Commit Graph

205 Commits

Author SHA1 Message Date
Soner Tari
5bc6933f79 Fix unit tests for libressl-2.2.7, libressl-2.7.4, and openssl-1.1.0 2021-11-14 01:17:33 +03:00
Soner Tari
c90f71f5ef Bump version to 0.9.2 2021-11-13 11:49:50 +03:00
Soner Tari
eba4eb3ea6 Fix syntax documentation for Log actions in struct filtering rules
And clean up
2021-11-13 10:57:16 +03:00
Soner Tari
677178c2d9 Fix use of uninitialised value error by valgrind 2021-11-10 20:42:13 +03:00
Soner Tari
2f2dd468f2 Free macros after setting filter rules during startup 2021-11-10 19:57:08 +03:00
Soner Tari
3003d237c7 Reflect the license change of aho corasick library to LGPL
Laurent Farhi, @farhiongit, the developer of the Aho Corasick library
has changed the license of the library to the LGPL. Thanks Laurent.
2021-11-09 11:59:29 +03:00
Soner Tari
3e55d4820e Release v0.9.1 2021-11-07 22:55:42 +03:00
Soner Tari
700a901e29 Add missing FilterRule option to proxyspec documentation 2021-11-07 18:47:56 +03:00
Soner Tari
dd4975690e Check if userdb file can be opened before setting userdb_path option 2021-11-07 18:13:54 +03:00
Soner Tari
5877e81301 Improve proxyspec documentation 2021-11-07 17:31:25 +03:00
Soner Tari
79bacaeff3 Fix definitely lost memleaks reported by valgrind
Fix a major memset() mistake leaking memory and possibly breaking CA
chains for proxyspecs and struct filtering rules.
Fix wrong memset size.
Fix redundant WUNRES attrib, MALLOC attrib has WUNRES already.
And fix param names.
2021-11-05 00:43:10 +03:00
Soner Tari
d07606b586 Add support for multi-site struct filtering rules
Now we can specify multiple sites in one struct rule: SNI, CN, Host,
URI, and DstIp destination sites. We create a new rule for each
destination site type specified. Struct rules can be complicated and
long, so this is expected to help with rule reuse.
2021-11-03 22:54:41 +03:00
Soner Tari
12f09dbb87 Add ReconnectSSL to debug logs 2021-11-03 03:04:45 +03:00
Soner Tari
45a4015707 Add checks for multiple or not allowed specs in struct filtering rules 2021-11-03 02:51:30 +03:00
Soner Tari
add8bcda09 Add line_num to filtering rules with DEBUG_PROXY
Error out unit tests if DEBUG_PROXY enabled, because we debug print
line_num if DEBUG_PROXY enabled. We cannot support line_num in expected
debug output, it would make things complicated with very little benefit.
2021-11-03 02:28:31 +03:00
Soner Tari
77df635afa Change line_num type to unsigned int 2021-11-02 19:27:45 +03:00
Soner Tari
feb673e8fa Add unit tests for struct proxyspecs 2021-11-02 03:40:39 +03:00
Soner Tari
eccd46dc0e Add support for multiple log actions on Log lines
But we don't support $macros within multi valued Log lines, i.e. cannot
mix log actions with $macros, use either log actions concat with spaces
or just a $macro, and no point trying to support it either.
2021-11-01 21:31:00 +03:00
Soner Tari
9708225bb1 Rename LogAction to Log 2021-11-01 20:48:24 +03:00
Soner Tari
a3c89fc931 Set conn_opts only if struct filtering rule specifies any conn option
Otherwise, we use the global or proxyspec conn options, so we should not
waste memory for duplicate conn_opts structs.
2021-11-01 18:44:36 +03:00
Soner Tari
8e00f94ccd Fix user/desc precedence in struct filtering rules
Don't forget tot increment precedence if only Desc is used.
But do not increment precedence twice for both User and Desc.
Note that the ordering of User and Desc in the rule is not known.
2021-11-01 18:20:23 +03:00
Soner Tari
775ae774ea Set conn term flag only, do not free conn in eventcb
Rename reconnected_ssl flag to reconnected
Improve e2e tests
2021-10-30 19:37:06 +03:00
Soner Tari
8f63ec7f82 Add ReconnectSSL option to enforce SSL options in struct filtering rules
The ReconnectSSL option allows rule developers to write struct filtering
rules using SNI and CN SSL specifications to override the SSL
configuration of a connection.

Otherwise, without this new option, filtering rules cannot change SSL
options using SSL filtering fields to match connections (the SSL config
in the rule would not have any effect on the server side of the matching
connection). Without ReconnectSSL, only DstIP and DstPort fields can be
used to override the SSL config of a connection.

If the ReconnectSSL option in a struct filtering rule is set, we
disconnect and free the server side of the matching SSL connection, and
reconnect it with the SSL options in the matching struct filtering rule.
This enforces the SSL config in the rule.

Do not use the ReconnectSSL option if server disconnect is not desirable
or acceptable in your case.
2021-10-30 16:27:13 +03:00
Soner Tari
e8f35ce587 Reapply dsthost filter after user auth
We have to apply the DstHost filter both (1) as early as in
pxy_conn_connect() and also (2) after user owner of the conn is
determined in srvdst connected callback functions for tcp and ssl.

Otherwise, we cannot override SSL options of conns if we don't apply it
before SSL establishment (1), and we cannot apply user auth filtering
rules if we don't apply after determining the user owner of conn (2).

This commit actually adds the same calls in the same places as they were
before the structured filtering rules were introduced.

