Commit Graph

1096 Commits

Author SHA1 Message Date
Soner Tari
b5944cc190 Fix split mode proxy specifications on the command line
Split mode structured proxy specifications were fine.
2021-09-14 13:01:03 +03:00
Soner Tari
c63309c766 Fix the precedence of multiple divert options used in conf file
The Divert option is not equivalent to the command line -n option.
Also, move the global static split var to tmp struct removed after
config is finished.
2021-09-14 12:41:57 +03:00
Soner Tari
9dae032c71 Fix the precedence of split mode set by -n option
Global split mode set by the -n option overrides the divert options of
all proxyspecs.
2021-09-14 00:15:43 +03:00
Soner Tari
5b435515e3 Fix handling of Divert option and Divert filtering rules 2021-09-13 23:44:17 +03:00
Soner Tari
8d752b4d31 Add documentation for filtering rules
Also bump version to 0.8.7
2021-09-13 23:10:41 +03:00
Soner Tari
99c852972e Implement filter actions
- SSL and Dst Host filters can take all of the actions.

- HTTP filter can only take block action, not divert, split, or pass.
Because, we cannot tear a conn down and reconnect its src, after the
processing of HTTP request header is complete, e.g. SSLproxy line has
already been added to its dst buffer. Also, any change in child conns
would affect listening programs too.

- The precedence of filters is as Dst Host > SSL > HTTP.

- The precedence of actions is as Divert > Split > Pass > Block. This is
only for the same type of filter.

- The precedence of match sites is as sni > cn for ssl filter and host >
uri for http filter.

For example, pass action of dst host filter is taken before split action
of ssl filter, due to the precedence order of filters.

For example, pass action of sni site is taken before split action of cn,
due to the precedence order of sites.

We now create src ssl before enabling src to be able to take divert or
split actions of SSL filter. Otherwise, we wouldn't be able to switch
between divert and split while enabling src, only pass or block action
could be taken at that stage.

Also, refactor and clean up.
2021-09-13 15:11:22 +03:00
Soner Tari
475a7ebcda Add Divert|Split|Pass|Block filtering rules
(Divert|Split|Pass|Block)
  ([from (
        user (username|*) [desc keyword]|
        ip (clientaddr|*)|
        *)]
    [to (
        sni (servername[*]|*)|
        cn (commonname[*]|*)|
        host (host[*]|*)|
        uri (uri[*]|*)|
        ip (serveraddr|*)|
        *)]
  |*)

Also, fix a couple of issues with filter rule handling
Clean up
2021-09-12 15:08:59 +03:00
Soner Tari
eb60fc9c1f Enclose equal macro in parentheses
Otherwise, we cannot and/or multiple equal macros or with certain other
conditions
2021-09-12 14:38:05 +03:00
Soner Tari
ff3bcab3f1 Add exact bit, do not add slashes around sites, avoid unnecessary strdups
Limit site len to 200
2021-09-11 11:53:32 +03:00
Soner Tari
85fb1bd214 Add new data structure for general filtering rules
Now PassSite rules are considered as pass rule and added to the new data
structure. PassSite option will be deprecated in the future.
2021-09-10 22:53:08 +03:00
Soner Tari
6a4a70bb06 Avoid strdup() and simplify passsite search
Also, improve code, tests, and documentation
2021-09-08 00:21:52 +03:00
Soner Tari
982880ccfe Restructure passsite filter data structure
Now we don't go over all of the passsite rules in a linked list trying
to apply passsite to the sni or common names of a conn. Instead, we now
have user+keyword, keyword, ip, and all lists. For example, if we find
the conn user in the user+keyword list and a passsite in that list
matches, we don't look into other lists.

This change is expected to improve the performance of passsite
processing considerably, because in the earlier implementation we had to
go over all of the passsite rules trying to match passsite.

And this solution uses a correct data structure, even if not the best.
For example, each user or keyword in passsite rules is strdup()'ed only
once.

Note that a better solution could use, say, a hash table for users,
instead of a linked list. But hash tables are not suitable for keywords
or sites, because we search for substring matches with them, not exact
matches.

Also, this fixes passsite rules without any filters defined, i.e. to be
applied to all connections.

Also, now e2e tests error exit if WITHOUT_USERAUTH is enabled. E2e tests
require UserAuth enabled.
2021-09-07 18:52:52 +03:00
Soner Tari
56237558cd Refactor protossl_pass_site() to reduce and decouple code for substring and exact search 2021-09-05 21:40:24 +03:00
Soner Tari
f2d4ef61c9 Add support for passsite substring match
Now the site field in PassSite option can have an '*' suffix to search
for a match anywhere in sni or common names. Note that this is not a
regex or wildcard search.

