holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity
14,885 Commits 104 Branches 736 Tags 54 MiB
8521c6f750
Commit Graph

7473 Commits

Author SHA1 Message Date
Tom Eastep
8b90827611
Minor cleanup of split_columns() 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-22 10:18:07 -07:00
Tom Eastep
8507c97b5a
Clean up column/value pair editing. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-22 09:46:52 -07:00
Tom Eastep
a6306f2c08
?reset action param now sets parmsmodified. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-18 12:53:05 -07:00
Tom Eastep
a79dc194a4
Re-factor the directive message change 
- results in much more compact code
- Document change in the config basics doc

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-18 11:42:53 -07:00
Tom Eastep
bdcf93f92c
Report the call site when issuing messages from an action. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-17 17:08:19 -07:00
Tom Eastep
6b84727886
Delete useless blank line 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-17 13:26:07 -07:00
Tom Eastep
5f445d9c2b
Merge branch '5.1.3' 2017-03-16 14:14:20 -07:00
Tom Eastep
31bd10ffdd
Correct two-interface sample snat file 
- s/92/192/

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-15 21:18:23 -07:00
Tom Eastep
c3303067fc
Correct all+ handling in the policy file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-15 11:20:37 -07:00
Tom Eastep
55cf06d0a8
Correct all+ handling in the policy file 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-15 10:09:53 -07:00
Tom Eastep
158f6305b1
Correct install fix 
- Also remove extra logic from action.Broadcast

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-14 14:39:25 -07:00
Tom Eastep
6407520a35
Add warning messages to the deprecated actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-14 14:32:28 -07:00
Tom Eastep
54336eaa80
Delete IPv6 actions that are now handled by their IPv4 counterparts 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-14 14:24:17 -07:00
Tom Eastep
5b85627fb8
Merge branch '5.1.3' 
Conflicts:
	Shorewall/Perl/Shorewall/Config.pm
	Shorewall6/Actions/action.Multicast
 2017-03-14 14:16:47 -07:00
Tom Eastep
a00d7217e3
Correct last commit 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-14 13:58:59 -07:00
Tom Eastep
54ef4e4ced
Delete deprecated actions during install 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-14 13:46:24 -07:00
Tom Eastep
a447d726fa
Revert change which screwed up ?begin perl ... ?end perl line numbering 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-14 12:44:33 -07:00
Tom Eastep
fe29adbd66
Correct use of $family in combined actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 16:52:16 -07:00
Tom Eastep
4dc6be6b3b
Deprecate A_AllowICMPs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 15:09:07 -07:00
Tom Eastep
6ebc8f4266
Merge branch '5.1.3' 2017-03-13 14:55:23 -07:00
Tom Eastep
c5c4211081
Unify actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 14:54:25 -07:00
Tom Eastep
4010f9bce4
Add multicast to the Deprecated A_Drop and A_Reject actions 
- Move A_Drop to deprecated/ directory

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 14:18:23 -07:00
Tom Eastep
02bb717d7d
Quote SMURF_LOG_LEVEL setting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 11:21:13 -07:00
Tom Eastep
046998ed84
Tabification of new actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 11:19:35 -07:00
Tom Eastep
24a014655b
Quote all _DEFAULT settings in the sample .conf files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 11:00:29 -07:00
Tom Eastep
0b8945da8e
Correctly handle expansion of option names 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 10:20:15 -07:00
Tom Eastep
da363880a9
Always quote the LEVEL and DEFAULT settings when updating 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-13 09:51:58 -07:00
Tom Eastep
037fe490f3
Process config options in file order during update. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-12 17:09:41 -07:00
Tom Eastep
b13014c9ab
Expand variables in .conf except when upgrading 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-11 11:21:07 -08:00
Tom Eastep
76aef6cb04
Correct generation of '! --syn' 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-11 08:43:04 -08:00
Tom Eastep
4c72b3ee58
Make sure that $LOG_LEVEL is defined 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-10 11:06:23 -08:00
Tom Eastep
d9071c5308
Correct $LOG_LEVEL expansion 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-10 10:24:24 -08:00
Tom Eastep
3d8d5aa469
quote $LOG_LEVEL in shorewall[6].conf files 
- Delete AllowICMPs from IPv4 policy action settings

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-08 14:16:24 -08:00
Tom Eastep
49811d24fa
Correct convertion of tcrules->mangle when a writable mangle exists 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 15:21:45 -08:00
Tom Eastep
fe4aaee1b4
Fix typos in action.dropNotSyn 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 14:37:08 -08:00
Tom Eastep
0ec7bc846e
Correct logging in inline policy actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 13:58:14 -08:00
Tom Eastep
dbcd4d9d16
Correct typo in action.AllowICMPs 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 13:57:05 -08:00
Tom Eastep
5a996cbda7
Change AllowICMPs to an inline action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/actions.std
 2017-03-07 13:56:44 -08:00
