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
311 lines
7.5 KiB
C++
311 lines
7.5 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_COMMON_REDIR_H
|
|
#define OPENVPN_COMMON_REDIR_H
|
|
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <cstring>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <errno.h>
|
|
|
|
#include <string>
|
|
#include <utility>
|
|
#include <memory>
|
|
#include <algorithm>
|
|
|
|
#include <openvpn/io/io.hpp>
|
|
|
|
#include <openvpn/common/exception.hpp>
|
|
#include <openvpn/common/scoped_fd.hpp>
|
|
#include <openvpn/common/tempfile.hpp>
|
|
#include <openvpn/common/pipe.hpp>
|
|
#include <openvpn/common/strerror.hpp>
|
|
|
|
namespace openvpn {
|
|
|
|
struct RedirectBase
|
|
{
|
|
OPENVPN_EXCEPTION(redirect_std_err);
|
|
virtual void redirect() = 0;
|
|
virtual void close() = 0;
|
|
virtual ~RedirectBase() {}
|
|
};
|
|
|
|
struct RedirectStdFD : public RedirectBase
|
|
{
|
|
virtual void redirect() noexcept override
|
|
{
|
|
// stdin
|
|
if (in.defined())
|
|
{
|
|
::dup2(in(), 0);
|
|
if (in() <= 2)
|
|
in.release();
|
|
}
|
|
|
|
// stdout
|
|
if (out.defined())
|
|
{
|
|
::dup2(out(), 1);
|
|
if (!err.defined() && combine_out_err)
|
|
::dup2(out(), 2);
|
|
if (out() <= 2)
|
|
out.release();
|
|
}
|
|
|
|
// stderr
|
|
if (err.defined())
|
|
{
|
|
::dup2(err(), 2);
|
|
if (err() <= 2)
|
|
err.release();
|
|
}
|
|
|
|
close();
|
|
}
|
|
|
|
virtual void close() override
|
|
{
|
|
in.close();
|
|
out.close();
|
|
err.close();
|
|
}
|
|
|
|
ScopedFD in;
|
|
ScopedFD out;
|
|
ScopedFD err;
|
|
bool combine_out_err = false;
|
|
};
|
|
|
|
class RedirectNull : public RedirectStdFD
|
|
{
|
|
public:
|
|
RedirectNull()
|
|
{
|
|
// open /dev/null for stdin
|
|
in.reset(::open("/dev/null", O_RDONLY, 0));
|
|
if (!in.defined())
|
|
{
|
|
const int eno = errno;
|
|
OPENVPN_THROW(redirect_std_err, "RedirectNull: error opening /dev/null for input : " << strerror_str(eno));
|
|
}
|
|
|
|
// open /dev/null for stdout
|
|
out.reset(::open("/dev/null", O_RDWR, 0));
|
|
if (!out.defined())
|
|
{
|
|
const int eno = errno;
|
|
OPENVPN_THROW(redirect_std_err, "RedirectNull: error opening /dev/null for output : " << strerror_str(eno));
|
|
}
|
|
combine_out_err = true;
|
|
}
|
|
};
|
|
|
|
class RedirectStd : public RedirectStdFD
|
|
{
|
|
public:
|
|
// flags shortcuts
|
|
static constexpr int FLAGS_OVERWRITE = O_CREAT | O_WRONLY | O_TRUNC;
|
|
static constexpr int FLAGS_APPEND = O_CREAT | O_WRONLY | O_APPEND;
|
|
static constexpr int FLAGS_MUST_NOT_EXIST = O_CREAT | O_WRONLY | O_EXCL;
|
|
|
|
// mode shortcuts
|
|
static constexpr mode_t MODE_ALL = 0777;
|
|
static constexpr mode_t MODE_USER_GROUP = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP;
|
|
static constexpr mode_t MODE_USER = S_IRUSR | S_IWUSR;
|
|
|
|
RedirectStd(const std::string& in_fn,
|
|
const std::string& out_fn,
|
|
const int out_flags = FLAGS_OVERWRITE,
|
|
const mode_t out_mode = MODE_ALL,
|
|
const bool combine_out_err_arg = true)
|
|
{
|
|
if (!in_fn.empty())
|
|
open_input(in_fn);
|
|
open_output(out_fn, out_flags, out_mode);
|
|
combine_out_err = combine_out_err_arg;
|
|
}
|
|
|
|
protected:
|
|
RedirectStd() {}
|
|
|
|
void open_input(const std::string& fn)
|
|
{
|
|
// open input file for stdin
|
|
in.reset(::open(fn.c_str(), O_RDONLY, 0));
|
|
if (!in.defined())
|
|
{
|
|
const int eno = errno;
|
|
OPENVPN_THROW(redirect_std_err, "error opening input file: " << fn << " : " << strerror_str(eno));
|
|
}
|
|
}
|
|
|
|
void open_output(const std::string& fn,
|
|
const int flags,
|
|
const mode_t mode)
|
|
{
|
|
// open output file for stdout/stderr
|
|
out.reset(::open(fn.c_str(),
|
|
flags,
|
|
mode));
|
|
if (!out.defined())
|
|
{
|
|
const int eno = errno;
|
|
OPENVPN_THROW(redirect_std_err, "error opening output file: " << fn << " : " << strerror_str(eno));
|
|
}
|
|
}
|
|
};
|
|
|
|
class RedirectTemp : public RedirectStd
|
|
{
|
|
public:
|
|
RedirectTemp(const std::string& stdin_fn,
|
|
TempFile& stdout_temp,
|
|
const bool combine_out_err_arg)
|
|
{
|
|
open_input(stdin_fn);
|
|
out = std::move(stdout_temp.fd);
|
|
combine_out_err = combine_out_err_arg;
|
|
}
|
|
|
|
RedirectTemp(const std::string& stdin_fn,
|
|
TempFile& stdout_temp,
|
|
TempFile& stderr_temp)
|
|
{
|
|
open_input(stdin_fn);
|
|
out = std::move(stdout_temp.fd);
|
|
err = std::move(stderr_temp.fd);
|
|
}
|
|
};
|
|
|
|
class RedirectPipe : public RedirectStdFD
|
|
{
|
|
public:
|
|
enum {
|
|
COMBINE_OUT_ERR = (1<<0), // capture combined stdout/stderr using a pipe
|
|
ENABLE_IN = (1<<1), // make a string -> stdin pipe, otherwise redirect stdin from /dev/null
|
|
IGNORE_IN = (1<<2), // don't touch stdin
|
|
IGNORE_OUT = (1<<3), // don't touch stdout
|
|
IGNORE_ERR = (1<<4), // don't touch stderr
|
|
};
|
|
|
|
struct InOut
|
|
{
|
|
std::string in;
|
|
std::string out;
|
|
std::string err;
|
|
};
|
|
|
|
RedirectPipe() {}
|
|
|
|
RedirectPipe(RedirectStdFD& remote,
|
|
const unsigned int flags_arg)
|
|
: flags(flags_arg)
|
|
{
|
|
// stdout
|
|
if (!(flags & IGNORE_OUT))
|
|
{
|
|
int fd[2];
|
|
Pipe::make_pipe(fd);
|
|
out.reset(cloexec(fd[0]));
|
|
remote.out.reset(fd[1]);
|
|
}
|
|
|
|
// stderr
|
|
if (!(flags & IGNORE_ERR))
|
|
{
|
|
combine_out_err = remote.combine_out_err = ((flags & (COMBINE_OUT_ERR|IGNORE_OUT)) == COMBINE_OUT_ERR);
|
|
if (!combine_out_err)
|
|
{
|
|
int fd[2];
|
|
Pipe::make_pipe(fd);
|
|
err.reset(cloexec(fd[0]));
|
|
remote.err.reset(fd[1]);
|
|
}
|
|
}
|
|
|
|
// stdin
|
|
if (!(flags & IGNORE_IN))
|
|
{
|
|
if (flags & ENABLE_IN)
|
|
{
|
|
int fd[2];
|
|
Pipe::make_pipe(fd);
|
|
in.reset(cloexec(fd[1]));
|
|
remote.in.reset(fd[0]);
|
|
}
|
|
else
|
|
{
|
|
// open /dev/null for stdin
|
|
remote.in.reset(::open("/dev/null", O_RDONLY, 0));
|
|
if (!remote.in.defined())
|
|
{
|
|
const int eno = errno;
|
|
OPENVPN_THROW(redirect_std_err, "error opening /dev/null : " << strerror_str(eno));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
void transact(InOut& inout)
|
|
{
|
|
openvpn_io::io_context io_context(1);
|
|
|
|
std::unique_ptr<Pipe::SD_OUT> send_in;
|
|
std::unique_ptr<Pipe::SD_IN> recv_out;
|
|
std::unique_ptr<Pipe::SD_IN> recv_err;
|
|
|
|
if (!(flags & IGNORE_IN))
|
|
send_in.reset(new Pipe::SD_OUT(io_context, inout.in, in));
|
|
if (!(flags & IGNORE_OUT))
|
|
recv_out.reset(new Pipe::SD_IN(io_context, out));
|
|
if (!(flags & IGNORE_ERR))
|
|
recv_err.reset(new Pipe::SD_IN(io_context, err));
|
|
|
|
io_context.run();
|
|
|
|
if (recv_out)
|
|
inout.out = recv_out->content();
|
|
if (recv_err)
|
|
inout.err = recv_err->content();
|
|
}
|
|
|
|
private:
|
|
// set FD_CLOEXEC to prevent fd from being passed across execs
|
|
static int cloexec(const int fd)
|
|
{
|
|
if (::fcntl(fd, F_SETFD, FD_CLOEXEC) < 0)
|
|
{
|
|
const int eno = errno;
|
|
OPENVPN_THROW(redirect_std_err, "error setting FD_CLOEXEC on pipe : " << strerror_str(eno));
|
|
}
|
|
return fd;
|
|
}
|
|
|
|
const unsigned int flags = 0;
|
|
};
|
|
}
|
|
|
|
#endif
|