Previously, we only supported exact matches in sni and between slashes
in common names. This change makes it possible to cover multiple sites
in one PassSite option. In fact, without this change, certain sites
could not be added as passsite, because it was impossible to know their
subdomain names beforehand, for example *.fbcdn.net, which may have many
subdomain names in place of asterisk.

So to use substring match, append an '*' to a site name in PassSite
option (the asterisk is removed before substring search). For example,
use ".fbcdn.net*" to match all subdomains of fbcdn.net, notice the
asterisk at the end.

We also add a warning log starting with "Closing on ssl error without
passsite match" to report sites that can be added as passsite, which is
expected to help in writing PassSite rules.

Also, we now set dstaddr_str earlier in conn handling, so we can print
it in debug logs. This also helps in IDLE and EXPIRED conn logs.
2021-09-05 00:48:37 +03:00
Soner Tari
9a7e2c35f3 Avoid multithreading issues by duping the site arg as a local var
If more than one thread enters protossl_pass_site() with the same
proxyspec, they all use spec->opts->passsites->site. Since
protossl_pass_site() modifies the site arg, spec->opts->passsites->site
may be broken. For example, /example.org/ may become /example.or//,
which really happened.
2021-09-04 15:48:45 +03:00
Soner Tari
d26c3fd079 Fix passsite in split mode
We should identify conn user before setting dst up in split mode.
Because in split mode dst setup also sets src up too, which tries to
apply passsite rules and switch to passthrough mode. But since user
identification has not run yet, we don't know the user owner of the
conn, which fails passsite rules.
2021-09-04 13:07:22 +03:00
Soner Tari
45b34678de Prepend sslproxy line using evbuffer_add_printf() in non-debug mode for non-http protos
This prevents unnecessary malloc and memmove calls in non-debug mode.
This change is for correctness not for speed, because it improves
conn handling only of the first packet and for non-http protos.
2021-09-03 22:21:40 +03:00
Soner Tari
74cf3800f2 Fix passthrough in split mode 2021-09-02 22:12:48 +03:00
Soner Tari
9123732739 Fix possible segfaults with srvdst_xferred, autossl and passthrough
- Fix segfault introduced in previous commit to prevent extra eof event.
We should NULL srvdst.bev after terminating child dst xferred from
srvdst of parent, so that we don't try to access srvdst.bev. This
happens if child conn with dst xferred from parent srvdst is terminated
before parent conn.

- Fix autossl crash trying to engage passthrough mode. We cannot engage
passthrough mode in autossl, because src is already enabled. But we
shouldn't crash either. These changes are expected to fix other possible
segfaults if passthrough is engaged on eventcb of a child conn.
2021-09-02 17:55:42 +03:00
Soner Tari
de9c85f65e Fix signal 11/10 crash due to a second eof event for srvdst in split mode
We reuse srvdst as dst or child dst, so srvdst == dst or child_dst.
But if we don't NULL the callbacks of srvdst in split mode,
we randomly but rarely get a second eof event for srvdst during conn
termination (especially on arm64), which crashes us with signal 11 or
10, because the first eof event for dst frees the ctx.
Note that we don't free anything here, but just disable callbacks and
events.
This does not seem to happen with srvdst_xferred, but just to be safe we
do the same for it too.
This seems to be an issue with libevent.

TODO: Why does libevent raise the same event again for an already
disabled and freed conn end? Note again that srvdst == dst or child_dst
here.
2021-08-31 17:51:43 +03:00
Soner Tari
3a9e77524e Report autossl in CONN logging not tcp at unencrypted stage of autossl
Currently, an autossl conn writes 3x CONN lines in connection logs,
when:

1. tcp srvdst connects (before ssl upgrade)
2. ssl dst connects (src ssl is not complete yet)
3. ssl src connects

This causes misleading connection statistics, as in UTMFW.

TODO: We should write CONN logs at conn termination times, for all
protos not just autossl, not tcp or ssl connect times, so that we don't
write multiple CONN logs for a single conn.
2021-08-30 13:43:20 +03:00
Soner Tari
69753b250c Add split mode of operation similar to SSLsplit
The -n command line option enables split mode for all proxyspecs,
effectively making sslproxy behave like sslsplit.
Divert option can be set/unset globally and per-proxyspec.
Add e2e tests for split mode, and update make file for tests
accordingly.
Update documentation accordingly.
Improve code reuse, remove duplicate functions.

