holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
15,249 Commits 104 Branches 736 Tags 54 MiB
0685d0edfd
Commit Graph

4011 Commits

Author SHA1 Message Date
Tom Eastep
e17c4ac8af Reorganize code around wait/Interface-variable fix 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-30 11:25:37 -08:00
Tom Eastep
a6000ee963 Reorganize code around wait/Interface-variable fix 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-30 11:25:04 -08:00
Tom Eastep
0ab1464f51 Merge branch '5.1.12' 2018-01-28 14:54:23 -08:00
Tom Eastep
789854adce Revert "Correct order of optional interface and address variable handling" 
This reverts commit fbee4a91fd.
 2018-01-28 14:54:06 -08:00
Tom Eastep
37101a2031 Merge branch '5.1.11' into 5.1.12 2018-01-28 13:15:42 -08:00
Tom Eastep
40bcfd15e5 Revert "Correct order of optional interface and address variable handling" 
This reverts commit f4cae55c1e.
 2018-01-28 13:15:13 -08:00
Tom Eastep
230ab06e5d Reverse order of required-interface and address variable processing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 13:10:44 -08:00
Tom Eastep
09cda21dd4 Revert "Correct order of optional interface and address variable handling" 
This reverts commit 9253f90ac5.
 2018-01-28 12:29:38 -08:00
Tom Eastep
9253f90ac5 Correct order of optional interface and address variable handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 11:39:06 -08:00
Tom Eastep
f4cae55c1e Correct order of optional interface and address variable handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 10:54:03 -08:00
Tom Eastep
fbee4a91fd Correct order of optional interface and address variable handling 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-28 10:53:20 -08:00
Tom Eastep
cdf5ad45d5
Eliminate the MAPOLDACTIONS option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-24 12:59:26 -08:00
Tom Eastep
070a67d665
Deimplement OPTIMIZE_USE_FIRST 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-24 11:56:20 -08:00
Tom Eastep
9796c58eb2
Add OPTIMIZE_MASK constant 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-23 13:15:44 -08:00
Tom Eastep
cabc20957f
Delete an unnecessary variable 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-23 09:45:50 -08:00
Tom Eastep
a9a379c5a5
Implement INPUT SNAT 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-22 16:37:38 -08:00
Tom Eastep
64f704a964
Improve quoting in the route-balancing logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-21 14:46:51 -08:00
Tom Eastep
416224ee05
Correct typos and anachronisms in Chains.pm comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-21 11:53:58 -08:00
Tom Eastep
fb4b362724
Eliminate unnecessary local array 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-20 13:26:10 -08:00
Tom Eastep
97de2be778
Change a fatal_error() call with an assertion in add_policy_rules() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-19 13:39:51 -08:00
Tom Eastep
85cae3c7f8
Add parens to improve readability 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-19 12:47:17 -08:00
Tom Eastep
acd425a3c2
Remove superfluous logic from validate_portpari1() 
- Add comments

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-19 12:46:52 -08:00
Tom Eastep
27a0f0f7a0
Make TRACK_PROVIDERS=Yes the default 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-10 08:46:01 -08:00
Tom Eastep
9ac075fd56
Clear the connection mark in tunneled packets from tracked providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-09 17:12:14 -08:00
Tom Eastep
b2604583af
Revert "Clear the connection mark in tunneled packets from tracked providers" 
This reverts commit 62c6411cb0.
 2018-01-09 17:01:51 -08:00
