/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.postinst

  • Committer: teddy at recompile
  • Date: 2020-02-08 14:01:38 UTC
  • Revision ID: teddy@recompile.se-20200208140138-h3ett0amdelfpt90
mandos: If possible, use shlex.quote() instead of re.escape()

* mandos: Make sure shlex.quote() exists (falling back to assigning
  re.escape to it).
  (Client.start_checker): Use shlex.quote() instead of re.escape().

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.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
case "$1" in
25
27
                *:Mandos\ password\ system,,,:/nonexistent:/bin/false)
26
28
                    usermod --login _mandos mandos
27
29
                    groupmod --new-name _mandos mandos
 
30
                    # Reload D-Bus daemon to be aware of the _mandos
 
31
                    # user & group
 
32
                    if [ -x /etc/init.d/dbus ]; then
 
33
                        invoke-rc.d dbus force-reload || :
 
34
                    fi
28
35
                    ;;
29
36
            esac
30
37
        fi
34
41
                --home /nonexistent --no-create-home --group \
35
42
                --disabled-password --gecos "Mandos password system" \
36
43
                _mandos
 
44
            # Reload D-Bus daemon to be aware of the _mandos user &
 
45
            # group
 
46
            if [ -x /etc/init.d/dbus ]; then
 
47
                invoke-rc.d dbus force-reload || :
 
48
            fi
37
49
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
38
50
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
39
51
        then
53
65
            chown _mandos:_mandos /var/lib/mandos
54
66
            chmod u=rwx,go= /var/lib/mandos
55
67
        fi
 
68
 
 
69
        if dpkg --compare-versions "$2" eq "1.8.0-1" \
 
70
                || dpkg --compare-versions "$2" eq "1.8.0-1~bpo9+1"; then
 
71
            if grep --quiet --regexp='^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$' /etc/mandos/clients.conf; then
 
72
                sed --in-place \
 
73
                    --expression='/^[[:space:]]*key_id[[:space:]]*=[[:space:]]*[Ee]3[Bb]0[Cc]44298[Ff][Cc]1[Cc]149[Aa][Ff][Bb][Ff]4[Cc]8996[Ff][Bb]92427[Aa][Ee]41[Ee]4649[Bb]934[Cc][Aa]495991[Bb]7852[Bb]855[[:space:]]*$/d' \
 
74
                    /etc/mandos/clients.conf
 
75
                invoke-rc.d mandos restart
 
76
                db_version 2.0
 
77
                db_fset mandos/removed_bad_key_ids seen false
 
78
                db_reset mandos/removed_bad_key_ids
 
79
                db_input critical mandos/removed_bad_key_ids || true
 
80
                db_go
 
81
                db_stop
 
82
            fi
 
83
        fi
 
84
 
 
85
        gnutls_version=$(dpkg-query --showformat='${Version}' \
 
86
                                    --show libgnutls30 \
 
87
                                    2>/dev/null || :)
 
88
        if [ -n "$gnutls_version" ] \
 
89
               && dpkg --compare-versions $gnutls_version ge 3.6.6; then
 
90
            db_version 2.0
 
91
            db_input critical mandos/key_id || true
 
92
            db_go
 
93
            db_stop
 
94
        fi
56
95
        ;;
57
96
    
58
97
    abort-upgrade|abort-deconfigure|abort-remove)