/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 Hogeborn
  • Date: 2015-08-10 09:00:23 UTC
  • Revision ID: teddy@recompile.se-20150810090023-fz6vjqr7zf33e2tf
Support the standard org.freedesktop.DBus.ObjectManager interface.

Now that the D-Bus standard has an interface to keep track of new and
removed objects, use that instead of our own methods.  This deprecates
our D-Bus methods "GetAllClients" and "GetAllClientsWithProperties"
and the signals "ClientAdded" and "ClientRemoved", all on the server
interface "se.recompile.Mandos".

* DBUS-API: Removed references to deprecated methods and signals;
  insert reference to the org.freedesktop.DBus.ObjectManager
  interface.
* mandos (DBusObjectWithProperties._get_all_interface_names): New.
  (dbus.OBJECT_MANAGER_IFACE): If not present, monkey patch.
  (DBusObjectWithObjectManager): New.
  (main/MandosDBusService): Inherit from DBusObjectWithObjectManager.
  (main/MandosDBusService.ClientRemoved): Annotate as deprecated.
  (main/MandosDBusService.GetAllClients): - '' -
  (main/MandosDBusService.GetAllClientsWithProperties): Annotate as
                                                        deprecated.
                                                        Also only
                                                        return
                                                        properties on
                                                        client
                                                        interface.
  (main/MandosDBusService.RemoveClient): Call client_removed_signal
                                         instead of ClientRemoved.
  (main/MandosDBusService.GetManagedObjects): New.
  (main/MandosDBusService.client_added_signal): New.
  (main/MandosDBusService.client_removed_signal): - '' -
  (main/cleanup): Call "client_removed_signal" instead of sending
                  "ClientRemoved" signal directly.
  (main): Call "client_added_signal" instead of sending "ClientAdded"
          signal directly.
* mandos-ctl: Use GetManagedObjects instead of
              GetAllClientsWithProperties.  Also, show better error
              message in case of failure to connect to the D-Bus

* mandos-monitor (MandosClientPropertyCache.properties_changed):
  Bug fix; only update properties on client interface.
  (UserInterface.find_and_remove_client): Change to accept arguments
                                          from InterfacesRemoved
                                          signal.  Also, bug fix:
                                          working error message when
                                          removing unknown client.
  (UserInterface.add_new_client): Change to accept arguments from
                                  InterfacesRemoved signal.  Pass
                                  properties to MandosClientWidget
                                  constructor.
  (UserInterface.run): Connect find_and_remove_client method to
                       InterfacesRemoved signal and the add_new_client
                       method to the InterfacesAdded signal.

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
 
 
20
18
set -e
21
19
 
22
20
case "$1" in
36
34
                --home /nonexistent --no-create-home --group \
37
35
                --disabled-password --gecos "Mandos password system" \
38
36
                _mandos
39
 
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
40
 
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
41
 
        then
42
 
            start=no
43
 
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
44
 
                invoke-rc.d mandos stop
45
 
                start=yes
46
 
            fi
47
 
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
48
 
                  2>/dev/null || :
49
 
            if [ "$start" = yes ]; then
50
 
                invoke-rc.d mandos start
51
 
            fi
52
 
        fi
53
 
        # Reload D-Bus daemon to be aware of the _mandos user & group
54
 
        if [ -x /etc/init.d/dbus ]; then
55
 
            invoke-rc.d dbus force-reload || :
56
 
        fi
57
 
        if ! dpkg-statoverride --list "/var/lib/mandos" >/dev/null \
58
 
             2>&1; then
59
 
            chown _mandos:_mandos /var/lib/mandos
60
 
            chmod u=rwx,go= /var/lib/mandos
61
 
        fi
62
 
 
63
 
        if dpkg --compare-versions "$2" eq "1.8.0-1" \
64
 
                || dpkg --compare-versions "$2" eq "1.8.0-1~bpo9+1"; then
65
 
            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
66
 
                sed --in-place \
67
 
                    --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' \
68
 
                    /etc/mandos/clients.conf
69
 
                invoke-rc.d mandos restart
70
 
                db_version 2.0
71
 
                db_fset mandos/removed_bad_key_ids seen false
72
 
                db_reset mandos/removed_bad_key_ids
73
 
                db_input critical mandos/removed_bad_key_ids || true
74
 
                db_go
75
 
                db_stop
76
 
            fi
77
 
        fi
78
 
 
79
 
        gnutls_version=$(dpkg-query --showformat='${Version}' \
80
 
                                    --show libgnutls30 \
81
 
                                    2>/dev/null || :)
82
 
        if [ -n "$gnutls_version" ] \
83
 
               && dpkg --compare-versions $gnutls_version ge 3.6.6; then
84
 
            db_version 2.0
85
 
            db_input critical mandos/key_id || true
86
 
            db_go
87
 
            db_stop
88
 
        fi
 
37
        fi
 
38
        chown _mandos:_mandos /var/lib/mandos
89
39
        ;;
90
40
    
91
41
    abort-upgrade|abort-deconfigure|abort-remove)