/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 mandos-ctl

  • Committer: Teddy Hogeborn
  • Date: 2010-01-01 15:17:12 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100101151712-x20p42nhuvf9lxol
Bug fix: mandos-client needs GnuPG but lacked a dependency on it.  The
Mandos server, on the other hand, did not need GnuPG but declared an
incorrect dependency on it.

* debian/control (Package: mandos/Depends): Removed "gnupg (< 2)".
  (Package: mandos-client/Depends): Added "gnupg (<< 2)".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-ctl
24
24
    'last_enabled': u'Last Enabled',
25
25
    'checker': u'Checker',
26
26
    }
27
 
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
28
 
                   'checker')
 
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok')
29
28
domain = 'se.bsnet.fukt'
30
29
busname = domain + '.Mandos'
31
30
server_path = '/'
32
31
server_interface = domain + '.Mandos'
33
32
client_interface = domain + '.Mandos.Client'
34
 
version = "1.0.8"
 
33
version = "1.0.14"
35
34
bus = dbus.SystemBus()
36
35
mandos_dbus_objc = bus.get_object(busname, server_path)
37
36
mandos_serv = dbus.Interface(mandos_dbus_objc,
38
37
                             dbus_interface = server_interface)
39
38
mandos_clients = mandos_serv.GetAllClientsWithProperties()
40
39
 
41
 
def datetime_to_milliseconds(dt):
42
 
    "Return the 'timeout' attribute in milliseconds"
43
 
    return ((dt.days * 24 * 60 * 60 * 1000)
44
 
            + (dt.seconds * 1000)
45
 
            + (dt.microseconds // 1000))
 
40
def timedelta_to_milliseconds(td):
 
41
    "Convert a datetime.timedelta object to milliseconds"
 
42
    return ((td.days * 24 * 60 * 60 * 1000)
 
43
            + (td.seconds * 1000)
 
44
            + (td.microseconds // 1000))
46
45
 
47
46
def milliseconds_to_string(ms):
48
47
    td = datetime.timedelta(0, 0, 0, ms)
49
 
    return "%s%02d:%02d:%02d" % (("%dT" % td.days) if td.days else "", # days
50
 
                           td.seconds // 3600,        # hours
51
 
                           (td.seconds % 3600) // 60, # minutes
52
 
                           (td.seconds % 60))         # seconds
 
48
    return (u"%(days)s%(hours)02d:%(minutes)02d:%(seconds)02d"
 
49
            % { "days": "%dT" % td.days if td.days else "",
 
50
                "hours": td.seconds // 3600,
 
51
                "minutes": (td.seconds % 3600) // 60,
 
52
                "seconds": td.seconds % 60,
 
53
                })
53
54
 
54
55
 
55
56
def string_to_delta(interval):
96
97
    def valuetostring(value, keyword):
97
98
        if type(value) is dbus.Boolean:
98
99
            return u"Yes" if value else u"No"
99
 
        if keyword in ("timeout", "interval"):
 
100
        if keyword in (u"timeout", u"interval"):
100
101
            return milliseconds_to_string(value)
101
102
        return unicode(value)
102
103
    
 
104
    # Create format string to print table rows
103
105
    format_string = u' '.join(u'%%-%ds' %
104
106
                              max(len(tablewords[key]),
105
107
                                  max(len(valuetostring(client[key], key))
106
108
                                      for client in
107
109
                                      clients))
108
110
                              for key in keywords)
109
 
    print format_string % tuple(tablewords[key] for key in keywords) 
 
111
    # Print header line
 
112
    print format_string % tuple(tablewords[key] for key in keywords)
110
113
    for client in clients:
111
114
        print format_string % tuple(valuetostring(client[key], key)
112
115
                                    for key in keywords)
124
127
                  help="Start checker for client")
125
128
parser.add_option("--stop-checker", action="store_true",
126
129
                  help="Stop checker for client")
127
 
parser.add_option("-V", "--is-valid", action="store_true",
128
 
                  help="Check if client is still valid")
 
130
parser.add_option("-V", "--is-enabled", action="store_true",
 
131
                  help="Check if client is enabled")
129
132
parser.add_option("-r", "--remove", action="store_true",
130
133
                  help="Remove client")
131
134
parser.add_option("-c", "--checker", type="string",
146
149
    for path, client in mandos_clients.iteritems():
147
150
        if client['name'] == name:
148
151
            client_objc = bus.get_object(busname, path)
149
 
            clients.append(dbus.Interface(client_objc,
150
 
                                          dbus_interface
151
 
                                          = client_interface))
 
152
            clients.append(client_objc)
152
153
            break
153
154
    else:
154
155
        print >> sys.stderr, "Client not found on server: %r" % name
167
168
    if options.remove:
168
169
        mandos_serv.RemoveClient(client.__dbus_object_path__)
169
170
    if options.enable:
170
 
        client.Enable()
 
171
        client.Enable(dbus_interface=client_interface)
171
172
    if options.disable:
172
 
        client.Disable()
 
173
        client.Disable(dbus_interface=client_interface)
173
174
    if options.bump_timeout:
174
 
        client.BumpTimeout()
 
175
        client.CheckedOK(dbus_interface=client_interface)
175
176
    if options.start_checker:
176
 
        client.StartChecker()
 
177
        client.StartChecker(dbus_interface=client_interface)
177
178
    if options.stop_checker:
178
 
        client.StopChecker()
179
 
    if options.is_valid:
180
 
        sys.exit(0 if client.IsStillValid() else 1)
 
179
        client.StopChecker(dbus_interface=client_interface)
 
180
    if options.is_enabled:
 
181
        sys.exit(0 if client.Get(client_interface,
 
182
                                 u"enabled",
 
183
                                 dbus_interface=dbus.PROPERTIES_IFACE)
 
184
                 else 1)
181
185
    if options.checker:
182
 
        client.SetChecker(options.checker)
 
186
        client.Set(client_interface, u"checker", options.checker,
 
187
                   dbus_interface=dbus.PROPERTIES_IFACE)
183
188
    if options.host:
184
 
        client.SetHost(options.host)
 
189
        client.Set(client_interface, u"host", options.host,
 
190
                   dbus_interface=dbus.PROPERTIES_IFACE)
185
191
    if options.interval:
186
 
        client.SetInterval(datetime_to_milliseconds
187
 
                           (string_to_delta(options.interval)))
 
192
        client.Set(client_interface, u"interval",
 
193
                   timedelta_to_milliseconds
 
194
                   (string_to_delta(options.interval)),
 
195
                   dbus_interface=dbus.PROPERTIES_IFACE)
188
196
    if options.timeout:
189
 
        client.SetTimeout(datetime_to_milliseconds
190
 
                          (string_to_delta(options.timeout)))
 
197
        client.Set(client_interface, u"timeout",
 
198
                   timedelta_to_milliseconds(string_to_delta
 
199
                                             (options.timeout)),
 
200
                   dbus_interface=dbus.PROPERTIES_IFACE)
191
201
    if options.secret:
192
 
        client.SetSecret(dbus.ByteArray(open(options.secret, 'rb').read()))
193
 
    
 
202
        client.Set(client_interface, u"secret",
 
203
                   dbus.ByteArray(open(options.secret, u'rb').read()),
 
204
                   dbus_interface=dbus.PROPERTIES_IFACE)