mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-04-24 00:00:05 +08:00
84ad2a289f
e6d68831a deps: update mbedTLS to 2.7.0 59de63fa6 cli.cpp: added OPENVPN_REMOTE_OVERRIDE caf9cf6c1 RedirectPipe: added additional flags for flexibility 68595de4d ClientAPI::RemoteOverride: added error status 37d848ca2 Log lines from C++ exceptions should contain the text "exception" f05802cf9 Increase server validation of password size to 16KB to support bundling SAML messages. 52e4d4a5f Increase client validation of password/response size to 16KB to support bundling SAML messages. a0416ed92 [OVPN3-209] win: add dependencies checksum verification f6eadbc4d [OVPN3-206] Refactor Windows build system 7b30c2f12 [OVPN3-220] proto.hpp: send initial options set on rekeying 33dd2f29e mbedtls: backport fixes for CVE-2018-0487 0912a9b62 [OVPN3-213] build system: mbedtls timing tests 98fa55576 deps: update asio to 1.12.0 620531101 [OVPN3-215] asio: apply external patches f4a73bde5 [OVPN3-215] asio: rebase external patches on top of our current commit ID a61cac928 mbedtls: Patches from 2.7 to fix timing test failures c892f41fb win: tune dependencies build 8a394a37d [OVPN3-213] build system: mbedtls timing tests 0a3dd67da [OVPN3-190] tun linux: add to/from_json methods 44c6cdfdc [OVPN3-206] readme: update Windows build instructions 0edec4a09 [OVPN3-206] win: update directories in VS projects 3d6fd62cb mac build: improve unittest stability 758ae98c6 [OVPN3-209] win: add dependencies checksum verification a7642ee82 [OVPN3-205] win: apply mbedTLS patches ac94b6eb7 [OVPN3-206] Refactor Windows build system c5bc3859e mbedTLS: don't set endpoint twice in conf object 3d5dd9ee3 [OVPN3-199] mac build: do not overwrite DEP_DIR b713762ba mbedtls: Patches from 2.7 to fix timing test failures 37ab79fa6 tun linux: apply changes from 362acf0 6a7aee2c9 [OVPN3-190] tun: implement persistence 1d2ebb07f [OVPN3-190] tun: move tun creation to separate class 53e33d634 [OVPN3-190] tun: move content of tun to tuncli 85d3377c2 [OVPN3-190] tun: move tun setup methods to separate file 735b985eb i/o layer: wrap raw pointers embedded in closures 322ae24b5 OptionList: support variadic template parameter pack in constructors 8a012b454 lz4: added namespace and improved error handling 34998e94a zlib: removed verbose parameter 846ed217d OpenSSL: set SSL_MODE_RELEASE_BUFFERS to conserve memory by releasing unneeded buffers 32e3ea117 OptionList: added show_unused_options() method fe38233a8 Buffer: added typedefs for thread-safe refcounts b34b6271e compression: added compress_lz4() and decompress_lz4() 755e1a181 linux/core.hpp: added exclude_from_core() function a7f6fe64f ManClientInstance::Send: added userprop_local_update() virtual method 94526ac19 BufferAllocated: fixed regression in buffer copy 33c16812e [OVPN3-144] mbedTLS: fix support for 4096bit encrypted keys f249ab4bd [OVPN3-144] build-mbedtls: run make check before compiling 5040aef4c [OVPN3-144] build-mbedtls: apply patches using git-apply instead of patch 8a5e838ab [OVPN3-144] mbedTLS: fix incompatibility with PKI created by OpenSSL 1.1 e7badefd7 proto.hpp/tls-crypt: fix access to ACK IDs during packet validation 73fa974db proto.hpp: print buffer exception in case of packet access error 79ad5eded Estblishing a stable branch 1c5f20ab0 Hide the @ sign in logs if username is empty 01ee1f5a4 Added ClientAPI::Config::retryOnAuthFailed parameter 05880b136 Added ProfileParseLimits::MAX_SERVER_LIST_SIZE and raise limit to 4096 eedee4fa6 cli.cpp: allow -s server override to reference a friendly name 6e350e9f9 Linux tun setup: use LinuxGW46 to obtain gateway info 3e044c6c7 top-level .gitignore was missing a trailing newline a27355ac7 Use C++11 push_back(std::move(...))) for pushing objects onto vectors 8c3af2704 HostPort::split_host_port: support unix socket filename as an alternative kind of host 14b588c86 asio: added asio_resolver_results_to_string() fd6e8e9bf AsioPolySock: minor changes to remote_endpoint_str() 06f5e4d71 AsioBoundSocket::Socket: added to_string() method 8fd968532 RemoteList: minor cleanup in set_endpoint_range() f9fc2f54e BufferAllocated: improve movability 8cb8d52cd string: added first_line() method a26b1646b AsioPolySock: extend AltRouting support ef3a40c27 Listen::Item: added AltRouting mode 02e786bc9 write_binary_atomic: support ConstBuffer 6745799c9 fileunix: added read_binary_unix_fast() 5689c2d9c write_binary_unix(): added ConstBuffer variant 2b0e76453 enum_dir: refactor to allow enumeration via lambda 116a5bd5e bufstr: added const_buf_from_string() method f8ec81413 Buffer: added const_buffer_ref() variant accepting a const argument ae98aa8b6 AsioPolySock: support AltRouting 8f81479f1 AsioBoundSocket::Socket: support inheritance 9598918e9 ServerProto: added schedule_disconnect() method. 4516cf67b ServerProto: reset CoarseTime object when AsioTimer is canceled 0ffc76a0b Route: implement operator< so Route objects can be used as map/set keys. c4af9f68b event_loop_wait_barrier: raise default timeout to 30 seconds d7fe87540 appversion.hpp: rename VERSION -> BUILD_VERSION git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: e6d68831a71131b7d92fbea93d3b9cbe10ba2068
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 exception: " << 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 exception: " << 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
|