/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 debian/mandos-client.postinst

  • Committer: Teddy Hogeborn
  • Date: 2019-02-10 08:41:14 UTC
  • Revision ID: teddy@recompile.se-20190210084114-u91mijrxtifvzra5
Bug fix: Only create TLS key with certtool, and read correct key file

* debian/mandos-client.postinst (create_keys): Remove any bad keys
                                               created by 1.8.0-1.
                                               Only create TLS keys if
                                               certtool succeeds.
* debian/mandos.postinst (configure): Remove any bad keys from
                                      clients.conf, and inform the
                                      user if any were found.
* debian/mandos.templates (mandos/removed_bad_key_ids): New message.
* mandos (MandosServer.handle_ipc): Do not trust a key_id with a known
                                    bad key ID.
* mandos-keygen (keygen): Only create TLS keys if certtool succeeds.
  (password): Bug fix: Generate key_id correctly, and only output
              key_id if TLS key exists.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos-client.postinst
15
15
# If prerm fails during replacement due to conflict:
16
16
#       <postinst> abort-remove in-favour <new-package> <version>
17
17
 
 
18
. /usr/share/debconf/confmodule
 
19
 
18
20
set -e
19
21
 
20
22
# Update the initial RAM file system image
61
63
        return 0
62
64
    fi
63
65
 
 
66
    # Remove any bad TLS keys by 1.8.0-1
 
67
    if dpkg --compare-versions "$2" eq "1.8.0-1" \
 
68
       || dpkg --compare-versions "$2" eq "1.8.0-1~bpo9+1"; then
 
69
        # Is the key bad?
 
70
        if ! certtool --password='' \
 
71
             --load-privkey=/etc/keys/mandos/tls-privkey.pem \
 
72
             --outfile=/dev/null --pubkey-info --no-text \
 
73
             2>/dev/null; then
 
74
            shred --remove -- /etc/keys/mandos/tls-privkey.pem
 
75
            rm -- /etc/keys/mandos/tls-pubkey.pem
 
76
        fi
 
77
    fi
 
78
 
64
79
    # If the TLS keys already exists, do nothing
65
80
    if [ -r /etc/keys/mandos/tls-privkey.pem \
66
81
            -a -r /etc/keys/mandos/tls-pubkey.pem ]; then
67
82
        return 0
68
83
    fi
69
84
 
70
 
    # If this is an upgrade from an old installation, the TLS keys
71
 
    # will not exist; create them.
72
 
 
73
 
    # First try certtool from GnuTLS
74
 
    if ! certtool --generate-privkey --password='' \
75
 
         --outfile /etc/keys/mandos/tls-privkey.pem \
76
 
         --sec-param ultra --key-type=ed25519 --pkcs8 --no-text \
77
 
         2>/dev/null; then
78
 
        # Otherwise try OpenSSL
79
 
        if ! openssl genpkey -algorithm X25519 \
80
 
             -out /etc/keys/mandos/tls-privkey.pem; then
81
 
            rm --force /etc/keys/mandos/tls-privkey.pem
82
 
            # None of the commands succeded; give up
83
 
            return 1
84
 
        fi
85
 
    fi
86
 
 
87
 
    local umask=$(umask)
88
 
    umask 077
89
 
    # First try certtool from GnuTLS
90
 
    if ! certtool --password='' \
91
 
         --load-privkey=/etc/keys/mandos/tls-privkey.pem \
92
 
         --outfile=/etc/keys/mandos/tls-pubkey.pem --pubkey-info \
93
 
         --no-text 2>/dev/null; then
94
 
        # Otherwise try OpenSSL
95
 
        if ! openssl pkey -in /etc/keys/mandos/tls-privkey.pem \
96
 
             -out /etc/keys/mandos/tls-pubkey.pem -pubout; then
97
 
            rm --force /etc/keys/mandos/tls-pubkey.pem
98
 
            # None of the commands succeded; give up
99
 
            umask $umask
100
 
            return 1
101
 
        fi
102
 
    fi
103
 
    umask $umask
 
85
    # Try to create the TLS keys
 
86
 
 
87
    TLS_PRIVKEYTMP="`mktemp -t mandos-client-privkey.XXXXXXXXXX`"
 
88
 
 
89
    if certtool --generate-privkey --password='' \
 
90
                --outfile "$TLS_PRIVKEYTMP" --sec-param ultra \
 
91
                --key-type=ed25519 --pkcs8 --no-text 2>/dev/null; then
 
92
 
 
93
        local umask=$(umask)
 
94
        umask 077
 
95
        cp --archive "$TLS_PRIVKEYTMP" /etc/keys/mandos/tls-privkey.pem
 
96
        shred --remove -- "$TLS_PRIVKEYTMP"
 
97
 
 
98
        # First try certtool from GnuTLS
 
99
        if ! certtool --password='' \
 
100
             --load-privkey=/etc/keys/mandos/tls-privkey.pem \
 
101
             --outfile=/etc/keys/mandos/tls-pubkey.pem --pubkey-info \
 
102
             --no-text 2>/dev/null; then
 
103
            # Otherwise try OpenSSL
 
104
            if ! openssl pkey -in /etc/keys/mandos/tls-privkey.pem \
 
105
                 -out /etc/keys/mandos/tls-pubkey.pem -pubout; then
 
106
                rm --force /etc/keys/mandos/tls-pubkey.pem
 
107
                # None of the commands succeded; give up
 
108
                umask $umask
 
109
                return 1
 
110
            fi
 
111
        fi
 
112
        umask $umask
 
113
 
 
114
        key_id=$(mandos-keygen --passfile=/dev/null \
 
115
                     | grep --regexp="^key_id[ =]")
 
116
 
 
117
        db_version 2.0
 
118
        db_fset mandos-client/key_id seen false
 
119
        db_reset mandos-client/key_id
 
120
        db_subst mandos-client/key_id key_id $key_id
 
121
        db_input critical mandos-client/key_id || true
 
122
        db_go
 
123
        db_stop
 
124
    else
 
125
        shred --remove -- "$TLS_PRIVKEYTMP"
 
126
    fi
104
127
}
105
128
 
106
129
create_dh_params(){