Soner Tari
6f37661772
Enable user auth for all supported protos or proxyspec types
2019-03-06 01:09:02 +03:00
Soner Tari
fcd24a2cbe
Do not terminate redirected connection until src outbuf is empty, otherwise 302 redirection may not have been sent yet
2019-03-05 19:11:08 +03:00
Soner Tari
1f451aa04d
Change user db table name to users, change mac column name to ether
...
Clean up
2019-03-02 03:44:14 +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
670f609d7a
Refactor logging code and fix memory leak
2018-11-30 14:28:51 +03:00
Soner Tari
77b81aa45f
Fix travis osx build
2018-11-03 18:50:49 +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
12ecc96648
Assume co-ownership of refactored and new pxy and proto source files by adding copyright line below the original copyright line
2018-10-30 12:42:52 +03:00
Soner Tari
87eb6ce004
Move conn end free function callback to conn end struct, proto ctx should not keep track of such conn end details, conn end should know which function to be called to free itself, we may have different protos on different ends of the same conn
...
Improve and clean up
2018-10-29 21:38:42 +03:00
Soner Tari
ca959ca391
Do not call topmost callback functions directly, use them in bufferevent setup only, otherwise can possibly cause double free of ctx
...
Run preexec and postexec logging and/or stats code when calling interface callback functions directly, they are mostly called in edge cases, but otherwise we would miss related logs and/or stats
2018-10-28 23:51:22 +03:00
Soner Tari
cd78d881c8
Fix passthrough mode double free crash and free any/all data of previous proto asap
...
Improve and clean up
2018-10-23 04:02:00 +03:00
Soner Tari
e8e8071772
Defer conn free until the exit code of topmost callback functions, for both parent and child connections, this is necessary to handle error conditions correctly and terminate connections gracefully
...
So introduce term flags in ctx and replace free functions with term functions to raise the term flag, this approach enables us to terminate connection anywhere in the code without causing use after free crashes
Improve and clean up
2018-10-22 23:13:42 +03:00
Soner Tari
c085cafe0f
Rename srv_dst to srvdst
...
Clean up
2018-10-22 16:12:07 +03:00
Soner Tari
adb99db518
Handle out of memory conditions correctly
...
Do not do anything else with ctx while returning from topmost callback functions if it is freed
Rename functions, improve, and clean up
2018-10-22 15:30:18 +03:00
Soner Tari
c91d569723
Improve debug logging, log proto name on connect/disconnect
...
Rename vars and functions
Improve and clean up
2018-10-21 00:25:01 +03:00
Soner Tari
1374d37722
Decouple stats from proto code
...
Move connect logging to the topmost callback functions, amap
Improve and clean up
2018-10-20 15:29:51 +03:00
Soner Tari
0c2d12f35d
Decouple connect logging from proxy code
...
Improve and clean up
2018-10-20 02:03:21 +03:00
Soner Tari
13040639b7
Add static and NONNULL attrib
...
Rename, improve, and clean up
2018-10-18 02:00:49 +03:00
Soner Tari
f681b31497
Decouple ssl from tcp and other protocols
...
Improve and clean up
2018-10-17 16:28:21 +03:00
Soner Tari
0c55600ec7
Move ssl proto to its own file, but still needs more refactoring to decouple ssl from other protocols, especially tcp
...
Rename and clean up
2018-10-16 03:37:07 +03:00
Soner Tari
8fc9b0a44d
Move tcp proto to its own file
...
Rename and clean up
2018-10-16 01:51:07 +03:00
Soner Tari
b10643908f
Move passthrough proto to its own file
...
Rename and clean up
2018-10-15 19:22:27 +03:00
Soner Tari
bb0afcfee6
Introduce ssl ctx, complete all protocol setup, so remove function tables and related code
...
Fix header string alloc and insert
Other improvements, fixes, and clean-up
2018-10-15 13:42:40 +03:00
Soner Tari
429c4c7a32
Refactor for code reuse
...
Clean up
2018-10-12 21:59:16 +03:00
Soner Tari
c25e1ca0f5
Refactor child conns and autossl
...
Other fixes and improvements
2018-10-12 00:07:30 +03:00
Soner Tari
8aae4c1125
Separate http protocol from proxy code and move http related functions to protohttp source files
...
Introduce protocol context, and set http protocol up using http context and interface functions in http protocol driver, the rest of the protocols still runs on callback function tables
Refactor for further short functions
Other fixes and improvements
2018-10-08 21:42:49 +03:00
Soner Tari
96254a65ae
Refactor for fd_readcb_funcs and conn_connect_funcs tables, better enum names
2018-10-06 03:24:14 +03:00
Soner Tari
1eb4789e8c
Use callback function tables, instead of if-else statements to run parent callback functions, fifth iteration
2018-10-05 04:56:05 +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
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
b064ffa668
Use llu int as unique conn id, much simpler than uuid
2017-10-26 20:10:36 +03:00
Soner Tari
137f017cb5
Fix EXPIRED message bug, other fixes and improvements
2017-10-26 18:57:46 +03:00
Soner Tari
a1c5d05143
Add support for log priority to error logs, so syslogd prints the correct prio for error logs now
2017-10-15 01:39:30 +03:00
Soner Tari
ea6dc07248
Rename to sslproxy
...
Reduce http headers to just one SSLproxy line
2017-08-11 15:01:51 +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
5a136b7ce7
Add extra stats
...
Rearrange, clean-up
2017-07-30 00:34:46 +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
378c8c03ef
Fix/improve logging, clean-up
2017-07-23 01:15:59 +03:00
Soner Tari
f38163f7ed
Code reuse, improvements, clean-up
2017-07-20 17:55:00 +03:00
Soner Tari
f38c3b4552
Enable HTTP code, needs extensive refactoring and clean-up
2017-07-18 22:07:29 +03:00
Soner Tari
1b9a192947
Remove recursion while freeing children, parent frees children in a loop now
...
Improve, simplify, clean-up
2017-07-15 13:04:13 +03:00
Soner Tari
ae35623c15
Remove meta ctx completely
...
Fix issues
2017-07-15 04:07:42 +03:00
Soner Tari
09e1c858b9
Refactoring to remove mctx
2017-07-14 22:34:15 +03:00
Soner Tari
496a4f090d
Refactoring: Simplify, reduce, rearrange, rename, and clean-up
...
Get rid of now unnecessary child info struct and functions
2017-07-12 22:37:36 +03:00
Soner Tari
d7094d7138
Refactoring: Simplify, reduce, rearrange, rename, and clean-up
...
Got rid of now unnecessary pxy_conn_is_ready_to_free*() functions
Got rid of now unnecessary duplicate child and parent free functions: pxy_*_conn_free()
Fix error handling
2017-07-12 16:46:51 +03:00
Soner Tari
1a446cd243
Refactoring: Create child ctx
...
Rearrange, clean-up
2017-07-12 01:45:15 +03:00
Soner Tari
590a693998
Rearrange and clean-up
2017-07-10 15:48:57 +03:00
Soner Tari
d6e1ed2cef
Fix a potential issue which could forward a packet without any SSL proxy address
...
Rename, rearrange, and clean-up
2017-07-07 17:18:01 +03:00