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
292 lines
7.9 KiB
C++
292 lines
7.9 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
|
|
|
|
#ifndef OPENVPN_TUN_MAC_MACDNS_WATCHDOG_H
|
|
#define OPENVPN_TUN_MAC_MACDNS_WATCHDOG_H
|
|
|
|
#include <thread>
|
|
#include <mutex>
|
|
|
|
#include <openvpn/log/logthread.hpp>
|
|
#include <openvpn/common/action.hpp>
|
|
#include <openvpn/apple/cf/cftimer.hpp>
|
|
#include <openvpn/apple/cf/cfrunloop.hpp>
|
|
#include <openvpn/tun/mac/macdns.hpp>
|
|
|
|
namespace openvpn {
|
|
OPENVPN_EXCEPTION(macdns_watchdog_error);
|
|
|
|
class MacDNSWatchdog : public RC<thread_unsafe_refcount>
|
|
{
|
|
public:
|
|
typedef RCPtr<MacDNSWatchdog> Ptr;
|
|
|
|
// flags
|
|
enum {
|
|
ENABLE_WATCHDOG = (1<<0),
|
|
SYNCHRONOUS = (1<<1),
|
|
FLUSH_RECONFIG = (1<<2),
|
|
};
|
|
|
|
class DNSAction : public Action
|
|
{
|
|
public:
|
|
typedef RCPtr<DNSAction> Ptr;
|
|
|
|
DNSAction(const MacDNSWatchdog::Ptr& parent_arg,
|
|
const MacDNS::Config::Ptr& config_arg,
|
|
const unsigned int flags_arg)
|
|
: parent(parent_arg),
|
|
config(config_arg),
|
|
flags(flags_arg)
|
|
{
|
|
}
|
|
|
|
virtual void execute(std::ostream& os)
|
|
{
|
|
os << to_string() << std::endl;
|
|
if (parent)
|
|
parent->setdns(config, flags);
|
|
}
|
|
|
|
virtual std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
os << "MacDNSAction: FLAGS=";
|
|
if (flags & ENABLE_WATCHDOG)
|
|
os << 'E';
|
|
if (flags & SYNCHRONOUS)
|
|
os << 'S';
|
|
if (flags & FLUSH_RECONFIG)
|
|
os << 'F';
|
|
if (config)
|
|
os << ' ' << config->to_string();
|
|
return os.str();
|
|
}
|
|
|
|
private:
|
|
const MacDNSWatchdog::Ptr parent;
|
|
const MacDNS::Config::Ptr config;
|
|
const unsigned int flags;
|
|
};
|
|
|
|
MacDNSWatchdog()
|
|
: macdns(new MacDNS("OpenVPNConnect")),
|
|
thread(nullptr)
|
|
{
|
|
}
|
|
|
|
virtual ~MacDNSWatchdog()
|
|
{
|
|
stop_thread();
|
|
}
|
|
|
|
static void add_actions(const MacDNS::Config::Ptr& dns,
|
|
const unsigned int flags,
|
|
ActionList& create,
|
|
ActionList& destroy)
|
|
{
|
|
MacDNSWatchdog::Ptr watchdog(new MacDNSWatchdog);
|
|
MacDNS::Config::Ptr dns_remove;
|
|
DNSAction::Ptr create_action(new DNSAction(watchdog, dns, flags));
|
|
DNSAction::Ptr destroy_action(new DNSAction(watchdog, dns_remove, flags));
|
|
create.add(create_action);
|
|
destroy.add(destroy_action);
|
|
}
|
|
|
|
private:
|
|
bool setdns(const MacDNS::Config::Ptr& config, const unsigned int flags)
|
|
{
|
|
bool mod = false;
|
|
if (config)
|
|
{
|
|
if ((flags & SYNCHRONOUS) || !(flags & ENABLE_WATCHDOG))
|
|
stop_thread();
|
|
config_ = config;
|
|
if (flags & ENABLE_WATCHDOG)
|
|
{
|
|
if (!thread)
|
|
{
|
|
mod = macdns->setdns(*config_);
|
|
thread = new std::thread(&MacDNSWatchdog::thread_func, this);
|
|
}
|
|
else
|
|
{
|
|
if (runloop.defined())
|
|
schedule_push_timer(0);
|
|
else
|
|
OPENVPN_LOG("MacDNSWatchdog::setdns: runloop undefined");
|
|
}
|
|
}
|
|
else
|
|
{
|
|
mod = macdns->setdns(*config_);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
stop_thread();
|
|
config_.reset();
|
|
mod = macdns->resetdns();
|
|
}
|
|
if (mod && (flags & FLUSH_RECONFIG))
|
|
{
|
|
macdns->flush_cache();
|
|
macdns->signal_network_reconfiguration();
|
|
}
|
|
return mod;
|
|
}
|
|
|
|
std::string to_string() const
|
|
{
|
|
const MacDNS::Config::Ptr config(config_);
|
|
if (config)
|
|
return config->to_string();
|
|
else
|
|
return std::string("UNDEF");
|
|
}
|
|
|
|
void stop_thread()
|
|
{
|
|
if (thread)
|
|
{
|
|
if (runloop.defined())
|
|
CFRunLoopStop(runloop());
|
|
thread->join();
|
|
delete thread;
|
|
thread = nullptr;
|
|
}
|
|
}
|
|
|
|
// All methods below this point called in the context of watchdog thread
|
|
// except for schedule_push_timer which may be called from parent thread
|
|
// as well.
|
|
void thread_func()
|
|
{
|
|
runloop.reset(CFRunLoopGetCurrent(), CF::GET);
|
|
Log::Context logctx(logwrap);
|
|
|
|
try {
|
|
SCDynamicStoreContext context = {0, this, nullptr, nullptr, nullptr};
|
|
CF::DynamicStore ds(SCDynamicStoreCreate(kCFAllocatorDefault,
|
|
CFSTR("OpenVPN_MacDNSWatchdog"),
|
|
callback_static,
|
|
&context));
|
|
if (!ds.defined())
|
|
throw macdns_watchdog_error("SCDynamicStoreCreate");
|
|
const CF::Array watched_keys(macdns->dskey_array());
|
|
if (!watched_keys.defined())
|
|
throw macdns_watchdog_error("watched_keys is undefined");
|
|
if (!SCDynamicStoreSetNotificationKeys(ds(),
|
|
watched_keys(),
|
|
nullptr))
|
|
throw macdns_watchdog_error("SCDynamicStoreSetNotificationKeys failed");
|
|
CF::RunLoopSource rls(SCDynamicStoreCreateRunLoopSource(kCFAllocatorDefault, ds(), 0));
|
|
if (!rls.defined())
|
|
throw macdns_watchdog_error("SCDynamicStoreCreateRunLoopSource failed");
|
|
CFRunLoopAddSource(CFRunLoopGetCurrent(), rls(), kCFRunLoopDefaultMode);
|
|
|
|
// process event loop until CFRunLoopStop is called from parent thread
|
|
CFRunLoopRun();
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
OPENVPN_LOG("MacDNSWatchdog::thread_func exception: " << e.what());
|
|
}
|
|
cancel_push_timer();
|
|
}
|
|
|
|
static void callback_static(SCDynamicStoreRef store, CFArrayRef changedKeys, void *arg)
|
|
{
|
|
MacDNSWatchdog *self = (MacDNSWatchdog *)arg;
|
|
self->callback(store, changedKeys);
|
|
}
|
|
|
|
void callback(SCDynamicStoreRef store, CFArrayRef changedKeys)
|
|
{
|
|
// DNS Watchdog delay from the time that change is detected
|
|
// to when we forcibly revert it (seconds).
|
|
schedule_push_timer(1);
|
|
}
|
|
|
|
void schedule_push_timer(const int seconds)
|
|
{
|
|
std::lock_guard<std::mutex> lock(push_timer_lock);
|
|
CFRunLoopTimerContext context = { 0, this, nullptr, nullptr, nullptr };
|
|
cancel_push_timer_nolock();
|
|
push_timer.reset(CFRunLoopTimerCreate(kCFAllocatorDefault, CFAbsoluteTimeGetCurrent() + seconds, 0, 0, 0, push_timer_callback_static, &context));
|
|
if (push_timer.defined())
|
|
CFRunLoopAddTimer(runloop(), push_timer(), kCFRunLoopCommonModes);
|
|
else
|
|
OPENVPN_LOG("MacDNSWatchdog::schedule_push_timer: failed to create timer");
|
|
}
|
|
|
|
void cancel_push_timer_nolock()
|
|
{
|
|
if (push_timer.defined())
|
|
{
|
|
CFRunLoopTimerInvalidate(push_timer());
|
|
push_timer.reset(nullptr);
|
|
}
|
|
}
|
|
|
|
void cancel_push_timer()
|
|
{
|
|
std::lock_guard<std::mutex> lock(push_timer_lock);
|
|
cancel_push_timer_nolock();
|
|
}
|
|
|
|
static void push_timer_callback_static(CFRunLoopTimerRef timer, void *info)
|
|
{
|
|
MacDNSWatchdog* self = (MacDNSWatchdog*)info;
|
|
self->push_timer_callback(timer);
|
|
}
|
|
|
|
void push_timer_callback(CFRunLoopTimerRef timer)
|
|
{
|
|
try {
|
|
// reset DNS settings after watcher detected modifications by third party
|
|
const MacDNS::Config::Ptr config(config_);
|
|
if (macdns->setdns(*config))
|
|
OPENVPN_LOG("MacDNSWatchdog: updated DNS settings");
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
OPENVPN_LOG("MacDNSWatchdog::push_timer_callback exception: " << e.what());
|
|
}
|
|
}
|
|
|
|
|
|
MacDNS::Config::Ptr config_;
|
|
MacDNS::Ptr macdns;
|
|
|
|
std::thread* thread; // watcher thread
|
|
CF::RunLoop runloop; // run loop in watcher thread
|
|
CF::Timer push_timer; // watcher thread timer
|
|
std::mutex push_timer_lock;
|
|
Log::Context::Wrapper logwrap; // used to carry forward the log context from parent thread
|
|
};
|
|
}
|
|
|
|
#endif
|