Squashed 'OpenVPN Adapter/Vendors/openvpn/' changes from 098fd412a..e6d68831a

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

openvpn/server/listenlist.hpp

@@ -44,6 +44,9 @@ namespace openvpn {
 	SSLUnspecified,
 	SSLOn,
 	SSLOff,
+#ifdef OPENVPN_POLYSOCK_SUPPORTS_ALT_ROUTING
+	AltRouting,
+#endif
       };
 
       std::string directive;
@@ -60,10 +63,22 @@ namespace openvpn {
 	if (!proto.is_local())
 	  ret += ' ' + port;
 	ret += ' ' + std::string(proto.str()) + ' ' + openvpn::to_string(n_threads);
-	if (ssl == SSLOn)
-	  ret += " ssl";
-	else if (ssl == SSLOff)
-	  ret += " !ssl";
+	switch (ssl)
+	  {
+	  case SSLUnspecified:
+	    break;
+	  case SSLOn:
+	    ret += " ssl";
+	    break;
+	  case SSLOff:
+	    ret += " !ssl";
+	    break;
+#ifdef OPENVPN_POLYSOCK_SUPPORTS_ALT_ROUTING
+	  case AltRouting:
+	    ret += " alt";
+	    break;
+#endif
+	  }
 	return ret;
       }
 
@@ -192,6 +207,10 @@ namespace openvpn {
 			  }
 			else if (ssl_qualifier == "!ssl")
 			  e.ssl = Item::SSLOff;
+#ifdef OPENVPN_POLYSOCK_SUPPORTS_ALT_ROUTING
+			else if (ssl_qualifier == "alt")
+			  e.ssl = Item::AltRouting;
+#endif
 			else
 			  OPENVPN_THROW(option_error, e.directive << ": unrecognized SSL qualifier");
 		      }

openvpn/server/manage.hpp

@@ -87,6 +87,9 @@ namespace openvpn {
 				 const std::string* username,
 				 const bool challenge,
 				 const bool throw_on_error) = 0;
+
+      // notify of local user properties update
+      virtual void userprop_local_update() = 0;
     };
 
     // Base class for the client instance receiver.  Note that all
@@ -113,6 +116,9 @@ namespace openvpn {
       // send control channel message
       virtual void post_cc_msg(BufferPtr&& msg) = 0;
 
+      // schedule a low-level connection disconnect in seconds
+      virtual void schedule_disconnect(const unsigned int seconds) = 0;
+
       // set up relay to target
       virtual void relay(const IP::Addr& target, const int port) = 0;
 

openvpn/server/servproto.hpp

@@ -327,12 +327,12 @@ namespace openvpn {
 			       const AuthCert::Ptr& auth_cert) override
       {
 	constexpr size_t MAX_USERNAME_SIZE = 256;
-	constexpr size_t MAX_PASSWORD_SIZE = 256;
+	constexpr size_t MAX_PASSWORD_SIZE = 16384;
 
 	if (get_management())
 	  {
 	    AuthCreds::Ptr auth_creds(new AuthCreds(Unicode::utf8_printable(username, MAX_USERNAME_SIZE|Unicode::UTF8_FILTER),
-						    Unicode::utf8_printable(password, MAX_PASSWORD_SIZE|Unicode::UTF8_FILTER),
+						    Unicode::utf8_printable(password, MAX_PASSWORD_SIZE|Unicode::UTF8_FILTER|Unicode::UTF8_PASS_FMT),
 						    Unicode::utf8_printable(peer_info, Unicode::UTF8_FILTER|Unicode::UTF8_PASS_FMT)));
 	    ManLink::send->auth_request(auth_creds, auth_cert, peer_addr);
 	  }
@@ -512,6 +512,15 @@ namespace openvpn {
 	set_housekeeping_timer();
       }
 
+      virtual void schedule_disconnect(const unsigned int seconds)
+      {
+	if (halt || did_client_halt_restart)
+	  return;
+	Base::update_now();
+	disconnect_in(Time::Duration::seconds(seconds));
+	set_housekeeping_timer();
+      }
+
       virtual void post_cc_msg(BufferPtr&& msg) override
       {
 	if (halt || !Base::primary_defined())
@@ -621,6 +630,7 @@ namespace openvpn {
 	    else
 	      {
 		housekeeping_timer.cancel();
+		housekeeping_schedule.reset();
 	      }
 	  }
       }