mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
82fea30fcc
3e002c8 remove unused Jenkinsfile 16b1055 [OVPN3-140] Update company names in copyrights 6caca2c [OVPN3-140] Relicense back to AGPLv3 4f9ae74 cliproto: react to tls_warnings 546547b Proto: export tls_warnings attribute from SSL session 7cbaa26 SSLAPI: add tls_warning attribute 7ed93a3 clievent: add Warn event class 7a71ba1 win: get 'arch' param value from environment 61bb21b win: make parameter optional 15d66c4 [OVPN3-141] win: disable WPO 97d9c28 [OU-15] mbedtls: remove duplicated code 95aec32 [OU-15] mbedtls: refactor X509Cert to allow reuse der2pem 946753e [OVPN3-135] Win: remove unneeded default route d7f8c47 nrpt: create separate policy per dns suffix 577b5ca cli.cpp: fix typ0 in define fc8f89d [OVPN3-129] android: ensure all SWIG files are archived and saved e143bc0 [OVPN3-129] android: improve build system in order to perform full build 06d23ec [OVPN3-129] build-system: let scripts download dependencies 76bb99c fix usage of to_string() in Android 44c183a time: mute type conversion warnings for UWP client 7d7490c transport: enable socket protect call for UWP 1c003ac transport: pass protocol type to external factory c0de92c transport: add stop_requeueing method e2c60c8 android: build core library with MD5 support 3928069 [OVPN3-119] mbedTLS: create INSECURE profile including MD5 4f99310 remove function accidentally duplicated by last merge b91d841 self-test: add missing includes 19e33c4 [OA-14] mbedTLS: relax x509 date/time format check f3cf645 [OVPN3-116] disable SSL_CBC_RECORD_SPLITTING fca9ed2 [OVPN3-105] ParseClientConfig: avoid crash when not all key material is provided 7299fef [OC-42] Android: specify API level on command line d3da3df android: build client lib for x86 (for emulator) 8e501c5 Update version for mbedTLS and lz4 e57676e ParseClientConfig: export config to json format 9aa715f ParseClientConfig: export configuration to ovpn file format 1eab4cb ParseClientConfig: add helper constructor 71a59e4 ParseClientConfig: store the entire ovpn profile e0bb85a Transport: convert from transport protocol to config string 2fe56c3 Compress: convert from ctx type to config string 174ee25 OpenSSL: implement stub methods for new private_key_type/length() SSLAPIs 3d57708 mbedTLS: implement private_key_type/length() API a3210f0 SSLAPI: add private_key_type/length() getter methods 8ffe888 OpenSSL: implement stub methods for new extract_* SSLAPIs 16e9160 mbedTLS: implement extended API for key material extraction fe3d519 SSLAPI: extend API with methods to extract key material 2b4c850 Debugging: added header and build flag for valgrind run-time extensions. b948cde ManClientInstance::Factory: added virtual stop() method. 121e975 client API: added portOverride 106981c JSON: allow alternative JSON library implementations f206ae2 logging: added logdatetime.hpp which prepends date/time to log lines 49e933d Time: added to_double, delta_float, and delta_str methods 569b1da daemon.hpp: added class WritePid for managing pid files 63e9e04 ClientProto: reset CoarseTime object when AsioTimer is canceled f64b501 Cleanup: allow functor to be passed by value. ebe2560 RunContext: add configurable exit via EXIT_IN env var for debugging 1fbff4f tls-crypt: revised server-side validate_initial_packet() methods to use a BufferAllocated rather than a Buffer. 0090c51 SSLConst: added new ssl_flags() method which filters out non-ssl flags from given argument. 8379b0a CryptoDCInstance: added new RekeyType PRIMARY_SECONDARY_SWAP and use it in ProtoContext::promote_secondary_to_primary() since it more accurately reflects the underlying implementation. 18f45c2 ManClientInstance::Send: added AuthStatus::Type parameter to disconnect_user() method. 4bba803 Listen::List: added expand_ports() method. 5122e7d Listen::List: in port_offset(), set n_threads to 0 since number-of-threads data for port_offset items isn't really relevant. 4e11a6c StaticKey: added render_to_base64() and init_from_rng() methods. 190ece9 CryptoAlgs: added mode() method. 76e65cf CryptoAlgs: added AEAD_NONCE_TAIL_SIZE constant (set to 8 bytes) to represent the size in bytes of AEAD "nonce tail" normally taken from the HMAC key material. 2738718 compress: added method_to_string() method, i.e. the inverse of parse_method(). 7b47f99 compress: since parse_method() performs a linear search on method, reorder so that more frequently used methods appear at the top of the list. b428f74 library: added integer is_pow2() and log2() methods based on efficient __builtin_ffs and __builtin_clz intrinsics. 4926011 Android: adapt toolchain scripts to new SDK and move to API 26 ad4e995 mbedTLS: use mbedtls API to initialize cert object 908c611 transport: use socket_protect to communicate socket handle on UWP 92a6216 build win: read certain params from env 8166ea8 common: define uwp platform macro 0186bf6 common: report platform name as "uwp" 3f291b0 netconf: disable getting hwaddr for UWP 6365d26 transport: external factory 2ffa0c9 transport: synchronous DNS lookup 2c09c7c cliconnect.hpp: support for AsioWork always on 4f5a04d rand.hpp: allow external entropy source b19c5da time.hpp: use GetTickCount64 on Vista and newer 712ccfc android: export DEP_DIR via vars files only if not already defined 1b5a784 asio: make sure to switch to DEP_DIR before building 4302651 changes to support android building 6f56b2b Merge pull request #21 from OpenVPN/make_test_proto_deterministic 3a5ef2b travis-ci: make testing binary deterministic b76882d mbedtls: fix typ0 in exception message 40065a6 avoid "uninitialized variable warning" f33e7c2 [OVPN3-5] tls-crypt: add tls-crypt support in proto.hpp test unit 74c5f4f [OVPN3-5] tls-crypt: introduce tls-crypt support 389353c proto.cpp: uninit process at the end of the execution 56a831f [OVPN3-5] crypto/ssl: add support for AES-256-CTR 7cbf539 [OVPN3-5] build script: allow user to specify its own mbedTLS folder and LDFLAGS 8ae2a3f Integrate Google Test framework 68ae101 Add swig build to jenkins pipeline d496311 ovpncli.hpp: inline LogInfo constructor for clarity 96e0d89 Revert "Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7)" 7db95cc Make build fail on compilation errors 860129a TunBuilderCapture: make (to|from)_json methods public 2486494 random: added helper class Rand2 containing a crypto and non-crypto RNG 04175c2 appversion.hpp: Stringize VERSION -> MY_VERSION 81cb887 build script: added DPROF=1 flag a3dd47f timestr.hpp: moved milliseconds_since_epoch() to time/epoch.hpp 59b9492 sslchoose.hpp: added SSL_LIB_NAME 8fcb797 ProtoContext::KeyContext::raw_recv() : fix state transition e49e993 ProtoContext: comment edit 1d941aa VPNServerNetblock::Netblock refactor 7190495 Server-side renamings to break up long class names using namespaces. 3f74ec1 Listen::List: minor changes 79c789b RandomAPI: comment edit 5b5af36 Added SSLConst::SERVER_TO_SERVER flag fe00df4 OpenSSLContext::Config::set_rng: call assert_crypto() 3ae0076 In sslchoose.hpp, move OPENVPN_LOG_SSL macro to new file ssllog.hpp 1502cf6 URL::Parse: made is_valid_uri_char() standalone and moved to validate_uri.hpp 2dcb189 Added HTTP::Status::SwitchingProtocols constant 2f57024 HTTP::HeaderList: added get_value_trim_lower() method bee94d2 HTTP::HeaderList: get_value() and get_value_trim() should return std::string instead of const std::string 5debab1 Frame::Context: #define OPENVPN_NO_IO to allow building without i/o layer faf8f8f StaticKey: added parse_from_base64() method d11f250 HashString: added final_base64() method c373bf8 CompressContext: use C++11 member initialization and remove explicit attribute on constructor bd75cd7 RCPtr: added operator==() and operator!=() methods 7be33c5 PThreadBarrier: fixed incorrect comment 6f5f77b Link: use move semantics 17a5d89 inotify.hpp: no longer used 8ce39fc added render_hex() and render_hex_sep() methods that accept void* data ddc8e8a Function: use std::forward 76ee587 write_binary_atomic(): added tmpdir (temporary directory) parameter f366d55 base64: encode() now accepts void* data 462fe90 BufferType: added read(), write(), and prepend() variants that accept void* data 9ad1be4 IP::RouteType: added host_bits() method 3ebc8c7 IPv[46]::Addr::to_sockaddr() now accepts optional port number ce0977b Support Cityhash. fdbb0b9 IP::Addr: added validate_prefix_len() 25146d8 IP::Addr::from_ipv[4|6](): use move semantics a264f99 Merge pull request #20 from OpenVPN/fix_travis_ci_coverity 966e212 travis: don't mess up the SSL libs for wget/curl 2b8f09d Merge pull request #19 from OpenVPN/antonio/travis-ci-to-coverity 127cbb0 travis.yml: send build to Coverity SCAN when building master 2bca49b Merge pull request #15 from OpenVPN/antonio/travis-ci a5ce566 add basic support for Travis CI f9b14e9 macOS: add basic logging support 2b9188d Remotelist: pass meaningful port value to resolve::async_resolve() 4ebdbd0 Merged in OVPN3-38-improve-jenkins-pipeline-script (pull request #8) 832cf7f Report build status to Bitbucket 62423c9 Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7) cce2455 Prepend log string with unique reference. f26b08b Merged in OVPN3-25-pipeline-build (pull request #4) dc5ff1f Add OpenSSL version building. c77e1d6 Add pipeline script for multiplatform build. 4fab9b0 Merged in OVPN3-18-vs-project (pull request #2) 8eb0d6c Add Visual Studio project info to README 67c4989 Visual Studio 2015 solution and project files 52bfcd3 Merged in OVPN3-17 (pull request #1) 5f648ce Document Windows build process 3213c48 Support for local build settings b3ec01b Support for gpl version of mbedtls 903abc8 Support for zipballs 4029579 AsioPolySock: support bind to local address. 1e85566 Use openvpn::strerror_str() instead of std::strerror(). 3ba37fc OpenVPN 3 client: added OPENVPN_OVPNCLI_ASYNC_SETUP flag. git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: 3e002c83ce2e9f9f40ddcee750d3cfa664238abe
509 lines
14 KiB
C++
509 lines
14 KiB
C++
// OpenVPN -- An application to securely tunnel IP networks
|
|
// over a single port, with support for SSL/TLS-based
|
|
// session authentication and key exchange,
|
|
// packet encryption, packet authentication, and
|
|
// packet compression.
|
|
//
|
|
// Copyright (C) 2012-2017 OpenVPN Inc.
|
|
//
|
|
// This program is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU Affero General Public License Version 3
|
|
// as published by the Free Software Foundation.
|
|
//
|
|
// This program is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU Affero General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Affero General Public License
|
|
// along with this program in the COPYING file.
|
|
// If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
// DNS utilities for Mac OS X.
|
|
|
|
#ifndef OPENVPN_TUN_MAC_MACDNS_H
|
|
#define OPENVPN_TUN_MAC_MACDNS_H
|
|
|
|
#include <string>
|
|
#include <sstream>
|
|
#include <memory>
|
|
|
|
#include <openvpn/common/size.hpp>
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/string.hpp>
|
|
#include <openvpn/common/process.hpp>
|
|
#include <openvpn/apple/macver.hpp>
|
|
#include <openvpn/apple/scdynstore.hpp>
|
|
#include <openvpn/apple/cf/cfhelper.hpp>
|
|
#include <openvpn/tun/builder/capture.hpp>
|
|
|
|
namespace openvpn {
|
|
class MacDNS : public RC<thread_unsafe_refcount>
|
|
{
|
|
class Info;
|
|
|
|
public:
|
|
typedef RCPtr<MacDNS> Ptr;
|
|
|
|
OPENVPN_EXCEPTION(macdns_error);
|
|
|
|
class Config : public RC<thread_safe_refcount>
|
|
{
|
|
public:
|
|
typedef RCPtr<Config> Ptr;
|
|
|
|
Config()
|
|
{
|
|
}
|
|
|
|
Config(const TunBuilderCapture& settings)
|
|
: dns_servers(get_dns_servers(settings)),
|
|
search_domains(get_search_domains(settings))
|
|
{
|
|
// We redirect DNS if either of the following is true:
|
|
// 1. redirect-gateway (IPv4) is pushed, or
|
|
// 2. DNS servers are pushed but no search domains are pushed
|
|
redirect_dns = settings.reroute_gw.ipv4 || (CF::array_len(dns_servers) && !CF::array_len(search_domains));
|
|
}
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
os << "RD=" << redirect_dns;
|
|
os << " SO=" << search_order;
|
|
os << " DNS=" << CF::array_to_string(dns_servers);
|
|
os << " DOM=" << CF::array_to_string(search_domains);
|
|
return os.str();
|
|
}
|
|
|
|
bool redirect_dns = false;
|
|
int search_order = 5000;
|
|
CF::Array dns_servers;
|
|
CF::Array search_domains;
|
|
|
|
private:
|
|
static CF::Array get_dns_servers(const TunBuilderCapture& settings)
|
|
{
|
|
CF::MutableArray ret(CF::mutable_array());
|
|
for (std::vector<TunBuilderCapture::DNSServer>::const_iterator i = settings.dns_servers.begin();
|
|
i != settings.dns_servers.end(); ++i)
|
|
{
|
|
const TunBuilderCapture::DNSServer& ds = *i;
|
|
CF::array_append_str(ret, ds.address);
|
|
}
|
|
return CF::const_array(ret);
|
|
}
|
|
|
|
static CF::Array get_search_domains(const TunBuilderCapture& settings)
|
|
{
|
|
CF::MutableArray ret(CF::mutable_array());
|
|
for (std::vector<TunBuilderCapture::SearchDomain>::const_iterator i = settings.search_domains.begin();
|
|
i != settings.search_domains.end(); ++i)
|
|
{
|
|
const TunBuilderCapture::SearchDomain& sd = *i;
|
|
CF::array_append_str(ret, sd.domain);
|
|
}
|
|
return CF::const_array(ret);
|
|
}
|
|
};
|
|
|
|
MacDNS(const std::string& sname_arg)
|
|
: sname(sname_arg)
|
|
{
|
|
}
|
|
|
|
void flush_cache()
|
|
{
|
|
const int v = ver.major();
|
|
if (v < Mac::Version::OSX_10_6)
|
|
OPENVPN_LOG("MacDNS: Error: No support for Mac OS X versions earlier than 10.6");
|
|
if (v == Mac::Version::OSX_10_6 || v >= Mac::Version::OSX_10_9)
|
|
{
|
|
Argv args;
|
|
args.push_back("/usr/bin/dscacheutil");
|
|
args.push_back("-flushcache");
|
|
OPENVPN_LOG(args.to_string());
|
|
system_cmd(args);
|
|
}
|
|
if (v >= Mac::Version::OSX_10_7)
|
|
{
|
|
Argv args;
|
|
args.push_back("/usr/bin/killall");
|
|
args.push_back("-HUP");
|
|
args.push_back("mDNSResponder");
|
|
OPENVPN_LOG(args.to_string());
|
|
system_cmd(args);
|
|
}
|
|
}
|
|
|
|
bool signal_network_reconfiguration()
|
|
{
|
|
const char *key = "Setup:/Network/Global/IPv4";
|
|
CF::DynamicStore sc = ds_create();
|
|
const CF::String cfkey = CF::string(key);
|
|
OPENVPN_LOG("MacDNS: SCDynamicStoreNotifyValue " << key);
|
|
return bool(SCDynamicStoreNotifyValue(sc(), cfkey()));
|
|
}
|
|
|
|
bool setdns(const Config& config)
|
|
{
|
|
bool mod = false;
|
|
|
|
try {
|
|
CF::DynamicStore sc = ds_create();
|
|
Info::Ptr info(new Info(sc, sname));
|
|
|
|
// cleanup settings applied to previous interface
|
|
interface_change_cleanup(info.get());
|
|
|
|
if (config.redirect_dns)
|
|
{
|
|
// redirect all DNS
|
|
info->dns.will_modify();
|
|
|
|
// set DNS servers
|
|
if (CF::array_len(config.dns_servers))
|
|
{
|
|
info->dns.backup_orig("ServerAddresses");
|
|
CF::dict_set_obj(info->dns.mod, "ServerAddresses", config.dns_servers());
|
|
}
|
|
|
|
// set search domains
|
|
info->dns.backup_orig("SearchDomains");
|
|
if (CF::array_len(config.search_domains))
|
|
CF::dict_set_obj(info->dns.mod, "SearchDomains", config.search_domains());
|
|
|
|
// set search order
|
|
info->dns.backup_orig("SearchOrder");
|
|
CF::dict_set_int(info->dns.mod, "SearchOrder", config.search_order);
|
|
|
|
// push it
|
|
mod |= info->dns.push_to_store();
|
|
}
|
|
else
|
|
{
|
|
// redirect specific domains
|
|
info->ovpn.mod_reset();
|
|
if (CF::array_len(config.dns_servers) && CF::array_len(config.search_domains))
|
|
{
|
|
// set DNS servers
|
|
CF::dict_set_obj(info->ovpn.mod, "ServerAddresses", config.dns_servers());
|
|
|
|
// set search domains, reverse domains can be added here as well
|
|
CF::dict_set_obj(info->ovpn.mod, "SupplementalMatchDomains", config.search_domains());
|
|
}
|
|
|
|
// push it
|
|
mod |= info->ovpn.push_to_store();
|
|
}
|
|
|
|
if (mod)
|
|
{
|
|
// As a backup, save PrimaryService in private dict (if network goes down while
|
|
// we are set, we can lose info about PrimaryService in State:/Network/Global/IPv4
|
|
// and be unable to reset ourselves).
|
|
const CFTypeRef ps = CF::dict_get_obj(info->ipv4.dict, "PrimaryService");
|
|
if (ps)
|
|
{
|
|
info->info.mod_reset();
|
|
CF::dict_set_obj(info->info.mod, "PrimaryService", ps);
|
|
info->info.push_to_store();
|
|
}
|
|
}
|
|
|
|
prev = info;
|
|
if (mod)
|
|
OPENVPN_LOG("MacDNS: SETDNS " << ver.to_string() << std::endl << info->to_string());
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
OPENVPN_LOG("MacDNS: setdns: " << e.what());
|
|
}
|
|
return mod;
|
|
}
|
|
|
|
bool resetdns()
|
|
{
|
|
bool mod = false;
|
|
try {
|
|
CF::DynamicStore sc = ds_create();
|
|
Info::Ptr info(new Info(sc, sname));
|
|
|
|
// cleanup settings applied to previous interface
|
|
interface_change_cleanup(info.get());
|
|
|
|
// undo primary dns changes
|
|
mod |= reset_primary_dns(info.get());
|
|
|
|
// undo non-redirect-gateway changes
|
|
if (CF::dict_len(info->ovpn.dict))
|
|
mod |= info->ovpn.remove_from_store();
|
|
|
|
// remove private info dict
|
|
if (CF::dict_len(info->info.dict))
|
|
mod |= info->info.remove_from_store();
|
|
|
|
if (mod)
|
|
OPENVPN_LOG("MacDNS: RESETDNS " << ver.to_string() << std::endl << info->to_string());
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
OPENVPN_LOG("MacDNS: resetdns: " << e.what());
|
|
}
|
|
return mod;
|
|
}
|
|
|
|
std::string to_string() const
|
|
{
|
|
CF::DynamicStore sc = ds_create();
|
|
Info::Ptr info(new Info(sc, sname));
|
|
return info->to_string();
|
|
}
|
|
|
|
CF::Array dskey_array() const
|
|
{
|
|
CF::DynamicStore sc = ds_create();
|
|
Info::Ptr info(new Info(sc, sname));
|
|
CF::MutableArray ret(CF::mutable_array());
|
|
CF::array_append_str(ret, info->ipv4.dskey);
|
|
CF::array_append_str(ret, info->info.dskey);
|
|
CF::array_append_str(ret, info->ovpn.dskey);
|
|
CF::array_append_str(ret, info->dns.dskey);
|
|
return CF::const_array(ret);
|
|
}
|
|
|
|
private:
|
|
void interface_change_cleanup(Info* info)
|
|
{
|
|
if (info->interface_change(prev.get()))
|
|
{
|
|
reset_primary_dns(prev.get());
|
|
prev.reset();
|
|
}
|
|
}
|
|
|
|
bool reset_primary_dns(Info* info)
|
|
{
|
|
bool mod = false;
|
|
if (info)
|
|
{
|
|
#if 1
|
|
// Restore previous DNS settings.
|
|
// Recommended for production.
|
|
info->dns.will_modify();
|
|
info->dns.restore_orig();
|
|
mod |= info->dns.push_to_store();
|
|
#else
|
|
// Wipe DNS settings without restore.
|
|
// This can potentially wipe static IP/DNS settings.
|
|
info->dns.mod_reset();
|
|
mod |= info->dns.push_to_store();
|
|
#endif
|
|
}
|
|
return mod;
|
|
}
|
|
|
|
class DSDict {
|
|
public:
|
|
DSDict(CF::DynamicStore& sc_arg, const std::string& sname_arg, const std::string& dskey_arg)
|
|
: sc(sc_arg),
|
|
sname(sname_arg),
|
|
dskey(dskey_arg),
|
|
dict(CF::DynamicStoreCopyDict(sc_arg, dskey))
|
|
{
|
|
}
|
|
|
|
bool dirty() const
|
|
{
|
|
return mod.defined() ? !CFEqual(dict(), mod()) : false;
|
|
}
|
|
|
|
bool push_to_store()
|
|
{
|
|
if (dirty())
|
|
{
|
|
const CF::String keystr = CF::string(dskey);
|
|
if (SCDynamicStoreSetValue(sc(), keystr(), mod()))
|
|
{
|
|
OPENVPN_LOG("MacDNS: updated " << dskey);
|
|
return true;
|
|
}
|
|
else
|
|
OPENVPN_LOG("MacDNS: ERROR updating " << dskey);
|
|
}
|
|
return false;
|
|
}
|
|
|
|
bool remove_from_store()
|
|
{
|
|
if (dirty())
|
|
throw macdns_error("internal error: remove_from_store called on modified dict");
|
|
const CF::String keystr = CF::string(dskey);
|
|
if (SCDynamicStoreRemoveValue(sc(), keystr()))
|
|
{
|
|
OPENVPN_LOG("MacDNS: removed " << dskey);
|
|
return true;
|
|
}
|
|
else
|
|
{
|
|
OPENVPN_LOG("MacDNS: ERROR removing " << dskey);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
void will_modify()
|
|
{
|
|
if (!mod.defined())
|
|
mod = CF::mutable_dict_copy(dict);
|
|
}
|
|
|
|
void mod_reset()
|
|
{
|
|
mod = CF::mutable_dict();
|
|
}
|
|
|
|
void backup_orig(const std::string& key, const bool wipe_orig=true)
|
|
{
|
|
const CF::String k = CF::string(key);
|
|
const CF::String orig = orig_key(key);
|
|
if (!CFDictionaryContainsKey(dict(), orig()))
|
|
{
|
|
const CF::String delval = delete_value();
|
|
CFTypeRef v = CFDictionaryGetValue(dict(), k());
|
|
if (!v)
|
|
v = delval();
|
|
will_modify();
|
|
CFDictionarySetValue(mod(), orig(), v);
|
|
}
|
|
if (wipe_orig)
|
|
{
|
|
will_modify();
|
|
CFDictionaryRemoveValue(mod(), k());
|
|
}
|
|
}
|
|
|
|
void restore_orig()
|
|
{
|
|
const CFIndex size = CFDictionaryGetCount(dict());
|
|
std::unique_ptr<const void *[]> keys(new const void *[size]);
|
|
std::unique_ptr<const void *[]> values(new const void *[size]);
|
|
CFDictionaryGetKeysAndValues(dict(), keys.get(), values.get());
|
|
const CF::String orig_prefix = orig_key("");
|
|
const CFIndex orig_prefix_len = CFStringGetLength(orig_prefix());
|
|
const CF::String delval = delete_value();
|
|
for (CFIndex i = 0; i < size; ++i)
|
|
{
|
|
const CF::String key = CF::string_cast(keys[i]);
|
|
if (CFStringHasPrefix(key(), orig_prefix()))
|
|
{
|
|
const CFIndex key_len = CFStringGetLength(key());
|
|
if (key_len > orig_prefix_len)
|
|
{
|
|
const CFRange r = CFRangeMake(orig_prefix_len, key_len - orig_prefix_len);
|
|
const CF::String k(CFStringCreateWithSubstring(kCFAllocatorDefault, key(), r));
|
|
const CFTypeRef v = values[i];
|
|
const CF::String vstr = CF::string_cast(v);
|
|
will_modify();
|
|
if (vstr.defined() && CFStringCompare(vstr(), delval(), 0) == kCFCompareEqualTo)
|
|
CFDictionaryRemoveValue(mod(), k());
|
|
else
|
|
CFDictionaryReplaceValue(mod(), k(), v);
|
|
CFDictionaryRemoveValue(mod(), key());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
os << "*** DSDict " << dskey << std::endl;
|
|
std::string orig = CF::description(dict());
|
|
string::trim_crlf(orig);
|
|
os << "ORIG " << orig << std::endl;
|
|
if (dirty())
|
|
{
|
|
std::string modstr = CF::description(mod());
|
|
string::trim_crlf(modstr);
|
|
os << "MODIFIED " << modstr << std::endl;
|
|
}
|
|
return os.str();
|
|
}
|
|
|
|
CF::DynamicStore sc;
|
|
const std::string sname;
|
|
const std::string dskey;
|
|
const CF::Dict dict;
|
|
CF::MutableDict mod;
|
|
|
|
private:
|
|
CF::String orig_key(const std::string& key) const
|
|
{
|
|
return CF::string(sname + "Orig" + key);
|
|
}
|
|
|
|
CF::String delete_value() const
|
|
{
|
|
return CF::string(sname + "DeleteValue");
|
|
}
|
|
};
|
|
|
|
class Info : public RC<thread_unsafe_refcount>
|
|
{
|
|
public:
|
|
typedef RCPtr<Info> Ptr;
|
|
|
|
Info(CF::DynamicStore& sc, const std::string& sname)
|
|
: ipv4(sc, sname, "State:/Network/Global/IPv4"),
|
|
info(sc, sname, "State:/Network/Service/" + sname + "/Info"),
|
|
ovpn(sc, sname, "State:/Network/Service/" + sname + "/DNS"),
|
|
dns(sc, sname, primary_dns(ipv4.dict, info.dict))
|
|
{
|
|
}
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
os << ipv4.to_string();
|
|
os << info.to_string();
|
|
os << ovpn.to_string();
|
|
os << dns.to_string();
|
|
return os.str();
|
|
}
|
|
|
|
bool interface_change(Info* other) const
|
|
{
|
|
return other && dns.dskey != other->dns.dskey;
|
|
}
|
|
|
|
DSDict ipv4;
|
|
DSDict info; // we may modify
|
|
DSDict ovpn; // we may modify
|
|
DSDict dns; // we may modify
|
|
|
|
private:
|
|
static std::string primary_dns(const CF::Dict& ipv4, const CF::Dict& info)
|
|
{
|
|
std::string serv = CF::dict_get_str(ipv4, "PrimaryService");
|
|
if (serv.empty())
|
|
serv = CF::dict_get_str(info, "PrimaryService");
|
|
if (serv.empty())
|
|
throw macdns_error("no primary service");
|
|
return "Setup:/Network/Service/" + serv + "/DNS";
|
|
}
|
|
};
|
|
|
|
CF::DynamicStore ds_create() const
|
|
{
|
|
CF::String sn = CF::string(sname);
|
|
return CF::DynamicStore(SCDynamicStoreCreate(kCFAllocatorDefault, sn(), nullptr, nullptr));
|
|
}
|
|
|
|
const std::string sname;
|
|
Mac::Version ver;
|
|
Info::Ptr prev;
|
|
};
|
|
}
|
|
|
|
#endif
|