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
822 lines
23 KiB
C++
822 lines
23 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/>.
|
|
|
|
// An artificial TunBuilder object, used to log the tun builder settings,
|
|
// but doesn't actually configure anything.
|
|
|
|
#ifndef OPENVPN_TUN_BUILDER_CAPTURE_H
|
|
#define OPENVPN_TUN_BUILDER_CAPTURE_H
|
|
|
|
#include <string>
|
|
#include <sstream>
|
|
#include <vector>
|
|
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/rc.hpp>
|
|
#include <openvpn/common/size.hpp>
|
|
#include <openvpn/common/hostport.hpp>
|
|
#include <openvpn/common/to_string.hpp>
|
|
#include <openvpn/common/jsonlib.hpp>
|
|
#include <openvpn/tun/builder/base.hpp>
|
|
#include <openvpn/client/rgopt.hpp>
|
|
#include <openvpn/addr/ip.hpp>
|
|
#include <openvpn/addr/route.hpp>
|
|
#include <openvpn/http/urlparse.hpp>
|
|
#include <openvpn/tun/layer.hpp>
|
|
|
|
#ifdef HAVE_JSON
|
|
#include <openvpn/common/jsonhelper.hpp>
|
|
#endif
|
|
|
|
namespace openvpn {
|
|
class TunBuilderCapture : public TunBuilderBase, public RC<thread_unsafe_refcount>
|
|
{
|
|
public:
|
|
typedef RCPtr<TunBuilderCapture> Ptr;
|
|
|
|
// builder data classes
|
|
|
|
class RemoteAddress
|
|
{
|
|
public:
|
|
std::string address;
|
|
bool ipv6 = false;
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::string ret = address;
|
|
if (ipv6)
|
|
ret += " [IPv6]";
|
|
return ret;
|
|
}
|
|
|
|
bool defined() const
|
|
{
|
|
return !address.empty();
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
IP::Addr(address, title, ipv6 ? IP::Addr::V6 : IP::Addr::V4);
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["address"] = Json::Value(address);
|
|
root["ipv6"] = Json::Value(ipv6);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
if (!json::is_dict(root, title))
|
|
return;
|
|
json::to_string(root, address, "address", title);
|
|
json::to_bool(root, ipv6, "ipv6", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
class RerouteGW
|
|
{
|
|
public:
|
|
bool ipv4 = false;
|
|
bool ipv6 = false;
|
|
unsigned int flags = 0;
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
const RedirectGatewayFlags rgf(flags);
|
|
os << "IPv4=" << ipv4 << " IPv6=" << ipv6 << " flags=" << rgf.to_string();
|
|
return os.str();
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
// nothing to validate
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["ipv4"] = Json::Value(ipv4);
|
|
root["ipv6"] = Json::Value(ipv6);
|
|
root["flags"] = Json::Value((Json::UInt)flags);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
json::assert_dict(root, title);
|
|
json::to_bool(root, ipv4, "ipv4", title);
|
|
json::to_bool(root, ipv6, "ipv6", title);
|
|
json::to_uint(root, flags, "flags", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
class RouteBase
|
|
{
|
|
public:
|
|
std::string address;
|
|
int prefix_length = 0;
|
|
int metric = -1; // optional
|
|
std::string gateway; // optional
|
|
bool ipv6 = false;
|
|
bool net30 = false;
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
os << address << '/' << prefix_length;
|
|
if (!gateway.empty())
|
|
os << " -> " << gateway;
|
|
if (metric >= 0)
|
|
os << " [METRIC=" << metric << ']';
|
|
if (ipv6)
|
|
os << " [IPv6]";
|
|
if (net30)
|
|
os << " [net30]";
|
|
return os.str();
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["address"] = Json::Value(address);
|
|
root["prefix_length"] = Json::Value(prefix_length);
|
|
root["metric"] = Json::Value(metric);
|
|
root["gateway"] = Json::Value(gateway);
|
|
root["ipv6"] = Json::Value(ipv6);
|
|
root["net30"] = Json::Value(net30);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
json::assert_dict(root, title);
|
|
json::to_string(root, address, "address", title);
|
|
json::to_int(root, prefix_length, "prefix_length", title);
|
|
json::to_int(root, metric, "metric", title);
|
|
json::to_string(root, gateway, "gateway", title);
|
|
json::to_bool(root, ipv6, "ipv6", title);
|
|
json::to_bool(root, net30, "net30", title);
|
|
}
|
|
#endif
|
|
|
|
protected:
|
|
void validate_(const std::string& title, const bool require_canonical) const
|
|
{
|
|
const IP::Addr::Version ver = ipv6 ? IP::Addr::V6 : IP::Addr::V4;
|
|
const IP::Route route = IP::route_from_string_prefix(address, prefix_length, title, ver);
|
|
if (require_canonical && !route.is_canonical())
|
|
OPENVPN_THROW_EXCEPTION(title << " : not a canonical route: " << route);
|
|
if (!gateway.empty())
|
|
IP::Addr(gateway, title + ".gateway", ver);
|
|
if (net30 && route.prefix_len != 30)
|
|
OPENVPN_THROW_EXCEPTION(title << " : not a net30 route: " << route);
|
|
}
|
|
};
|
|
|
|
class RouteAddress : public RouteBase // may be non-canonical
|
|
{
|
|
public:
|
|
void validate(const std::string& title) const
|
|
{
|
|
validate_(title, false);
|
|
}
|
|
};
|
|
|
|
class Route : public RouteBase // must be canonical
|
|
{
|
|
public:
|
|
void validate(const std::string& title) const
|
|
{
|
|
validate_(title, true);
|
|
}
|
|
};
|
|
|
|
class DNSServer
|
|
{
|
|
public:
|
|
std::string address;
|
|
bool ipv6 = false;
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::string ret = address;
|
|
if (ipv6)
|
|
ret += " [IPv6]";
|
|
return ret;
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
IP::Addr(address, title, ipv6 ? IP::Addr::V6 : IP::Addr::V4);
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["address"] = Json::Value(address);
|
|
root["ipv6"] = Json::Value(ipv6);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
json::assert_dict(root, title);
|
|
json::to_string(root, address, "address", title);
|
|
json::to_bool(root, ipv6, "ipv6", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
class SearchDomain
|
|
{
|
|
public:
|
|
std::string domain;
|
|
|
|
std::string to_string() const
|
|
{
|
|
return domain;
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
HostPort::validate_host(domain, title);
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["domain"] = Json::Value(domain);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
json::assert_dict(root, title);
|
|
json::to_string(root, domain, "domain", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
class ProxyBypass
|
|
{
|
|
public:
|
|
std::string bypass_host;
|
|
|
|
std::string to_string() const
|
|
{
|
|
return bypass_host;
|
|
}
|
|
|
|
bool defined() const
|
|
{
|
|
return !bypass_host.empty();
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
if (defined())
|
|
HostPort::validate_host(bypass_host, title);
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["bypass_host"] = Json::Value(bypass_host);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
json::assert_dict(root, title);
|
|
json::to_string(root, bypass_host, "bypass_host", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
class ProxyAutoConfigURL
|
|
{
|
|
public:
|
|
std::string url;
|
|
|
|
std::string to_string() const
|
|
{
|
|
return url;
|
|
}
|
|
|
|
bool defined() const {
|
|
return !url.empty();
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
try {
|
|
if (defined())
|
|
URL::Parse(url);
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
OPENVPN_THROW_EXCEPTION(title << " : error parsing ProxyAutoConfigURL: " << e.what());
|
|
}
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["url"] = Json::Value(url);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
if (!json::is_dict(root, title))
|
|
return;
|
|
json::to_string(root, url, "url", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
class ProxyHostPort
|
|
{
|
|
public:
|
|
std::string host;
|
|
int port = 0;
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
os << host << ' ' << port;
|
|
return os.str();
|
|
}
|
|
|
|
bool defined() const {
|
|
return !host.empty();
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
if (defined())
|
|
{
|
|
HostPort::validate_host(host, title);
|
|
HostPort::validate_port(port, title);
|
|
}
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["host"] = Json::Value(host);
|
|
root["port"] = Json::Value(port);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
if (!json::is_dict(root, title))
|
|
return;
|
|
json::to_string(root, host, "host", title);
|
|
json::to_int(root, port, "port", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
class WINSServer
|
|
{
|
|
public:
|
|
std::string address;
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::string ret = address;
|
|
return ret;
|
|
}
|
|
|
|
void validate(const std::string& title) const
|
|
{
|
|
IP::Addr(address, title, IP::Addr::V4);
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["address"] = Json::Value(address);
|
|
return root;
|
|
}
|
|
|
|
void from_json(const Json::Value& root, const std::string& title)
|
|
{
|
|
json::assert_dict(root, title);
|
|
json::to_string(root, address, "address", title);
|
|
}
|
|
#endif
|
|
};
|
|
|
|
virtual bool tun_builder_set_remote_address(const std::string& address, bool ipv6) override
|
|
{
|
|
remote_address.address = address;
|
|
remote_address.ipv6 = ipv6;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_add_address(const std::string& address, int prefix_length, const std::string& gateway, bool ipv6, bool net30) override
|
|
{
|
|
RouteAddress r;
|
|
r.address = address;
|
|
r.prefix_length = prefix_length;
|
|
r.gateway = gateway;
|
|
r.ipv6 = ipv6;
|
|
r.net30 = net30;
|
|
if (ipv6)
|
|
tunnel_address_index_ipv6 = (int)tunnel_addresses.size();
|
|
else
|
|
tunnel_address_index_ipv4 = (int)tunnel_addresses.size();
|
|
tunnel_addresses.push_back(r);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_reroute_gw(bool ipv4, bool ipv6, unsigned int flags) override
|
|
{
|
|
reroute_gw.ipv4 = ipv4;
|
|
reroute_gw.ipv6 = ipv6;
|
|
reroute_gw.flags = flags;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_route_metric_default(int metric) override
|
|
{
|
|
route_metric_default = metric;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_add_route(const std::string& address, int prefix_length, int metric, bool ipv6) override
|
|
{
|
|
Route r;
|
|
r.address = address;
|
|
r.prefix_length = prefix_length;
|
|
r.metric = metric;
|
|
r.ipv6 = ipv6;
|
|
add_routes.push_back(r);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_exclude_route(const std::string& address, int prefix_length, int metric, bool ipv6) override
|
|
{
|
|
Route r;
|
|
r.address = address;
|
|
r.prefix_length = prefix_length;
|
|
r.metric = metric;
|
|
r.ipv6 = ipv6;
|
|
exclude_routes.push_back(r);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_add_dns_server(const std::string& address, bool ipv6) override
|
|
{
|
|
DNSServer dns;
|
|
dns.address = address;
|
|
dns.ipv6 = ipv6;
|
|
dns_servers.push_back(dns);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_add_search_domain(const std::string& domain) override
|
|
{
|
|
SearchDomain dom;
|
|
dom.domain = domain;
|
|
search_domains.push_back(dom);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_adapter_domain_suffix(const std::string& name) override
|
|
{
|
|
adapter_domain_suffix = name;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_layer(int layer) override
|
|
{
|
|
this->layer = Layer::from_value(layer);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_mtu(int mtu) override
|
|
{
|
|
this->mtu = mtu;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_session_name(const std::string& name) override
|
|
{
|
|
session_name = name;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_add_proxy_bypass(const std::string& bypass_host) override
|
|
{
|
|
ProxyBypass b;
|
|
b.bypass_host = bypass_host;
|
|
proxy_bypass.push_back(b);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_proxy_auto_config_url(const std::string& url) override
|
|
{
|
|
proxy_auto_config_url.url = url;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_proxy_http(const std::string& host, int port) override
|
|
{
|
|
http_proxy.host = host;
|
|
http_proxy.port = port;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_proxy_https(const std::string& host, int port) override
|
|
{
|
|
https_proxy.host = host;
|
|
https_proxy.port = port;
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_add_wins_server(const std::string& address) override
|
|
{
|
|
WINSServer wins;
|
|
wins.address = address;
|
|
wins_servers.push_back(wins);
|
|
return true;
|
|
}
|
|
|
|
virtual bool tun_builder_set_block_ipv6(bool value) override
|
|
{
|
|
block_ipv6 = value;
|
|
return true;
|
|
}
|
|
|
|
void reset_tunnel_addresses()
|
|
{
|
|
tunnel_addresses.clear();
|
|
tunnel_address_index_ipv4 = -1;
|
|
tunnel_address_index_ipv6 = -1;
|
|
}
|
|
|
|
void reset_dns_servers()
|
|
{
|
|
dns_servers.clear();
|
|
}
|
|
|
|
const RouteAddress* vpn_ipv4() const
|
|
{
|
|
if (tunnel_address_index_ipv4 >= 0)
|
|
return &tunnel_addresses[tunnel_address_index_ipv4];
|
|
else
|
|
return nullptr;
|
|
}
|
|
|
|
const RouteAddress* vpn_ipv6() const
|
|
{
|
|
if (tunnel_address_index_ipv6 >= 0)
|
|
return &tunnel_addresses[tunnel_address_index_ipv6];
|
|
else
|
|
return nullptr;
|
|
}
|
|
|
|
const RouteAddress* vpn_ip(const IP::Addr::Version v) const
|
|
{
|
|
switch (v)
|
|
{
|
|
case IP::Addr::V4:
|
|
return vpn_ipv4();
|
|
case IP::Addr::V6:
|
|
return vpn_ipv6();
|
|
default:
|
|
return nullptr;
|
|
}
|
|
}
|
|
|
|
void validate() const
|
|
{
|
|
validate_layer("root");
|
|
validate_mtu("root");
|
|
remote_address.validate("remote_address");
|
|
validate_list(tunnel_addresses, "tunnel_addresses");
|
|
validate_tunnel_address_indices("root");
|
|
reroute_gw.validate("reroute_gw");
|
|
validate_list(add_routes, "add_routes");
|
|
validate_list(exclude_routes, "exclude_routes");
|
|
validate_list(dns_servers, "dns_servers");
|
|
validate_list(search_domains, "search_domains");
|
|
validate_list(proxy_bypass, "proxy_bypass");
|
|
proxy_auto_config_url.validate("proxy_auto_config_url");
|
|
http_proxy.validate("http_proxy");
|
|
https_proxy.validate("https_proxy");
|
|
}
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
os << "Session Name: " << session_name << std::endl;
|
|
os << "Layer: " << layer.str() << std::endl;
|
|
if (mtu)
|
|
os << "MTU: " << mtu << std::endl;
|
|
os << "Remote Address: " << remote_address.to_string() << std::endl;
|
|
render_list(os, "Tunnel Addresses", tunnel_addresses);
|
|
os << "Reroute Gateway: " << reroute_gw.to_string() << std::endl;
|
|
os << "Block IPv6: " << (block_ipv6 ? "yes" : "no") << std::endl;
|
|
if (route_metric_default >= 0)
|
|
os << "Route Metric Default: " << route_metric_default << std::endl;
|
|
render_list(os, "Add Routes", add_routes);
|
|
render_list(os, "Exclude Routes", exclude_routes);
|
|
render_list(os, "DNS Servers", dns_servers);
|
|
render_list(os, "Search Domains", search_domains);
|
|
if (!adapter_domain_suffix.empty())
|
|
os << "Adapter Domain Suffix: " << adapter_domain_suffix << std::endl;
|
|
if (!proxy_bypass.empty())
|
|
render_list(os, "Proxy Bypass", proxy_bypass);
|
|
if (proxy_auto_config_url.defined())
|
|
os << "Proxy Auto Config URL: " << proxy_auto_config_url.to_string() << std::endl;
|
|
if (http_proxy.defined())
|
|
os << "HTTP Proxy: " << http_proxy.to_string() << std::endl;
|
|
if (https_proxy.defined())
|
|
os << "HTTPS Proxy: " << https_proxy.to_string() << std::endl;
|
|
if (!wins_servers.empty())
|
|
render_list(os, "WINS Servers", wins_servers);
|
|
return os.str();
|
|
}
|
|
|
|
#ifdef HAVE_JSON
|
|
|
|
Json::Value to_json() const
|
|
{
|
|
Json::Value root(Json::objectValue);
|
|
root["session_name"] = Json::Value(session_name);
|
|
root["mtu"] = Json::Value(mtu);
|
|
root["layer"] = Json::Value(layer.value());
|
|
if (remote_address.defined())
|
|
root["remote_address"] = remote_address.to_json();
|
|
json::from_vector(root, tunnel_addresses, "tunnel_addresses");
|
|
root["tunnel_address_index_ipv4"] = Json::Value(tunnel_address_index_ipv4);
|
|
root["tunnel_address_index_ipv6"] = Json::Value(tunnel_address_index_ipv6);
|
|
root["reroute_gw"] = reroute_gw.to_json();
|
|
root["block_ipv6"] = Json::Value(block_ipv6);
|
|
root["route_metric_default"] = Json::Value(route_metric_default);
|
|
json::from_vector(root, add_routes, "add_routes");
|
|
json::from_vector(root, exclude_routes, "exclude_routes");
|
|
json::from_vector(root, dns_servers, "dns_servers");
|
|
json::from_vector(root, wins_servers, "wins_servers");
|
|
json::from_vector(root, search_domains, "search_domains");
|
|
root["adapter_domain_suffix"] = Json::Value(adapter_domain_suffix);
|
|
json::from_vector(root, proxy_bypass, "proxy_bypass");
|
|
if (proxy_auto_config_url.defined())
|
|
root["proxy_auto_config_url"] = proxy_auto_config_url.to_json();
|
|
if (http_proxy.defined())
|
|
root["http_proxy"] = http_proxy.to_json();
|
|
if (https_proxy.defined())
|
|
root["https_proxy"] = https_proxy.to_json();
|
|
return root;
|
|
}
|
|
|
|
static TunBuilderCapture::Ptr from_json(const Json::Value& root)
|
|
{
|
|
const std::string title = "root";
|
|
TunBuilderCapture::Ptr tbc(new TunBuilderCapture);
|
|
json::assert_dict(root, title);
|
|
json::to_string(root, tbc->session_name, "session_name", title);
|
|
tbc->layer = Layer::from_value(json::get_int(root, "layer", title));
|
|
json::to_int(root, tbc->mtu, "mtu", title);
|
|
tbc->remote_address.from_json(root["remote_address"], "remote_address");
|
|
json::to_vector(root, tbc->tunnel_addresses, "tunnel_addresses", title);
|
|
json::to_int(root, tbc->tunnel_address_index_ipv4, "tunnel_address_index_ipv4", title);
|
|
json::to_int(root, tbc->tunnel_address_index_ipv6, "tunnel_address_index_ipv6", title);
|
|
tbc->reroute_gw.from_json(root["reroute_gw"], "reroute_gw");
|
|
json::to_bool(root, tbc->block_ipv6, "block_ipv6", title);
|
|
json::to_int(root, tbc->route_metric_default, "route_metric_default", title);
|
|
json::to_vector(root, tbc->add_routes, "add_routes", title);
|
|
json::to_vector(root, tbc->exclude_routes, "exclude_routes", title);
|
|
json::to_vector(root, tbc->dns_servers, "dns_servers", title);
|
|
json::to_vector(root, tbc->wins_servers, "wins_servers", title);
|
|
json::to_vector(root, tbc->search_domains, "search_domains", title);
|
|
json::to_string(root, tbc->adapter_domain_suffix, "adapter_domain_suffix", title);
|
|
json::to_vector(root, tbc->proxy_bypass, "proxy_bypass", title);
|
|
tbc->proxy_auto_config_url.from_json(root["proxy_auto_config_url"], "proxy_auto_config_url");
|
|
tbc->http_proxy.from_json(root["http_proxy"], "http_proxy");
|
|
tbc->https_proxy.from_json(root["https_proxy"], "https_proxy");
|
|
return tbc;
|
|
}
|
|
|
|
#endif // HAVE_JSON
|
|
|
|
// builder data
|
|
std::string session_name;
|
|
int mtu = 0;
|
|
Layer layer{Layer::OSI_LAYER_3}; // OSI layer
|
|
RemoteAddress remote_address; // real address of server
|
|
std::vector<RouteAddress> tunnel_addresses; // local tunnel addresses
|
|
int tunnel_address_index_ipv4 = -1; // index into tunnel_addresses for IPv4 entry (or -1 if undef)
|
|
int tunnel_address_index_ipv6 = -1; // index into tunnel_addresses for IPv6 entry (or -1 if undef)
|
|
RerouteGW reroute_gw; // redirect-gateway info
|
|
bool block_ipv6 = false; // block IPv6 traffic while VPN is active
|
|
int route_metric_default = -1; // route-metric directive
|
|
std::vector<Route> add_routes; // routes that should be added to tunnel
|
|
std::vector<Route> exclude_routes; // routes that should be excluded from tunnel
|
|
std::vector<DNSServer> dns_servers; // VPN DNS servers
|
|
std::vector<SearchDomain> search_domains; // domain suffixes whose DNS requests should be tunnel-routed
|
|
std::string adapter_domain_suffix; // domain suffix on tun/tap adapter (currently Windows only)
|
|
|
|
std::vector<ProxyBypass> proxy_bypass; // hosts that should bypass proxy
|
|
ProxyAutoConfigURL proxy_auto_config_url;
|
|
ProxyHostPort http_proxy;
|
|
ProxyHostPort https_proxy;
|
|
|
|
std::vector<WINSServer> wins_servers; // Windows WINS servers
|
|
|
|
private:
|
|
template <typename LIST>
|
|
static void render_list(std::ostream& os, const std::string& title, const LIST& list)
|
|
{
|
|
os << title << ':' << std::endl;
|
|
for (auto &e : list)
|
|
os << " " << e.to_string() << std::endl;
|
|
}
|
|
|
|
template <typename LIST>
|
|
static void validate_list(const LIST& list, const std::string& title)
|
|
{
|
|
int i = 0;
|
|
for (auto &e : list)
|
|
{
|
|
e.validate(title + '[' + openvpn::to_string(i) + ']');
|
|
++i;
|
|
}
|
|
}
|
|
|
|
bool validate_tunnel_index(const int index) const
|
|
{
|
|
if (index == -1)
|
|
return true;
|
|
return index >= 0 && index <= tunnel_addresses.size();
|
|
}
|
|
|
|
void validate_tunnel_address_indices(const std::string& title) const
|
|
{
|
|
if (!validate_tunnel_index(tunnel_address_index_ipv4))
|
|
OPENVPN_THROW_EXCEPTION(title << ".tunnel_address_index_ipv4 : IPv4 tunnel address index out of range: " << tunnel_address_index_ipv4);
|
|
if (!validate_tunnel_index(tunnel_address_index_ipv6))
|
|
OPENVPN_THROW_EXCEPTION(title << ".tunnel_address_index_ipv6 : IPv6 tunnel address index out of range: " << tunnel_address_index_ipv6);
|
|
const RouteAddress* r4 = vpn_ipv4();
|
|
if (r4 && r4->ipv6)
|
|
OPENVPN_THROW_EXCEPTION(title << ".tunnel_address_index_ipv4 : IPv4 tunnel address index points to wrong address type: " << r4->to_string());
|
|
const RouteAddress* r6 = vpn_ipv6();
|
|
if (r6 && !r6->ipv6)
|
|
OPENVPN_THROW_EXCEPTION(title << ".tunnel_address_index_ipv6 : IPv6 tunnel address index points to wrong address type: " << r6->to_string());
|
|
}
|
|
|
|
void validate_mtu(const std::string& title) const
|
|
{
|
|
if (mtu < 0 || mtu > 65536)
|
|
OPENVPN_THROW_EXCEPTION(title << ".mtu : MTU out of range: " << mtu);
|
|
}
|
|
|
|
void validate_layer(const std::string& title) const
|
|
{
|
|
if (!layer.defined())
|
|
OPENVPN_THROW_EXCEPTION(title << ": layer undefined");
|
|
}
|
|
};
|
|
}
|
|
|
|
#endif
|