To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos-keygen
- browse files at revision 898
- compare with another revision
- download diff
- download tarball
- view history from revision 898
- Committer: Teddy Hogeborn
- Date: 2017-02-22 21:45:35 UTC
- Revision ID: teddy@recompile.se-20170222214535-milf6w0b1krwpaex
Server bug fix: Use the mandos.conf "zeroconf" and "restore" options
Allow the "zeroconf" and "restore" options to actually work from the
mandos.conf file, in addition to command line options.
Closes: 855589
Reported-by: Pablo Abelenda <pabelenda@igalia.com>
Suggested-by: Pablo Abelenda <pabelenda@igalia.com>
Allow the "zeroconf" and "restore" options to actually work from the
mandos.conf file, in addition to command line options.
Closes: 855589
Reported-by: Pablo Abelenda <pabelenda@igalia.com>
Suggested-by: Pablo Abelenda <pabelenda@igalia.com>
- files added:
- .bzr-builddeb
- debian
- debian/po
- debian/source
- debian/upstream
- network-hooks.d
- plugin-helpers
- files removed:
- network-protocol.txt
- files renamed:
- mandos-client.c => plugin-runner.c
- mandos-client.xml => plugin-runner.xml
- plugins.d/password-request.c => plugins.d/mandos-client.c
- plugins.d/password-request.xml => plugins.d/mandos-client.xml
- files modified:
- Makefile
added
removed
mandos-keygen
2
2
#
3
3
# Mandos key generator - create a new OpenPGP key for a Mandos client
4
4
#
5
# Copyright © 2007-2008 Teddy Hogeborn & Björn Påhlsson
5
# Copyright © 2008-2016 Teddy Hogeborn
6
# Copyright © 2008-2016 Björn Påhlsson
6
7
#
7
8
# This program is free software: you can redistribute it and/or modify
8
9
# it under the terms of the GNU General Public License as published by
17
18
# You should have received a copy of the GNU General Public License
18
19
# along with this program. If not, see <http://www.gnu.org/licenses/>.
19
20
#
20
# Contact the authors at <mandos@fukt.bsnet.se>.
21
# Contact the authors at <mandos@recompile.se>.
21
22
#
22
23
23
VERSION="1.0"
24
VERSION="1.7.14"
24
25
25
KEYDIR="/etc/mandos"
26
KEYTYPE=DSA
27
KEYLENGTH=1024
28
KEYNAME="`hostname --fqdn`"
26
KEYDIR="/etc/keys/mandos"
27
KEYTYPE=RSA
28
KEYLENGTH=4096
29
SUBKEYTYPE=RSA
30
SUBKEYLENGTH=4096
31
KEYNAME="`hostname --fqdn 2>/dev/null || hostname`"
29
32
KEYEMAIL=""
30
KEYCOMMENT="Mandos client key"
33
KEYCOMMENT=""
31
34
KEYEXPIRE=0
32
35
FORCE=no
36
SSH=yes
33
37
KEYCOMMENT_ORIG="$KEYCOMMENT"
38
mode=keygen
39
40
if [ ! -d "$KEYDIR" ]; then
41
KEYDIR="/etc/mandos/keys"
42
fi
34
43
35
44
# Parse options
36
TEMP=`getopt --options vhd:t:l:n:e:c:x:f \
37
--longoptions version,help,dir:,type:,length:,name:,email:,comment:,expire:,force \
45
TEMP=`getopt --options vhpF:d:t:l:s:L:n:e:c:x:fS \
46
--longoptions version,help,password,passfile:,dir:,type:,length:,subtype:,sublength:,name:,email:,comment:,expire:,force,no-ssh \
38
47
--name "$0" -- "$@"`
39
48
40
49
help(){
50
basename="`basename "$0"`"
41
51
cat <<EOF
42
Usage: `basename $0` [options]
52
Usage: $basename [ -v | --version ]
53
$basename [ -h | --help ]
54
Key creation:
55
$basename [ OPTIONS ]
56
Encrypted password creation:
57
$basename { -p | --password } [ --name NAME ] [ --dir DIR]
58
$basename { -F | --passfile } FILE [ --name NAME ] [ --dir DIR]
43
59
44
Options:
60
Key creation options:
45
61
-v, --version Show program's version number and exit
46
62
-h, --help Show this help message and exit
47
63
-d DIR, --dir DIR Target directory for key files
48
-t TYPE, --type TYPE Key type. Default is DSA.
64
-t TYPE, --type TYPE Key type. Default is RSA.
49
65
-l BITS, --length BITS
50
Key length in bits. Default is 1024.
66
Key length in bits. Default is 4096.
67
-s TYPE, --subtype TYPE
68
Subkey type. Default is RSA.
69
-L BITS, --sublength BITS
70
Subkey length in bits. Default is 4096.
51
71
-n NAME, --name NAME Name of key. Default is the FQDN.
52
-e EMAIL, --email EMAIL
72
-e ADDRESS, --email ADDRESS
53
73
Email address of key. Default is empty.
54
-c COMMENT, --comment COMMENT
55
Comment field for key. The default value is
56
"Mandos client key".
74
-c TEXT, --comment TEXT
75
Comment field for key. The default is empty.
57
76
-x TIME, --expire TIME
58
77
Key expire time. Default is no expiration.
59
78
See gpg(1) for syntax.
60
-f, --force Force overwriting old keys.
79
-f, --force Force overwriting old key files.
80
81
Password creation options:
82
-p, --password Create an encrypted password using the key in
83
the key directory. All options other than
84
--dir and --name are ignored.
85
-F FILE, --passfile FILE
86
Encrypt a password from FILE using the key in
87
the key directory. All options other than
88
--dir and --name are ignored.
89
-S, --no-ssh Don't get SSH key or set "checker" option.
61
90
EOF
62
91
}
63
92
64
93
eval set -- "$TEMP"
65
94
while :; do
66
95
case "$1" in
96
-p|--password) mode=password; shift;;
97
-F|--passfile) mode=password; PASSFILE="$2"; shift 2;;
67
98
-d|--dir) KEYDIR="$2"; shift 2;;
68
99
-t|--type) KEYTYPE="$2"; shift 2;;
100
-s|--subtype) SUBKEYTYPE="$2"; shift 2;;
69
101
-l|--length) KEYLENGTH="$2"; shift 2;;
102
-L|--sublength) SUBKEYLENGTH="$2"; shift 2;;
70
103
-n|--name) KEYNAME="$2"; shift 2;;
71
104
-e|--email) KEYEMAIL="$2"; shift 2;;
72
105
-c|--comment) KEYCOMMENT="$2"; shift 2;;
73
-x|--expire) KEYCOMMENT="$2"; shift 2;;
106
-x|--expire) KEYEXPIRE="$2"; shift 2;;
74
107
-f|--force) FORCE=yes; shift;;
108
-S|--no-ssh) SSH=no; shift;;
75
109
-v|--version) echo "$0 $VERSION"; exit;;
76
110
-h|--help) help; exit;;
77
111
--) shift; break;;
79
113
esac
80
114
done
81
115
if [ "$#" -gt 0 ]; then
82
echo "Unknown arguments: '$@'" >&2
116
echo "Unknown arguments: '$*'" >&2
83
117
exit 1
84
118
fi
85
119
87
121
PUBKEYFILE="$KEYDIR/pubkey.txt"
88
122
89
123
# Check for some invalid values
90
if [ -d "$KEYDIR" ]; then :; else
124
if [ ! -d "$KEYDIR" ]; then
91
125
echo "$KEYDIR not a directory" >&2
92
126
exit 1
93
127
fi
94
if [ -w "$KEYDIR" ]; then :; else
95
echo "Directory $KEYDIR not writeable" >&2
96
exit 1
97
fi
98
99
if [ -z "$KEYTYPE" ]; then
100
echo "Empty key type" >&2
101
exit 1
102
fi
103
104
if [ -z "$KEYNAME" ]; then
105
echo "Empty key name" >&2
106
exit 1
107
fi
108
109
if [ -z "$KEYLENGTH" ] || [ "$KEYLENGTH" -lt 512 ]; then
110
echo "Invalid key length" >&2
111
exit 1
112
fi
113
114
if [ -z "$KEYEXPIRE" ]; then
115
echo "Empty key expiration" >&2
116
exit 1
117
fi
118
119
# Make FORCE be 0 or 1
120
case "$FORCE" in
121
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) FORCE=1;;
122
[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|*) FORCE=0;;
123
esac
124
125
if { [ -e "$SECKEYFILE" ] || [ -e "$PUBKEYFILE" ]; } \
126
&& [ "$FORCE" -eq 0 ]; then
127
echo "Refusing to overwrite old key files; use --force" >&2
128
exit 1
129
fi
130
131
# Set lines for GnuPG batch file
132
if [ -n "$KEYCOMMENT" ]; then
133
KEYCOMMENTLINE="Name-Comment: $KEYCOMMENT"
134
fi
135
if [ -n "$KEYEMAIL" ]; then
136
KEYEMAILLINE="Name-Email: $KEYEMAIL"
137
fi
138
139
# Create temp files
140
BATCHFILE="`mktemp -t mandos-gpg-batch.XXXXXXXXXX`"
141
SECRING="`mktemp -t mandos-gpg-secring.XXXXXXXXXX`"
142
PUBRING="`mktemp -t mandos-gpg-pubring.XXXXXXXXXX`"
128
if [ ! -r "$KEYDIR" ]; then
129
echo "Directory $KEYDIR not readable" >&2
130
exit 1
131
fi
132
133
if [ "$mode" = keygen ]; then
134
if [ ! -w "$KEYDIR" ]; then
135
echo "Directory $KEYDIR not writeable" >&2
136
exit 1
137
fi
138
if [ -z "$KEYTYPE" ]; then
139
echo "Empty key type" >&2
140
exit 1
141
fi
142
143
if [ -z "$KEYNAME" ]; then
144
echo "Empty key name" >&2
145
exit 1
146
fi
147
148
if [ -z "$KEYLENGTH" ] || [ "$KEYLENGTH" -lt 512 ]; then
149
echo "Invalid key length" >&2
150
exit 1
151
fi
152
153
if [ -z "$KEYEXPIRE" ]; then
154
echo "Empty key expiration" >&2
155
exit 1
156
fi
157
158
# Make FORCE be 0 or 1
159
case "$FORCE" in
160
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) FORCE=1;;
161
[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|*) FORCE=0;;
162
esac
163
164
if [ \( -e "$SECKEYFILE" -o -e "$PUBKEYFILE" \) \
165
-a "$FORCE" -eq 0 ]; then
166
echo "Refusing to overwrite old key files; use --force" >&2
167
exit 1
168
fi
169
170
# Set lines for GnuPG batch file
171
if [ -n "$KEYCOMMENT" ]; then
172
KEYCOMMENTLINE="Name-Comment: $KEYCOMMENT"
173
fi
174
if [ -n "$KEYEMAIL" ]; then
175
KEYEMAILLINE="Name-Email: $KEYEMAIL"
176
fi
177
178
# Create temporary gpg batch file
179
BATCHFILE="`mktemp -t mandos-keygen-batch.XXXXXXXXXX`"
180
fi
181
182
if [ "$mode" = password ]; then
183
# Create temporary encrypted password file
184
SECFILE="`mktemp -t mandos-keygen-secfile.XXXXXXXXXX`"
185
fi
186
187
# Create temporary key ring directory
188
RINGDIR="`mktemp -d -t mandos-keygen-keyrings.XXXXXXXXXX`"
143
189
144
190
# Remove temporary files on exit
145
trap "rm --force $PUBRING $BATCHFILE; shred --remove $SECRING" EXIT
146
147
# Create batch file for GnuPG
148
cat >"$BATCHFILE" <<EOF
149
Key-Type: $KEYTYPE
150
Key-Length: $KEYLENGTH
151
#Key-Usage: encrypt,sign,auth
152
Name-Real: $KEYNAME
153
$KEYCOMMENTLINE
154
$KEYEMAILLINE
155
Expire-Date: $KEYEXPIRE
156
%pubring $PUBRING
157
%secring $SECRING
158
%commit
159
EOF
160
161
umask 027
162
163
# Generate a new key in the key rings
164
gpg --no-random-seed-file --quiet --batch --no-tty \
165
--no-default-keyring --no-options --batch \
166
--secret-keyring "$SECRING" --keyring "$PUBRING" \
167
--gen-key "$BATCHFILE"
168
rm --force "$BATCHFILE"
169
170
# Backup any old key files
171
if cp --backup=numbered --force "$SECKEYFILE" "$SECKEYFILE" \
172
2>/dev/null; then
173
shred --remove "$SECKEYFILE"
174
fi
175
if cp --backup=numbered --force "$PUBKEYFILE" "$PUBKEYFILE" \
176
2>/dev/null; then
177
rm --force "$PUBKEYFILE"
178
fi
179
180
FILECOMMENT="Mandos client key for $KEYNAME"
181
if [ "$KEYCOMMENT" != "$KEYCOMMENT_ORIG" ]; then
182
FILECOMMENT="$FILECOMMENT ($KEYCOMMENT)"
183
fi
184
185
if [ -n "$KEYEMAIL" ]; then
186
FILECOMMENT="$FILECOMMENT <$KEYEMAIL>"
187
fi
188
189
# Export keys from key rings to key files
190
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
191
--no-default-keyring --secret-keyring "$SECRING" \
192
--keyring "$PUBRING" --export-options export-minimal \
193
--comment "$FILECOMMENT" --output "$SECKEYFILE" \
194
--export-secret-keys
195
gpg --no-random-seed-file --quiet --batch --no-tty --armor \
196
--no-default-keyring --secret-keyring "$SECRING" \
197
--keyring "$PUBRING" --export-options export-minimal \
198
--comment "$FILECOMMENT" --output "$PUBKEYFILE" \
199
--export
191
trap "
192
set +e; \
193
test -n \"$SECFILE\" && shred --remove \"$SECFILE\"; \
194
shred --remove \"$RINGDIR\"/sec* 2>/dev/null;
195
test -n \"$BATCHFILE\" && rm --force \"$BATCHFILE\"; \
196
rm --recursive --force \"$RINGDIR\";
197
tty --quiet && stty echo; \
198
" EXIT
199
200
set -e
201
202
umask 077
203
204
if [ "$mode" = keygen ]; then
205
# Create batch file for GnuPG
206
cat >"$BATCHFILE" <<-EOF
207
Key-Type: $KEYTYPE
208
Key-Length: $KEYLENGTH
209
Key-Usage: sign,auth
210
Subkey-Type: $SUBKEYTYPE
211
Subkey-Length: $SUBKEYLENGTH
212
Subkey-Usage: encrypt
213
Name-Real: $KEYNAME
214
$KEYCOMMENTLINE
215
$KEYEMAILLINE
216
Expire-Date: $KEYEXPIRE
217
#Preferences: <string>
218
#Handle: <no-spaces>
219
#%pubring pubring.gpg
220
#%secring secring.gpg
221
%no-protection
222
%commit
223
EOF
224
225
if tty --quiet; then
226
cat <<-EOF
227
Note: Due to entropy requirements, key generation could take
228
anything from a few minutes to SEVERAL HOURS. Please be
229
patient and/or supply the system with more entropy if needed.
230
EOF
231
echo -n "Started: "
232
date
233
fi
234
235
# Make sure trustdb.gpg exists;
236
# this is a workaround for Debian bug #737128
237
gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
238
--homedir "$RINGDIR" \
239
--import-ownertrust < /dev/null
240
# Generate a new key in the key rings
241
gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
242
--homedir "$RINGDIR" --trust-model always \
243
--gen-key "$BATCHFILE"
244
rm --force "$BATCHFILE"
245
246
if tty --quiet; then
247
echo -n "Finished: "
248
date
249
fi
250
251
# Backup any old key files
252
if cp --backup=numbered --force "$SECKEYFILE" "$SECKEYFILE" \
253
2>/dev/null; then
254
shred --remove "$SECKEYFILE"
255
fi
256
if cp --backup=numbered --force "$PUBKEYFILE" "$PUBKEYFILE" \
257
2>/dev/null; then
258
rm --force "$PUBKEYFILE"
259
fi
260
261
FILECOMMENT="Mandos client key for $KEYNAME"
262
if [ "$KEYCOMMENT" != "$KEYCOMMENT_ORIG" ]; then
263
FILECOMMENT="$FILECOMMENT ($KEYCOMMENT)"
264
fi
265
266
if [ -n "$KEYEMAIL" ]; then
267
FILECOMMENT="$FILECOMMENT <$KEYEMAIL>"
268
fi
269
270
# Export key from key rings to key files
271
gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
272
--homedir "$RINGDIR" --armor --export-options export-minimal \
273
--comment "$FILECOMMENT" --output "$SECKEYFILE" \
274
--export-secret-keys
275
gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
276
--homedir "$RINGDIR" --armor --export-options export-minimal \
277
--comment "$FILECOMMENT" --output "$PUBKEYFILE" --export
278
fi
279
280
if [ "$mode" = password ]; then
281
282
# Make SSH be 0 or 1
283
case "$SSH" in
284
[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) SSH=1;;
285
[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|*) SSH=0;;
286
esac
287
288
if [ $SSH -eq 1 ]; then
289
for ssh_keytype in ecdsa-sha2-nistp256 ed25519 rsa; do
290
set +e
291
ssh_fingerprint="`ssh-keyscan -t $ssh_keytype localhost 2>/dev/null`"
292
set -e
293
if [ $? -ne 0 ]; then
294
ssh_fingerprint=""
295
continue
296
fi
297
if [ -n "$ssh_fingerprint" ]; then
298
ssh_fingerprint="${ssh_fingerprint#localhost }"
299
break
300
fi
301
done
302
fi
303
304
# Import key into temporary key rings
305
gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
306
--homedir "$RINGDIR" --trust-model always --armor \
307
--import "$SECKEYFILE"
308
gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
309
--homedir "$RINGDIR" --trust-model always --armor \
310
--import "$PUBKEYFILE"
311
312
# Get fingerprint of key
313
FINGERPRINT="`gpg --quiet --batch --no-tty --no-options \
314
--enable-dsa2 --homedir "$RINGDIR" --trust-model always \
315
--fingerprint --with-colons \
316
| sed --quiet \
317
--expression='/^fpr:/{s/^fpr:.*:\\([0-9A-Z]*\\):\$/\\1/p;q}'`"
318
319
test -n "$FINGERPRINT"
320
321
FILECOMMENT="Encrypted password for a Mandos client"
322
323
while [ ! -s "$SECFILE" ]; do
324
if [ -n "$PASSFILE" ]; then
325
cat "$PASSFILE"
326
else
327
tty --quiet && stty -echo
328
echo -n "Enter passphrase: " >/dev/tty
329
read -r first
330
tty --quiet && echo >&2
331
echo -n "Repeat passphrase: " >/dev/tty
332
read -r second
333
if tty --quiet; then
334
echo >&2
335
stty echo
336
fi
337
if [ "$first" != "$second" ]; then
338
echo "Passphrase mismatch" >&2
339
touch "$RINGDIR"/mismatch
340
else
341
echo -n "$first"
342
fi
343
fi | gpg --quiet --batch --no-tty --no-options --enable-dsa2 \
344
--homedir "$RINGDIR" --trust-model always --armor \
345
--encrypt --sign --recipient "$FINGERPRINT" --comment \
346
"$FILECOMMENT" > "$SECFILE"
347
if [ -e "$RINGDIR"/mismatch ]; then
348
rm --force "$RINGDIR"/mismatch
349
if tty --quiet; then
350
> "$SECFILE"
351
else
352
exit 1
353
fi
354
fi
355
done
356
357
cat <<-EOF
358
[$KEYNAME]
359
host = $KEYNAME
360
fingerprint = $FINGERPRINT
361
secret =
362
EOF
363
sed --quiet --expression='
364
/^-----BEGIN PGP MESSAGE-----$/,/^-----END PGP MESSAGE-----$/{
365
/^$/,${
366
# Remove 24-bit Radix-64 checksum
367
s/=....$//
368
# Indent four spaces
369
/^[^-]/s/^/ /p
370
}
371
}' < "$SECFILE"
372
if [ -n "$ssh_fingerprint" ]; then
373
echo 'checker = ssh-keyscan -t '"$ssh_keytype"' %%(host)s 2>/dev/null | grep --fixed-strings --line-regexp --quiet --regexp=%%(host)s" %(ssh_fingerprint)s"'
374
echo "ssh_fingerprint = ${ssh_fingerprint}"
375
fi
376
fi
200
377
201
378
trap - EXIT
202
379
380
set +e
381
# Remove the password file, if any
382
if [ -n "$SECFILE" ]; then
383
shred --remove "$SECFILE"
384
fi
203
385
# Remove the key rings
204
shred --remove "$SECRING"
205
rm --force "$PUBRING"
386
shred --remove "$RINGDIR"/sec* 2>/dev/null
387
rm --recursive --force "$RINGDIR"
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0