Tom Eastep
6019adaae5
Change macro.ICMPs to an inline action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>

Conflicts:
	Shorewall/actions.std
 2017-03-07 13:54:52 -08:00
Tom Eastep
4f869c3506
More manpage updates for tcp:!syn 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 11:13:58 -08:00
Tom Eastep
e3c2874b21
Modify dropNotSyn to use {proto=6:!syn} 
- also make the same change in the rejNotSyn audited case
 2017-03-07 11:00:39 -08:00
Tom Eastep
e8a0142480
Document tcp:!syn support 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 10:48:24 -08:00
Tom Eastep
a4768776f7
Modify rejNotSyn to use new/corrected features 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 10:34:15 -08:00
Tom Eastep
8e000b158e
Correct the handling of tcp-reset 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 10:33:51 -08:00
Tom Eastep
f1d1ab6411
Implement tcp:!syn in PROTO column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-07 10:33:20 -08:00
Tom Eastep
cd103bb715
Correct rejNotSyn 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-06 16:01:31 -08:00
Tom Eastep
5f1370f1b4
Clear the firewall on Debian systemd 'stop' command 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-06 11:22:55 -08:00
Tom Eastep
dc53fa2665
Correct file/line from ?error 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-06 11:02:06 -08:00
Tom Eastep
71d9a03697
Update shorewall[6]-rules. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 14:29:57 -08:00
Tom Eastep
137d4bcc90
Alter logging behavior of Limit 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 13:03:57 -08:00
Tom Eastep
356d3fa2dd
Correct new directives with respect to omitting 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 12:09:54 -08:00
Tom Eastep
80d93235b5
Eliminate builtin actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 12:09:33 -08:00
Tom Eastep
c1e7fce1c5
Report the file/line where action invoked 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-05 09:29:00 -08:00
Tom Eastep
63ec936f21
Remove determinism sorts 2017-03-04 19:05:33 -08:00
Tom Eastep
dabe0bd205
Set PERL_HASH_SEED to make compilation deterministic. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-04 18:48:48 -08:00
Tom Eastep
63cf7dd699
Revert "Move $test to the config module." 
This reverts commit 876d76b294.
 2017-03-04 18:45:40 -08:00
