Archives/SSLproxy
2
0
Fork 0
mirror of https://github.com/sonertari/SSLproxy synced 2024-11-06 09:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
528 Commits 2 Branches 27 Tags 3.1 MiB
0b5ef8b14d
Commit Graph

528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Soner Tari
0b5ef8b14d Mark critical errors as CRITICAL 2017-08-21 17:53:24 +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
36c89a0314 Fix crash if no logging enabled 
Disable debug, the default now
 2017-08-11 16:53:46 +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
9e637dd2cc Clean-up 2017-08-01 16:05:25 +03:00
Soner Tari
1ae732f533 There are 3 dst bevs, writecbs of all of them may fire before connected event, so call eventcb first when that happens for each dst bevs. 
Check if srv_dst bev is NULL or not: Since both eventcb and writecb for srv_dst are enabled, either eventcb or writecb may get a NULL srv_dst bev, causing a crash with signal 10.
Remove unnecessary evutil_closesocket() calls, they could close the fds twice, causing conn stalls
 2017-08-01 14:57:49 +03:00
Soner Tari
5a136b7ce7 Add extra stats 
Rearrange, clean-up
 2017-07-30 00:34:46 +03:00
Soner Tari
cea873e6f2 Set the OPENBSD directive at compile time 2017-07-29 01:15:39 +03:00
Soner Tari
b6d1d92990 Fix use after free, other.bev may be NULL 2017-07-28 21:15:22 +03:00
Soner Tari
d35e9af521 Fix use after free, other.bev may be NULL 2017-07-28 16:43:26 +03:00
Soner Tari
dd7bf7b277 Fix srv_dst EOF on outbound connection before connection establishment, free conn, also move i/o debug lines to prevent segfault due to already freed srv_dst 
Remove squid header lines only in children
 2017-07-28 12:52:53 +03:00
Soner Tari
2411f79582 Add plain or ssl info to SSLproxy specific header line 
Fix child eof bug
Flickr keeps redirecting to https with 301 unless we remove the Via line of squid, so apparently flickr assumes the existence of Via header field or squid keyword a sign of plain http, even if we are using https
Also do not send the loopback address to the Internet
Other fixes
 2017-07-27 17:50:45 +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
3958adce9e Replace string manipulation functions with memory functions, simplify, clean-up 2017-07-23 16:44:32 +03:00
Soner Tari
378c8c03ef Fix/improve logging, clean-up 2017-07-23 01:15:59 +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
Soner Tari
26cbefa3a4 Use inet_ntop() instead of inet_ntoa() 
Fix compiler warnings
 2017-07-22 13:52:40 +03:00
Soner Tari
34665cf3c7 Refactor for code reuse, clean-up 
Fix drive.google issue: Watermark disable mistake
 2017-07-22 00:44:12 +03:00
Soner Tari
bc55a5f7bb Import sslsplit code for errorcb ERROR event, and improvements 2017-07-21 13:46:44 +03:00
Soner Tari
63c51e9edd Fix packet size 2017-07-21 00:44:21 +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
74c2e18e43 BEV_OPT_DEFER_CALLBACKS seems responsible for the issue with srv_dst, libevent acts as if we call event connect() ourselves. See: Launching connections on socket-based bufferevents at http://www.wangafu.net/~nickm/libevent-book/Ref6_bufferevent.html. So enable writecb and assume write event as CONNECTED too. 2017-07-17 12:47:42 +03:00
Soner Tari
72687803e1 Fix multithreading, potential NULL retval, and other refactoring issues 
Fix clean-up after errors
 2017-07-16 17:10:18 +03:00
Soner Tari
5aae8fa320 Detach while freeing parent ctx, because we attach while creating the parent ctx, this should fix a signal 10 crash 2017-07-16 02:22:35 +03:00
Soner Tari
e013eadf23 Make child eventcb more similar to parent's eventcb 
Re-enable closing srv_dst, TCP conns still stall even without it
 2017-07-15 23:42:22 +03:00
Soner Tari
a23d3ecb7b Closing srv_dst causes TCP conns to stall sometimes (SSL cons were ok), so disabled for now 
Make eventcb more similar to original sslsplit code
 2017-07-15 21:51:20 +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
133584361f Rename and clean-up 2017-07-13 00:45:12 +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
fc60db0e74 Disable the workaround for dst connection issues, NULL r/w cbs 
Reduce the conn timeout to 30s again
 2017-07-10 22:08:44 +03:00
Soner Tari
85875be00f Sometimes dst write cb fires but not event cb, especially if the listener cb is not finished yet, so the conn stalls. This is a workaround for this error condition, nothing else seems to work. 
Clean-up
 2017-07-10 17:26:58 +03:00
Soner Tari
590a693998 Rearrange and clean-up 2017-07-10 15:48:57 +03:00
Soner Tari
e8332f11cf Make conn termination more similar to orig sslsplit code 
Free child info struct of a deleted child
Rename, rearrange, and clean-up
 2017-07-10 12:27:46 +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
Soner Tari
e3266cc811 Fix closing fd2 when uninit, i.e. fd2=0, which was freeing stdin 
Clean-up and improvements
 2017-07-06 15:38:32 +03:00
Soner Tari
8ad3b5db25 Defer all e2 setup until after parent is connected 
Clean-up and improvements
 2017-07-06 01:58:21 +03:00
Soner Tari
6975175117 Defer e2 setup until after parent is connected, to prevent multithreading issues 
Refactoring, improvements
 2017-07-05 22:32:10 +03:00
Soner Tari
4d88906d24 Clean up and improve 2017-07-04 18:13:34 +03:00
Soner Tari
4f6b207e57 Improve conn termination: Close children asap if there is no parent, close parent asap if there is no child 2017-07-04 12:28:04 +03:00
Soner Tari
ad1f95e465 Remove conn mutexes: Use thrmgr mutex during attach/detatch only, do eveything in the same thread, do not touch the other threads 
Flex, fix, and improve conn termination: Make it more similar to orig sslsplit code
Fix issues, and clean-up
 2017-07-04 02:12:17 +03:00
Soner Tari
ecfaf24614 Add more child info to conns list, and clean-up 2017-07-02 17:47:26 +03:00
Soner Tari
5047df8cba Fix some of the compiler warnings, rearrange, and clean-up 2017-07-01 23:17:45 +03:00