mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-22 00:00:06 +08:00
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
348 lines
8.4 KiB
C++
348 lines
8.4 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/>.
|
|
|
|
// Client tun interface for Linux.
|
|
|
|
#ifndef OPENVPN_TUN_LINUX_CLIENT_TUNCLI_H
|
|
#define OPENVPN_TUN_LINUX_CLIENT_TUNCLI_H
|
|
|
|
#include <openvpn/asio/asioerr.hpp>
|
|
#include <openvpn/common/cleanup.hpp>
|
|
#include <openvpn/common/scoped_fd.hpp>
|
|
#include <openvpn/tun/builder/setup.hpp>
|
|
#include <openvpn/tun/tunio.hpp>
|
|
#include <openvpn/tun/persist/tunpersist.hpp>
|
|
#include <openvpn/tun/linux/client/tunsetup.hpp>
|
|
|
|
namespace openvpn {
|
|
namespace TunLinux {
|
|
|
|
struct PacketFrom
|
|
{
|
|
typedef std::unique_ptr<PacketFrom> SPtr;
|
|
BufferAllocated buf;
|
|
};
|
|
|
|
template <typename ReadHandler>
|
|
class Tun : public TunIO<ReadHandler, PacketFrom, openvpn_io::posix::stream_descriptor>
|
|
{
|
|
typedef TunIO<ReadHandler, PacketFrom, openvpn_io::posix::stream_descriptor> Base;
|
|
|
|
public:
|
|
typedef RCPtr<Tun> Ptr;
|
|
|
|
Tun(openvpn_io::io_context& io_context,
|
|
ReadHandler read_handler_arg,
|
|
const Frame::Ptr& frame_arg,
|
|
const SessionStats::Ptr& stats_arg,
|
|
const int socket,
|
|
const std::string& name)
|
|
: Base(read_handler_arg, frame_arg, stats_arg)
|
|
{
|
|
Base::name_ = name;
|
|
Base::retain_stream = true;
|
|
Base::stream = new openvpn_io::posix::stream_descriptor(io_context, socket);
|
|
OPENVPN_LOG_TUN(Base::name_ << " opened");
|
|
}
|
|
|
|
~Tun() { Base::stop(); }
|
|
};
|
|
|
|
typedef TunPersistTemplate<ScopedFD> TunPersist;
|
|
|
|
class ClientConfig : public TunClientFactory
|
|
{
|
|
public:
|
|
typedef RCPtr<ClientConfig> Ptr;
|
|
|
|
std::string dev_name;
|
|
int txqueuelen = 200;
|
|
|
|
TunProp::Config tun_prop;
|
|
|
|
int n_parallel = 8;
|
|
Frame::Ptr frame;
|
|
SessionStats::Ptr stats;
|
|
|
|
TunBuilderSetup::Factory::Ptr tun_setup_factory;
|
|
TunPersist::Ptr tun_persist;
|
|
|
|
void load(const OptionList& opt)
|
|
{
|
|
// set a default MTU
|
|
if (!tun_prop.mtu)
|
|
tun_prop.mtu = 1500;
|
|
|
|
// parse "dev" option
|
|
if (dev_name.empty())
|
|
{
|
|
const Option* dev = opt.get_ptr("dev");
|
|
if (dev)
|
|
dev_name = dev->get(1, 64);
|
|
}
|
|
}
|
|
|
|
static Ptr new_obj()
|
|
{
|
|
return new ClientConfig;
|
|
}
|
|
|
|
virtual TunClient::Ptr new_tun_client_obj(openvpn_io::io_context& io_context,
|
|
TunClientParent& parent,
|
|
TransportClient* transcli);
|
|
|
|
TunBuilderSetup::Base::Ptr new_setup_obj()
|
|
{
|
|
if (tun_setup_factory)
|
|
return tun_setup_factory->new_setup_obj();
|
|
else
|
|
return new TunLinux::Setup();
|
|
}
|
|
|
|
private:
|
|
ClientConfig() {}
|
|
};
|
|
|
|
class Client : public TunClient
|
|
{
|
|
friend class ClientConfig; // calls constructor
|
|
friend class TunIO<Client*, PacketFrom, openvpn_io::posix::stream_descriptor>; // calls tun_read_handler
|
|
|
|
typedef Tun<Client*> TunImpl;
|
|
|
|
public:
|
|
virtual void tun_start(const OptionList& opt, TransportClient& transcli, CryptoDCSettings&)
|
|
{
|
|
if (!impl)
|
|
{
|
|
halt = false;
|
|
|
|
if (config->tun_persist)
|
|
{
|
|
OPENVPN_LOG("TunPersist: long-term session scope");
|
|
tun_persist = config->tun_persist; // long-term persistent
|
|
}
|
|
else
|
|
{
|
|
OPENVPN_LOG("TunPersist: short-term connection scope");
|
|
tun_persist.reset(new TunPersist(true, false, nullptr)); // short-term
|
|
}
|
|
|
|
try {
|
|
const IP::Addr server_addr = transcli.server_endpoint_addr();
|
|
|
|
int sd = -1;
|
|
|
|
// Check if persisted tun session matches properties of to-be-created session
|
|
if (tun_persist->use_persisted_tun(server_addr, config->tun_prop, opt))
|
|
{
|
|
state = tun_persist->state();
|
|
sd = tun_persist->obj();
|
|
state = tun_persist->state();
|
|
OPENVPN_LOG("TunPersist: reused tun context");
|
|
}
|
|
else
|
|
{
|
|
// notify parent
|
|
parent.tun_pre_tun_config();
|
|
|
|
// close old tun handle if persisted
|
|
tun_persist->close();
|
|
|
|
// parse pushed options
|
|
TunBuilderCapture::Ptr po(new TunBuilderCapture());
|
|
TunProp::configure_builder(po.get(),
|
|
state.get(),
|
|
config->stats.get(),
|
|
server_addr,
|
|
config->tun_prop,
|
|
opt,
|
|
nullptr,
|
|
false);
|
|
|
|
OPENVPN_LOG("CAPTURED OPTIONS:" << std::endl << po->to_string());
|
|
|
|
// create new tun setup object
|
|
tun_setup = config->new_setup_obj();
|
|
|
|
// create config object for tun setup layer
|
|
Setup::Config tsconf;
|
|
tsconf.layer = config->tun_prop.layer;
|
|
tsconf.dev_name = config->dev_name;
|
|
tsconf.txqueuelen = config->txqueuelen;
|
|
|
|
// open/config tun
|
|
{
|
|
std::ostringstream os;
|
|
auto os_print = Cleanup([&os](){ OPENVPN_LOG_STRING(os.str()); });
|
|
sd = tun_setup->establish(*po, &tsconf, nullptr, os);
|
|
}
|
|
|
|
// persist tun settings state
|
|
state->iface_name = tsconf.iface_name;
|
|
tun_persist->persist_tun_state(sd, state);
|
|
|
|
// enable tun_setup destructor
|
|
tun_persist->add_destructor(tun_setup);
|
|
}
|
|
|
|
// start tun
|
|
impl.reset(new TunImpl(io_context,
|
|
this,
|
|
config->frame,
|
|
config->stats,
|
|
sd,
|
|
state->iface_name
|
|
));
|
|
impl->start(config->n_parallel);
|
|
|
|
// signal that we are connected
|
|
parent.tun_connected();
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
if (tun_persist)
|
|
tun_persist->close();
|
|
|
|
stop();
|
|
parent.tun_error(Error::TUN_SETUP_FAILED, e.what());
|
|
}
|
|
}
|
|
}
|
|
|
|
virtual bool tun_send(BufferAllocated& buf)
|
|
{
|
|
return send(buf);
|
|
}
|
|
|
|
virtual std::string tun_name() const
|
|
{
|
|
if (impl)
|
|
return impl->name();
|
|
else
|
|
return "UNDEF_TUN";
|
|
}
|
|
|
|
virtual std::string vpn_ip4() const
|
|
{
|
|
if (state->vpn_ip4_addr.specified())
|
|
return state->vpn_ip4_addr.to_string();
|
|
else
|
|
return "";
|
|
}
|
|
|
|
virtual std::string vpn_ip6() const
|
|
{
|
|
if (state->vpn_ip6_addr.specified())
|
|
return state->vpn_ip6_addr.to_string();
|
|
else
|
|
return "";
|
|
}
|
|
|
|
virtual std::string vpn_gw4() const override
|
|
{
|
|
if (state->vpn_ip4_gw.specified())
|
|
return state->vpn_ip4_gw.to_string();
|
|
else
|
|
return "";
|
|
}
|
|
|
|
virtual std::string vpn_gw6() const override
|
|
{
|
|
if (state->vpn_ip6_gw.specified())
|
|
return state->vpn_ip6_gw.to_string();
|
|
else
|
|
return "";
|
|
}
|
|
|
|
virtual void set_disconnect()
|
|
{
|
|
}
|
|
|
|
virtual void stop() { stop_(); }
|
|
virtual ~Client() { stop_(); }
|
|
|
|
private:
|
|
Client(openvpn_io::io_context& io_context_arg,
|
|
ClientConfig* config_arg,
|
|
TunClientParent& parent_arg)
|
|
: io_context(io_context_arg),
|
|
config(config_arg),
|
|
parent(parent_arg),
|
|
state(new TunProp::State()),
|
|
halt(false)
|
|
{
|
|
}
|
|
|
|
bool send(Buffer& buf)
|
|
{
|
|
if (impl)
|
|
return impl->write(buf);
|
|
else
|
|
return false;
|
|
}
|
|
|
|
void tun_read_handler(PacketFrom::SPtr& pfp) // called by TunImpl
|
|
{
|
|
parent.tun_recv(pfp->buf);
|
|
}
|
|
|
|
void tun_error_handler(const Error::Type errtype, // called by TunImpl
|
|
const openvpn_io::error_code* error)
|
|
{
|
|
}
|
|
|
|
void stop_()
|
|
{
|
|
if (!halt)
|
|
{
|
|
halt = true;
|
|
|
|
// stop tun
|
|
if (impl)
|
|
impl->stop();
|
|
|
|
tun_persist.reset();
|
|
}
|
|
}
|
|
|
|
openvpn_io::io_context& io_context;
|
|
TunPersist::Ptr tun_persist;
|
|
ClientConfig::Ptr config;
|
|
TunClientParent& parent;
|
|
TunImpl::Ptr impl;
|
|
TunProp::State::Ptr state;
|
|
TunBuilderSetup::Base::Ptr tun_setup;
|
|
bool halt;
|
|
};
|
|
|
|
inline TunClient::Ptr ClientConfig::new_tun_client_obj(openvpn_io::io_context& io_context,
|
|
TunClientParent& parent,
|
|
TransportClient* transcli)
|
|
{
|
|
return TunClient::Ptr(new Client(io_context, this, parent));
|
|
}
|
|
|
|
}
|
|
} // namespace openvpn
|
|
|
|
#endif // OPENVPN_TUN_LINUX_CLIENT_TUNCLI_H
|