~mdw
/
firewall
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vampire.m4: Extend services to untrusted hosts over IPv6.
[firewall]
/
local.m4
diff --git
a/local.m4
b/local.m4
index
36f76b3
..
d91b171
100644
(file)
--- a/
local.m4
+++ b/
local.m4
@@
-47,20
+47,20
@@
m4_divert(26)m4_dnl
## House networks.
defnet dmz trusted
## House networks.
defnet dmz trusted
- addr 62.49.204.144/28
+ addr 62.49.204.144/28
2001:470:1f09:1b98::/64
forwards unsafe untrusted
defnet unsafe trusted
forwards unsafe untrusted
defnet unsafe trusted
- addr 172.29.199.0/25
+ addr 172.29.199.0/25
2001:470:9740:1::/64
forwards househub
defnet safe safe
forwards househub
defnet safe safe
- addr 172.29.199.192/2
8
+ addr 172.29.199.192/2
7 2001:470:9740:4001::/64
forwards househub
defnet untrusted untrusted
forwards househub
defnet untrusted untrusted
- addr 172.29.198.0/25
+ addr 172.29.198.0/25
2001:470:9740:8001::/64
forwards househub
defnet vpn safe
forwards househub
defnet vpn safe
- addr 172.29.199.128/27
- forwards househub
+ addr 172.29.199.128/27
2001:ba8:1d9:6000::/64
+ forwards househub
colohub
host crybaby 1
host terror 2
defnet iodine untrusted
host crybaby 1
host terror 2
defnet iodine untrusted
@@
-75,29
+75,30
@@
defnet housebdry virtual
## House hosts.
defhost radius
router
## House hosts.
defhost radius
router
- iface eth0 dmz
- iface eth1
un
safe
+ iface eth0 dmz
unsafe safe
+ iface eth1
dmz unsafe
safe
iface eth2 safe
iface eth3 untrusted
defhost roadstar
iface eth2 safe
iface eth3 untrusted
defhost roadstar
- iface eth0 dmz
- iface eth1 unsafe
+ iface eth0 dmz
unsafe
+ iface eth1
dmz
unsafe
defhost jem
defhost jem
- iface eth0 dmz
- iface eth1 unsafe
+ iface eth0 dmz
unsafe
+ iface eth1
dmz
unsafe
defhost artist
defhost artist
- iface eth0 dmz
- iface eth1 unsafe
+ iface eth0 dmz
unsafe
+ iface eth1
dmz
unsafe
defhost vampire
router
defhost vampire
router
- iface eth0.0 dmz
- iface eth0.1 unsafe
+ iface eth0.0 dmz unsafe safe
+ iface eth0.1 dmz unsafe safe
+ iface eth0.2 safe
iface eth0.3 untrusted
iface dns0 dns
iface vpn-+ vpn
iface vpn-precision colobdry vpn
defhost ibanez
iface eth0.3 untrusted
iface dns0 dns
iface vpn-+ vpn
iface vpn-precision colobdry vpn
defhost ibanez
- iface br-dmz dmz
+ iface br-dmz dmz
unsafe
iface br-unsafe unsafe
defhost gibson
iface br-unsafe unsafe
defhost gibson
@@
-105,10
+106,10
@@
defhost gibson
## Colocated networks.
defnet jump trusted
## Colocated networks.
defnet jump trusted
- addr 212.13.198.64/28
+ addr 212.13.198.64/28
2001:ba8:0:1d9::/64
forwards colohub
defnet colo trusted
forwards colohub
defnet colo trusted
- addr 172.29.199.176/28
+ addr 172.29.199.176/28
2001:ba8:1d9:2::/64
forwards colohub
defnet colohub virtual
forwards colobdry jump colo
forwards colohub
defnet colohub virtual
forwards colobdry jump colo
@@
-118,30
+119,31
@@
defnet colobdry virtual
## Colocated hosts.
defhost fender
## Colocated hosts.
defhost fender
- iface br-jump jump
- iface br-colo colo
+ iface br-jump jump
colo
+ iface br-colo
jump
colo
defhost precision
router
defhost precision
router
- iface eth0 jump
- iface eth1 colo
+ iface eth0 jump
colo
+ iface eth1
jump
colo
iface vpn-+ vpn
iface vpn-vampire housebdry vpn
defhost telecaster
iface vpn-+ vpn
iface vpn-vampire housebdry vpn
defhost telecaster
- iface eth0 jump
- iface eth1 colo
+ iface eth0 jump
colo
+ iface eth1
jump
colo
defhost stratocaster
defhost stratocaster
- iface eth0 jump
- iface eth1 colo
+ iface eth0 jump
colo
+ iface eth1
jump
colo
defhost jazz
defhost jazz
- iface eth0 jump
- iface eth1 colo
+ iface eth0 jump
colo
+ iface eth1
jump
colo
## Other networks.
defnet hub virtual
forwards housebdry colobdry
defnet default untrusted
## Other networks.
defnet hub virtual
forwards housebdry colobdry
defnet default untrusted
- addr 62.49.204.144/28
- addr 212.13.198.64/28
+ addr 62.49.204.144/28 2001:470:1f09:1b98::/64
+ addr 212.13.198.64/28 2001:ba8:0:1d9::/64
+ addr 2001:ba8:1d9::/48 #temporary
forwards dmz untrusted unsafe jump colo
m4_divert(80)m4_dnl
forwards dmz untrusted unsafe jump colo
m4_divert(80)m4_dnl
@@
-262,12
+264,9
@@
run ip46tables -A inbound -j forbidden
run ip46tables -A INPUT -m mark --mark $from_untrusted/$MASK_FROM -g inbound
## Otherwise process as indicated by the mark.
run ip46tables -A INPUT -m mark --mark $from_untrusted/$MASK_FROM -g inbound
## Otherwise process as indicated by the mark.
-run ip46tables -A INPUT -m mark ! --mark 0/$MASK_MASK -j ACCEPT
-case $forward in
- 1)
- run ip46tables -A FORWARD -m mark ! --mark 0/$MASK_MASK -j ACCEPT
- ;;
-esac
+for i in $inchains; do
+ run ip46tables -A $i -m mark ! --mark 0/$MASK_MASK -j ACCEPT
+done
m4_divert(-1)
###----- That's all, folks --------------------------------------------------
m4_divert(-1)
###----- That's all, folks --------------------------------------------------