/mandos/trunk : revision 708

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

Committer: Teddy Hogeborn
Date: 2014-06-22 02:19:30 UTC
Revision ID: teddy@recompile.se-20140622021930-icl7h4cm97blhjml

mandos-keygen: Generate "checker" option to use SSH fingerprints.

To turn this off, use a new "--no-ssh" option to mandos-keygen.

* INSTALL (Mandos Server, Mandos Client): Document new suggested
                                          installation of SSH.
* Makefile (confdir/clients.conf): Use new "--no-ssh" option to
                                   "mandos-keygen".
* debian/control (mandos/Depends): Changed to "fping | ssh-client".
  (mandos-client/Recommends): New; set to "ssh".
* intro.xml (FREQUENTLY ASKED QUESTIONS): Rename and rewrite section
                                          called "Faking ping
                                          replies?" to address new
                                          default behavior.
* mandos-clients.conf.xml (OPTIONS/checker): Briefly discuss new
                                             behavior of
                                             mandos-keygen.
* mandos-keygen: Bug fix: Suppress failure output of "shred" to remove
                 "sec*", since no such files may exist.
(password mode): Scan for SSH key fingerprints and output as new
                  "checker" and "ssh_fingerprint" options, unless new
                  "--no-ssh" option is given.
* mandos-keygen.xml (SYNOPSIS/--force): Bug fix: Document short form.
  (OPTIONS/--no-ssh): New.
  (SEE ALSO): Add reference "ssh-keyscan(1)".
* plugins.d/mandos-client.xml (SECURITY): Briefly mention the
                                          possibility of using SSH key
                                          fingerprints for checking.

Show diffs side-by-side

added added

removed removed

initramfs-tools-hook

CONFDIR="/conf/conf.d/mandos"

MANDOSDIR="/lib/mandos"

PLUGINDIR="${MANDOSDIR}/plugins.d"

PLUGINHELPERDIR="${MANDOSDIR}/plugin-helpers"

HOOKDIR="${MANDOSDIR}/network-hooks.d"

# Make directories

install --directory --mode=u=rwx,go=rx "${DESTDIR}${CONFDIR}" \

"${DESTDIR}${MANDOSDIR}" "${DESTDIR}${HOOKDIR}" \

"${DESTDIR}${PLUGINHELPERDIR}"

"${DESTDIR}${MANDOSDIR}" "${DESTDIR}${HOOKDIR}"

install --owner=${mandos_user} --group=${mandos_group} --directory \

--mode=u=rwx "${DESTDIR}${PLUGINDIR}"

100

esac

101

done

102

100

103

# Copy the packaged plugin helpers

104

for file in "$libdir"/mandos/plugin-helpers/*; do

105

base="`basename \"$file\"`"

106

# Is this plugin overridden?

107

if [ -e "/etc/mandos/plugin-helpers/$base" ]; then

108

continue

109

110

case "$base" in

111

*~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)

112

: ;;

113

"*") : ;;

114

*) copy_exec "$file" "${PLUGINHELPERDIR}" ;;

115

esac

116

done

117

118

101

# Copy any user-supplied plugins

119

102

for file in /etc/mandos/plugins.d/*; do

120

103

base="`basename \"$file\"`"

126

109

esac

127

110

done

128

111

129

# Copy any user-supplied plugin helpers

130

for file in /etc/mandos/plugin-helpers/*; do

131

base="`basename \"$file\"`"

132

case "$base" in

133

*~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)

134

: ;;

135

"*") : ;;

136

*) copy_exec "$file" "${PLUGINHELPERDIR}" ;;

137

esac

138

done

139

140

112

# Get DEVICE from initramfs.conf and other files

141

113

. /etc/initramfs-tools/initramfs.conf

142

114

for conf in /etc/initramfs-tools/conf.d/*; do

178

150

done

179

151

180

152

# GPGME needs GnuPG

181

gpg=/usr/bin/gpg

182

153

libgpgme11_version="`dpkg-query --showformat='${Version}' --show libgpgme11`"

183

if dpkg --compare-versions "$libgpgme11_version" ge 1.5.0-0.1; then

184

if [ -e /usr/bin/gpgconf ]; then

185

if [ ! -e "${DESTDIR}/usr/bin/gpgconf" ]; then

186

copy_exec /usr/bin/gpgconf

187

188

gpg="`/usr/bin/gpgconf|sed --quiet --expression='s/^gpg:[^:]*://p'`"

189

190

elif dpkg --compare-versions "$libgpgme11_version" ge 1.4.1-0.1; then

154

if dpkg --compare-versions "$libgpgme11_version" ge 1.4.1-0.1; then

191

155

gpg=/usr/bin/gpg2

156

else

157

gpg=/usr/bin/gpg

192

158

193

159

if [ ! -e "${DESTDIR}$gpg" ]; then

194

160

copy_exec "$gpg"

219

185

if [ -d "$file" ]; then

220

186

continue

221

187

222

case "$file" in

223

*~|.*|\#*\#|*.dpkg-old|*.dpkg-bak|*.dpkg-new|*.dpkg-divert)

224

: ;;

225

"*") : ;;

226

227

cp --archive --sparse=always "$file" \

228

"${DESTDIR}${CONFDIR}"

229

chown ${mandos_user}:${mandos_group} \

230

"${DESTDIR}${CONFDIR}/`basename \"$file\"`"

231

;;

232

esac

188

cp --archive --sparse=always "$file" "${DESTDIR}${CONFDIR}"

189

chown ${mandos_user}:${mandos_group} \

190

"${DESTDIR}${CONFDIR}/`basename \"$file\"`"

233

191

done

234

# Use Diffie-Hellman parameters file if available

235

if [ -e "${DESTDIR}${CONFDIR}"/client-dhparams.pem ]; then

236

sed --in-place \

237

--expression="1i--options-for=mandos-client:--dh-params=${CONFDIR}/client-dhparams.pem" \

238

"${DESTDIR}/${CONFDIR}/plugin-runner.conf"

239

240

192

241

193

# /lib/mandos/plugin-runner will drop priviliges, but needs access to

242

194

# its plugin directory and its config file. However, since almost all

Older »