github/OpenVPNAdapter
4
0
Fork 0
mirror of https://github.com/deneraraujo/OpenVPNAdapter.git synced 2026-04-24 00:00:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'OpenVPN Adapter/Vendors/openvpn/' changes from 4095565..3e002c8

Browse Source 
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
This commit is contained in:
Sergey Abramchuk
2018-01-08 11:44:56 +03:00
parent 9b95600d06
commit 82fea30fcc
437 changed files with 7377 additions and 2864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openvpn/server/listenlist.hpp
+50 -17
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.
@@ -55,22 +55,23 @@ namespace openvpn {
std::string to_string() const
{
std::ostringstream os;
os << directive << ' ' << addr;
std::string ret;
ret += directive + ' ' + addr;
if (!proto.is_local())
os << ' ' << port;
os << ' ' << proto.str() << ' ' << n_threads;
ret += ' ' + port;
ret += ' ' + std::string(proto.str()) + ' ' + openvpn::to_string(n_threads);
if (ssl == SSLOn)
os << " ssl";
ret += " ssl";
else if (ssl == SSLOff)
os << " !ssl";
return os.str();
ret += " !ssl";
return ret;
}
Item port_offset(const unsigned int offset) const
{
Item ret(*this);
ret.port = openvpn::to_string(HostPort::parse_port(ret.port, "offset") + offset);
ret.n_threads = 0;
return ret;
}
};
@@ -103,9 +104,8 @@ namespace openvpn {
{
size_t n_listen = 0;
for (OptionList::const_iterator i = opt.begin(); i != opt.end(); ++i)
for (auto &o : opt)
{
const Option& o = *i;
if (match(directive, o))
++n_listen;
}
@@ -114,9 +114,8 @@ namespace openvpn {
{
reserve(n_listen);
for (OptionList::const_iterator i = opt.begin(); i != opt.end(); ++i)
for (auto &o : opt)
{
const Option& o = *i;
if (match(directive, o))
{
o.touch();
@@ -255,8 +254,42 @@ namespace openvpn {
unsigned int total_threads() const
{
unsigned int ret = 0;
for (const_iterator i = begin(); i != end(); ++i)
ret += i->n_threads;
for (auto &i : *this)
ret += i.n_threads;
return ret;
}
std::string to_string() const
{
std::string ret;
for (auto &i : *this)
{
ret += i.to_string();
ret += '\n';
}
return ret;
}
std::string local_addr() const
{
for (auto &i : *this)
if (i.proto.is_local())
return i.addr;
return std::string();
}
List expand_ports(const size_t max_size) const
{
List ret;
for (const auto &e : *this)
{
unsigned int offset = 0;
do {
if (ret.size() >= max_size)
OPENVPN_THROW(option_error, e.directive << ": max_size=" << max_size << " exceeded");
ret.emplace_back(e.port_offset(offset));
} while (++offset < e.n_threads);
}
return ret;
}
openvpn/server/manage.hpp
+74 -71
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.
@@ -38,99 +38,102 @@
#include <openvpn/server/peerstats.hpp>
#include <openvpn/server/peeraddr.hpp>
#include <openvpn/auth/authcert.hpp>
#include <openvpn/auth/authstatusconst.hpp>
namespace openvpn {
// Base class for the per-client-instance state of the ManServer.
// Each client instance uses this class to send data to the man layer.
struct ManClientInstanceSend : public virtual RC<thread_unsafe_refcount>
{
typedef RCPtr<ManClientInstanceSend> Ptr;
namespace ManClientInstance {
//virtual bool defined() const = 0;
virtual void stop() = 0;
// Base class for the per-client-instance state of the ManServer.
// Each client instance uses this class to send data to the man layer.
struct Send : public virtual RC<thread_unsafe_refcount>
{
typedef RCPtr<Send> Ptr;
virtual void auth_request(const AuthCreds::Ptr& auth_creds,
const AuthCert::Ptr& auth_cert,
const PeerAddr::Ptr& peer_addr) = 0;
virtual void push_request(const ProtoContext::Config::Ptr& pconf) = 0;
virtual void pre_stop() = 0;
virtual void stop() = 0;
// INFO notification
virtual void info_request(const std::string& imsg) = 0;
virtual void auth_request(const AuthCreds::Ptr& auth_creds,
const AuthCert::Ptr& auth_cert,
const PeerAddr::Ptr& peer_addr) = 0;
virtual void push_request(const ProtoContext::Config::Ptr& pconf) = 0;
// bandwidth stats notification
virtual void stats_notify(const PeerStats& ps, const bool final) = 0;
// INFO notification
virtual void info_request(const std::string& imsg) = 0;
// client float notification
virtual void float_notify(const PeerAddr::Ptr& addr) = 0;
// bandwidth stats notification
virtual void stats_notify(const PeerStats& ps, const bool final) = 0;
// ID
virtual std::string instance_name() const = 0;
virtual std::uint64_t instance_id() const = 0;
// client float notification
virtual void float_notify(const PeerAddr::Ptr& addr) = 0;
// return a JSON string describing connected user
virtual std::string describe_user() = 0;
// ID
virtual std::string instance_name() const = 0;
virtual std::uint64_t instance_id() const = 0;
// disconnect
virtual void disconnect_user(const HaltRestart::Type type,
const std::string& reason,
const bool tell_client) = 0;
// return a JSON string describing connected user
virtual std::string describe_user() = 0;
// send control channel message
virtual void post_info_user(BufferPtr&& info) = 0;
// disconnect
virtual void disconnect_user(const HaltRestart::Type type,
const AuthStatus::Type auth_status,
const std::string& reason,
const bool tell_client) = 0;
// set ACL ID for user
virtual void set_acl_id(const int acl_id,
const std::string* username,
const bool challenge,
const bool throw_on_error) = 0;
};
// send control channel message
virtual void post_info_user(BufferPtr&& info) = 0;
// Base class for the client instance receiver. Note that all
// client instance receivers (transport, routing, management,
// etc.) must inherit virtually from RC because the client instance
// object will inherit from multiple receivers.
struct ManClientInstanceRecv : public virtual RC<thread_unsafe_refcount>
{
typedef RCPtr<ManClientInstanceRecv> Ptr;
// set ACL index for user
virtual void set_acl_index(const int acl_index,
const std::string* username,
const bool challenge,
const bool throw_on_error) = 0;
};
//virtual bool defined() const = 0;
virtual void stop() = 0;
// Base class for the client instance receiver. Note that all
// client instance receivers (transport, routing, management,
// etc.) must inherit virtually from RC because the client instance
// object will inherit from multiple receivers.
struct Recv : public virtual RC<thread_unsafe_refcount>
{
typedef RCPtr<Recv> Ptr;
virtual void auth_failed(const std::string& reason,
const bool tell_client) = 0;
virtual void stop() = 0;
virtual void push_reply(std::vector<BufferPtr>&& push_msgs,
const std::vector<IP::Route>& routes,
const unsigned int initial_fwmark) = 0;
virtual void auth_failed(const std::string& reason,
const bool tell_client) = 0;
// push a halt or restart message to client
virtual void push_halt_restart_msg(const HaltRestart::Type type,
const std::string& reason,
const bool tell_client) = 0;
virtual void push_reply(std::vector<BufferPtr>&& push_msgs) = 0;
// push a halt or restart message to client
virtual void push_halt_restart_msg(const HaltRestart::Type type,
const std::string& reason,
const bool tell_client) = 0;
// send control channel message
virtual void post_cc_msg(BufferPtr&& msg) = 0;
// send control channel message
virtual void post_cc_msg(BufferPtr&& msg) = 0;
// set fwmark value in client instance
virtual void set_fwmark(const unsigned int fwmark) = 0;
// set up relay to target
virtual void relay(const IP::Addr& target, const int port) = 0;
// set up relay to target
virtual void relay(const IP::Addr& target, const int port) = 0;
// get client bandwidth stats
virtual PeerStats stats_poll() = 0;
// get client bandwidth stats
virtual PeerStats stats_poll() = 0;
};
// get native reference to client instance
virtual TunClientInstance::NativeHandle tun_native_handle() = 0;
};
struct ManClientInstanceFactory : public RC<thread_unsafe_refcount>
{
typedef RCPtr<ManClientInstanceFactory> Ptr;
struct Factory : public RC<thread_unsafe_refcount>
{
typedef RCPtr<Factory> Ptr;
virtual void start() = 0;
virtual void start() = 0;
virtual void stop() = 0;
virtual ManClientInstanceSend::Ptr new_obj(ManClientInstanceRecv* instance) = 0;
};
virtual Send::Ptr new_obj(Recv* instance) = 0;
};
}
}
#endif
openvpn/server/peeraddr.hpp
+4 -4
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.
openvpn/server/peerstats.hpp
+4 -4
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.
openvpn/server/servhalt.hpp
+4 -4
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.
openvpn/server/servproto.hpp
+54 -52
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.
@@ -54,14 +54,14 @@ namespace openvpn {
class ServerProto
{
typedef ProtoContext Base;
typedef Link<TransportClientInstanceSend, TransportClientInstanceRecv> TransportLink;
typedef Link<TunClientInstanceSend, TunClientInstanceRecv> TunLink;
typedef Link<ManClientInstanceSend, ManClientInstanceRecv> ManLink;
typedef Link<TransportClientInstance::Send, TransportClientInstance::Recv> TransportLink;
typedef Link<TunClientInstance::Send, TunClientInstance::Recv> TunLink;
typedef Link<ManClientInstance::Send, ManClientInstance::Recv> ManLink;
public:
class Session;
class Factory : public TransportClientInstanceFactory
class Factory : public TransportClientInstance::Factory
{
public:
typedef RCPtr<Factory> Ptr;
@@ -71,13 +71,15 @@ namespace openvpn {
const Base::Config& c)
: io_context(io_context_arg)
{
if (c.tls_auth_enabled())
if (c.tls_crypt_enabled())
preval.reset(new Base::TLSCryptPreValidate(c, true));
else if (c.tls_auth_enabled())
preval.reset(new Base::TLSAuthPreValidate(c, true));
}
virtual TransportClientInstanceRecv::Ptr new_client_instance();
virtual TransportClientInstance::Recv::Ptr new_client_instance() override;
virtual bool validate_initial_packet(const Buffer& net_buf)
virtual bool validate_initial_packet(const BufferAllocated& net_buf) override
{
if (preval)
{
@@ -98,13 +100,13 @@ namespace openvpn {
openvpn_io::io_context& io_context;
ProtoConfig::Ptr proto_context_config;
ManClientInstanceFactory::Ptr man_factory;
TunClientInstanceFactory::Ptr tun_factory;
ManClientInstance::Factory::Ptr man_factory;
TunClientInstance::Factory::Ptr tun_factory;
SessionStats::Ptr stats;
private:
Base::TLSAuthPreValidate::Ptr preval;
Base::TLSWrapPreValidate::Ptr preval;
};
// This is the main server-side client instance object
@@ -123,20 +125,20 @@ namespace openvpn {
public:
typedef RCPtr<Session> Ptr;
virtual bool defined() const
virtual bool defined() const override
{
return defined_();
}
virtual TunClientInstanceRecv* override_tun(TunClientInstanceSend* tun)
virtual TunClientInstance::Recv* override_tun(TunClientInstance::Send* tun) override
{
TunLink::send.reset(tun);
return this;
}
virtual void start(const TransportClientInstanceSend::Ptr& parent,
virtual void start(const TransportClientInstance::Send::Ptr& parent,
const PeerAddr::Ptr& addr,
const int local_peer_id)
const int local_peer_id) override
{
TransportLink::send = parent;
peer_addr = addr;
@@ -152,7 +154,7 @@ namespace openvpn {
housekeeping_schedule.init(Time::Duration::binary_ms(512), Time::Duration::binary_ms(1024));
}
virtual PeerStats stats_poll()
virtual PeerStats stats_poll() override
{
if (TransportLink::send)
return TransportLink::send->stats_poll();
@@ -160,13 +162,16 @@ namespace openvpn {
return PeerStats();
}
virtual void stop()
virtual void stop() override
{
if (!halt)
{
halt = true;
housekeeping_timer.cancel();
if (ManLink::send)
ManLink::send->pre_stop();
// deliver final peer stats to management layer
if (TransportLink::send && ManLink::send)
{
@@ -195,7 +200,7 @@ namespace openvpn {
}
// called with OpenVPN-encapsulated packets from transport layer
virtual bool transport_recv(BufferAllocated& buf)
virtual bool transport_recv(BufferAllocated& buf) override
{
bool ret = false;
if (!Base::primary_defined())
@@ -252,13 +257,13 @@ namespace openvpn {
}
// called with cleartext IP packets from routing layer
virtual void tun_recv(BufferAllocated& buf)
virtual void tun_recv(BufferAllocated& buf) override
{
// fixme -- code me
}
// Return true if keepalive parameter(s) are enabled.
virtual bool is_keepalive_enabled() const
virtual bool is_keepalive_enabled() const override
{
return Base::is_keepalive_enabled();
}
@@ -266,13 +271,13 @@ namespace openvpn {
// Disable keepalive for rest of session, but fetch
// the keepalive parameters (in seconds).
virtual void disable_keepalive(unsigned int& keepalive_ping,
unsigned int& keepalive_timeout)
unsigned int& keepalive_timeout) override
{
Base::disable_keepalive(keepalive_ping, keepalive_timeout);
}
// override the data channel factory
virtual void override_dc_factory(const CryptoDCFactory::Ptr& dc_factory)
virtual void override_dc_factory(const CryptoDCFactory::Ptr& dc_factory) override
{
Base::dc_settings().set_factory(dc_factory);
}
@@ -287,8 +292,8 @@ namespace openvpn {
private:
Session(openvpn_io::io_context& io_context_arg,
const Factory& factory,
ManClientInstanceFactory::Ptr man_factory_arg,
TunClientInstanceFactory::Ptr tun_factory_arg)
ManClientInstance::Factory::Ptr man_factory_arg,
TunClientInstance::Factory::Ptr tun_factory_arg)
: Base(factory.clone_proto_config(), factory.stats),
io_context(io_context_arg),
housekeeping_timer(io_context_arg),
@@ -304,7 +309,7 @@ namespace openvpn {
}
// proto base class calls here for control channel network sends
virtual void control_net_send(const Buffer& net_buf)
virtual void control_net_send(const Buffer& net_buf) override
{
OPENVPN_LOG_SERVPROTO("Transport SEND[" << net_buf.size() << "] " << client_endpoint_render() << ' ' << Base::dump_packet(net_buf));
if (TransportLink::send)
@@ -319,7 +324,7 @@ namespace openvpn {
virtual void server_auth(const std::string& username,
const SafeString& password,
const std::string& peer_info,
const AuthCert::Ptr& auth_cert)
const AuthCert::Ptr& auth_cert) override
{
constexpr size_t MAX_USERNAME_SIZE = 256;
constexpr size_t MAX_PASSWORD_SIZE = 256;
@@ -334,7 +339,7 @@ namespace openvpn {
}
// proto base class calls here for app-level control-channel messages received
virtual void control_recv(BufferPtr&& app_bp)
virtual void control_recv(BufferPtr&& app_bp) override
{
const std::string msg = Unicode::utf8_printable(Base::template read_control_string<std::string>(*app_bp),
Unicode::UTF8_FILTER);
@@ -363,18 +368,12 @@ namespace openvpn {
}
virtual void auth_failed(const std::string& reason,
const bool tell_client)
const bool tell_client) override
{
push_halt_restart_msg(HaltRestart::AUTH_FAILED, reason, tell_client);
}
virtual void set_fwmark(const unsigned int fwmark)
{
if (TunLink::send)
TunLink::send->set_fwmark(fwmark);
}
virtual void relay(const IP::Addr& target, const int port)
virtual void relay(const IP::Addr& target, const int port) override
{
Base::update_now();
@@ -397,9 +396,7 @@ namespace openvpn {
set_housekeeping_timer();
}
virtual void push_reply(std::vector<BufferPtr>&& push_msgs,
const std::vector<IP::Route>& rtvec,
const unsigned int initial_fwmark)
virtual void push_reply(std::vector<BufferPtr>&& push_msgs) override
{
if (halt || relay_transition || !Base::primary_defined())
return;
@@ -409,9 +406,6 @@ namespace openvpn {
if (get_tun())
{
Base::init_data_channel();
if (initial_fwmark)
TunLink::send->set_fwmark(initial_fwmark);
TunLink::send->add_routes(rtvec);
for (auto &msg : push_msgs)
{
msg->null_terminate();
@@ -426,9 +420,17 @@ namespace openvpn {
}
}
virtual TunClientInstance::NativeHandle tun_native_handle() override
{
if (get_tun())
return TunLink::send->tun_native_handle();
else
return TunClientInstance::NativeHandle();
}
virtual void push_halt_restart_msg(const HaltRestart::Type type,
const std::string& reason,
const bool tell_client)
const bool tell_client) override
{
if (halt || did_client_halt_restart)
return;
@@ -510,7 +512,7 @@ namespace openvpn {
set_housekeeping_timer();
}
virtual void post_cc_msg(BufferPtr&& msg)
virtual void post_cc_msg(BufferPtr&& msg) override
{
if (halt || !Base::primary_defined())
return;
@@ -522,13 +524,13 @@ namespace openvpn {
set_housekeeping_timer();
}
virtual void stats_notify(const PeerStats& ps, const bool final)
virtual void stats_notify(const PeerStats& ps, const bool final) override
{
if (ManLink::send)
ManLink::send->stats_notify(ps, final);
}
virtual void float_notify(const PeerAddr::Ptr& addr)
virtual void float_notify(const PeerAddr::Ptr& addr) override
{
if (ManLink::send)
ManLink::send->float_notify(addr);
@@ -536,7 +538,7 @@ namespace openvpn {
virtual void data_limit_notify(const int key_id,
const DataLimit::Mode cdl_mode,
const DataLimit::State cdl_status)
const DataLimit::State cdl_status) override
{
Base::update_now();
Base::data_limit_notify(key_id, cdl_mode, cdl_status);
@@ -677,12 +679,12 @@ namespace openvpn {
SessionStats::Ptr stats;
ManClientInstanceFactory::Ptr man_factory;
TunClientInstanceFactory::Ptr tun_factory;
ManClientInstance::Factory::Ptr man_factory;
TunClientInstance::Factory::Ptr tun_factory;
};
};
inline TransportClientInstanceRecv::Ptr ServerProto::Factory::new_client_instance()
inline TransportClientInstance::Recv::Ptr ServerProto::Factory::new_client_instance()
{
return new Session(io_context, *this, man_factory, tun_factory);
}
openvpn/server/vpnservnetblock.hpp
+35 -20
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.
@@ -39,19 +39,16 @@ namespace openvpn {
struct Netblock
{
Netblock() : prefix_len(0) {}
Netblock() {}
Netblock(const IP::Route& route)
{
if (!route.is_canonical())
throw vpn_serv_netblock("not canonical");
const size_t extent = route.extent();
if (extent < 4)
if (route.host_bits() < 2)
throw vpn_serv_netblock("need at least 4 addresses in netblock");
net = route.addr;
server_gw = net + 1;
bcast = net + (extent - 1);
clients = IP::Range(net + 2, extent - 3);
prefix_len = route.prefix_len;
}
@@ -72,17 +69,35 @@ namespace openvpn {
std::string to_string() const
{
return '[' + net.to_string() + ','
+ server_gw.to_string() + ','
+ clients.to_string() + ','
+ bcast.to_string() + ']';
return '[' + net.to_string() + ',' + server_gw.to_string() + ']';
}
IP::Addr net;
IP::Addr server_gw;
unsigned int prefix_len = 0;
};
struct ClientNetblock : public Netblock
{
ClientNetblock() {}
ClientNetblock(const IP::Route& route)
: Netblock(route)
{
const size_t extent = route.extent();
bcast = net + (extent - 1);
clients = IP::Range(net + 2, extent - 3);
}
std::string to_string() const
{
return '[' + Netblock::to_string() + ','
+ clients.to_string() + ','
+ bcast.to_string() + ']';
}
IP::Range clients;
IP::Addr bcast;
unsigned int prefix_len;
};
class PerThread
@@ -115,7 +130,7 @@ namespace openvpn {
if (rt.version() != IP::Addr::V4)
throw vpn_serv_netblock(opt_name + " address is not IPv4");
rt.force_canonical();
snb4 = Netblock(rt);
snb4 = ClientNetblock(rt);
if (snb4.server_gw != gw)
throw vpn_serv_netblock(opt_name + " local gateway must be first usable address of subnet");
}
@@ -130,7 +145,7 @@ namespace openvpn {
throw vpn_serv_netblock(opt_name + "-ipv6 network is not IPv6");
if (!rt.is_canonical())
throw vpn_serv_netblock(opt_name + "-ipv6 network is not canonical");
snb6 = Netblock(rt);
snb6 = ClientNetblock(rt);
}
}
@@ -165,8 +180,8 @@ namespace openvpn {
}
}
const Netblock& netblock4() const { return snb4; }
const Netblock& netblock6() const { return snb6; }
const ClientNetblock& netblock4() const { return snb4; }
const ClientNetblock& netblock6() const { return snb6; }
bool netblock_contains(const IP::Addr& a) const
{
@@ -199,8 +214,8 @@ namespace openvpn {
}
private:
Netblock snb4;
Netblock snb6;
ClientNetblock snb4;
ClientNetblock snb6;
std::vector<PerThread> thr;
};
}
openvpn/server/vpnservpool.hpp
+4 -4
View File
@@ -4,18 +4,18 @@
// packet encryption, packet authentication, and
// packet compression.
//
// Copyright (C) 2012-2017 OpenVPN Technologies, Inc.
// 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 General Public License Version 3
// 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 General Public License for more details.
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// 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/>.