Tom Eastep
62c6411cb0
Clear the connection mark in tunneled packets from tracked providers 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-09 14:51:57 -08:00
Tom Eastep
1bc90beb01
Update copyrights 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-07 15:01:46 -08:00
Tom Eastep
eaccf033c6
Update copyrights for 2018 
- Update some header versions to 5.1

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-07 14:24:01 -08:00
Tom Eastep
056711d304
Remove anachronistic comment 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-06 13:58:20 -08:00
Tom Eastep
0aa0bebe07
Reword error message 
- "Invalid action name ..." to "Reserved action name ..."

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-06 13:56:36 -08:00
Tom Eastep
1a68d87c94
Don't enable forwarding in 'clear' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-04 15:39:07 -08:00
Tom Eastep
c518cfaa4a
Allow address variables to work correctly with the 'clear' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2018-01-03 08:58:28 -08:00
Tom Eastep
45a164733b
Fix breakage of ipp2p 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-30 08:38:14 -08:00
Tom Eastep
6f82bfe7d1
Handle PROTO '-' in conntrack file processing. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-29 15:54:15 -08:00
Tom Eastep
078c781dfa
Allow override of :syn assumption in CT rules 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-29 15:15:33 -08:00
Tom Eastep
46f68c6dcb
Move adjustment of the protocol in process_conntrack_rule() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-29 13:51:33 -08:00
Tom Eastep
9e3cb27d0a
Use the synchain name in log messages rather than the base chain name 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-28 14:13:50 -08:00
Tom Eastep
b1d1fa862a
Add comment noting that the 'physwild' interface member is currently unused 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:58:16 -08:00
Tom Eastep
24acf25451
Delete unused find_interfaces_by_option1() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:53:16 -08:00
Tom Eastep
229c47ac6c
Don't delete options that are to be ignored from %options 
- specifying some options can have side-effects that cause
  $interfaceref->{options}{$option} to be accessed

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:47:22 -08:00
Tom Eastep
38de9c1732
Make wildcard/option checks order-independent WRT the options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-23 10:24:08 -08:00
Tom Eastep
17f4fd7cd2
Initialize $physwild to $wildcard 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 15:42:16 -08:00
Tom Eastep
cfd02c1bb6
More $minroot changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 13:58:38 -08:00
Tom Eastep
19b7601c72
Improve handling of wildcard interfaces and options 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 13:43:45 -08:00
Tom Eastep
5a8e9cd0a3
Correct $minroot logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-22 09:08:27 -08:00
Tom Eastep
45468af2d2
Correct ingress policing for later releases of iproute2 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-18 11:52:19 -08:00
Tom Eastep
821d72093a
Rename DEFAULTACTION_SECTION to POLICYACTION_SECTION. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 16:25:15 -08:00
Tom Eastep
42d5d13780
Retain proto setting when switching inline <-> noinline 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 13:40:41 -08:00
Tom Eastep
7121a0f1b1
Disallow a protocol on the Reject Action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 12:58:05 -08:00
Tom Eastep
ab12d63a4f
Change 'default action' to 'policy action' in comments and messages 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 12:55:17 -08:00
Tom Eastep
6ba1d5413b
Allow a protocol to be associated with an action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-12-02 11:24:08 -08:00
Tom Eastep
b04b65cac8
Clear counters in all tables during 'reset' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-30 14:31:59 -08:00
Tom Eastep
5dcb684efc
Don't be specific when deleting IPv6 balanced/fallback default routes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-28 15:26:17 -08:00
Tom Eastep
7289175070
Chop first config dir if non-root or if compiling for export. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-23 09:57:12 -08:00
Tom Eastep
528b473f6b
Add some additional documentation to the Config module 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-22 08:41:37 -08:00
Tom Eastep
2a9272ccd1
Clean up RAs involving "|" 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-14 08:26:17 -08:00
Tom Eastep
130ddff9de
Correct a typo in an error message 
- Includes cosmetic changes to Providers.pm

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-10 11:25:52 -08:00
Tom Eastep
9cf298482d
Merge branch '5.1.8' 2017-11-09 12:59:59 -08:00
Tom Eastep
c5a586aa37
Allow [...] around gateway address in the providers file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-09 12:20:01 -08:00
Tom Eastep
832418585a
Don't make persistent routes and rules dependent on autosrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-08 09:46:25 -08:00
Tom Eastep
605f61fb3c
Don't make persistent routes and rules dependent on autosrc. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-08 09:45:59 -08:00
Tom Eastep
ef8b85fc3e
Implement support for logging in the SNAT file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-11-02 12:44:42 -07:00
Tom Eastep
b35f1112f4
Allow 'noinline' in /etc/shorewall[6]/actions to override 'inline' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-20 09:19:50 -07:00
Tom Eastep
77d9eeb915
Eliminate extra parameter editing of TPROXY parameter list. 
- Clarify syntax for actions with multiple parameters

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-19 13:08:12 -07:00
Tom Eastep
17838c1443
Add TCPMSS to the allowed mangle actions. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-19 12:58:38 -07:00
Tom Eastep
5867ce6c3b
CLAMPMSS now done in the mangle table. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-18 15:55:07 -07:00
Tom Eastep
8ea96098bf
Warning when 'persistent' used with RESTORE_DEFAULT_ROUTE=Yes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 15:22:07 -07:00
Tom Eastep
02ed36332a
Revert "Warn when RESTORE_DEFAULT_ROUTE=Yes and a persistent provider is defined" 
This reverts commit 39a3c72057.
 2017-10-11 11:24:54 -07:00
