mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-11 00:00:08 +08:00
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
412 lines
10 KiB
C++
412 lines
10 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/>.
|
|
|
|
// Manage a pool of threads for a multi-threaded server.
|
|
//
|
|
// To stress test this code, in client after serv->start() add:
|
|
// if (unit == 3 || unit == 5)
|
|
// throw Exception("HIT IT");
|
|
// And after "case PThreadBarrier::ERROR:"
|
|
// if (unit & 1)
|
|
// break;
|
|
|
|
#ifndef OPENVPN_COMMON_RUNCONTEXT_H
|
|
#define OPENVPN_COMMON_RUNCONTEXT_H
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include <thread>
|
|
#include <mutex>
|
|
#include <memory>
|
|
#include <type_traits> // for std::is_nothrow_move_constructible
|
|
|
|
#include <openvpn/common/platform.hpp>
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/size.hpp>
|
|
#include <openvpn/common/signal.hpp>
|
|
#include <openvpn/common/stop.hpp>
|
|
#include <openvpn/common/environ.hpp>
|
|
#include <openvpn/common/number.hpp>
|
|
#include <openvpn/asio/asiosignal.hpp>
|
|
#include <openvpn/time/time.hpp>
|
|
#include <openvpn/time/asiotimer.hpp>
|
|
#include <openvpn/time/timestr.hpp>
|
|
|
|
#ifdef ASIO_HAS_LOCAL_SOCKETS
|
|
#include <openvpn/common/scoped_fd.hpp>
|
|
#endif
|
|
|
|
namespace openvpn {
|
|
|
|
struct RunContextLogEntry
|
|
{
|
|
RunContextLogEntry(const time_t timestamp_arg, const std::string& text_arg)
|
|
: timestamp(timestamp_arg),
|
|
text(text_arg)
|
|
{
|
|
}
|
|
|
|
time_t timestamp;
|
|
std::string text;
|
|
};
|
|
|
|
template <typename RC_TYPE>
|
|
struct ServerThreadType : public virtual RC_TYPE
|
|
{
|
|
typedef RCPtr<ServerThreadType> Ptr;
|
|
typedef RCWeakPtr<ServerThreadType> WPtr;
|
|
|
|
virtual void thread_safe_stop() = 0;
|
|
|
|
virtual void log_notify(const RunContextLogEntry& le)
|
|
{
|
|
}
|
|
};
|
|
|
|
typedef ServerThreadType<RCWeak<thread_safe_refcount>> ServerThreadWeakBase;
|
|
typedef ServerThreadType<RC<thread_safe_refcount>> ServerThreadBase;
|
|
|
|
struct RunContextBase : public LogBase
|
|
{
|
|
virtual void cancel() = 0;
|
|
virtual std::vector<RunContextLogEntry> add_log_observer(const unsigned int unit) = 0;
|
|
virtual void disable_log_history() = 0;
|
|
virtual Stop* async_stop() = 0;
|
|
};
|
|
|
|
template <typename ServerThread, typename Stats>
|
|
class RunContext : public RunContextBase
|
|
{
|
|
public:
|
|
typedef RCPtr<RunContext> Ptr;
|
|
|
|
class ThreadContext
|
|
{
|
|
public:
|
|
ThreadContext(RunContext& ctx_arg)
|
|
: ctx(ctx_arg)
|
|
{
|
|
ctx.add_thread();
|
|
}
|
|
|
|
~ThreadContext()
|
|
{
|
|
ctx.remove_thread();
|
|
}
|
|
|
|
private:
|
|
RunContext& ctx;
|
|
};
|
|
|
|
RunContext()
|
|
: exit_timer(io_context),
|
|
log_context(this),
|
|
log_wrap()
|
|
{
|
|
signals.reset(new ASIOSignals(io_context));
|
|
signal_rearm();
|
|
schedule_debug_exit();
|
|
}
|
|
|
|
void set_async_stop(Stop* async_stop)
|
|
{
|
|
async_stop_ = async_stop;
|
|
}
|
|
|
|
void set_thread(const unsigned int unit, std::thread* thread)
|
|
{
|
|
while (threadlist.size() <= unit)
|
|
threadlist.push_back(nullptr);
|
|
if (threadlist[unit])
|
|
throw Exception("RunContext::set_thread: overwrite");
|
|
threadlist[unit] = thread;
|
|
}
|
|
|
|
// called from worker thread
|
|
void set_server(const unsigned int unit, ServerThread* serv)
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
if (halt)
|
|
throw Exception("RunContext::set_server: halting");
|
|
while (servlist.size() <= unit)
|
|
servlist.push_back(nullptr);
|
|
if (servlist[unit])
|
|
throw Exception("RunContext::set_server: overwrite");
|
|
servlist[unit] = serv;
|
|
}
|
|
|
|
// called from worker thread
|
|
void clear_server(const unsigned int unit)
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
if (unit < servlist.size())
|
|
servlist[unit] = nullptr;
|
|
|
|
// remove log observer entry, if present
|
|
auto lu = std::find(log_observers.begin(), log_observers.end(), unit);
|
|
if (lu != log_observers.end())
|
|
log_observers.erase(lu);
|
|
}
|
|
|
|
void enable_log_history()
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
if (!log_history)
|
|
log_history.reset(new std::vector<RunContextLogEntry>());
|
|
}
|
|
|
|
virtual void disable_log_history() override
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
log_history.reset();
|
|
}
|
|
|
|
virtual std::vector<RunContextLogEntry> add_log_observer(const unsigned int unit) override
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
auto lu = std::find(log_observers.begin(), log_observers.end(), unit);
|
|
if (lu == log_observers.end())
|
|
log_observers.push_back(unit);
|
|
if (log_history)
|
|
return *log_history;
|
|
else
|
|
return std::vector<RunContextLogEntry>();
|
|
}
|
|
|
|
#ifdef ASIO_HAS_LOCAL_SOCKETS
|
|
void set_exit_socket(ScopedFD& fd)
|
|
{
|
|
exit_sock.reset(new openvpn_io::posix::stream_descriptor(io_context, fd.release()));
|
|
exit_sock->async_read_some(openvpn_io::null_buffers(),
|
|
[self=Ptr(this)](const openvpn_io::error_code& error, const size_t bytes_recvd)
|
|
{
|
|
if (!error)
|
|
self->cancel();
|
|
});
|
|
}
|
|
#endif
|
|
|
|
void set_prefix(const std::string& pre)
|
|
{
|
|
prefix = pre + ": ";
|
|
}
|
|
|
|
void run()
|
|
{
|
|
if (!halt)
|
|
io_context.run();
|
|
}
|
|
|
|
void join()
|
|
{
|
|
for (size_t i = 0; i < threadlist.size(); ++i)
|
|
{
|
|
std::thread* t = threadlist[i];
|
|
if (t)
|
|
{
|
|
t->join();
|
|
delete t;
|
|
threadlist[i] = nullptr;
|
|
}
|
|
}
|
|
}
|
|
|
|
virtual void log(const std::string& str) override
|
|
{
|
|
time_t now;
|
|
const std::string ts = date_time_store_time_t(now);
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
std::cout << ts << ' ' << str << std::flush;
|
|
|
|
if (!log_observers.empty() || log_history)
|
|
{
|
|
const RunContextLogEntry le(now, str);
|
|
for (auto &si : log_observers)
|
|
{
|
|
ServerThread* st = servlist[si];
|
|
if (st)
|
|
st->log_notify(le);
|
|
}
|
|
if (log_history)
|
|
log_history->emplace_back(now, str);
|
|
}
|
|
}
|
|
}
|
|
|
|
// called from main or worker thread
|
|
virtual void cancel() override
|
|
{
|
|
if (halt)
|
|
return;
|
|
openvpn_io::post(io_context, [self=Ptr(this)]()
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(self->mutex);
|
|
if (self->halt)
|
|
return;
|
|
self->halt = true;
|
|
|
|
// async stop
|
|
if (self->async_stop_)
|
|
self->async_stop_->stop();
|
|
|
|
self->exit_timer.cancel();
|
|
#ifdef ASIO_HAS_LOCAL_SOCKETS
|
|
self->exit_sock.reset();
|
|
#endif
|
|
if (self->signals)
|
|
self->signals->cancel();
|
|
|
|
// stop threads
|
|
{
|
|
unsigned int stopped = 0;
|
|
for (size_t i = 0; i < self->servlist.size(); ++i)
|
|
{
|
|
ServerThread* serv = self->servlist[i];
|
|
if (serv)
|
|
{
|
|
serv->thread_safe_stop();
|
|
++stopped;
|
|
}
|
|
self->servlist[i] = nullptr;
|
|
}
|
|
OPENVPN_LOG(self->prefix << "Stopping " << stopped << '/' << self->servlist.size() << " thread(s)");
|
|
}
|
|
});
|
|
}
|
|
|
|
const Log::Context::Wrapper& log_wrapper() { return log_wrap; }
|
|
|
|
void set_stats_obj(const typename Stats::Ptr& stats_arg)
|
|
{
|
|
stats = stats_arg;
|
|
}
|
|
|
|
virtual Stop* async_stop()
|
|
{
|
|
return async_stop_;
|
|
}
|
|
|
|
private:
|
|
// called from main or worker thread
|
|
void add_thread()
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
++thread_count;
|
|
}
|
|
|
|
// called from main or worker thread
|
|
void remove_thread()
|
|
{
|
|
bool last = false;
|
|
{
|
|
std::lock_guard<std::recursive_mutex> lock(mutex);
|
|
last = (--thread_count <= 0);
|
|
}
|
|
if (last)
|
|
cancel();
|
|
}
|
|
|
|
void signal(const openvpn_io::error_code& error, int signum)
|
|
{
|
|
if (!error && !halt)
|
|
{
|
|
OPENVPN_LOG("ASIO SIGNAL " << signum);
|
|
switch (signum)
|
|
{
|
|
case SIGINT:
|
|
case SIGTERM:
|
|
#if !defined(OPENVPN_PLATFORM_WIN)
|
|
case SIGQUIT:
|
|
#endif
|
|
cancel();
|
|
break;
|
|
#if !defined(OPENVPN_PLATFORM_WIN)
|
|
case SIGUSR2:
|
|
if (stats)
|
|
OPENVPN_LOG(stats->dump());
|
|
signal_rearm();
|
|
break;
|
|
#endif
|
|
}
|
|
}
|
|
}
|
|
|
|
void signal_rearm()
|
|
{
|
|
signals->register_signals_all([self=Ptr(this)](const openvpn_io::error_code& error, int signal_number)
|
|
{
|
|
self->signal(error, signal_number);
|
|
});
|
|
}
|
|
|
|
// debugging feature -- exit in n seconds
|
|
void schedule_debug_exit()
|
|
{
|
|
const std::string exit_in = Environ::find_static("EXIT_IN");
|
|
if (exit_in.empty())
|
|
return;
|
|
const unsigned int n_sec = parse_number_throw<unsigned int>(exit_in, "error parsing EXIT_IN");
|
|
exit_timer.expires_after(Time::Duration::seconds(n_sec));
|
|
exit_timer.async_wait([self=Ptr(this)](const openvpn_io::error_code& error)
|
|
{
|
|
if (error)
|
|
return;
|
|
OPENVPN_LOG("DEBUG EXIT");
|
|
self->cancel();
|
|
});
|
|
}
|
|
|
|
// these vars only used by main thread
|
|
openvpn_io::io_context io_context{1};
|
|
typename Stats::Ptr stats;
|
|
ASIOSignals::Ptr signals;
|
|
AsioTimer exit_timer;
|
|
std::string prefix;
|
|
std::vector<std::thread*> threadlist;
|
|
#ifdef ASIO_HAS_LOCAL_SOCKETS
|
|
std::unique_ptr<openvpn_io::posix::stream_descriptor> exit_sock;
|
|
#endif
|
|
|
|
// main lock
|
|
std::recursive_mutex mutex;
|
|
|
|
// servlist and related vars protected by mutex
|
|
std::vector<ServerThread*> servlist;
|
|
int thread_count = 0;
|
|
volatile bool halt = false;
|
|
|
|
// stop
|
|
Stop* async_stop_ = nullptr;
|
|
|
|
// log observers
|
|
std::vector<unsigned int> log_observers; // unit numbers of log observers
|
|
std::unique_ptr<std::vector<RunContextLogEntry>> log_history;
|
|
|
|
// logging
|
|
Log::Context log_context;
|
|
Log::Context::Wrapper log_wrap; // must be constructed after log_context
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|