/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/wireless

First version of a somewhat complete D-Bus server interface.  Also
change user/group name to "_mandos".

* debian/mandos.postinst: Rename old "mandos" user and group to
                          "_mandos"; create "_mandos" user and group
                          if none exist.
* debian/mandos-client.postinst: - '' -

* initramfs-tools-hook: Try "_mandos" before "mandos" as user and
                        group name.

* mandos (_datetime_to_dbus_struct): New; was previously local.
  (Client.started): Renamed to "last_started".  All users changed.
  (Client.started): New; boolean.
  (Client.dbus_object_path): New.
  (Client.check_command): Renamed to "checker_command".  All users
                          changed.
  (Client.__init__): Set and use "self.dbus_object_path".  Set
                     "self.started".
  (Client.start): Update "self.started".  Emit "self.PropertyChanged"
                  signals for both "started" and "last_started".
  (Client.stop): Update "self.started".  Emit "self.PropertyChanged"
                 signal for "started".
  (Client.checker_callback): Take additional "command" argument.  All
                             callers changed. Emit
                             "self.PropertyChanged" signal.
  (Client.bump_timeout): Emit "self.PropertyChanged" signal for
                         "last_checked_ok".
  (Client.start_checker): Emit "self.PropertyChanged" signal for
                          "checker_running".
  (Client.stop_checker): Emit "self.PropertyChanged" signal for
                         "checker_running".
  (Client.still_valid): Bug fix: use "getattr(self, started, False)"
                        instead of "self.started" in case this client
                        object is so new that the "started" attribute
                        has not been created yet.
  (Client.IntervalChanged, Client.CheckerIsRunning, Client.GetChecker,
  Client.GetCreated, Client.GetFingerprint, Client.GetHost,
  Client.GetInterval, Client.GetName, Client.GetStarted,
  Client.GetTimeout, Client.StateChanged, Client.TimeoutChanged):
  Removed; all callers changed.
  (Client.CheckerCompleted): Add "condition" and "command" arguments.
                             All callers changed.
  (Client.GetAllProperties, Client.PropertyChanged): New.
  (Client.StillValid): Renamed to "IsStillValid".
  (Client.StartChecker): Changed to its own function to avoid the
                         return value from "Client.start_checker()".
  (Client.Stop): Changed to its own function to avoid the return value
                 from "Client.stop()".
  (main): Try "_mandos" before "mandos" as user and group name.
          Removed inner function "remove_from_clients".  New inner
          class "MandosServer".

Show diffs side-by-side

added added

removed removed

Lines of Context:
network-hooks.d/wireless
1
 
#!/bin/sh
2
 
#
3
 
# This is an example of a Mandos client network hook.  This hook
4
 
# brings up a wireless 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
 
RUNDIR="/run"
20
 
CTRL="$RUNDIR/wpa_supplicant-global"
21
 
CTRLDIR="$RUNDIR/wpa_supplicant"
22
 
PIDFILE="$RUNDIR/wpa_supplicant-mandos.pid"
23
 
 
24
 
CONFIG="$MANDOSNETHOOKDIR/wireless.conf"
25
 
 
26
 
addrtoif(){
27
 
    grep -liFe "$1" /sys/class/net/*/address \
28
 
        | sed -e 's,.*/\([^/]*\)/[^/]*,\1,'
29
 
}
30
 
 
31
 
# Read config file
32
 
if [ -e "$CONFIG" ]; then
33
 
    . "$CONFIG"
34
 
else
35
 
    exit
36
 
fi
37
 
 
38
 
ifkeys=`env | sed -n -e 's/^ADDRESS_\([^=]*\)=.*/\1/p' "$CONFIG" \
39
 
    | sort -u`
40
 
 
41
 
# Exit if DEVICE is set and is not any of the wireless interfaces
42
 
if [ -n "$DEVICE" ]; then
43
 
    while :; do
44
 
        for KEY in $ifkeys; do
45
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
46
 
            INTERFACE=`addrtoif "$ADDRESS"`
47
 
            if [ "$INTERFACE" = "$DEVICE" ]; then
48
 
                break 2
49
 
            fi
50
 
        done
51
 
        exit
52
 
    done
53
 
fi
54
 
 
55
 
wpa_supplicant=/sbin/wpa_supplicant
56
 
wpa_cli=/sbin/wpa_cli
57
 
ip=/bin/ip
58
 
 
59
 
# Used by the wpa_interface_* functions in the wireless.conf file
60
 
wpa_cli_set(){
61
 
    case "$1" in
62
 
        ssid|psk) arg="\"$2\"" ;;
63
 
        *) arg="$2" ;;
64
 
    esac
65
 
    "$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" set_network "$NETWORK" \
