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
288 lines
7.2 KiB
C++
288 lines
7.2 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/>.
|
|
|
|
#ifndef OPENVPN_ADDR_ROUTE_H
|
|
#define OPENVPN_ADDR_ROUTE_H
|
|
|
|
#include <string>
|
|
#include <sstream>
|
|
#include <vector>
|
|
#include <cstdint> // for std::uint32_t
|
|
#include <tuple>
|
|
|
|
#include <openvpn/common/size.hpp>
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/number.hpp>
|
|
#include <openvpn/common/to_string.hpp>
|
|
#include <openvpn/common/split.hpp>
|
|
#include <openvpn/common/hash.hpp>
|
|
#include <openvpn/addr/ip.hpp>
|
|
|
|
namespace openvpn {
|
|
namespace IP {
|
|
// Basic route object
|
|
template <typename ADDR>
|
|
struct RouteType
|
|
{
|
|
typedef ADDR Addr;
|
|
|
|
ADDR addr;
|
|
unsigned int prefix_len;
|
|
|
|
OPENVPN_EXCEPTION(route_error);
|
|
|
|
RouteType()
|
|
: prefix_len(0)
|
|
{
|
|
}
|
|
|
|
RouteType(const std::string& rtstr, const char *title = nullptr)
|
|
: RouteType(RouteType::from_string(rtstr, title))
|
|
{
|
|
}
|
|
|
|
RouteType(const std::string& rtstr, const std::string& title)
|
|
: RouteType(RouteType::from_string(rtstr, title.c_str()))
|
|
{
|
|
}
|
|
|
|
RouteType(const ADDR& addr_arg,
|
|
const unsigned int prefix_len_arg)
|
|
: addr(addr_arg),
|
|
prefix_len(prefix_len_arg)
|
|
{
|
|
}
|
|
|
|
static RouteType from_string(const std::string& rtstr, const char *title = nullptr)
|
|
{
|
|
RouteType r;
|
|
std::vector<std::string> pair;
|
|
pair.reserve(2);
|
|
Split::by_char_void<std::vector<std::string>, NullLex, Split::NullLimit>(pair, rtstr, '/', 0, 1);
|
|
r.addr = ADDR::from_string(pair[0], title);
|
|
if (pair.size() >= 2)
|
|
{
|
|
r.prefix_len = parse_number_throw<unsigned int>(pair[1], "prefix length");
|
|
if (r.prefix_len > r.addr.size())
|
|
OPENVPN_THROW(route_error, (title ? title : "route") << " : bad prefix length : " << rtstr);
|
|
}
|
|
else
|
|
r.prefix_len = r.addr.size();
|
|
return r;
|
|
}
|
|
|
|
IP::Addr::Version version() const
|
|
{
|
|
return addr.version();
|
|
}
|
|
|
|
IP::Addr::VersionMask version_mask() const
|
|
{
|
|
return addr.version_mask();
|
|
}
|
|
|
|
ADDR netmask() const
|
|
{
|
|
return ADDR::netmask_from_prefix_len(version(), prefix_len);
|
|
}
|
|
|
|
size_t extent() const
|
|
{
|
|
return netmask().extent_from_netmask().to_ulong();
|
|
}
|
|
|
|
bool is_canonical() const
|
|
{
|
|
return (addr & netmask()) == addr;
|
|
}
|
|
|
|
void force_canonical()
|
|
{
|
|
addr = addr & netmask();
|
|
}
|
|
|
|
bool is_host() const
|
|
{
|
|
return addr.defined() && prefix_len == addr.size();
|
|
}
|
|
|
|
unsigned int host_bits() const
|
|
{
|
|
if (prefix_len < addr.size())
|
|
return addr.size() - prefix_len;
|
|
else
|
|
return 0;
|
|
}
|
|
|
|
bool contains(const ADDR& a) const // assumes canonical address/routes
|
|
{
|
|
if (addr.defined() && addr.version() == a.version())
|
|
return (a & netmask()) == addr;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
bool contains(const RouteType& r) const // assumes canonical routes
|
|
{
|
|
return contains(r.addr) && r.prefix_len >= prefix_len;
|
|
}
|
|
|
|
bool split(RouteType& r1, RouteType& r2) const // assumes we are canonical
|
|
{
|
|
if (!is_host())
|
|
{
|
|
const unsigned int newpl = prefix_len + 1;
|
|
r1.addr = addr;
|
|
r1.prefix_len = newpl;
|
|
|
|
r2.addr = addr + ADDR::netmask_from_prefix_len(addr.version(), newpl).extent_from_netmask();
|
|
r2.prefix_len = newpl;
|
|
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
std::string to_string() const
|
|
{
|
|
return addr.to_string() + '/' + openvpn::to_string(prefix_len);
|
|
}
|
|
|
|
std::string to_string_by_netmask() const
|
|
{
|
|
return addr.to_string() + ' ' + netmask().to_string();
|
|
}
|
|
|
|
bool operator==(const RouteType& other) const
|
|
{
|
|
return std::tie(prefix_len, addr) == std::tie(other.prefix_len, other.addr);
|
|
}
|
|
|
|
bool operator<(const RouteType& other) const
|
|
{
|
|
return std::tie(prefix_len, addr) < std::tie(other.prefix_len, other.addr);
|
|
}
|
|
|
|
template <typename HASH>
|
|
void hash(HASH& h) const
|
|
{
|
|
addr.hash(h);
|
|
h(prefix_len);
|
|
}
|
|
|
|
#ifdef HAVE_CITYHASH
|
|
std::size_t hash_value() const
|
|
{
|
|
HashSizeT h;
|
|
hash(h);
|
|
return h.value();
|
|
}
|
|
#endif
|
|
};
|
|
|
|
template <typename ADDR>
|
|
struct RouteTypeList : public std::vector<RouteType<ADDR>>
|
|
{
|
|
typedef std::vector< RouteType<ADDR> > Base;
|
|
|
|
OPENVPN_EXCEPTION(route_list_error);
|
|
|
|
std::string to_string() const
|
|
{
|
|
std::ostringstream os;
|
|
for (auto &r : *this)
|
|
os << r.to_string() << std::endl;
|
|
return os.str();
|
|
}
|
|
|
|
IP::Addr::VersionMask version_mask() const
|
|
{
|
|
IP::Addr::VersionMask mask = 0;
|
|
for (auto &r : *this)
|
|
mask |= r.version_mask();
|
|
return mask;
|
|
}
|
|
|
|
void verify_canonical() const
|
|
{
|
|
for (auto &r : *this)
|
|
if (!r.is_canonical())
|
|
throw route_list_error("route not canonical: " + r.to_string());
|
|
}
|
|
|
|
template <typename R>
|
|
bool contains(const R& c) const
|
|
{
|
|
for (auto &r : *this)
|
|
if (r.contains(c))
|
|
return true;
|
|
return false;
|
|
}
|
|
};
|
|
|
|
typedef RouteType<IP::Addr> Route;
|
|
typedef RouteType<IPv4::Addr> Route4;
|
|
typedef RouteType<IPv6::Addr> Route6;
|
|
|
|
typedef RouteTypeList<IP::Addr> RouteList;
|
|
typedef RouteTypeList<IPv4::Addr> Route4List;
|
|
typedef RouteTypeList<IPv6::Addr> Route6List;
|
|
|
|
OPENVPN_OSTREAM(Route, to_string);
|
|
OPENVPN_OSTREAM(Route4, to_string);
|
|
OPENVPN_OSTREAM(Route6, to_string);
|
|
|
|
OPENVPN_OSTREAM(RouteList, to_string);
|
|
OPENVPN_OSTREAM(Route4List, to_string);
|
|
OPENVPN_OSTREAM(Route6List, to_string);
|
|
|
|
inline Route route_from_string_prefix(const std::string& addrstr,
|
|
const unsigned int prefix_len,
|
|
const std::string& title,
|
|
const IP::Addr::Version required_version = IP::Addr::UNSPEC)
|
|
{
|
|
Route r;
|
|
r.addr = IP::Addr(addrstr, title, required_version);
|
|
r.prefix_len = prefix_len;
|
|
if (r.prefix_len > r.addr.size())
|
|
OPENVPN_THROW(Route::route_error, title << " : bad prefix length : " << addrstr);
|
|
return r;
|
|
}
|
|
|
|
inline Route route_from_string(const std::string& rtstr,
|
|
const std::string& title,
|
|
const IP::Addr::Version required_version = IP::Addr::UNSPEC)
|
|
{
|
|
Route r(rtstr, title);
|
|
r.addr.validate_version(title, required_version);
|
|
return r;
|
|
}
|
|
}
|
|
}
|
|
|
|
#ifdef HAVE_CITYHASH
|
|
OPENVPN_HASH_METHOD(openvpn::IP::Route, hash_value);
|
|
OPENVPN_HASH_METHOD(openvpn::IP::Route4, hash_value);
|
|
OPENVPN_HASH_METHOD(openvpn::IP::Route6, hash_value);
|
|
#endif
|
|
|
|
#endif
|