mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2026-02-11 00:00:08 +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
597 lines
14 KiB
C++
597 lines
14 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/>.
|
|
|
|
// General purpose string-manipulation functions.
|
|
|
|
#ifndef OPENVPN_COMMON_STRING_H
|
|
#define OPENVPN_COMMON_STRING_H
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
#include <cstring>
|
|
#include <cctype>
|
|
|
|
#include <openvpn/common/platform.hpp>
|
|
#include <openvpn/common/size.hpp>
|
|
|
|
namespace openvpn {
|
|
namespace string {
|
|
// case insensitive compare functions
|
|
|
|
inline int strcasecmp(const char *s1, const char *s2)
|
|
{
|
|
#ifdef OPENVPN_PLATFORM_WIN
|
|
return ::_stricmp(s1, s2);
|
|
#else
|
|
return ::strcasecmp(s1, s2);
|
|
#endif
|
|
}
|
|
|
|
inline int strcasecmp(const std::string& s1, const char *s2)
|
|
{
|
|
return strcasecmp(s1.c_str(), s2);
|
|
}
|
|
|
|
inline int strcasecmp(const char *s1, const std::string& s2)
|
|
{
|
|
return strcasecmp(s1, s2.c_str());
|
|
}
|
|
|
|
inline int strcasecmp(const std::string& s1, const std::string& s2)
|
|
{
|
|
return strcasecmp(s1.c_str(), s2.c_str());
|
|
}
|
|
|
|
// Like strncpy but makes sure dest is always null terminated
|
|
inline void strncpynt (char *dest, const char *src, size_t maxlen)
|
|
{
|
|
strncpy (dest, src, maxlen);
|
|
if (maxlen > 0)
|
|
dest[maxlen - 1] = 0;
|
|
}
|
|
|
|
inline bool is_true(const std::string& str)
|
|
{
|
|
return str == "1" || !strcasecmp(str.c_str(), "true");
|
|
}
|
|
|
|
inline bool starts_with(const std::string& str, const std::string& prefix)
|
|
{
|
|
const size_t len = str.length();
|
|
const size_t plen = prefix.length();
|
|
if (plen <= len)
|
|
return std::memcmp(str.c_str(), prefix.c_str(), plen) == 0;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
inline bool starts_with(const std::string& str, const char *prefix)
|
|
{
|
|
const size_t len = str.length();
|
|
const size_t plen = std::strlen(prefix);
|
|
if (plen <= len)
|
|
return std::memcmp(str.c_str(), prefix, plen) == 0;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
inline bool ends_with(const std::string& str, const std::string& suffix)
|
|
{
|
|
const size_t len = str.length();
|
|
const size_t slen = suffix.length();
|
|
if (slen <= len)
|
|
return std::memcmp(str.c_str() + (len-slen), suffix.c_str(), slen) == 0;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
inline bool ends_with(const std::string& str, const char *suffix)
|
|
{
|
|
const size_t len = str.length();
|
|
const size_t slen = std::strlen(suffix);
|
|
if (slen <= len)
|
|
return std::memcmp(str.c_str() + (len-slen), suffix, slen) == 0;
|
|
else
|
|
return false;
|
|
}
|
|
|
|
// return true if string ends with char c
|
|
inline bool ends_with(const std::string& str, const char c)
|
|
{
|
|
return str.length() && str.back() == c;
|
|
}
|
|
|
|
// return true if string ends with a newline
|
|
inline bool ends_with_newline(const std::string& str)
|
|
{
|
|
return ends_with(str, '\n');
|
|
}
|
|
|
|
// return true if string ends with a CR or LF
|
|
inline bool ends_with_crlf(const std::string& str)
|
|
{
|
|
if (str.length())
|
|
{
|
|
const char c = str.back();
|
|
return c == '\n' || c == '\r';
|
|
}
|
|
else
|
|
return false;
|
|
}
|
|
|
|
// make sure that string ends with char c, if not append it
|
|
inline std::string add_trailing_copy(const std::string& str, const char c)
|
|
{
|
|
if (ends_with(str, c))
|
|
return str;
|
|
else
|
|
return str + c;
|
|
}
|
|
|
|
// make sure that string ends with char c, if not append it
|
|
inline void add_trailing(std::string& str, const char c)
|
|
{
|
|
if (!ends_with(str, c))
|
|
str += c;
|
|
}
|
|
|
|
// make sure that string ends with CRLF, if not append it
|
|
inline void add_trailing_crlf(std::string& str)
|
|
{
|
|
if (ends_with(str, "\r\n"))
|
|
;
|
|
else if (ends_with(str, '\r'))
|
|
str += '\n';
|
|
else if (ends_with(str, '\n'))
|
|
{
|
|
str.pop_back();
|
|
str += "\r\n";
|
|
}
|
|
else
|
|
str += "\r\n";
|
|
}
|
|
|
|
// make sure that string ends with CRLF, if not append it
|
|
inline std::string add_trailing_crlf_copy(std::string str)
|
|
{
|
|
add_trailing_crlf(str);
|
|
return str;
|
|
}
|
|
|
|
// make sure that string ends with char c, if not append it (unless the string is empty)
|
|
inline std::string add_trailing_unless_empty_copy(const std::string& str, const char c)
|
|
{
|
|
if (str.empty() || ends_with(str, c))
|
|
return str;
|
|
else
|
|
return str + c;
|
|
}
|
|
|
|
// remove trailing \r or \n chars
|
|
inline void trim_crlf(std::string& str)
|
|
{
|
|
while (ends_with_crlf(str))
|
|
str.pop_back();
|
|
}
|
|
|
|
// remove trailing \r or \n chars
|
|
inline std::string trim_crlf_copy(std::string str)
|
|
{
|
|
trim_crlf(str);
|
|
return str;
|
|
}
|
|
|
|
// return true if str of size len contains an embedded null
|
|
inline bool embedded_null(const char *str, size_t len)
|
|
{
|
|
while (len--)
|
|
if (!*str++)
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
// return the length of a string, omitting trailing nulls
|
|
inline size_t len_without_trailing_nulls(const char *str, size_t len)
|
|
{
|
|
while (len > 0 && str[len-1] == '\0')
|
|
--len;
|
|
return len;
|
|
}
|
|
|
|
// return true if string contains at least one newline
|
|
inline bool is_multiline(const std::string& str)
|
|
{
|
|
return str.find_first_of('\n') != std::string::npos;
|
|
}
|
|
|
|
// return the first line (without newline) of a multi-line string
|
|
std::string first_line(const std::string& str)
|
|
{
|
|
const size_t pos = str.find_first_of('\n');
|
|
if (pos != std::string::npos)
|
|
return str.substr(0, pos);
|
|
else
|
|
return str;
|
|
}
|
|
|
|
// Define a common interpretation of what constitutes a space character.
|
|
// Return true if c is a space char.
|
|
inline bool is_space(const char c)
|
|
{
|
|
return std::isspace(static_cast<unsigned char>(c)) != 0;
|
|
}
|
|
|
|
inline bool is_digit(const char c)
|
|
{
|
|
return std::isdigit(static_cast<unsigned char>(c)) != 0;
|
|
}
|
|
|
|
inline bool is_alpha(const char c)
|
|
{
|
|
return std::isalpha(static_cast<unsigned char>(c)) != 0;
|
|
}
|
|
|
|
inline bool is_alphanumeric(const char c)
|
|
{
|
|
return std::isalnum(static_cast<unsigned char>(c)) != 0;
|
|
}
|
|
|
|
inline bool is_printable(const char c)
|
|
{
|
|
return std::isprint(static_cast<unsigned char>(c)) != 0;
|
|
}
|
|
|
|
inline bool is_printable(const unsigned char c)
|
|
{
|
|
return std::isprint(c) != 0;
|
|
}
|
|
|
|
inline bool is_ctrl(const char c)
|
|
{
|
|
return std::iscntrl(static_cast<unsigned char>(c)) != 0;
|
|
}
|
|
|
|
inline bool is_ctrl(const unsigned char c)
|
|
{
|
|
return std::iscntrl(c) != 0;
|
|
}
|
|
|
|
// return true if string conforms to regex \w*
|
|
inline bool is_word(const std::string& str)
|
|
{
|
|
for (auto &c : str)
|
|
if (!(is_alphanumeric(c) || c == '_'))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
// return true if all string characters are printable (or if string is empty)
|
|
inline bool is_printable(const std::string& str)
|
|
{
|
|
for (auto &c : str)
|
|
if (!is_printable(c))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
// return true if str contains at least one non-space control char
|
|
inline bool contains_non_space_ctrl(const std::string& str)
|
|
{
|
|
for (auto &c : str)
|
|
if (!is_space(c) && is_ctrl(c))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
// return true if str contains at least one space char
|
|
inline bool contains_space(const std::string& str)
|
|
{
|
|
for (std::string::const_iterator i = str.begin(); i != str.end(); ++i)
|
|
if (is_space(*i))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
// replace all spaces in string with rep
|
|
inline std::string replace_spaces(const std::string& str, const char rep)
|
|
{
|
|
std::string ret;
|
|
for (std::string::const_iterator i = str.begin(); i != str.end(); ++i)
|
|
{
|
|
char c = *i;
|
|
if (is_space(c))
|
|
c = rep;
|
|
ret += c;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
// replace all spaces in string with rep, reducing instances of multiple
|
|
// consecutive spaces to a single instance of rep and removing leading
|
|
// and trailing spaces
|
|
inline std::string reduce_spaces(const std::string& str, const char rep)
|
|
{
|
|
std::string ret;
|
|
bool last_space = true;
|
|
for (std::string::const_iterator i = str.begin(); i != str.end(); ++i)
|
|
{
|
|
char c = *i;
|
|
const bool space = is_space(c);
|
|
if (is_space(c))
|
|
c = rep;
|
|
if (!(space && last_space))
|
|
ret += c;
|
|
last_space = space;
|
|
}
|
|
if (last_space && !ret.empty())
|
|
ret.pop_back();
|
|
return ret;
|
|
}
|
|
|
|
// generate a string with spaces
|
|
inline std::string spaces(int n)
|
|
{
|
|
std::string ret;
|
|
ret.reserve(n);
|
|
while (n-- > 0)
|
|
ret += ' ';
|
|
return ret;
|
|
}
|
|
|
|
// indent a multiline string
|
|
inline std::string indent(const std::string& str, const int first, const int remaining)
|
|
{
|
|
std::string ret = spaces(first);
|
|
for (auto &c : str)
|
|
{
|
|
ret += c;
|
|
if (c == '\n')
|
|
ret += spaces(remaining);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
// replace instances of char 'from' in string with char 'to'
|
|
inline std::string replace_copy(const std::string& str, const char from, const char to)
|
|
{
|
|
std::string ret;
|
|
ret.reserve(str.length());
|
|
for (auto &c : str)
|
|
ret.push_back(c == from ? to : c);
|
|
return ret;
|
|
}
|
|
|
|
// return true if str is empty or contains only space chars
|
|
inline bool is_empty(const std::string& str)
|
|
{
|
|
for (const auto& c : str)
|
|
if (!is_space(c))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
// return true if str is empty or contains only space chars
|
|
inline bool is_empty(const char *str)
|
|
{
|
|
if (!str)
|
|
return true;
|
|
char c;
|
|
while ((c = *str++) != '\0')
|
|
if (!is_space(c))
|
|
return false;
|
|
return true;
|
|
}
|
|
|
|
// convert \n to \r\n
|
|
inline std::string unix2dos(const std::string& str, const bool force_eol=false)
|
|
{
|
|
std::string ret;
|
|
bool last_char_was_cr = false;
|
|
|
|
ret.reserve(str.length() + str.length() / 8);
|
|
for (std::string::const_iterator i = str.begin(); i != str.end(); ++i)
|
|
{
|
|
const char c = *i;
|
|
if (c == '\n' && !last_char_was_cr)
|
|
ret += '\r';
|
|
ret += c;
|
|
last_char_was_cr = (c == '\r');
|
|
}
|
|
if (force_eol)
|
|
add_trailing_crlf(ret);
|
|
return ret;
|
|
}
|
|
|
|
// Split a string on sep delimiter. The size of the
|
|
// returned string list will be at most maxsplit + 1.
|
|
inline std::vector<std::string> split(const std::string& str,
|
|
const char sep,
|
|
const int maxsplit = -1)
|
|
{
|
|
std::vector<std::string> ret;
|
|
int nterms = 0;
|
|
std::string term;
|
|
|
|
for (auto &c : str)
|
|
{
|
|
if (c == sep && (maxsplit < 0 || nterms < maxsplit))
|
|
{
|
|
ret.push_back(std::move(term));
|
|
++nterms;
|
|
term = "";
|
|
}
|
|
else
|
|
term += c;
|
|
}
|
|
ret.push_back(std::move(term));
|
|
return ret;
|
|
}
|
|
|
|
inline std::string join(const std::vector<std::string>& strings,
|
|
const std::string& delim,
|
|
const bool tail=false)
|
|
{
|
|
std::string ret;
|
|
bool first = true;
|
|
for (const auto &s : strings)
|
|
{
|
|
if (!first)
|
|
ret += delim;
|
|
ret += s;
|
|
first = false;
|
|
}
|
|
if (tail && !ret.empty())
|
|
ret += delim;
|
|
return ret;
|
|
}
|
|
|
|
inline std::vector<std::string> from_argv(int argc, char *argv[], const bool skip_first)
|
|
{
|
|
std::vector<std::string> ret;
|
|
for (int i = (skip_first ? 1 : 0); i < argc; ++i)
|
|
ret.emplace_back(argv[i]);
|
|
return ret;
|
|
}
|
|
|
|
inline std::string trim_left_copy(const std::string& str)
|
|
{
|
|
for (size_t i = 0; i < str.length(); ++i)
|
|
{
|
|
if (!is_space(str[i]))
|
|
return str.substr(i);
|
|
}
|
|
return std::string();
|
|
}
|
|
|
|
inline std::string trim_copy(const std::string& str)
|
|
{
|
|
for (size_t i = 0; i < str.length(); ++i)
|
|
{
|
|
if (!is_space(str[i]))
|
|
{
|
|
size_t last_nonspace = i;
|
|
for (size_t j = i + 1; j < str.length(); ++j)
|
|
{
|
|
if (!is_space(str[j]))
|
|
last_nonspace = j;
|
|
}
|
|
return str.substr(i, last_nonspace - i + 1);
|
|
}
|
|
}
|
|
return std::string();
|
|
}
|
|
|
|
inline std::string to_upper_copy(const std::string& str)
|
|
{
|
|
std::string ret;
|
|
ret.reserve(str.length()+1);
|
|
for (const auto &c : str)
|
|
ret.push_back(std::toupper(static_cast<unsigned char>(c)));
|
|
return ret;
|
|
}
|
|
|
|
inline std::string to_lower_copy(const std::string& str)
|
|
{
|
|
std::string ret;
|
|
ret.reserve(str.length()+1);
|
|
for (const auto &c : str)
|
|
ret.push_back(std::tolower(static_cast<unsigned char>(c)));
|
|
return ret;
|
|
}
|
|
|
|
inline void trim(std::string& str)
|
|
{
|
|
str = trim_copy(str);
|
|
}
|
|
|
|
inline void trim_left(std::string& str)
|
|
{
|
|
str = trim_left_copy(str);
|
|
}
|
|
|
|
inline void to_lower(std::string& str)
|
|
{
|
|
str = to_lower_copy(str);
|
|
}
|
|
|
|
inline void to_upper(std::string& str)
|
|
{
|
|
str = to_upper_copy(str);
|
|
}
|
|
|
|
// Replace any subsequence of consecutive space chars containing
|
|
// at least one newline with a single newline char. If string
|
|
// is non-empty and doesn't include a trailing newline, add one.
|
|
inline std::string remove_blanks(const std::string& str)
|
|
{
|
|
std::string ret;
|
|
ret.reserve(str.length()+1);
|
|
|
|
std::string spaces;
|
|
bool in_space = false;
|
|
bool has_nl = false;
|
|
|
|
for (auto &c : str)
|
|
{
|
|
const bool s = is_space(c);
|
|
reprocess:
|
|
if (in_space)
|
|
{
|
|
if (s)
|
|
{
|
|
if (c == '\n')
|
|
has_nl = true;
|
|
spaces += c;
|
|
}
|
|
else
|
|
{
|
|
if (has_nl)
|
|
ret += '\n';
|
|
else
|
|
ret += spaces;
|
|
in_space = false;
|
|
has_nl = false;
|
|
spaces.clear();
|
|
goto reprocess;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (s)
|
|
{
|
|
in_space = true;
|
|
goto reprocess;
|
|
}
|
|
else
|
|
ret += c;
|
|
}
|
|
}
|
|
if (!ret.empty() && !ends_with_newline(ret))
|
|
ret += '\n';
|
|
return ret;
|
|
}
|
|
|
|
} // namespace string
|
|
|
|
} // namespace openvpn
|
|
|
|
#endif // OPENVPN_COMMON_STRING_H
|