/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 initramfs-tools-hook

Hooks take new "modules" argument, and hook names can contain periods.

* debian/mandos-client.README.Debian: Adjust wording.
* debian/rules (binary-common): Exclude nework-hooks.d directory from
                                dh_fixperms.
* initramfs-tools-hook: Also create network hook directory.  Allow
                        periods in hook names.  Only run executable
                        files in hook directory.  Copy needed modules.
* network-hooks.d/bridge: Fix "/usr/bin/brctl" to "/usr/sbin/brctl".
                          Also take "modules" argument.
* plugins.d/mandos-client.xml (NETWORK HOOKS/REQUIREMENTS): Document
                                                            the
                                                            allowing
                                                            of periods
                                                            in hook
                                                            names.
  (NETWORK HOOKS/REQUIREMENTS/files): Adjust wording.
  (NETWORK HOOKS/REQUIREMENTS/modules): New.
  (NETWORK HOOKS/REQUIREMENTS/MANDOSNETHOOKDIR): Clarify.
  (NETWORK HOOKS/REQUIREMENTS/MODE): Add "modules".

Show diffs side-by-side

added added

removed removed

Lines of Context:
initramfs-tools-hook
51
51
    exit 1
52
52
fi
53
53
 
54
 
mandos_user="`{ getent passwd mandos \
55
 
                || getent passwd nobody \
56
 
                || echo ::65534::::; } \
57
 
        | awk --field-separator=: '{ print $3 }'`" 
58
 
mandos_group="`{ getent group mandos \
59
 
                || getent group nogroup \
60
 
                || echo ::65534:; } \
61
 
        | awk --field-separator=: '{ print $3 }'`"
 
54
set `{ getent passwd _mandos \
 
55
    || getent passwd nobody \
 
56
    || echo ::65534:65534:::; } \
 
57
    | cut --delimiter=: --fields=3,4 --only-delimited \
 
58
    --output-delimiter=" "`
 
59
mandos_user="$1"
 
60
mandos_group="$2"
62
61
 
63
62
# The Mandos network client uses the network
64
63
auto_add_modules net
69
68
CONFDIR="/conf/conf.d/mandos"
70
69
MANDOSDIR="/lib/mandos"
71
70
PLUGINDIR="${MANDOSDIR}/plugins.d"
 
71
HOOKDIR="${MANDOSDIR}/network-hooks.d"
72
72
 
73
73
# Make directories
74
74
install --directory --mode=u=rwx,go=rx "${DESTDIR}${CONFDIR}" \
75
 
        "${DESTDIR}${MANDOSDIR}"
 
75
        "${DESTDIR}${MANDOSDIR}" "${DESTDIR}${HOOKDIR}"
76
76
install --owner=${mandos_user} --group=${mandos_group} --directory \
77
77
    --mode=u=rwx "${DESTDIR}${PLUGINDIR}"
78
78
 
89
89
        continue
90
90
    fi
91
91
    case "$base" in
92
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
93
 
        "*") :;;
94
 
        *) copy_exec "$file" "${PLUGINDIR}";;
 
92
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
 
93
            : ;;
 
94
        "*") echo "W: Mandos client plugin directory is empty." >&2 ;;
 
95
        *) copy_exec "$file" "${PLUGINDIR}" ;;
95
96
    esac
96
97
done
97
98
 
99
100
for file in /etc/mandos/plugins.d/*; do
100
101
    base="`basename \"$file\"`"
101
102
    case "$base" in
102
 
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-new|*.dpkg-divert) : ;;
103
 
        "*") :;;
104
 
        *) copy_exec "$file" "${PLUGINDIR}";;
105
 
    esac
 
103
        *~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)
 
104
            : ;;
 
105
        "*") : ;;
 
106
        *) copy_exec "$file" "${PLUGINDIR}" ;;
 
107
    esac
 
108
done
 
109
 
 
110
# Copy network hooks
 
111
for hook in /etc/mandos/network-hooks.d/*; do
 
112
    case "`basename \"$hook\"`" in
 
113
        "*") continue ;;
 
114
        *[!A-Za-z0-9_.-]*) continue ;;
 
115
        *) test -d "$hook" || copy_exec "$hook" "${HOOKDIR}" ;;
 
116
    esac
 
117
    if [ -x "$hook" ]; then
 
118
        # Copy any files needed by the network hook
 
119
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=files \
 
120
            VERBOSITY=0 "$hook" files | while read file target; do
 
121
            if [ -z "${target}" ]; then
 
122
                copy_exec "$file"
 
123
            else
 
124
                copy_exec "$file" "$target"
 
125
            fi
 
126
        done
 
127
        # Copy and load any modules needed by the network hook
 
128
        MANDOSNETHOOKDIR=/etc/mandos/network-hooks.d MODE=modules \
 
129
            VERBOSITY=0 "$hook" modules | while read module; do
 
130
            if [ -z "${target}" ]; then
 
131
                force_load "$module"
 
132
            fi
 
133
        done
 
134
    fi
106
135
done
107
136
 
108
137
# GPGME needs /usr/bin/gpg
113
142
fi
114
143
 
115
144
# Config files
116
 
for file in /etc/mandos/*; do
 
145
for file in /etc/mandos/plugin-runner.conf; do
117
146
    if [ -d "$file" ]; then
118
147
        continue
119
148
    fi
120
149
    cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"
121
150
done
122
151
 
123
 
# Key files 
124
 
for file in  "$keydir"/*; do
 
152
if [ ${mandos_user} != 65534 ]; then
 
153
    sed --in-place --expression="1i--userid=${mandos_user}" \
 
154
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
155
fi
 
156
 
 
157
if [ ${mandos_group} != 65534 ]; then
 
158
    sed --in-place --expression="1i--groupid=${mandos_group}" \
 
159
        "${DESTDIR}${CONFDIR}/plugin-runner.conf"
 
160
fi
 
161
 
 
162
# Key files
 
163
for file in "$keydir"/*; do
125
164
    if [ -d "$file" ]; then
126
165
        continue
127
166
    fi
156
195
        chmod a+rX "${DESTDIR}$dir"
157
196
    fi
158
197
done
159
 
for dir in /lib /usr/lib; do
160
 
    find "${DESTDIR}$dir" \! -perm -u+rw,g+r -prune -or -print0 \
161
 
        | xargs --null --no-run-if-empty chmod a+rX
 
198
for dir in "${DESTDIR}"/lib* "${DESTDIR}"/usr/lib*; do
 
199
    if [ -d "$dir" ]; then
 
200
        find "$dir" \! -perm -u+rw,g+r -prune -or -print0 \
 
201
            | xargs --null --no-run-if-empty chmod a+rX
 
202
    fi
162
203
done