So for example, now we have to apply filters 4x for an HTTPS conn: 2x
dsthost, 1x ssl, and 1x http.
2021-10-30 01:16:24 +03:00
Soner Tari
05d5412515 Fix warning for unused ctx debug param in pxy_conn_set_filter_action() 2021-10-29 22:56:24 +03:00
Soner Tari
98d9a05eac Add documentation for structured filtering rules 2021-10-29 22:49:18 +03:00
Soner Tari
6c586bb4a4 Add e2e tests for struct filtering rules, and add -B EnableSSLProto option
The EnableSSLProto option is useful with structured proxyspecs and
filtering rules.
2021-10-29 21:21:19 +03:00
Soner Tari
1485fa1dfb Fix copying of SSL options in tmp_opts
And clean up whitspace
2021-10-29 18:46:38 +03:00
Soner Tari
a3222ee2c1 Increment rule precedence only once for multiple LogAction specs
We allow for multiple LogAction lines in the same structured filtering
rule.
2021-10-29 02:00:28 +03:00
Soner Tari
18fb6f4dd7 Apply dstip filter before ssl server conn setup
So that we can replace the SSL/TLS configuration of the conn with the
one in the matching filtering rule. Otherwise, once the server conn is
established, we cannot change the SSL config, or would risk confusing
the SSL routines.
2021-10-29 01:18:09 +03:00
Soner Tari
6c988b0f4a Add structured filtering rules to specify conn options
Now all connection oriented proxy options possible to specify
per-proxyspec or globally can be specified in structured filtering rules
to be selectively applied to connections too. One line filtering rules
can specify filter and log actions only.

For example, we can enable/disable user authentication, protocol
validation, server ssl verification, and many other options
per-connection, or configure SSL/TLS connection options per-connection.

So, now we replace the conn_opts struct of a connection's ctx with the
conn_opts struct of the matching structured filtering rule. (One line
filtering rules have a NULL conn_opts, so we first check if the
conn_opts is not NULL.)
2021-10-28 23:33:53 +03:00
Soner Tari
14c8d417c9 Move connection oriented options to a new conn_opts struct 2021-10-26 19:08:00 +03:00
Soner Tari
396db70a87 Rename parent/child dst/src addrs to divert and return addrs 2021-10-26 14:46:10 +03:00
Soner Tari
07c3f08584 Release v0.9.0 2021-10-21 14:10:19 +03:00
Soner Tari
efc9f3175d Update version to 0.9.0 2021-10-16 20:49:53 +03:00
Soner Tari
b3aa278be2 Add missing documentation for MinSSLProto and MaxSSLProto options 2021-10-16 19:42:17 +03:00
Soner Tari
64640d7574 Fix build with LibreSSL 3.4.1 on OpenBSD 7.0 2021-10-14 23:34:53 +03:00
Soner Tari
42d84629f3 Add support for inline comments with #
Just trim the char # onwards from the start of value. So values cannot
have the char # in them.
2021-10-11 19:27:01 +03:00
Soner Tari
dff3f90c62 Add DEBUG_PROXY around debug func params 2021-10-08 01:17:50 +03:00
Soner Tari
f056f699c1 Add port option to all site specs, fix precedences in filtering rules
Now, all of the 'to' site fields in filtering rules can specify a port,
not just the dstip sites.

Fix the precedence of sites in the same type of rules. For example, if
we find a match with an sni site, we should not stop searching for a
match in cn, because a matching cn site may have a higher precedence
than the matching sni site. We should apply the action of the cn site,
although sni rules have precedence over cn. The same applies to http
host and uri rules too.

Fix the precedence of dstip rules.

Improve and update unit and e2e tests accordingly.
2021-10-07 22:22:23 +03:00
Soner Tari
114f01fa19 Fix missing all desc rules without user spec
If no user specified in an all desc (desc *) rule, we should set
all_user, otherwise the rule cannot be translated to data structs, they
go missing.
2021-10-07 12:22:36 +03:00
Soner Tari
7ed1396366 Add do {} while(0) around macros for semicolon termination 2021-10-07 01:20:03 +03:00
Soner Tari
017f0f8631 Improve and clean up code and documentation 2021-10-06 19:41:00 +03:00
Soner Tari
4602d0109b Update third-party licenses and documentation
aho_corasick_template*.h library is licensed under GPLv3. The developer
has been contacted for a license change to the LGPL.
2021-10-06 12:56:27 +03:00
Soner Tari
9d2e523cd0 Use Aho-Corasick machines for substring matching
Now, the filter uses B-trees for exact string matching and Aho-Corasick
machines for substring matching. B-trees and AC machines are exported to
linked lists for debug logging only.

Also,
- Separate all_sites and all_ports filters from substring filters. They
are not related with substring filters actually, and ACM keywords cannot
be empty strings anyway. So now they should be handled separately too.
- Improve debug logging of filtering rules.
- Update unit tests accordingly, and improve.
- Fix pxyconn_filter(), keep searching for a match in substring filters
if exact match does not have a matching site rule.
- Increase common names max len and tokens. weather.gov has 73 tokens.
- Rename keyword to desc.
- Update documentation.
- Clean up.
2021-10-05 23:00:17 +03:00
Soner Tari
97117d4e50 Fix and update documentation
We use B-tree not BST
2021-10-04 02:18:44 +03:00
Soner Tari
96ba8557d6 Add unit tests for substring 'from' fields in filtering rules
Also, improve code
2021-10-03 23:50:41 +03:00
Soner Tari
640558863c Add NLORNONE macro 2021-10-03 21:37:58 +03:00
Soner Tari
f6e6b25221 Never pass NULL as rule param to filter_set() 2021-10-03 20:54:29 +03:00
Soner Tari
477bb239a0 Do not tokenize ssl_names if there is no rule to match exact common names 2021-10-03 15:18:36 +03:00