mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-11 00:00:08 +08:00
3e002c8 remove unused Jenkinsfile 16b1055 [OVPN3-140] Update company names in copyrights 6caca2c [OVPN3-140] Relicense back to AGPLv3 4f9ae74 cliproto: react to tls_warnings 546547b Proto: export tls_warnings attribute from SSL session 7cbaa26 SSLAPI: add tls_warning attribute 7ed93a3 clievent: add Warn event class 7a71ba1 win: get 'arch' param value from environment 61bb21b win: make parameter optional 15d66c4 [OVPN3-141] win: disable WPO 97d9c28 [OU-15] mbedtls: remove duplicated code 95aec32 [OU-15] mbedtls: refactor X509Cert to allow reuse der2pem 946753e [OVPN3-135] Win: remove unneeded default route d7f8c47 nrpt: create separate policy per dns suffix 577b5ca cli.cpp: fix typ0 in define fc8f89d [OVPN3-129] android: ensure all SWIG files are archived and saved e143bc0 [OVPN3-129] android: improve build system in order to perform full build 06d23ec [OVPN3-129] build-system: let scripts download dependencies 76bb99c fix usage of to_string() in Android 44c183a time: mute type conversion warnings for UWP client 7d7490c transport: enable socket protect call for UWP 1c003ac transport: pass protocol type to external factory c0de92c transport: add stop_requeueing method e2c60c8 android: build core library with MD5 support 3928069 [OVPN3-119] mbedTLS: create INSECURE profile including MD5 4f99310 remove function accidentally duplicated by last merge b91d841 self-test: add missing includes 19e33c4 [OA-14] mbedTLS: relax x509 date/time format check f3cf645 [OVPN3-116] disable SSL_CBC_RECORD_SPLITTING fca9ed2 [OVPN3-105] ParseClientConfig: avoid crash when not all key material is provided 7299fef [OC-42] Android: specify API level on command line d3da3df android: build client lib for x86 (for emulator) 8e501c5 Update version for mbedTLS and lz4 e57676e ParseClientConfig: export config to json format 9aa715f ParseClientConfig: export configuration to ovpn file format 1eab4cb ParseClientConfig: add helper constructor 71a59e4 ParseClientConfig: store the entire ovpn profile e0bb85a Transport: convert from transport protocol to config string 2fe56c3 Compress: convert from ctx type to config string 174ee25 OpenSSL: implement stub methods for new private_key_type/length() SSLAPIs 3d57708 mbedTLS: implement private_key_type/length() API a3210f0 SSLAPI: add private_key_type/length() getter methods 8ffe888 OpenSSL: implement stub methods for new extract_* SSLAPIs 16e9160 mbedTLS: implement extended API for key material extraction fe3d519 SSLAPI: extend API with methods to extract key material 2b4c850 Debugging: added header and build flag for valgrind run-time extensions. b948cde ManClientInstance::Factory: added virtual stop() method. 121e975 client API: added portOverride 106981c JSON: allow alternative JSON library implementations f206ae2 logging: added logdatetime.hpp which prepends date/time to log lines 49e933d Time: added to_double, delta_float, and delta_str methods 569b1da daemon.hpp: added class WritePid for managing pid files 63e9e04 ClientProto: reset CoarseTime object when AsioTimer is canceled f64b501 Cleanup: allow functor to be passed by value. ebe2560 RunContext: add configurable exit via EXIT_IN env var for debugging 1fbff4f tls-crypt: revised server-side validate_initial_packet() methods to use a BufferAllocated rather than a Buffer. 0090c51 SSLConst: added new ssl_flags() method which filters out non-ssl flags from given argument. 8379b0a CryptoDCInstance: added new RekeyType PRIMARY_SECONDARY_SWAP and use it in ProtoContext::promote_secondary_to_primary() since it more accurately reflects the underlying implementation. 18f45c2 ManClientInstance::Send: added AuthStatus::Type parameter to disconnect_user() method. 4bba803 Listen::List: added expand_ports() method. 5122e7d Listen::List: in port_offset(), set n_threads to 0 since number-of-threads data for port_offset items isn't really relevant. 4e11a6c StaticKey: added render_to_base64() and init_from_rng() methods. 190ece9 CryptoAlgs: added mode() method. 76e65cf CryptoAlgs: added AEAD_NONCE_TAIL_SIZE constant (set to 8 bytes) to represent the size in bytes of AEAD "nonce tail" normally taken from the HMAC key material. 2738718 compress: added method_to_string() method, i.e. the inverse of parse_method(). 7b47f99 compress: since parse_method() performs a linear search on method, reorder so that more frequently used methods appear at the top of the list. b428f74 library: added integer is_pow2() and log2() methods based on efficient __builtin_ffs and __builtin_clz intrinsics. 4926011 Android: adapt toolchain scripts to new SDK and move to API 26 ad4e995 mbedTLS: use mbedtls API to initialize cert object 908c611 transport: use socket_protect to communicate socket handle on UWP 92a6216 build win: read certain params from env 8166ea8 common: define uwp platform macro 0186bf6 common: report platform name as "uwp" 3f291b0 netconf: disable getting hwaddr for UWP 6365d26 transport: external factory 2ffa0c9 transport: synchronous DNS lookup 2c09c7c cliconnect.hpp: support for AsioWork always on 4f5a04d rand.hpp: allow external entropy source b19c5da time.hpp: use GetTickCount64 on Vista and newer 712ccfc android: export DEP_DIR via vars files only if not already defined 1b5a784 asio: make sure to switch to DEP_DIR before building 4302651 changes to support android building 6f56b2b Merge pull request #21 from OpenVPN/make_test_proto_deterministic 3a5ef2b travis-ci: make testing binary deterministic b76882d mbedtls: fix typ0 in exception message 40065a6 avoid "uninitialized variable warning" f33e7c2 [OVPN3-5] tls-crypt: add tls-crypt support in proto.hpp test unit 74c5f4f [OVPN3-5] tls-crypt: introduce tls-crypt support 389353c proto.cpp: uninit process at the end of the execution 56a831f [OVPN3-5] crypto/ssl: add support for AES-256-CTR 7cbf539 [OVPN3-5] build script: allow user to specify its own mbedTLS folder and LDFLAGS 8ae2a3f Integrate Google Test framework 68ae101 Add swig build to jenkins pipeline d496311 ovpncli.hpp: inline LogInfo constructor for clarity 96e0d89 Revert "Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7)" 7db95cc Make build fail on compilation errors 860129a TunBuilderCapture: make (to|from)_json methods public 2486494 random: added helper class Rand2 containing a crypto and non-crypto RNG 04175c2 appversion.hpp: Stringize VERSION -> MY_VERSION 81cb887 build script: added DPROF=1 flag a3dd47f timestr.hpp: moved milliseconds_since_epoch() to time/epoch.hpp 59b9492 sslchoose.hpp: added SSL_LIB_NAME 8fcb797 ProtoContext::KeyContext::raw_recv() : fix state transition e49e993 ProtoContext: comment edit 1d941aa VPNServerNetblock::Netblock refactor 7190495 Server-side renamings to break up long class names using namespaces. 3f74ec1 Listen::List: minor changes 79c789b RandomAPI: comment edit 5b5af36 Added SSLConst::SERVER_TO_SERVER flag fe00df4 OpenSSLContext::Config::set_rng: call assert_crypto() 3ae0076 In sslchoose.hpp, move OPENVPN_LOG_SSL macro to new file ssllog.hpp 1502cf6 URL::Parse: made is_valid_uri_char() standalone and moved to validate_uri.hpp 2dcb189 Added HTTP::Status::SwitchingProtocols constant 2f57024 HTTP::HeaderList: added get_value_trim_lower() method bee94d2 HTTP::HeaderList: get_value() and get_value_trim() should return std::string instead of const std::string 5debab1 Frame::Context: #define OPENVPN_NO_IO to allow building without i/o layer faf8f8f StaticKey: added parse_from_base64() method d11f250 HashString: added final_base64() method c373bf8 CompressContext: use C++11 member initialization and remove explicit attribute on constructor bd75cd7 RCPtr: added operator==() and operator!=() methods 7be33c5 PThreadBarrier: fixed incorrect comment 6f5f77b Link: use move semantics 17a5d89 inotify.hpp: no longer used 8ce39fc added render_hex() and render_hex_sep() methods that accept void* data ddc8e8a Function: use std::forward 76ee587 write_binary_atomic(): added tmpdir (temporary directory) parameter f366d55 base64: encode() now accepts void* data 462fe90 BufferType: added read(), write(), and prepend() variants that accept void* data 9ad1be4 IP::RouteType: added host_bits() method 3ebc8c7 IPv[46]::Addr::to_sockaddr() now accepts optional port number ce0977b Support Cityhash. fdbb0b9 IP::Addr: added validate_prefix_len() 25146d8 IP::Addr::from_ipv[4|6](): use move semantics a264f99 Merge pull request #20 from OpenVPN/fix_travis_ci_coverity 966e212 travis: don't mess up the SSL libs for wget/curl 2b8f09d Merge pull request #19 from OpenVPN/antonio/travis-ci-to-coverity 127cbb0 travis.yml: send build to Coverity SCAN when building master 2bca49b Merge pull request #15 from OpenVPN/antonio/travis-ci a5ce566 add basic support for Travis CI f9b14e9 macOS: add basic logging support 2b9188d Remotelist: pass meaningful port value to resolve::async_resolve() 4ebdbd0 Merged in OVPN3-38-improve-jenkins-pipeline-script (pull request #8) 832cf7f Report build status to Bitbucket 62423c9 Merged in OVPN3-21-prepend-log-record-with-unique- (pull request #7) cce2455 Prepend log string with unique reference. f26b08b Merged in OVPN3-25-pipeline-build (pull request #4) dc5ff1f Add OpenSSL version building. c77e1d6 Add pipeline script for multiplatform build. 4fab9b0 Merged in OVPN3-18-vs-project (pull request #2) 8eb0d6c Add Visual Studio project info to README 67c4989 Visual Studio 2015 solution and project files 52bfcd3 Merged in OVPN3-17 (pull request #1) 5f648ce Document Windows build process 3213c48 Support for local build settings b3ec01b Support for gpl version of mbedtls 903abc8 Support for zipballs 4029579 AsioPolySock: support bind to local address. 1e85566 Use openvpn::strerror_str() instead of std::strerror(). 3ba37fc OpenVPN 3 client: added OPENVPN_OVPNCLI_ASYNC_SETUP flag. git-subtree-dir: OpenVPN Adapter/Vendors/openvpn git-subtree-split: 3e002c83ce2e9f9f40ddcee750d3cfa664238abe
970 lines
28 KiB
C++
970 lines
28 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/>.
|
|
|
|
// OpenVPN 3 test client
|
|
|
|
#include <stdlib.h> // for atoi
|
|
|
|
#include <string>
|
|
#include <iostream>
|
|
#include <thread>
|
|
#include <memory>
|
|
#include <mutex>
|
|
|
|
#include <openvpn/common/platform.hpp>
|
|
|
|
#ifdef OPENVPN_PLATFORM_MAC
|
|
#include <CoreFoundation/CFBundle.h>
|
|
#include <ApplicationServices/ApplicationServices.h>
|
|
#endif
|
|
|
|
// If enabled, don't direct ovpn3 core logging to
|
|
// ClientAPI::OpenVPNClient::log() virtual method.
|
|
// Instead, logging will go to LogBaseSimple::log().
|
|
// In this case, make sure to define:
|
|
// LogBaseSimple log;
|
|
// at the top of your main() function to receive
|
|
// log messages from all threads.
|
|
// Also, note that the OPENVPN_LOG_GLOBAL setting
|
|
// MUST be consistent across all compilation units.
|
|
#ifdef OPENVPN_USE_LOG_BASE_SIMPLE
|
|
#define OPENVPN_LOG_GLOBAL // use global rather than thread-local log object pointer
|
|
#include <openvpn/log/logbasesimple.hpp>
|
|
#endif
|
|
|
|
// don't export core symbols
|
|
#define OPENVPN_CORE_API_VISIBILITY_HIDDEN
|
|
|
|
// should be included before other openvpn includes,
|
|
// with the exception of openvpn/log includes
|
|
#include <client/ovpncli.cpp>
|
|
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/string.hpp>
|
|
#include <openvpn/common/signal.hpp>
|
|
#include <openvpn/common/file.hpp>
|
|
#include <openvpn/common/getopt.hpp>
|
|
#include <openvpn/common/getpw.hpp>
|
|
#include <openvpn/common/cleanup.hpp>
|
|
#include <openvpn/time/timestr.hpp>
|
|
#include <openvpn/ssl/peerinfo.hpp>
|
|
#include <openvpn/ssl/sslchoose.hpp>
|
|
|
|
#if defined(USE_MBEDTLS)
|
|
#include <openvpn/mbedtls/util/pkcs1.hpp>
|
|
#endif
|
|
|
|
#if defined(OPENVPN_PLATFORM_WIN)
|
|
#include <openvpn/win/console.hpp>
|
|
#endif
|
|
|
|
using namespace openvpn;
|
|
|
|
namespace {
|
|
OPENVPN_SIMPLE_EXCEPTION(usage);
|
|
}
|
|
|
|
class Client : public ClientAPI::OpenVPNClient
|
|
{
|
|
public:
|
|
enum ClockTickAction {
|
|
CT_UNDEF,
|
|
CT_STOP,
|
|
CT_RECONNECT,
|
|
CT_PAUSE,
|
|
CT_RESUME,
|
|
CT_STATS,
|
|
};
|
|
|
|
bool is_dynamic_challenge() const
|
|
{
|
|
return !dc_cookie.empty();
|
|
}
|
|
|
|
std::string dynamic_challenge_cookie()
|
|
{
|
|
return dc_cookie;
|
|
}
|
|
|
|
std::string epki_ca;
|
|
std::string epki_cert;
|
|
#if defined(USE_MBEDTLS)
|
|
MbedTLSPKI::PKContext epki_ctx; // external PKI context
|
|
#endif
|
|
|
|
void set_clock_tick_action(const ClockTickAction action)
|
|
{
|
|
clock_tick_action = action;
|
|
}
|
|
|
|
void print_stats()
|
|
{
|
|
const int n = stats_n();
|
|
std::vector<long long> stats = stats_bundle();
|
|
|
|
std::cout << "STATS:" << std::endl;
|
|
for (int i = 0; i < n; ++i)
|
|
{
|
|
const long long value = stats[i];
|
|
if (value)
|
|
std::cout << " " << stats_name(i) << " : " << value << std::endl;
|
|
}
|
|
}
|
|
|
|
private:
|
|
virtual bool socket_protect(int socket) override
|
|
{
|
|
std::cout << "*** socket_protect " << socket << std::endl;
|
|
return true;
|
|
}
|
|
|
|
virtual void event(const ClientAPI::Event& ev) override
|
|
{
|
|
std::cout << date_time() << " EVENT: " << ev.name;
|
|
if (!ev.info.empty())
|
|
std::cout << ' ' << ev.info;
|
|
if (ev.fatal)
|
|
std::cout << " [FATAL-ERR]";
|
|
else if (ev.error)
|
|
std::cout << " [ERR]";
|
|
std::cout << std::endl;
|
|
if (ev.name == "DYNAMIC_CHALLENGE")
|
|
{
|
|
dc_cookie = ev.info;
|
|
|
|
ClientAPI::DynamicChallenge dc;
|
|
if (ClientAPI::OpenVPNClient::parse_dynamic_challenge(ev.info, dc)) {
|
|
std::cout << "DYNAMIC CHALLENGE" << std::endl;
|
|
std::cout << "challenge: " << dc.challenge << std::endl;
|
|
std::cout << "echo: " << dc.echo << std::endl;
|
|
std::cout << "responseRequired: " << dc.responseRequired << std::endl;
|
|
std::cout << "stateID: " << dc.stateID << std::endl;
|
|
}
|
|
}
|
|
else if (ev.name == "INFO" && (string::starts_with(ev.info, "OPEN_URL:http://")
|
|
|| string::starts_with(ev.info, "OPEN_URL:https://")))
|
|
{
|
|
// launch URL
|
|
const std::string url_str = ev.info.substr(9);
|
|
#ifdef OPENVPN_PLATFORM_MAC
|
|
std::thread thr([url_str]() {
|
|
CFURLRef url = CFURLCreateWithBytes(
|
|
NULL, // allocator
|
|
(UInt8*)url_str.c_str(), // URLBytes
|
|
url_str.length(), // length
|
|
kCFStringEncodingUTF8, // encoding
|
|
NULL // baseURL
|
|
);
|
|
LSOpenCFURLRef(url, 0);
|
|
CFRelease(url);
|
|
});
|
|
thr.detach();
|
|
#else
|
|
std::cout << "No implementation to launch " << url_str << std::endl;
|
|
#endif
|
|
}
|
|
}
|
|
|
|
virtual void log(const ClientAPI::LogInfo& log) override
|
|
{
|
|
std::lock_guard<std::mutex> lock(log_mutex);
|
|
std::cout << date_time() << ' ' << log.text << std::flush;
|
|
}
|
|
|
|
virtual void clock_tick() override
|
|
{
|
|
const ClockTickAction action = clock_tick_action;
|
|
clock_tick_action = CT_UNDEF;
|
|
|
|
switch (action)
|
|
{
|
|
case CT_STOP:
|
|
std::cout << "signal: CT_STOP" << std::endl;
|
|
stop();
|
|
break;
|
|
case CT_RECONNECT:
|
|
std::cout << "signal: CT_RECONNECT" << std::endl;
|
|
reconnect(0);
|
|
break;
|
|
case CT_PAUSE:
|
|
std::cout << "signal: CT_PAUSE" << std::endl;
|
|
pause("clock-tick pause");
|
|
break;
|
|
case CT_RESUME:
|
|
std::cout << "signal: CT_RESUME" << std::endl;
|
|
resume();
|
|
break;
|
|
case CT_STATS:
|
|
std::cout << "signal: CT_STATS" << std::endl;
|
|
print_stats();
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
virtual void external_pki_cert_request(ClientAPI::ExternalPKICertRequest& certreq) override
|
|
{
|
|
if (!epki_cert.empty())
|
|
{
|
|
certreq.cert = epki_cert;
|
|
certreq.supportingChain = epki_ca;
|
|
}
|
|
else
|
|
{
|
|
certreq.error = true;
|
|
certreq.errorText = "external_pki_cert_request not implemented";
|
|
}
|
|
}
|
|
|
|
virtual void external_pki_sign_request(ClientAPI::ExternalPKISignRequest& signreq) override
|
|
{
|
|
#if defined(USE_MBEDTLS)
|
|
if (epki_ctx.defined())
|
|
{
|
|
try {
|
|
// decode base64 sign request
|
|
BufferAllocated signdata(256, BufferAllocated::GROW);
|
|
base64->decode(signdata, signreq.data);
|
|
|
|
// get MD alg
|
|
const mbedtls_md_type_t md_alg = PKCS1::DigestPrefix::MbedTLSParse().alg_from_prefix(signdata);
|
|
|
|
// log info
|
|
OPENVPN_LOG("SIGN[" << PKCS1::DigestPrefix::MbedTLSParse::to_string(md_alg) << ',' << signdata.size() << "]: " << render_hex_generic(signdata));
|
|
|
|
// allocate buffer for signature
|
|
BufferAllocated sig(mbedtls_pk_get_len(epki_ctx.get()), BufferAllocated::ARRAY);
|
|
|
|
// sign it
|
|
size_t sig_size = 0;
|
|
const int status = mbedtls_pk_sign(epki_ctx.get(),
|
|
md_alg,
|
|
signdata.c_data(),
|
|
signdata.size(),
|
|
sig.data(),
|
|
&sig_size,
|
|
rng_callback,
|
|
this);
|
|
if (status != 0)
|
|
throw Exception("mbedtls_pk_sign failed, err=" + openvpn::to_string(status));
|
|
if (sig.size() != sig_size)
|
|
throw Exception("unexpected signature size");
|
|
|
|
// encode base64 signature
|
|
signreq.sig = base64->encode(sig);
|
|
OPENVPN_LOG("SIGNATURE[" << sig_size << "]: " << signreq.sig);
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
signreq.error = true;
|
|
signreq.errorText = std::string("external_pki_sign_request: ") + e.what();
|
|
}
|
|
}
|
|
else
|
|
#endif
|
|
{
|
|
signreq.error = true;
|
|
signreq.errorText = "external_pki_sign_request not implemented";
|
|
}
|
|
}
|
|
|
|
// RNG callback
|
|
static int rng_callback(void *arg, unsigned char *data, size_t len)
|
|
{
|
|
Client *self = (Client *)arg;
|
|
if (!self->rng)
|
|
{
|
|
self->rng.reset(new SSLLib::RandomAPI(false));
|
|
self->rng->assert_crypto();
|
|
}
|
|
return self->rng->rand_bytes_noexcept(data, len) ? 0 : -1; // using -1 as a general-purpose mbed TLS error code
|
|
}
|
|
|
|
virtual bool pause_on_connection_timeout() override
|
|
{
|
|
return false;
|
|
}
|
|
|
|
std::mutex log_mutex;
|
|
std::string dc_cookie;
|
|
RandomAPI::Ptr rng; // random data source for epki
|
|
volatile ClockTickAction clock_tick_action = CT_UNDEF;
|
|
};
|
|
|
|
static Client *the_client = nullptr; // GLOBAL
|
|
|
|
static void worker_thread()
|
|
{
|
|
#if !defined(OPENVPN_OVPNCLI_SINGLE_THREAD)
|
|
openvpn_io::detail::signal_blocker signal_blocker; // signals should be handled by parent thread
|
|
#endif
|
|
try {
|
|
std::cout << "Thread starting..." << std::endl;
|
|
ClientAPI::Status connect_status = the_client->connect();
|
|
if (connect_status.error)
|
|
{
|
|
std::cout << "connect error: ";
|
|
if (!connect_status.status.empty())
|
|
std::cout << connect_status.status << ": ";
|
|
std::cout << connect_status.message << std::endl;
|
|
}
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
std::cout << "Connect thread exception: " << e.what() << std::endl;
|
|
}
|
|
std::cout << "Thread finished" << std::endl;
|
|
}
|
|
|
|
static std::string read_profile(const char *fn, const std::string* profile_content)
|
|
{
|
|
if (!string::strcasecmp(fn, "http") && profile_content && !profile_content->empty())
|
|
return *profile_content;
|
|
else
|
|
{
|
|
ProfileMerge pm(fn, "ovpn", "", ProfileMerge::FOLLOW_FULL,
|
|
ProfileParseLimits::MAX_LINE_SIZE, ProfileParseLimits::MAX_PROFILE_SIZE);
|
|
if (pm.status() != ProfileMerge::MERGE_SUCCESS)
|
|
OPENVPN_THROW_EXCEPTION("merge config error: " << pm.status_string() << " : " << pm.error());
|
|
return pm.profile_content();
|
|
}
|
|
}
|
|
|
|
#if defined(OPENVPN_PLATFORM_WIN)
|
|
|
|
static void start_thread(Client& client)
|
|
{
|
|
// Set Windows title bar
|
|
const std::string title_text = "F2:Stats F3:Reconnect F4:Stop F5:Pause";
|
|
Win::Console::Title title(ClientAPI::OpenVPNClient::platform() + " " + title_text);
|
|
Win::Console::Input console;
|
|
|
|
// start connect thread
|
|
std::unique_ptr<std::thread> thread;
|
|
volatile bool thread_exit = false;
|
|
the_client = &client;
|
|
thread.reset(new std::thread([&thread_exit]() {
|
|
worker_thread();
|
|
thread_exit = true;
|
|
}));
|
|
|
|
// wait for connect thread to exit, also check for keypresses
|
|
while (!thread_exit)
|
|
{
|
|
while (true)
|
|
{
|
|
const unsigned int c = console.get();
|
|
if (!c)
|
|
break;
|
|
else if (c == 0x3C) // F2
|
|
the_client->print_stats();
|
|
else if (c == 0x3D) // F3
|
|
the_client->reconnect(0);
|
|
else if (c == 0x3E) // F4
|
|
the_client->stop();
|
|
else if (c == 0x3F) // F5
|
|
the_client->pause("user-pause");
|
|
}
|
|
Sleep(1000);
|
|
}
|
|
|
|
// wait for connect thread to exit
|
|
thread->join();
|
|
|
|
the_client = nullptr;
|
|
}
|
|
|
|
#elif defined(OPENVPN_OVPNCLI_SINGLE_THREAD)
|
|
|
|
static void handler(int signum)
|
|
{
|
|
switch (signum)
|
|
{
|
|
case SIGTERM:
|
|
case SIGINT:
|
|
if (the_client)
|
|
the_client->set_clock_tick_action(Client::CT_STOP);
|
|
break;
|
|
case SIGHUP:
|
|
if (the_client)
|
|
the_client->set_clock_tick_action(Client::CT_RECONNECT);
|
|
break;
|
|
case SIGUSR1:
|
|
if (the_client)
|
|
the_client->set_clock_tick_action(Client::CT_STATS);
|
|
break;
|
|
case SIGUSR2:
|
|
{
|
|
// toggle pause/resume
|
|
static bool hup = false;
|
|
if (the_client)
|
|
{
|
|
if (hup)
|
|
the_client->set_clock_tick_action(Client::CT_RESUME);
|
|
else
|
|
the_client->set_clock_tick_action(Client::CT_PAUSE);
|
|
hup = !hup;
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void start_thread(Client& client)
|
|
{
|
|
the_client = &client;
|
|
|
|
// capture signals that might occur while we're in worker_thread
|
|
Signal signal(handler, Signal::F_SIGINT|Signal::F_SIGTERM|Signal::F_SIGHUP|Signal::F_SIGUSR1|Signal::F_SIGUSR2);
|
|
|
|
// run the client
|
|
worker_thread();
|
|
|
|
the_client = nullptr;
|
|
}
|
|
|
|
#else
|
|
|
|
static void handler(int signum)
|
|
{
|
|
switch (signum)
|
|
{
|
|
case SIGTERM:
|
|
case SIGINT:
|
|
std::cout << "received stop signal " << signum << std::endl;
|
|
if (the_client)
|
|
the_client->stop();
|
|
break;
|
|
case SIGHUP:
|
|
std::cout << "received reconnect signal " << signum << std::endl;
|
|
if (the_client)
|
|
the_client->reconnect(0);
|
|
break;
|
|
case SIGUSR1:
|
|
if (the_client)
|
|
the_client->print_stats();
|
|
break;
|
|
case SIGUSR2:
|
|
{
|
|
// toggle pause/resume
|
|
static bool hup = false;
|
|
std::cout << "received pause/resume toggle signal " << signum << std::endl;
|
|
if (the_client)
|
|
{
|
|
if (hup)
|
|
the_client->resume();
|
|
else
|
|
the_client->pause("pause-resume-signal");
|
|
hup = !hup;
|
|
}
|
|
}
|
|
break;
|
|
default:
|
|
std::cout << "received unknown signal " << signum << std::endl;
|
|
break;
|
|
}
|
|
}
|
|
|
|
static void start_thread(Client& client)
|
|
{
|
|
std::unique_ptr<std::thread> thread;
|
|
|
|
// start connect thread
|
|
the_client = &client;
|
|
thread.reset(new std::thread([]() {
|
|
worker_thread();
|
|
}));
|
|
|
|
{
|
|
// catch signals that might occur while we're in join()
|
|
Signal signal(handler, Signal::F_SIGINT|Signal::F_SIGTERM|Signal::F_SIGHUP|Signal::F_SIGUSR1|Signal::F_SIGUSR2);
|
|
|
|
// wait for connect thread to exit
|
|
thread->join();
|
|
}
|
|
the_client = nullptr;
|
|
}
|
|
|
|
#endif
|
|
|
|
int openvpn_client(int argc, char *argv[], const std::string* profile_content)
|
|
{
|
|
static const struct option longopts[] = {
|
|
{ "username", required_argument, nullptr, 'u' },
|
|
{ "password", required_argument, nullptr, 'p' },
|
|
{ "response", required_argument, nullptr, 'r' },
|
|
{ "dc", required_argument, nullptr, 'D' },
|
|
{ "proto", required_argument, nullptr, 'P' },
|
|
{ "ipv6", required_argument, nullptr, '6' },
|
|
{ "server", required_argument, nullptr, 's' },
|
|
{ "port", required_argument, nullptr, 'R' },
|
|
{ "timeout", required_argument, nullptr, 't' },
|
|
{ "compress", required_argument, nullptr, 'c' },
|
|
{ "pk-password", required_argument, nullptr, 'z' },
|
|
{ "tvm-override", required_argument, nullptr, 'M' },
|
|
{ "proxy-host", required_argument, nullptr, 'h' },
|
|
{ "proxy-port", required_argument, nullptr, 'q' },
|
|
{ "proxy-username", required_argument, nullptr, 'U' },
|
|
{ "proxy-password", required_argument, nullptr, 'W' },
|
|
{ "peer-info", required_argument, nullptr, 'I' },
|
|
{ "gremlin", required_argument, nullptr, 'G' },
|
|
{ "proxy-basic", no_argument, nullptr, 'B' },
|
|
{ "alt-proxy", no_argument, nullptr, 'A' },
|
|
{ "dco", no_argument, nullptr, 'd' },
|
|
{ "eval", no_argument, nullptr, 'e' },
|
|
{ "self-test", no_argument, nullptr, 'T' },
|
|
{ "cache-password", no_argument, nullptr, 'C' },
|
|
{ "no-cert", no_argument, nullptr, 'x' },
|
|
{ "force-aes-cbc", no_argument, nullptr, 'f' },
|
|
{ "google-dns", no_argument, nullptr, 'g' },
|
|
{ "persist-tun", no_argument, nullptr, 'j' },
|
|
{ "def-keydir", required_argument, nullptr, 'k' },
|
|
{ "merge", no_argument, nullptr, 'm' },
|
|
{ "version", no_argument, nullptr, 'v' },
|
|
{ "auto-sess", no_argument, nullptr, 'a' },
|
|
{ "tcprof-override", required_argument, nullptr, 'X' },
|
|
{ "ssl-debug", required_argument, nullptr, 1 },
|
|
{ "epki-cert", required_argument, nullptr, 2 },
|
|
{ "epki-ca", required_argument, nullptr, 3 },
|
|
{ "epki-key", required_argument, nullptr, 4 },
|
|
{ nullptr, 0, nullptr, 0 }
|
|
};
|
|
|
|
int ret = 0;
|
|
auto cleanup = Cleanup([]() {
|
|
the_client = nullptr;
|
|
});
|
|
|
|
try {
|
|
if (argc >= 2)
|
|
{
|
|
std::string username;
|
|
std::string password;
|
|
std::string response;
|
|
std::string dynamicChallengeCookie;
|
|
std::string proto;
|
|
std::string ipv6;
|
|
std::string server;
|
|
std::string port;
|
|
int timeout = 0;
|
|
std::string compress;
|
|
std::string privateKeyPassword;
|
|
std::string tlsVersionMinOverride;
|
|
std::string tlsCertProfileOverride;
|
|
std::string proxyHost;
|
|
std::string proxyPort;
|
|
std::string proxyUsername;
|
|
std::string proxyPassword;
|
|
std::string peer_info;
|
|
std::string gremlin;
|
|
bool eval = false;
|
|
bool self_test = false;
|
|
bool cachePassword = false;
|
|
bool disableClientCert = false;
|
|
bool proxyAllowCleartextAuth = false;
|
|
int defaultKeyDirection = -1;
|
|
bool forceAesCbcCiphersuites = false;
|
|
int sslDebugLevel = 0;
|
|
bool googleDnsFallback = false;
|
|
bool autologinSessions = false;
|
|
bool tunPersist = false;
|
|
bool merge = false;
|
|
bool version = false;
|
|
bool altProxy = false;
|
|
bool dco = false;
|
|
std::string epki_cert_fn;
|
|
std::string epki_ca_fn;
|
|
std::string epki_key_fn;
|
|
|
|
int ch;
|
|
optind = 1;
|
|
while ((ch = getopt_long(argc, argv, "BAdeTCxfgjmvau:p:r:D:P:6:s:t:c:z:M:h:q:U:W:I:G:k:X:R:", longopts, nullptr)) != -1)
|
|
{
|
|
switch (ch)
|
|
{
|
|
case 1: // ssl-debug
|
|
sslDebugLevel = ::atoi(optarg);
|
|
break;
|
|
case 2: // --epki-cert
|
|
epki_cert_fn = optarg;
|
|
break;
|
|
case 3: // --epki-ca
|
|
epki_ca_fn = optarg;
|
|
break;
|
|
case 4: // --epki-key
|
|
epki_key_fn = optarg;
|
|
break;
|
|
case 'e':
|
|
eval = true;
|
|
break;
|
|
case 'T':
|
|
self_test = true;
|
|
break;
|
|
case 'C':
|
|
cachePassword = true;
|
|
break;
|
|
case 'x':
|
|
disableClientCert = true;
|
|
break;
|
|
case 'u':
|
|
username = optarg;
|
|
break;
|
|
case 'p':
|
|
password = optarg;
|
|
break;
|
|
case 'r':
|
|
response = optarg;
|
|
break;
|
|
case 'P':
|
|
proto = optarg;
|
|
break;
|
|
case '6':
|
|
ipv6 = optarg;
|
|
break;
|
|
case 's':
|
|
server = optarg;
|
|
break;
|
|
case 'R':
|
|
port = optarg;
|
|
break;
|
|
case 't':
|
|
timeout = ::atoi(optarg);
|
|
break;
|
|
case 'c':
|
|
compress = optarg;
|
|
break;
|
|
case 'z':
|
|
privateKeyPassword = optarg;
|
|
break;
|
|
case 'M':
|
|
tlsVersionMinOverride = optarg;
|
|
break;
|
|
case 'X':
|
|
tlsCertProfileOverride = optarg;
|
|
break;
|
|
case 'h':
|
|
proxyHost = optarg;
|
|
break;
|
|
case 'q':
|
|
proxyPort = optarg;
|
|
break;
|
|
case 'U':
|
|
proxyUsername = optarg;
|
|
break;
|
|
case 'W':
|
|
proxyPassword = optarg;
|
|
break;
|
|
case 'B':
|
|
proxyAllowCleartextAuth = true;
|
|
break;
|
|
case 'A':
|
|
altProxy = true;
|
|
break;
|
|
case 'd':
|
|
dco = true;
|
|
break;
|
|
case 'f':
|
|
forceAesCbcCiphersuites = true;
|
|
break;
|
|
case 'g':
|
|
googleDnsFallback = true;
|
|
break;
|
|
case 'a':
|
|
autologinSessions = true;
|
|
break;
|
|
case 'j':
|
|
tunPersist = true;
|
|
break;
|
|
case 'm':
|
|
merge = true;
|
|
break;
|
|
case 'v':
|
|
version = true;
|
|
break;
|
|
case 'k':
|
|
{
|
|
const std::string arg = optarg;
|
|
if (arg == "bi" || arg == "bidirectional")
|
|
defaultKeyDirection = -1;
|
|
else if (arg == "0")
|
|
defaultKeyDirection = 0;
|
|
else if (arg == "1")
|
|
defaultKeyDirection = 1;
|
|
else
|
|
OPENVPN_THROW_EXCEPTION("bad default key-direction: " << arg);
|
|
}
|
|
break;
|
|
case 'D':
|
|
dynamicChallengeCookie = optarg;
|
|
break;
|
|
case 'I':
|
|
peer_info = optarg;
|
|
break;
|
|
case 'G':
|
|
gremlin = optarg;
|
|
break;
|
|
default:
|
|
throw usage();
|
|
}
|
|
}
|
|
argc -= optind;
|
|
argv += optind;
|
|
|
|
if (version)
|
|
{
|
|
std::cout << "OpenVPN cli 1.0" << std::endl;
|
|
std::cout << ClientAPI::OpenVPNClient::platform() << std::endl;
|
|
std::cout << ClientAPI::OpenVPNClient::copyright() << std::endl;
|
|
}
|
|
else if (self_test)
|
|
{
|
|
std::cout << ClientAPI::OpenVPNClient::crypto_self_test();
|
|
}
|
|
else if (merge)
|
|
{
|
|
if (argc != 1)
|
|
throw usage();
|
|
std::cout << read_profile(argv[0], profile_content);
|
|
}
|
|
else
|
|
{
|
|
if (argc < 1)
|
|
throw usage();
|
|
|
|
bool retry;
|
|
do {
|
|
retry = false;
|
|
|
|
ClientAPI::Config config;
|
|
config.guiVersion = "cli 1.0";
|
|
config.content = read_profile(argv[0], profile_content);
|
|
for (int i = 1; i < argc; ++i)
|
|
{
|
|
config.content += argv[i];
|
|
config.content += '\n';
|
|
}
|
|
config.serverOverride = server;
|
|
config.portOverride = port;
|
|
config.protoOverride = proto;
|
|
config.connTimeout = timeout;
|
|
config.compressionMode = compress;
|
|
config.ipv6 = ipv6;
|
|
config.privateKeyPassword = privateKeyPassword;
|
|
config.tlsVersionMinOverride = tlsVersionMinOverride;
|
|
config.tlsCertProfileOverride = tlsCertProfileOverride;
|
|
config.disableClientCert = disableClientCert;
|
|
config.proxyHost = proxyHost;
|
|
config.proxyPort = proxyPort;
|
|
config.proxyUsername = proxyUsername;
|
|
config.proxyPassword = proxyPassword;
|
|
config.proxyAllowCleartextAuth = proxyAllowCleartextAuth;
|
|
config.altProxy = altProxy;
|
|
config.dco = dco;
|
|
config.defaultKeyDirection = defaultKeyDirection;
|
|
config.forceAesCbcCiphersuites = forceAesCbcCiphersuites;
|
|
config.sslDebugLevel = sslDebugLevel;
|
|
config.googleDnsFallback = googleDnsFallback;
|
|
config.autologinSessions = autologinSessions;
|
|
config.tunPersist = tunPersist;
|
|
config.gremlinConfig = gremlin;
|
|
config.info = true;
|
|
#if defined(OPENVPN_OVPNCLI_SINGLE_THREAD)
|
|
config.clockTickMS = 250;
|
|
#endif
|
|
|
|
if (!epki_cert_fn.empty())
|
|
config.externalPkiAlias = "epki"; // dummy string
|
|
|
|
PeerInfo::Set::parse_csv(peer_info, config.peerInfo);
|
|
|
|
if (eval)
|
|
{
|
|
ClientAPI::EvalConfig eval = ClientAPI::OpenVPNClient::eval_config_static(config);
|
|
std::cout << "EVAL PROFILE" << std::endl;
|
|
std::cout << "error=" << eval.error << std::endl;
|
|
std::cout << "message=" << eval.message << std::endl;
|
|
std::cout << "userlockedUsername=" << eval.userlockedUsername << std::endl;
|
|
std::cout << "profileName=" << eval.profileName << std::endl;
|
|
std::cout << "friendlyName=" << eval.friendlyName << std::endl;
|
|
std::cout << "autologin=" << eval.autologin << std::endl;
|
|
std::cout << "externalPki=" << eval.externalPki << std::endl;
|
|
std::cout << "staticChallenge=" << eval.staticChallenge << std::endl;
|
|
std::cout << "staticChallengeEcho=" << eval.staticChallengeEcho << std::endl;
|
|
std::cout << "privateKeyPasswordRequired=" << eval.privateKeyPasswordRequired << std::endl;
|
|
std::cout << "allowPasswordSave=" << eval.allowPasswordSave << std::endl;
|
|
|
|
for (size_t i = 0; i < eval.serverList.size(); ++i)
|
|
{
|
|
const ClientAPI::ServerEntry& se = eval.serverList[i];
|
|
std::cout << '[' << i << "] " << se.server << '/' << se.friendlyName << std::endl;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Client client;
|
|
ClientAPI::EvalConfig eval = client.eval_config(config);
|
|
if (eval.error)
|
|
OPENVPN_THROW_EXCEPTION("eval config error: " << eval.message);
|
|
if (eval.autologin)
|
|
{
|
|
if (!username.empty() || !password.empty())
|
|
std::cout << "NOTE: creds were not needed" << std::endl;
|
|
}
|
|
else
|
|
{
|
|
if (username.empty())
|
|
OPENVPN_THROW_EXCEPTION("need creds");
|
|
ClientAPI::ProvideCreds creds;
|
|
if (password.empty() && dynamicChallengeCookie.empty())
|
|
password = get_password("Password:");
|
|
creds.username = username;
|
|
creds.password = password;
|
|
creds.response = response;
|
|
creds.dynamicChallengeCookie = dynamicChallengeCookie;
|
|
creds.replacePasswordWithSessionID = true;
|
|
creds.cachePassword = cachePassword;
|
|
ClientAPI::Status creds_status = client.provide_creds(creds);
|
|
if (creds_status.error)
|
|
OPENVPN_THROW_EXCEPTION("creds error: " << creds_status.message);
|
|
}
|
|
|
|
// external PKI
|
|
if (!epki_cert_fn.empty())
|
|
{
|
|
client.epki_cert = read_text_utf8(epki_cert_fn);
|
|
if (!epki_ca_fn.empty())
|
|
client.epki_ca = read_text_utf8(epki_ca_fn);
|
|
#if defined(USE_MBEDTLS)
|
|
if (!epki_key_fn.empty())
|
|
{
|
|
const std::string epki_key_txt = read_text_utf8(epki_key_fn);
|
|
client.epki_ctx.parse(epki_key_txt, "EPKI", privateKeyPassword);
|
|
}
|
|
else
|
|
OPENVPN_THROW_EXCEPTION("--epki-key must be specified");
|
|
#endif
|
|
}
|
|
|
|
std::cout << "CONNECTING..." << std::endl;
|
|
|
|
// start the client thread
|
|
start_thread(client);
|
|
|
|
// Get dynamic challenge response
|
|
if (client.is_dynamic_challenge())
|
|
{
|
|
std::cout << "ENTER RESPONSE" << std::endl;
|
|
std::getline(std::cin, response);
|
|
if (!response.empty())
|
|
{
|
|
dynamicChallengeCookie = client.dynamic_challenge_cookie();
|
|
retry = true;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
// print closing stats
|
|
client.print_stats();
|
|
}
|
|
}
|
|
} while (retry);
|
|
}
|
|
}
|
|
else
|
|
throw usage();
|
|
}
|
|
catch (const usage&)
|
|
{
|
|
std::cout << "OpenVPN Client (ovpncli)" << std::endl;
|
|
std::cout << "usage: cli [options] <config-file> [extra-config-directives...]" << std::endl;
|
|
std::cout << "--version, -v : show version info" << std::endl;
|
|
std::cout << "--eval, -e : evaluate profile only (standalone)" << std::endl;
|
|
std::cout << "--merge, -m : merge profile into unified format (standalone)" << std::endl;
|
|
std::cout << "--username, -u : username" << std::endl;
|
|
std::cout << "--password, -p : password" << std::endl;
|
|
std::cout << "--response, -r : static response" << std::endl;
|
|
std::cout << "--dc, -D : dynamic challenge/response cookie" << std::endl;
|
|
std::cout << "--proto, -P : protocol override (udp|tcp)" << std::endl;
|
|
std::cout << "--server, -s : server override" << std::endl;
|
|
std::cout << "--port, -R : port override" << std::endl;
|
|
std::cout << "--ipv6, -6 : IPv6 (yes|no|default)" << std::endl;
|
|
std::cout << "--timeout, -t : timeout" << std::endl;
|
|
std::cout << "--compress, -c : compression mode (yes|no|asym)" << std::endl;
|
|
std::cout << "--pk-password, -z : private key password" << std::endl;
|
|
std::cout << "--tvm-override, -M : tls-version-min override (disabled, default, tls_1_x)" << std::endl;
|
|
std::cout << "--tcprof-override, -X : tls-cert-profile override (" <<
|
|
#ifdef OPENVPN_USE_TLS_MD5
|
|
"insecure, " <<
|
|
#endif
|
|
"legacy, preferred, etc.)" << std::endl;
|
|
std::cout << "--proxy-host, -h : HTTP proxy hostname/IP" << std::endl;
|
|
std::cout << "--proxy-port, -q : HTTP proxy port" << std::endl;
|
|
std::cout << "--proxy-username, -U : HTTP proxy username" << std::endl;
|
|
std::cout << "--proxy-password, -W : HTTP proxy password" << std::endl;
|
|
std::cout << "--proxy-basic, -B : allow HTTP basic auth" << std::endl;
|
|
std::cout << "--alt-proxy, -A : enable alternative proxy module" << std::endl;
|
|
std::cout << "--dco, -d : enable data channel offload" << std::endl;
|
|
std::cout << "--cache-password, -C : cache password" << std::endl;
|
|
std::cout << "--no-cert, -x : disable client certificate" << std::endl;
|
|
std::cout << "--def-keydir, -k : default key direction ('bi', '0', or '1')" << std::endl;
|
|
std::cout << "--force-aes-cbc, -f : force AES-CBC ciphersuites" << std::endl;
|
|
std::cout << "--ssl-debug : SSL debug level" << std::endl;
|
|
std::cout << "--google-dns, -g : enable Google DNS fallback" << std::endl;
|
|
std::cout << "--auto-sess, -a : request autologin session" << std::endl;
|
|
std::cout << "--persist-tun, -j : keep TUN interface open across reconnects" << std::endl;
|
|
std::cout << "--peer-info, -I : peer info key/value list in the form K1=V1,K2=V2,..." << std::endl;
|
|
std::cout << "--gremlin, -G : gremlin info (send_delay_ms, recv_delay_ms, send_drop_prob, recv_drop_prob)" << std::endl;
|
|
std::cout << "--epki-ca : simulate external PKI cert supporting intermediate/root certs" << std::endl;
|
|
std::cout << "--epki-cert : simulate external PKI cert" << std::endl;
|
|
std::cout << "--epki-key : simulate external PKI private key" << std::endl;
|
|
ret = 2;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
#ifndef OPENVPN_OVPNCLI_OMIT_MAIN
|
|
|
|
int main(int argc, char *argv[])
|
|
{
|
|
int ret = 0;
|
|
|
|
#ifdef OPENVPN_LOG_LOGBASE_H
|
|
LogBaseSimple log;
|
|
#endif
|
|
|
|
try {
|
|
Client::init_process();
|
|
ret = openvpn_client(argc, argv, nullptr);
|
|
}
|
|
catch (const std::exception& e)
|
|
{
|
|
std::cout << "Main thread exception: " << e.what() << std::endl;
|
|
ret = 1;
|
|
}
|
|
Client::uninit_process();
|
|
return ret;
|
|
}
|
|
|
|
#endif
|