66
 
        "$1" "$arg" 2>&1 | sed -e '/^OK$/d'
67
 
}
68
 
 
69
 
if [ $VERBOSITY -gt 0 ]; then
70
 
    WPAS_OPTIONS="-d $WPAS_OPTIONS"
71
 
fi
72
 
if [ -n "$PIDFILE" ]; then
73
 
    WPAS_OPTIONS="-P$PIDFILE $WPAS_OPTIONS"
74
 
fi
75
 
 
76
 
case "${MODE:-$1}" in
77
 
    start)
78
 
        mkdir -m u=rwx,go= -p "$CTRLDIR"
79
 
        "$wpa_supplicant" -B -g "$CTRL" -p "$CTRLDIR" $WPAS_OPTIONS
80
 
        for KEY in $ifkeys; do
81
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
82
 
            INTERFACE=`addrtoif "$ADDRESS"`
83
 
            DRIVER=`eval 'echo "$WPA_DRIVER_'"$KEY"\"`
84
 
            IFDELAY=`eval 'echo "$DELAY_'"$KEY"\"`
85
 
            "$wpa_cli" -g "$CTRL" interface_add "$INTERFACE" "" \
86
 
                "${DRIVER:-wext}" "$CTRLDIR" > /dev/null \
87
 
                | sed -e '/^OK$/d'
88
 
            NETWORK=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" \
89
 
                add_network`
90
 
            eval wpa_interface_"$KEY"
91
 
            "$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" enable_network \
92
 
                "$NETWORK" | sed -e '/^OK$/d'
93
 
            sleep "${IFDELAY:-$DELAY}" &
94
 
            sleep=$!
95
 
            while :; do
96
 
                kill -0 $sleep 2>/dev/null || break
97
 
                STATE=`"$wpa_cli" -p "$CTRLDIR" -i "$INTERFACE" \
98
 
                    status | sed -n -e 's/^wpa_state=//p'`
99
 
                if [ "$STATE" = COMPLETED ]; then
100
 
                    while :; do
101
 
                        kill -0 $sleep 2>/dev/null || break 2
102
 
                        UP=`cat /sys/class/net/"$INTERFACE"/operstate`
103
 
                        if [ "$UP" = up ]; then
104
 
                            kill $sleep 2>/dev/null
105
 
                            break 2
106
 
                        fi
107
 
                        sleep 1
108
 
                    done
109
 
                fi
110
 
                sleep 1
111
 
            done &
112
 
            wait $sleep || :
113
 
            IPADDRS=`eval 'echo "$IPADDRS_'"$KEY"\"`
114
 
            if [ -n "$IPADDRS" ]; then
115
 
                if [ "$IPADDRS" = dhcp ]; then
116
 
                    ipconfig -c dhcp -d "$INTERFACE" || :
117
 
                    #dhclient "$INTERFACE"
118
 
                else
119
 
                    for ipaddr in $IPADDRS; do
120
 
                        "$ip" addr add "$ipaddr" dev "$INTERFACE"
121
 
                    done
122
 
                fi
123
 
            fi
124
 
            ROUTES=`eval 'echo "$ROUTES_'"$KEY"\"`
125
 
            if [ -n "$ROUTES" ]; then
126
 
                for route in $ROUTES; do
127
 
                    "$ip" route add "$route" dev "$BRIDGE"
128
 
                done
129
 
            fi
130
 
        done
131
 
        ;;
132
 
    stop)
133
 
        "$wpa_cli" -g "$CTRL" terminate 2>&1 | sed -e '/^OK$/d'
134
 
        for KEY in $ifkeys; do
135
 
            ADDRESS=`eval 'echo "$ADDRESS_'"$KEY"\"`
136
 
            INTERFACE=`addrtoif "$ADDRESS"`
137
 
            "$ip" addr show scope global permanent dev "$INTERFACE" \
138
 
                | while read type addr rest; do
139
 
                case "$type" in
140
 
                    inet|inet6)
141
 
                        "$ip" addr del "$addr" dev "$INTERFACE"
142
 
                        ;;
143
 
                esac
144
 
            done
145
 
            "$ip" link set dev "$INTERFACE" down
146
 
        done
147
 
        ;;
148
 
    files)
149
 
        echo "$wpa_supplicant"
150
 
        echo "$wpa_cli"
151
 
        echo "$ip"
152
 
        ;;
153
 
    modules)
154
 
        if [ "$IPADDRS" = dhcp ]; then
155
 
            echo af_packet
156
 
        fi
157
 
        sed -n -e 's/#.*$//' -e 's/[    ]*$//' \
158
 
            -e 's/^MODULE_[^=]\+=//p' "$CONFIG"
159
 
        ;;
160
 
esac