/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to network-hooks.d/bridge

* network-hooks.d/bridge: Use "/usr/sbin/brctl" explicitly.
* plugins.d/mandos-client.c (run_network_hooks): Raise priviliges in
                                                 child process.
  (main): Do not use getuid() to check if running setuid root.  Do not
          raise privileges for run_network_hooks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/bridge
6
6
# configuration file(s) should be copied into the
7
7
# /etc/mandos/network-hooks.d directory.
8
8
# 
9
 
# Copyright © 2011 Teddy Hogeborn
10
 
# Copyright © 2011 Björn Påhlsson
11
 
# 
12
9
# Copying and distribution of this file, with or without modification,
13
10
# are permitted in any medium without royalty provided the copyright
14
11
# notice and this notice are preserved.  This file is offered as-is,
18
15
 
19
16
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
20
17
 
21
 
addrtoif(){
22
 
    grep -liFe "$1" /sys/class/net/*/address \
23
 
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
24
 
}
25
 
 
26
 
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
27
 
# optionally "IPADDRS" and "ROUTES".
 
18
# Read config file, which must set "BRIDGE", "PORTS", and optionally
 
19
# "IPADDRS" and "ROUTES".
28
20
if [ -e "$CONFIG" ]; then
29
21
    . "$CONFIG"
30
22
fi
31
23
 
32
 
if [ -z "$BRIDGE" -o -z "$PORT_ADDRESSES" ]; then
 
24
if [ -z "$BRIDGE" -o -z "$PORTS" ]; then
33
25
    exit
34
26
fi
35
27
 
37
29
    exit
38
30
fi
39
31
 
40
 
for b in /sbin/brctl /usr/sbin/brctl; do
41
 
    if [ -e "$b" ]; then
42
 
        brctl="$b"
43
 
        break
44
 
    fi
45
 
done
46
 
 
47
32
case "$1" in
48
33
    start)
49
 
        "$brctl" addbr "$BRIDGE"
50
 
        for address in $PORT_ADDRESSES; do
51
 
            interface=`addrtoif "$address"`
52
 
            "$brctl" addif "$BRIDGE" "$interface"
53
 
            ip link set dev "$interface" up
 
34
        /usr/sbin/brctl addbr "$BRIDGE"
 
35
        for port in $PORTS; do
 
36
            /usr/sbin/brctl addif "$BRIDGE" "$port"
54
37
        done
55
 
        ip link set dev "$BRIDGE" up
56
 
        sleep "$DELAY"
 
38
        ip link set up "$BRIDGE"
57
39
        if [ -n "$IPADDRS" ]; then
58
40
            for ipaddr in $IPADDRS; do
59
41
                ip addr add "$ipaddr" dev "$BRIDGE"
66
48
        fi
67
49
        ;;
68
50
    stop)
69
 
        ip link set dev "$BRIDGE" down
70
 
        for address in $PORT_ADDRESSES; do
71
 
            interface=`addrtoif "$address"`
72
 
            ip link set dev "$interface" down
73
 
            "$brctl" delif "$BRIDGE" "$interface"
 
51
        ip link set down "$BRIDGE"
 
52
        for port in $PORTS; do
 
53
            /usr/sbin/brctl delif "$BRIDGE" "$port"
74
54
        done
75
 
        "$brctl" delbr "$BRIDGE"
 
55
        /usr/sbin/brctl delbr "$BRIDGE"
76
56
        ;;
77
57
    files)
78
58
        echo /bin/ip
79
 
        echo "$brctl"
 
59
        echo /usr/sbin/brctl
80
60
        ;;
81
61
    modules)
82
62
        echo bridge