Commit Graph

79 Commits

Author SHA1 Message Date
Soner Tari
009fe9f6ad Merge sslsplit develop changes 2019-08-08 12:23:04 +03:00
Soner Tari
52802b6291 Add new opts tests 2019-08-02 13:21:01 +03:00
Soner Tari
fc153338ca Free tmp strs used to clone global opts into proxyspecs asap
Fix English
2019-07-31 14:46:04 +03:00
Soner Tari
1a7dc673bf Fix libressl macros: OPENSSL_VERSION_NUMBER on OpenBSD is always 0x20000000L (> 0x10100000L) 2019-07-31 01:41:24 +03:00
Soner Tari
6cdec55509 Enable Force/Min/MaxSSLProto options with LibreSSL 2.7.2+ (OpenBSD 6.3) 2019-07-31 00:25:57 +03:00
Soner Tari
001420a7ab Fix travis and OpenBSD builds 2019-07-30 23:08:24 +03:00
Soner Tari
231806ea75 Add MinSSLProto/MaxSSLProto options
Fix memout handling
2019-07-30 21:46:18 +03:00
Soner Tari
b9b1744568 Fix str var free in passsite_str 2019-07-25 21:24:30 +03:00
Soner Tari
fdcf138150 Put option dbg logs in between DEBUG_OPTS macro
Assume ownership of further code
Clean up
2019-07-23 12:55:06 +03:00
Soner Tari
8484c8b927 Fix handling of proxyspec struct closing brace 2019-07-12 22:36:52 +03:00
Soner Tari
f42e682f59 Fix unit tests 2019-07-12 15:52:36 +03:00
Soner Tari
58eb907d69 Separate global and proxyspec opts 2019-07-12 14:40:04 +03:00
Soner Tari
d6f0f4cdc7 Create proxyspec options 2019-07-08 21:49:06 +03:00
Soner Tari
a7d671169c Fix handling of HTTP Accept-Encoding 2019-06-18 10:23:50 +03:00
Soner Tari
d1a3328c58 Differentiate PassSite option from Passthrough option: PassSite does not require Passthrough now
Remove redundant if conditions
2019-05-02 19:06:48 +03:00
Soner Tari
26a73d797d Fix passsite struct free 2019-04-21 01:46:40 +03:00
Soner Tari
c3abe74776 Add client filtering to PassSite option, per site filters can be defined using client IP addresses, users, and description keywords 2019-04-21 01:00:46 +03:00
Soner Tari
7e8fcbcafa Move strncpy() call from passsite matching to initial PassSite setup 2019-04-19 04:21:41 +03:00
Soner Tari
ddeb9831ed Add PassSite option, if the site matches SNI or common names in the SSL certificate, the connection is passed through the proxy, issue #12 2019-04-19 01:17:41 +03:00
Soner Tari
9275315541 Add OpenFilesLimit option, use 50-10000, so user does not need to modify system-wide value now 2019-03-27 14:23:18 +03:00
Soner Tari
074e5d6400 Add LeafKeyRSABits option for user to change leaf key RSA keysize in bits, so it can be set to 1024|2048|3072|4096 now 2019-03-27 03:07:36 +03:00
Soner Tari
0d49ba56db Enable user auth support on Linux 2019-03-09 18:17:05 +03:00
Soner Tari
b6f2203495 Validate proxyspec protocols http, pop3, and smtp 2019-03-07 23:14:53 +03:00
Soner Tari
c37bcc6de1 Add UserDBPath and UserTimeout options 2019-03-02 02:52:48 +03:00
Soner Tari
cde3fbca3f Redirect user to login page and redirect again to orig target after successful authentication, currently supported only on OpenBSD
Get ethernet address and compare with the one in userdb, on each conn setup
Create user_auth options
Rename and clean-up
2019-03-01 02:08:24 +03:00
Soner Tari
304207e9e9 Add initial user database support using sqlite3 2019-02-16 17:29:14 +03:00
Soner Tari
e132b12d79 Support remote listening programs using ua and ra proxyspec options, address of remote listening program that decrypted packets are diverted to and address SSLproxy is listening for returned packets from remote listening program, respectively 2019-01-06 18:09:17 +03:00
Soner Tari
70a22f4515 Do not break the event loop if out of fds, instead properly check all retvals of libevent functions
So remove getdtable*() solution
2018-11-30 02:49:37 +03:00
Soner Tari
52d37297b6 Update with sslsplit develop changes, especially content logging
Change SIGHUP to behave like SIGUSR1
2018-11-03 18:23:31 +03:00
Soner Tari
2f0e574f09 Fix autossl, but Evolution client sometimes does not send ehlo, especially after user rejects self-signed cert, which needs further investigation
And other improvements
2018-10-21 22:01:46 +03:00
Soner Tari
a314be6e94 Add conn context and is_child fields to proxy context struct to get rid of extra function params and to simplify conditionals
Remove redundant parent/conn pointer vars
Use conn instead of parent amap
2018-09-23 02:02:15 +03:00
Soner Tari
9213734c95 Enable header insertion for tcp and ssl proxspecs as well, reported by @Sfinx
Remove redundant mail field of proxyspec
2018-09-22 02:34:25 +03:00
Soner Tari
d2e9ab4487 Merge sslsplit-develop changes 2018-09-15 02:51:26 +03:00
Soner Tari
a584363f62 Add defined(LIBRESSL_VERSION_NUMBER) directives to fix signal 6 and 10 crashes: LibreSSL versions up to v2.7.4 behave like OPENSSL_VERSION_NUMBER < 0x1000200fL, beware not just OPENSSL_VERSION_NUMBER < 0x10100000L
Fix up:port af, use a different var, because utm port af is always AF_INET, and it breaks the target address af if the listening address is AF_INET6
Enable -O2 C flag, because LibreSSL is compiled with -O2 too
2018-08-22 22:48:55 +03:00
Soner Tari
0c8348db75 Merge sslsplit develop changes 2018-08-03 23:36:51 +03:00
Soner Tari
e8054deed3 Set option defaults in opts_new() now
Use bit instead of int for boolean options
2018-08-03 17:14:21 +03:00
Soner Tari
7ac3e0a445 Remove most of defined(LIBRESSL_VERSION_NUMBER), LibreSSL behaves more like OPENSSL_VERSION_NUMBER >= 0x10100000L now 2018-08-03 16:07:54 +03:00
Soner Tari
5a4b8974bf Add fall through comment for missing break in case statement, as gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 complains about it now
Break out of for loop if max token is reached
2018-08-01 21:38:12 +03:00
Soner Tari
ee3278d2bb Fix a possible memory corruption due to incorrect size allocation for argv 2018-05-10 21:13:53 +03:00
Soner Tari
27650fab69 Support all command line options in the conf file as well
Update with the latest sslsplit-devel changes
2018-05-09 20:05:29 +03:00
Soner Tari
5bba07b27f Use SSL_CTX_set_min_proto_version() and SSL_CTX_set_max_proto_version() functions to force SSL/TLS protocol version for OpenSSL 1.1.0+ 2018-03-16 12:12:48 +03:00
Soner Tari
9d435e180c Update with SSLsplit 0.5.2 and develop branch changes as of 270218 2018-02-27 22:20:58 +03:00
Soner Tari
4c8831bd90 Update with SSLsplit 0.5.1 changes, fix LibreSSL version issues
Add VerifyPeer and AllowWrongHost options
2018-01-18 03:18:53 +03:00
Soner Tari
4fceaaa0e9 Fix compiler warning
Rename the man page for the ports package
2017-08-22 02:02:30 +03:00
Soner Tari
9ec58f821b Changes needed while adding SSL proxy support to WUI
Separate mail/mails to pop3/pop3s/smtp/smpts for statistics
Write connect logs to syslog too, for statistics
Fix log lines for statistics, remove fds from err logs
2017-08-20 01:46:57 +03:00
Soner Tari
7748e3ec1b Add conf file support, with -f command line option, supports a subset of all possible options 2017-08-16 16:01:52 +03:00
Soner Tari
1a6eab50a5 Tidy and clean logs up
Add DEBUG_PROXY directive around all log_dbg_level_printf() and related lines
Log stats to syslog, similar to error logs, so that it is simpler to rotate and parse
-O w/o -g is failing bufferevent_socket_connect for parent dst, so either enable -O w/ -g, or disable -O w/o -g (-O2 is failing too)
Refactoring
2017-08-13 04:36:33 +03:00
Soner Tari
4bfc85868b Add support for pop3 (p3scan pop3 proxy)
Send sslproxy info only once, in the first packet only
Clean-up
2017-08-03 14:55:57 +03:00
Soner Tari
67ddee1585 Import sslsplit-devel changes
Add stats logs, initial
Add SSLproxy_SrcAddr header field
Clean-up
2017-07-25 16:07:39 +03:00
Soner Tari
5a496d04e0 Make utm service port spec a command line option
Check NULL retvals, clean-up
2017-07-22 16:30:40 +03:00