This change deserves a release of its own, hence v0.8.4.
2021-08-29 17:31:05 +03:00
Soner Tari
a6cf55cffe Refactor ifdef directive for get_client_ether() call 2021-08-27 18:45:23 +03:00
Soner Tari
f8ada5100a Fix initialization of content logging in lp (issue #30)
readcb fires before connect eventcb, so we enable it in readcb now. But
perhaps lp should behave like sslproxy and not enable readcb until after
connect eventcb.

Note that there is no problem with sslproxy, it's just lp.
2021-07-17 16:13:50 +03:00
Soner Tari
1bb5bd2398 Improve UserAuth documentation 2021-06-22 11:49:41 +03:00
Soner Tari
41ec0045f5 Disable osx build on travis until xcode/xnu version fixed 2021-05-08 15:42:15 +03:00
Soner Tari
2b9cb937fd Improve documentation 2021-05-08 11:17:27 +03:00
Soner Tari
0bd1a414cb Fix libpcap install on macOS 10.13 2021-02-11 10:56:11 +03:00
Soner Tari
7ed4748d96 Fix clang warning due to -Wpointer-bool-conversion, remove NONNULL for list
pxyconn.c:1590:9: warning: comparison of nonnull parameter 'list' not
equal to a null pointer is 'true' on first encounter
2021-02-11 01:02:04 +03:00
Soner Tari
596aebb2f3 Update version to 0.8.3 and copyright year to 2021 2021-02-11 00:25:09 +03:00
Soner Tari
6b2072dc94 Fix formatting for -A option
Reported on sslsplit as https://github.com/droe/sslsplit/issues/287
2021-02-10 11:51:57 +03:00
Soner Tari
10f753c012 Remove delimiters around user names
Delimiter can be either or all of ",", " ", and "\t", and we don't allow
spaces in user names now
2020-12-25 15:20:01 +03:00
Soner Tari
cb28a1e12a Do not debug print proxyspecs in proxy_new() 2020-12-25 12:12:05 +03:00
Soner Tari
65b7fb9847 Reduce code for user lists 2020-12-25 02:26:09 +03:00
Soner Tari
66dddf2cdb Add info on IPv4-only features 2020-12-24 17:19:51 +03:00
Soner Tari
255cd1cd88 Separate make test as unit and e2e 2020-12-23 22:35:32 +03:00
Soner Tari
9c76563cee Fix mistake: return address -> divert address 2020-12-23 11:01:31 +03:00
Soner Tari
177f6a3b52 Improve overview 2020-12-22 00:56:34 +03:00
Soner Tari
def65e195c Update man page with README
Improve README
2020-12-20 18:04:43 +03:00
Soner Tari
f1e9de7386 Improve documentation 2020-12-20 15:40:28 +03:00
Soner Tari
f254ac1586 Add info on DivertUsers and PassUsers options 2020-12-18 00:04:23 +03:00
Soner Tari
aded848043 Release v0.8.2 2020-12-15 17:12:50 +03:00
Soner Tari
e2bf278933 Allow mirroring without explicit target
Allow omitting the -T option, indicating the target is irrelevant.

The use case is an IDS sensor listening on a dummy interface for the
packets sslsplit produces. The IDS will listen in promisc mode, so the
target is irrelevant.

Copied from sslsplit.
2020-12-14 17:45:22 +03:00
Soner Tari
463aa1a71e Fix doc typo 2020-12-14 16:23:06 +03:00
Soner Tari
151b305c2f Do not pass null arg to log_*_printf()
vfprintf %s NULL in "Error from bufferevent: %i:%s %lu:%i:%s:%i:%s:%i:%s
"
Error from bufferevent: 32:Broken pipe 50327584:32:Broken pipe:2:system
library:4095:(null)
2020-12-14 16:22:42 +03:00
Soner Tari
4c94853fc5 Disable UserAuth in main.mk if we are not on OpenBSD or Linux
Fixes osx build after updates to userauth
2020-11-14 13:08:29 +03:00
Soner Tari
80d10a94c3 Move classify_user into identify_user
Otherwise, we cannot classify user if we need to issue identify_user
events, in case database is busy or locked. We should call classify_user
callback right after the user is identified.
So we introduce classify_user callback to achieve that, which fixes the
classify_user behavior for autssl proto too.

Return void in pxy_userauth
Fix typo in clasify
2020-11-13 19:01:45 +03:00
Soner Tari
4f3ce763ac Add DivertUsers and PassUsers options
Update documentation
2020-11-13 13:03:29 +03:00
Soner Tari
6c0b981831 Update version to 0.8.1
Update TLS 1.3 documentation.
2020-09-08 14:33:25 +03:00
Soner Tari
4ee7bbcf15 Fix whitespace 2020-08-27 12:00:34 +03:00