/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

  • Committer: Teddy Hogeborn
  • Date: 2019-02-10 03:50:20 UTC
  • Revision ID: teddy@recompile.se-20190210035020-nttr1tybgwwixueu
http://bugs.debian.org/879538
http://bugs.debian.org/916673
Show debconf note about new TLS key IDs

If mandos-client did not see TLS keys and had to create them, or if
mandos sees GnuTLS version 3.6.6 or later, show an important notice on
package installation about the importance of adding the new key_id
options to clients.conf on the Mandos server.

* debian/control (Package: mandos, Package: mandos-client): Depend on
                                                            debconf.
* debian/mandos-client.lintian-overrides: Override warnings.
* debian/mandos-client.postinst (create_keys): Show notice if new TLS
                                               key files were created.
* debian/mandos-client.templates: New.
* debian/mandos.lintian-overrides: Override warnings.
* debian/mandos.postinst (configure): If GnuTLS 3.6.6 or later is
                                      detected, show an important
                                      notice (once) about the new
                                      key_id option required in
                                      clients.conf.
* debian/mandos.templates: New.

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