/mandos/release

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

« back to all changes in this revision

Viewing changes to network-hooks.d/bridge

  • Committer: Teddy Hogeborn
  • Date: 2008-07-29 03:35:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20080729033539-08zecoj3jwlkpjhw
* server.conf: New file.

* mandos-clients.conf: Renamed to clients.conf.

* Makefile (FORTIFY): New.
  (CFLAGS): Include $(FORTIFY).

* plugins.d/mandosclient.c (main): New "if_index" variable.  Bug fix:
                                   check if interface exists.  New
                                   "--connect" option.

* server.py (serviceInterface): Removed; replaced by
                                "AvahiService.interface".  All users
                                changed.
  (AvahiError, AvahiServiceError, AvahiGroupError): New exception
                                                    classes.
  (AvahiService): New class.
  (serviceName): Removed; replaced by "AvahiService.name".  All users
                 changed.
  (serviceType): Removed; replaced by "AvahiService.type".  All users
                 changed.
  (servicePort): Removed; replaced by "AvahiService.port".  All users
                 changed.
  (serviceTXT): Removed; replaced by "AvahiService.TXT".  All users
                changed.
  (domain): Removed; replaced by "AvahiService.domain".  All users
            changed.
  (host): Removed; replaced by "AvahiService.host".  All users
          changed.
  (rename_count): Removed; replaced by "AvahiService.rename_count" and
                 "AvahiService.max_renames".  All users changed.
  (Client.__init__): If no secret or secfile, raise TypeError instead
                     of RuntimeError.
  (Client.last_seen): Renamed to "Client.last_checked_ok".  All users
                      changed.
  (Client.stop, Client.stop_checker): Use "getattr" with default value
                                      instead of "hasattr".
  (Client.still_valid): Removed "now" argument.
  (Client.handle): Separate the "no client found" and "client invalid"
                   cases for clearer code.
  (IPv6_TCPServer.__init__): "options" argument replaced by
                             "settings".  All callers changed.
  (IPv6_TCPServer.options): Replaced by "IPv6_TCPServer.settings".
                            All users changed.
  (IPv6_TCPServer.server_bind): Use getattr instead of hasattr.
  (add_service): Removed; replaced by "AvahiService.add".  All callers
                 changed.
  (remove_service): Removed; replaced by "AvahiService.remove".  All
                    callers changed.
  (entry_group_state_changed): On entry group collision, call the new
                               AvahiService.rename method.  Raise
                               AvahiGroupError on group error.
  (if_nametoindex): Use ctypes.utils.find_library to locate the C
                    library.  Cache the result.  Loop on EINTR.
  (daemon): Use os.path.devnull to locate "/dev/null".
  (killme): Removed.  All callers changed to do "sys.exit()" instead,
            except where stated otherwise.
  (main): Removed "exitstatus".  Removed all default values from all
          non-bool options.  New option "--configdir".  New variables
          "server_defaults" and "server_settings", read from
          "%(configdir)s/server.conf".  Let any supplied command line
          options override server settings.   Variable "defaults"
          renamed to "client_defaults", which is read from
          "clients.conf" instead of "mandos-clients.conf".  New global
          AvahiService object "service" replaces old global variables.
          Catch AvahiError and exit with error if caught.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/bin/sh
2
 
#
3
 
# This is an example of a Mandos client network hook.  This hook
4
 
# brings up a bridge interface as specified in a separate
5
 
# configuration file.  To be used, this file and any needed
6
 
# configuration file(s) should be copied into the
7
 
# /etc/mandos/network-hooks.d directory.
8
 
9
 
# Copyright © 2012 Teddy Hogeborn
10
 
# Copyright © 2012 Björn Påhlsson
11
 
12
 
# Copying and distribution of this file, with or without modification,
13
 
# are permitted in any medium without royalty provided the copyright
14
 
# notice and this notice are preserved.  This file is offered as-is,
15
 
# without any warranty.
16
 
 
17
 
set -e
18
 
 
19
 
CONFIG="$MANDOSNETHOOKDIR/bridge.conf"
20
 
 
21
 
addrtoif(){
22
 
    grep -liFe "$1" /sys/class/net/*/address \
23
 
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,' -e "/^${BRIDGE}\$/d"
24
 
}
25
 
 
26
 
# Read config file, which must set "BRIDGE", "PORT_ADDRESSES", and
27
 
# optionally "IPADDRS" and "ROUTES".
28
 
if [ -e "$CONFIG" ]; then
29
 
    . "$CONFIG"
30
 
fi
31
 
 
32
 
if [ -z "$BRIDGE" -o -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
45
 
    if [ -e "$b" ]; then
46
 
        brctl="$b"
47
 
        break
48
 
    fi
49
 
done
50
 
 
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}"
85
 
        ;;
86
 
    files)
87
 
        echo /bin/ip
88
 
        echo "$brctl"
89
 
        ;;
90
 
    modules)
91
 
        echo bridge
92
 
        ;;
93
 
esac