Tom Eastep
cb4f9e7261
Don't restore default routes when there is an enabled fallback provider 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 11:24:13 -07:00
Tom Eastep
ddb12fcad9
Add/correct comments 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 11:00:46 -07:00
Tom Eastep
42ce754961
Don't restore default routes when a fallback= provider is enabled 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 11:00:05 -07:00
Tom Eastep
5cd4d63bc5
Delete main default routes when a fallback provider is enabled 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 10:59:31 -07:00
Tom Eastep
5b567f2d8b
Correct delete_default_routes() in tables other than main 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 10:58:48 -07:00
Tom Eastep
39a3c72057
Warn when RESTORE_DEFAULT_ROUTE=Yes and a persistent provider is defined 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-11 10:58:09 -07:00
Tom Eastep
b47e633c38
Use 'route replace' rather than 'route add' to avoid persistence issues 
Previous failure case was:

- disable interface
- reload
- enable interface

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-09 08:58:10 -07:00
Tom Eastep
1b55a37a28
Ensure that 'rule add' commands don't fail with persistent interfaces 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-08 08:53:53 -07:00
Tom Eastep
a97dcd23d0
Allow merging of rules that specify an IPSEC policy 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-07 13:17:43 -07:00
Tom Eastep
108b169d8d
Treat LOG_TARGET like all other capabilities 
- Previous implementation could generate unworkable script when
  LOAD_HELPERS_ONLY=Yes

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-10-06 08:01:52 -07:00
Tom Eastep
8469f983d8
Merge branch '5.1.7' 
# Conflicts:
#	Shorewall/Perl/prog.footer
 2017-09-29 15:25:37 -07:00
Tom Eastep
f54acb665a
Correct handling of mark range in MARK target. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-29 14:44:33 -07:00
Tom Eastep
3d2e9eb93e
Improve the fix for SELinux "getattr" denials 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-28 15:16:50 -07:00
Tom Eastep
c6a939301f
Improve the fix for SELinux "getattr" denials 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-28 15:16:00 -07:00
Tom Eastep
1cb98254cc
Handle SELinux getattr denials in open() processing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-26 16:42:54 -07:00
Tom Eastep
baa791a1e3
Handle SELinux getattr denials in open() processing 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-26 16:41:50 -07:00
Tom Eastep
8b4b965f63
Remove unnecessary disable/enable of script generation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-21 14:36:30 -07:00
Tom Eastep
8ee2d6246c
Update a comment in the compiler 
- get_configuration() also processes the shorewallrc file(s)

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-21 12:32:34 -07:00
Tom Eastep
a7be3dfece
Align progress messages produced by 'reenable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:29:13 -07:00
Tom Eastep
846e8c4ece
Correct reenable logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:29:08 -07:00
Tom Eastep
e2bf7e6584
Align progress messages produced by 'reenable' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:28:09 -07:00
Tom Eastep
ff3994f6a1
Correct reenable logic 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 13:17:50 -07:00
Tom Eastep
494ec9c59c
Avoid extra comparison in reload_command() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 10:49:11 -07:00
Tom Eastep
1cde92e8f3
Initialize g_dockeringress 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 10:43:44 -07:00
Tom Eastep
721a1e3b33
Initialize g_dockeringress 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 10:39:52 -07:00
Tom Eastep
84fa774cb7
Change copyright dates in lib.runtime 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-19 09:03:00 -07:00
Tom Eastep
be5aabcbfb
Correct typo in Chains.pm 
&g_dockeringress -> $g_dockeringress

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-18 10:14:22 -07:00
Tom Eastep
a8937e6bc8
Correct harmless typo 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-18 10:06:41 -07:00
Tom Eastep
5e1cf17ebc
DOCKER-INGRESS support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-17 10:57:29 -07:00
Tom Eastep
85a7ec6fe5
Correct module loading in the compiler 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-14 15:08:38 -07:00
Tom Eastep
2ed11c7e15
Default ADD_IP_ALIASES to 'No' in Shorewall6 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-12 11:55:53 -07:00
Tom Eastep
4f79d2e82b
Move and simplify handling of nat columns 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-09-12 10:53:04 -07:00