Matt Darfeuille
0b3a32b365
Change the preferred way to remove sysvinit script 
- Correct typo in command
 - Correct spacing

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-04 09:03:59 -08:00
Tom Eastep
a7d45e9566
Restore logging to the BLACKLIST action 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-03 10:14:30 -08:00
Tom Eastep
876d76b294
Move $test to the config module. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-02 11:42:07 -08:00
Tom Eastep
9075a6dd7a
Copy libs and footer when compiling for test 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-02 10:49:49 -08:00
Tom Eastep
61f5e3531c
Rename action.allowUPnP to action.allowinUPnP 
- Allows 'show action allowinUPnP' to work correctly.

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-03-02 10:05:31 -08:00
Matt Darfeuille
7ffe8e4e4b
shorewall: Document the -p option in installer 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-23 09:33:35 -08:00
Matt Darfeuille
06c6a017d5
Use a specific parameter file for systemd script 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:56:25 -08:00
Matt Darfeuille
75fd8ccb37
Use a specific parameter file for sysvinit script 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:56:21 -08:00
Matt Darfeuille
8c7e6fddfd
Use a common uninstaller for Sw and Sw6 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:56:11 -08:00
Matt Darfeuille
783e438b4a
Be more verbose while uninstalling Shorewall 
- Remove version file as a file and not as a directory.

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:56:00 -08:00
Matt Darfeuille
27a620347a
shorewall: Fail if Shorewall-core is not installed 
Shorewall-core's version file resides in ${SHAREDIR}/shorewall.

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:55:56 -08:00
Matt Darfeuille
a496edef54
Use a function to fail on fatal error 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:55:50 -08:00
Matt Darfeuille
22b044f350
shorewall: Use a function to install file 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:55:41 -08:00
Matt Darfeuille
c58efe7698
Unify the uninstallers 
- Clean up code
 - Use the .service suffix

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:55:36 -08:00
Matt Darfeuille
f48b2e715f
Unify the installers 
- Clean up code

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:55:31 -08:00
Matt Darfeuille
f6f7e691d0
Fail if the rc file can not be loaded 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:54:40 -08:00
Matt Darfeuille
a9048b63f2
Correct typos 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:54:36 -08:00
Matt Darfeuille
bc1df90829
Group comment lines with corresponding command 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:54:33 -08:00
Matt Darfeuille
09462cf92b
Use 4 octal digits as numeric mode in installers 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:54:29 -08:00
Matt Darfeuille
315d4c39b8
Create and set directory mode using a function 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:54:04 -08:00
Matt Darfeuille
42554f8f31
Add cant_autostart() to the installers's library 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:53:59 -08:00
Matt Darfeuille
f0debcb6fb
Copy only required libraries to run Shorewall 
Copy only libraries that are required by Shorewall to operate properly.

Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:53:54 -08:00
Matt Darfeuille
20cc56f2f1
Load uninstallers's common functions 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 17:53:39 -08:00
Matt Darfeuille
4e771083c7
Load installers's common functions 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 16:42:38 -08:00
Matt Darfeuille
a6eebc8ecf
Replace product names by product vars 
Signed-off-by: Matt Darfeuille <matdarf@gmail.com>
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-22 16:40:41 -08:00
Tom Eastep
6966270822
Allow 'show action' on buitin actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-19 13:43:23 -08:00
Tom Eastep
118e4f73c9
Correct validation of LOG_LEVEL 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-19 10:25:44 -08:00
Tom Eastep
10b39f3855
Correct typo (allowMast -> allowMcast) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-19 10:25:27 -08:00
Tom Eastep
a71b61c238
Delete the deprecated macros and actions during install 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-15 10:16:53 -08:00
Tom Eastep
944888c04f
Handle broadcast and muticast separately 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-15 10:16:20 -08:00
Tom Eastep
48d301b2cf
Rename the policy LIMIT column to RATE 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-12 10:17:43 -08:00
Tom Eastep
735919d8d3
Add LOG_LEVEL option 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-12 09:52:55 -08:00
Tom Eastep
b4561e97c8
Deprecate Drop and Reject in actions.std 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-12 09:28:38 -08:00
Tom Eastep
66a63a4da5
Fix instances of $LOGrmation 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-12 08:33:56 -08:00
Tom Eastep
8c9fb501fd
Adjust .conf files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-11 13:41:28 -08:00
Tom Eastep
977fa81d46
Make 'none' case-insensitive in policy action specifications 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-10 11:43:51 -08:00
Tom Eastep
09fda9eb6c
Manpage updates: 
- interfaces: Clarify the 'bridge' option
- rtrules:    Warn about similar rules with same priority
 2017-02-10 11:43:04 -08:00
Tom Eastep
7e984af094
Some cleanup of policy actions 
- Allow '+' in policy file action list

Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-07 13:19:53 -08:00
Tom Eastep
af8d4e32c2
Replace 'info' with '$LOG' in the sample policy files 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-07 08:27:19 -08:00
Tom Eastep
ca33a7ef65
Fix Sample .conf files. 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 18:28:05 -08:00
Tom Eastep
e91f414223
Document policy action changes 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 17:09:23 -08:00
Tom Eastep
5cd2f26b51
Correct shorewall.conf(5) 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 14:46:10 -08:00
Tom Eastep
dab9e1d7c4
Assume no default actions 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 14:45:43 -08:00
Tom Eastep
b9471a2499
Correct parsing of the POLICY column 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
 2017-02-06 14:15:24 -08:00