/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

  • Committer: Teddy Hogeborn
  • Date: 2010-09-12 03:00:40 UTC
  • Revision ID: teddy@fukt.bsnet.se-20100912030040-b0uopyennste9fdh
Documentation changes:

* DBUS-API: New file documenting the server D-Bus interface.

* clients.conf: Add examples of new approval settings.

* debian/mandos.docs: Added "DBUS-API".

* mandos-clients.conf.xml (OPTIONS): Added "approved_by_default",
                                     "approval_delay", and
                                     "approval_duration".
* mandos.xml (D-BUS INTERFACE): Refer to the "DBUS-API" file.
  (BUGS): Remove mention of lack of a remote query interface.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008,2009 Teddy Hogeborn
 
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
31
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
 
from __future__ import (division, absolute_import, print_function,
35
 
                        unicode_literals)
 
34
from __future__ import division, with_statement, absolute_import
36
35
 
37
36
import SocketServer as socketserver
38
37
import socket
39
 
import argparse
 
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
82
81
        SO_BINDTODEVICE = None
83
82
 
84
83
 
85
 
version = "1.3.1"
 
84
version = "1.0.14"
86
85
 
87
 
#logger = logging.getLogger('mandos')
88
 
logger = logging.Logger('mandos')
 
86
#logger = logging.getLogger(u'mandos')
 
87
logger = logging.Logger(u'mandos')
89
88
syslogger = (logging.handlers.SysLogHandler
90
89
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
 
              address = str("/dev/log")))
 
90
              address = "/dev/log"))
92
91
syslogger.setFormatter(logging.Formatter
93
 
                       ('Mandos [%(process)d]: %(levelname)s:'
94
 
                        ' %(message)s'))
 
92
                       (u'Mandos [%(process)d]: %(levelname)s:'
 
93
                        u' %(message)s'))
95
94
logger.addHandler(syslogger)
96
95
 
97
96
console = logging.StreamHandler()
98
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
 
                                       ' %(levelname)s:'
100
 
                                       ' %(message)s'))
 
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
 
98
                                       u' %(levelname)s:'
 
99
                                       u' %(message)s'))
101
100
logger.addHandler(console)
102
101
 
103
102
class AvahiError(Exception):
120
119
    Attributes:
121
120
    interface: integer; avahi.IF_UNSPEC or an interface index.
122
121
               Used to optionally bind to the specified interface.
123
 
    name: string; Example: 'Mandos'
124
 
    type: string; Example: '_mandos._tcp'.
 
122
    name: string; Example: u'Mandos'
 
123
    type: string; Example: u'_mandos._tcp'.
125
124
                  See <http://www.dns-sd.org/ServiceTypes.html>
126
125
    port: integer; what port to announce
127
126
    TXT: list of strings; TXT record for the service
136
135
    """
137
136
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
137
                 servicetype = None, port = None, TXT = None,
139
 
                 domain = "", host = "", max_renames = 32768,
 
138
                 domain = u"", host = u"", max_renames = 32768,
140
139
                 protocol = avahi.PROTO_UNSPEC, bus = None):
141
140
        self.interface = interface
142
141
        self.name = name
151
150
        self.group = None       # our entry group
152
151
        self.server = None
153
152
        self.bus = bus
154
 
        self.entry_group_state_changed_match = None
155
153
    def rename(self):
156
154
        """Derived from the Avahi example code"""
157
155
        if self.rename_count >= self.max_renames:
158
 
            logger.critical("No suitable Zeroconf service name found"
159
 
                            " after %i retries, exiting.",
 
156
            logger.critical(u"No suitable Zeroconf service name found"
 
157
                            u" after %i retries, exiting.",
160
158
                            self.rename_count)
161
 
            raise AvahiServiceError("Too many renames")
 
159
            raise AvahiServiceError(u"Too many renames")
162
160
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
163
 
        logger.info("Changing Zeroconf service name to %r ...",
 
161
        logger.info(u"Changing Zeroconf service name to %r ...",
164
162
                    self.name)
165
163
        syslogger.setFormatter(logging.Formatter
166
 
                               ('Mandos (%s) [%%(process)d]:'
167
 
                                ' %%(levelname)s: %%(message)s'
 
164
                               (u'Mandos (%s) [%%(process)d]:'
 
165
                                u' %%(levelname)s: %%(message)s'
168
166
                                % self.name))
169
167
        self.remove()
170
168
        try:
171
169
            self.add()
172
 
        except dbus.exceptions.DBusException as error:
173
 
            logger.critical("DBusException: %s", error)
 
170
        except dbus.exceptions.DBusException, error:
 
171
            logger.critical(u"DBusException: %s", error)
174
172
            self.cleanup()
175
173
            os._exit(1)
176
174
        self.rename_count += 1
177
175
    def remove(self):
178
176
        """Derived from the Avahi example code"""
179
 
        if self.entry_group_state_changed_match is not None:
180
 
            self.entry_group_state_changed_match.remove()
181
 
            self.entry_group_state_changed_match = None
182
177
        if self.group is not None:
183
178
            self.group.Reset()
184
179
    def add(self):
185
180
        """Derived from the Avahi example code"""
186
 
        self.remove()
187
181
        if self.group is None:
188
182
            self.group = dbus.Interface(
189
183
                self.bus.get_object(avahi.DBUS_NAME,
190
184
                                    self.server.EntryGroupNew()),
191
185
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
192
 
        self.entry_group_state_changed_match = (
193
 
            self.group.connect_to_signal(
194
 
                'StateChanged', self .entry_group_state_changed))
195
 
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
 
186
            self.group.connect_to_signal('StateChanged',
 
187
                                         self
 
188
                                         .entry_group_state_changed)
 
189
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
196
190
                     self.name, self.type)
197
191
        self.group.AddService(
198
192
            self.interface,
205
199
        self.group.Commit()
206
200
    def entry_group_state_changed(self, state, error):
207
201
        """Derived from the Avahi example code"""
208
 
        logger.debug("Avahi entry group state change: %i", state)
 
202
        logger.debug(u"Avahi entry group state change: %i", state)
209
203
        
210
204
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
211
 
            logger.debug("Zeroconf service established.")
 
205
            logger.debug(u"Zeroconf service established.")
212
206
        elif state == avahi.ENTRY_GROUP_COLLISION:
213
 
            logger.info("Zeroconf service name collision.")
 
207
            logger.warning(u"Zeroconf service name collision.")
214
208
            self.rename()
215
209
        elif state == avahi.ENTRY_GROUP_FAILURE:
216
 
            logger.critical("Avahi: Error in group state changed %s",
 
210
            logger.critical(u"Avahi: Error in group state changed %s",
217
211
                            unicode(error))
218
 
            raise AvahiGroupError("State changed: %s"
 
212
            raise AvahiGroupError(u"State changed: %s"
219
213
                                  % unicode(error))
220
214
    def cleanup(self):
221
215
        """Derived from the Avahi example code"""
222
216
        if self.group is not None:
223
 
            try:
224
 
                self.group.Free()
225
 
            except (dbus.exceptions.UnknownMethodException,
226
 
                    dbus.exceptions.DBusException) as e:
227
 
                pass
 
217
            self.group.Free()
228
218
            self.group = None
229
 
        self.remove()
230
 
    def server_state_changed(self, state, error=None):
 
219
    def server_state_changed(self, state):
231
220
        """Derived from the Avahi example code"""
232
 
        logger.debug("Avahi server state change: %i", state)
233
 
        bad_states = { avahi.SERVER_INVALID:
234
 
                           "Zeroconf server invalid",
235
 
                       avahi.SERVER_REGISTERING: None,
236
 
                       avahi.SERVER_COLLISION:
237
 
                           "Zeroconf server name collision",
238
 
                       avahi.SERVER_FAILURE:
239
 
                           "Zeroconf server failure" }
240
 
        if state in bad_states:
241
 
            if bad_states[state] is not None:
242
 
                if error is None:
243
 
                    logger.error(bad_states[state])
244
 
                else:
245
 
                    logger.error(bad_states[state] + ": %r", error)
246
 
            self.cleanup()
 
221
        logger.debug(u"Avahi server state change: %i", state)
 
222
        if state == avahi.SERVER_COLLISION:
 
223
            logger.error(u"Zeroconf server name collision")
 
224
            self.remove()
247
225
        elif state == avahi.SERVER_RUNNING:
248
226
            self.add()
249
 
        else:
250
 
            if error is None:
251
 
                logger.debug("Unknown state: %r", state)
252
 
            else:
253
 
                logger.debug("Unknown state: %r: %r", state, error)
254
227
    def activate(self):
255
228
        """Derived from the Avahi example code"""
256
229
        if self.server is None:
257
230
            self.server = dbus.Interface(
258
231
                self.bus.get_object(avahi.DBUS_NAME,
259
 
                                    avahi.DBUS_PATH_SERVER,
260
 
                                    follow_name_owner_changes=True),
 
232
                                    avahi.DBUS_PATH_SERVER),
261
233
                avahi.DBUS_INTERFACE_SERVER)
262
 
        self.server.connect_to_signal("StateChanged",
 
234
        self.server.connect_to_signal(u"StateChanged",
263
235
                                 self.server_state_changed)
264
236
        self.server_state_changed(self.server.GetState())
265
237
 
266
238
 
267
 
def _timedelta_to_milliseconds(td):
268
 
    "Convert a datetime.timedelta() to milliseconds"
269
 
    return ((td.days * 24 * 60 * 60 * 1000)
270
 
            + (td.seconds * 1000)
271
 
            + (td.microseconds // 1000))
272
 
        
273
239
class Client(object):
274
240
    """A representation of a client host served by this server.
275
241
    
276
242
    Attributes:
277
 
    _approved:   bool(); 'None' if not yet approved/disapproved
278
 
    approval_delay: datetime.timedelta(); Time to wait for approval
279
 
    approval_duration: datetime.timedelta(); Duration of one approval
 
243
    name:       string; from the config file, used in log messages and
 
244
                        D-Bus identifiers
 
245
    fingerprint: string (40 or 32 hexadecimal digits); used to
 
246
                 uniquely identify the client
 
247
    secret:     bytestring; sent verbatim (over TLS) to client
 
248
    host:       string; available for use by the checker command
 
249
    created:    datetime.datetime(); (UTC) object creation
 
250
    last_enabled: datetime.datetime(); (UTC)
 
251
    enabled:    bool()
 
252
    last_checked_ok: datetime.datetime(); (UTC) or None
 
253
    timeout:    datetime.timedelta(); How long from last_checked_ok
 
254
                                      until this client is disabled
 
255
    interval:   datetime.timedelta(); How often to start a new checker
 
256
    disable_hook:  If set, called by disable() as disable_hook(self)
280
257
    checker:    subprocess.Popen(); a running checker process used
281
258
                                    to see if the client lives.
282
259
                                    'None' if no process is running.
283
 
    checker_callback_tag: a gobject event source tag, or None
284
 
    checker_command: string; External command which is run to check
285
 
                     if client lives.  %() expansions are done at
 
260
    checker_initiator_tag: a gobject event source tag, or None
 
261
    disable_initiator_tag: - '' -
 
262
    checker_callback_tag:  - '' -
 
263
    checker_command: string; External command which is run to check if
 
264
                     client lives.  %() expansions are done at
286
265
                     runtime with vars(self) as dict, so that for
287
266
                     instance %(name)s can be used in the command.
288
 
    checker_initiator_tag: a gobject event source tag, or None
289
 
    created:    datetime.datetime(); (UTC) object creation
290
267
    current_checker_command: string; current running checker_command
291
 
    disable_hook:  If set, called by disable() as disable_hook(self)
292
 
    disable_initiator_tag: a gobject event source tag, or None
293
 
    enabled:    bool()
294
 
    fingerprint: string (40 or 32 hexadecimal digits); used to
295
 
                 uniquely identify the client
296
 
    host:       string; available for use by the checker command
297
 
    interval:   datetime.timedelta(); How often to start a new checker
298
 
    last_approval_request: datetime.datetime(); (UTC) or None
299
 
    last_checked_ok: datetime.datetime(); (UTC) or None
300
 
    last_enabled: datetime.datetime(); (UTC)
301
 
    name:       string; from the config file, used in log messages and
302
 
                        D-Bus identifiers
303
 
    secret:     bytestring; sent verbatim (over TLS) to client
304
 
    timeout:    datetime.timedelta(); How long from last_checked_ok
305
 
                                      until this client is disabled
306
 
    extended_timeout:   extra long timeout when password has been sent
307
 
    runtime_expansions: Allowed attributes for runtime expansion.
308
 
    expires:    datetime.datetime(); time (UTC) when a client will be
309
 
                disabled, or None
 
268
    approval_delay: datetime.timedelta(); Time to wait for approval
 
269
    _approved:   bool(); 'None' if not yet approved/disapproved
 
270
    approval_duration: datetime.timedelta(); Duration of one approval
310
271
    """
311
272
    
312
 
    runtime_expansions = ("approval_delay", "approval_duration",
313
 
                          "created", "enabled", "fingerprint",
314
 
                          "host", "interval", "last_checked_ok",
315
 
                          "last_enabled", "name", "timeout")
 
273
    @staticmethod
 
274
    def _timedelta_to_milliseconds(td):
 
275
        "Convert a datetime.timedelta() to milliseconds"
 
276
        return ((td.days * 24 * 60 * 60 * 1000)
 
277
                + (td.seconds * 1000)
 
278
                + (td.microseconds // 1000))
316
279
    
317
280
    def timeout_milliseconds(self):
318
281
        "Return the 'timeout' attribute in milliseconds"
319
 
        return _timedelta_to_milliseconds(self.timeout)
320
 
    
321
 
    def extended_timeout_milliseconds(self):
322
 
        "Return the 'extended_timeout' attribute in milliseconds"
323
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
282
        return self._timedelta_to_milliseconds(self.timeout)
324
283
    
325
284
    def interval_milliseconds(self):
326
285
        "Return the 'interval' attribute in milliseconds"
327
 
        return _timedelta_to_milliseconds(self.interval)
328
 
    
 
286
        return self._timedelta_to_milliseconds(self.interval)
 
287
 
329
288
    def approval_delay_milliseconds(self):
330
 
        return _timedelta_to_milliseconds(self.approval_delay)
 
289
        return self._timedelta_to_milliseconds(self.approval_delay)
331
290
    
332
291
    def __init__(self, name = None, disable_hook=None, config=None):
333
292
        """Note: the 'checker' key in 'config' sets the
336
295
        self.name = name
337
296
        if config is None:
338
297
            config = {}
339
 
        logger.debug("Creating client %r", self.name)
 
298
        logger.debug(u"Creating client %r", self.name)
340
299
        # Uppercase and remove spaces from fingerprint for later
341
300
        # comparison purposes with return value from the fingerprint()
342
301
        # function
343
 
        self.fingerprint = (config["fingerprint"].upper()
344
 
                            .replace(" ", ""))
345
 
        logger.debug("  Fingerprint: %s", self.fingerprint)
346
 
        if "secret" in config:
347
 
            self.secret = config["secret"].decode("base64")
348
 
        elif "secfile" in config:
 
302
        self.fingerprint = (config[u"fingerprint"].upper()
 
303
                            .replace(u" ", u""))
 
304
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
 
305
        if u"secret" in config:
 
306
            self.secret = config[u"secret"].decode(u"base64")
 
307
        elif u"secfile" in config:
349
308
            with open(os.path.expanduser(os.path.expandvars
350
 
                                         (config["secfile"])),
 
309
                                         (config[u"secfile"])),
351
310
                      "rb") as secfile:
352
311
                self.secret = secfile.read()
353
312
        else:
354
 
            raise TypeError("No secret or secfile for client %s"
 
313
            raise TypeError(u"No secret or secfile for client %s"
355
314
                            % self.name)
356
 
        self.host = config.get("host", "")
 
315
        self.host = config.get(u"host", u"")
357
316
        self.created = datetime.datetime.utcnow()
358
317
        self.enabled = False
359
 
        self.last_approval_request = None
360
318
        self.last_enabled = None
361
319
        self.last_checked_ok = None
362
 
        self.timeout = string_to_delta(config["timeout"])
363
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
364
 
        self.interval = string_to_delta(config["interval"])
 
320
        self.timeout = string_to_delta(config[u"timeout"])
 
321
        self.interval = string_to_delta(config[u"interval"])
365
322
        self.disable_hook = disable_hook
366
323
        self.checker = None
367
324
        self.checker_initiator_tag = None
368
325
        self.disable_initiator_tag = None
369
 
        self.expires = None
370
326
        self.checker_callback_tag = None
371
 
        self.checker_command = config["checker"]
 
327
        self.checker_command = config[u"checker"]
372
328
        self.current_checker_command = None
373
329
        self.last_connect = None
374
330
        self._approved = None
375
 
        self.approved_by_default = config.get("approved_by_default",
 
331
        self.approved_by_default = config.get(u"approved_by_default",
376
332
                                              True)
377
333
        self.approvals_pending = 0
378
334
        self.approval_delay = string_to_delta(
379
 
            config["approval_delay"])
 
335
            config[u"approval_delay"])
380
336
        self.approval_duration = string_to_delta(
381
 
            config["approval_duration"])
 
337
            config[u"approval_duration"])
382
338
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
383
339
    
384
340
    def send_changedstate(self):
388
344
        
389
345
    def enable(self):
390
346
        """Start this client's checker and timeout hooks"""
391
 
        if getattr(self, "enabled", False):
 
347
        if getattr(self, u"enabled", False):
392
348
            # Already enabled
393
349
            return
394
350
        self.send_changedstate()
 
351
        self.last_enabled = datetime.datetime.utcnow()
395
352
        # Schedule a new checker to be started an 'interval' from now,
396
353
        # and every interval from then on.
397
354
        self.checker_initiator_tag = (gobject.timeout_add
398
355
                                      (self.interval_milliseconds(),
399
356
                                       self.start_checker))
400
357
        # Schedule a disable() when 'timeout' has passed
401
 
        self.expires = datetime.datetime.utcnow() + self.timeout
402
358
        self.disable_initiator_tag = (gobject.timeout_add
403
359
                                   (self.timeout_milliseconds(),
404
360
                                    self.disable))
405
361
        self.enabled = True
406
 
        self.last_enabled = datetime.datetime.utcnow()
407
362
        # Also start a new checker *right now*.
408
363
        self.start_checker()
409
364
    
414
369
        if not quiet:
415
370
            self.send_changedstate()
416
371
        if not quiet:
417
 
            logger.info("Disabling client %s", self.name)
418
 
        if getattr(self, "disable_initiator_tag", False):
 
372
            logger.info(u"Disabling client %s", self.name)
 
373
        if getattr(self, u"disable_initiator_tag", False):
419
374
            gobject.source_remove(self.disable_initiator_tag)
420
375
            self.disable_initiator_tag = None
421
 
        self.expires = None
422
 
        if getattr(self, "checker_initiator_tag", False):
 
376
        if getattr(self, u"checker_initiator_tag", False):
423
377
            gobject.source_remove(self.checker_initiator_tag)
424
378
            self.checker_initiator_tag = None
425
379
        self.stop_checker()
440
394
        if os.WIFEXITED(condition):
441
395
            exitstatus = os.WEXITSTATUS(condition)
442
396
            if exitstatus == 0:
443
 
                logger.info("Checker for %(name)s succeeded",
 
397
                logger.info(u"Checker for %(name)s succeeded",
444
398
                            vars(self))
445
399
                self.checked_ok()
446
400
            else:
447
 
                logger.info("Checker for %(name)s failed",
 
401
                logger.info(u"Checker for %(name)s failed",
448
402
                            vars(self))
449
403
        else:
450
 
            logger.warning("Checker for %(name)s crashed?",
 
404
            logger.warning(u"Checker for %(name)s crashed?",
451
405
                           vars(self))
452
406
    
453
 
    def checked_ok(self, timeout=None):
 
407
    def checked_ok(self):
454
408
        """Bump up the timeout for this client.
455
409
        
456
410
        This should only be called when the client has been seen,
457
411
        alive and well.
458
412
        """
459
 
        if timeout is None:
460
 
            timeout = self.timeout
461
413
        self.last_checked_ok = datetime.datetime.utcnow()
462
414
        gobject.source_remove(self.disable_initiator_tag)
463
 
        self.expires = datetime.datetime.utcnow() + timeout
464
415
        self.disable_initiator_tag = (gobject.timeout_add
465
 
                                      (_timedelta_to_milliseconds(timeout),
 
416
                                      (self.timeout_milliseconds(),
466
417
                                       self.disable))
467
418
    
468
 
    def need_approval(self):
469
 
        self.last_approval_request = datetime.datetime.utcnow()
470
 
    
471
419
    def start_checker(self):
472
420
        """Start a new checker subprocess if one is not running.
473
421
        
485
433
        # If a checker exists, make sure it is not a zombie
486
434
        try:
487
435
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
488
 
        except (AttributeError, OSError) as error:
 
436
        except (AttributeError, OSError), error:
489
437
            if (isinstance(error, OSError)
490
438
                and error.errno != errno.ECHILD):
491
439
                raise error
492
440
        else:
493
441
            if pid:
494
 
                logger.warning("Checker was a zombie")
 
442
                logger.warning(u"Checker was a zombie")
495
443
                gobject.source_remove(self.checker_callback_tag)
496
444
                self.checker_callback(pid, status,
497
445
                                      self.current_checker_command)
502
450
                command = self.checker_command % self.host
503
451
            except TypeError:
504
452
                # Escape attributes for the shell
505
 
                escaped_attrs = dict(
506
 
                    (attr,
507
 
                     re.escape(unicode(str(getattr(self, attr, "")),
508
 
                                       errors=
509
 
                                       'replace')))
510
 
                    for attr in
511
 
                    self.runtime_expansions)
512
 
                
 
453
                escaped_attrs = dict((key,
 
454
                                      re.escape(unicode(str(val),
 
455
                                                        errors=
 
456
                                                        u'replace')))
 
457
                                     for key, val in
 
458
                                     vars(self).iteritems())
513
459
                try:
514
460
                    command = self.checker_command % escaped_attrs
515
 
                except TypeError as error:
516
 
                    logger.error('Could not format string "%s":'
517
 
                                 ' %s', self.checker_command, error)
 
461
                except TypeError, error:
 
462
                    logger.error(u'Could not format string "%s":'
 
463
                                 u' %s', self.checker_command, error)
518
464
                    return True # Try again later
519
465
            self.current_checker_command = command
520
466
            try:
521
 
                logger.info("Starting checker %r for %s",
 
467
                logger.info(u"Starting checker %r for %s",
522
468
                            command, self.name)
523
469
                # We don't need to redirect stdout and stderr, since
524
470
                # in normal mode, that is already done by daemon(),
526
472
                # always replaced by /dev/null.)
527
473
                self.checker = subprocess.Popen(command,
528
474
                                                close_fds=True,
529
 
                                                shell=True, cwd="/")
 
475
                                                shell=True, cwd=u"/")
530
476
                self.checker_callback_tag = (gobject.child_watch_add
531
477
                                             (self.checker.pid,
532
478
                                              self.checker_callback,
537
483
                if pid:
538
484
                    gobject.source_remove(self.checker_callback_tag)
539
485
                    self.checker_callback(pid, status, command)
540
 
            except OSError as error:
541
 
                logger.error("Failed to start subprocess: %s",
 
486
            except OSError, error:
 
487
                logger.error(u"Failed to start subprocess: %s",
542
488
                             error)
543
489
        # Re-run this periodically if run by gobject.timeout_add
544
490
        return True
548
494
        if self.checker_callback_tag:
549
495
            gobject.source_remove(self.checker_callback_tag)
550
496
            self.checker_callback_tag = None
551
 
        if getattr(self, "checker", None) is None:
 
497
        if getattr(self, u"checker", None) is None:
552
498
            return
553
 
        logger.debug("Stopping checker for %(name)s", vars(self))
 
499
        logger.debug(u"Stopping checker for %(name)s", vars(self))
554
500
        try:
555
501
            os.kill(self.checker.pid, signal.SIGTERM)
556
502
            #time.sleep(0.5)
557
503
            #if self.checker.poll() is None:
558
504
            #    os.kill(self.checker.pid, signal.SIGKILL)
559
 
        except OSError as error:
 
505
        except OSError, error:
560
506
            if error.errno != errno.ESRCH: # No such process
561
507
                raise
562
508
        self.checker = None
563
509
 
564
 
 
565
 
def dbus_service_property(dbus_interface, signature="v",
566
 
                          access="readwrite", byte_arrays=False):
 
510
def dbus_service_property(dbus_interface, signature=u"v",
 
511
                          access=u"readwrite", byte_arrays=False):
567
512
    """Decorators for marking methods of a DBusObjectWithProperties to
568
513
    become properties on the D-Bus.
569
514
    
576
521
    """
577
522
    # Encoding deeply encoded byte arrays is not supported yet by the
578
523
    # "Set" method, so we fail early here:
579
 
    if byte_arrays and signature != "ay":
580
 
        raise ValueError("Byte arrays not supported for non-'ay'"
581
 
                         " signature %r" % signature)
 
524
    if byte_arrays and signature != u"ay":
 
525
        raise ValueError(u"Byte arrays not supported for non-'ay'"
 
526
                         u" signature %r" % signature)
582
527
    def decorator(func):
583
528
        func._dbus_is_property = True
584
529
        func._dbus_interface = dbus_interface
585
530
        func._dbus_signature = signature
586
531
        func._dbus_access = access
587
532
        func._dbus_name = func.__name__
588
 
        if func._dbus_name.endswith("_dbus_property"):
 
533
        if func._dbus_name.endswith(u"_dbus_property"):
589
534
            func._dbus_name = func._dbus_name[:-14]
590
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
535
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
591
536
        return func
592
537
    return decorator
593
538
 
613
558
 
614
559
class DBusObjectWithProperties(dbus.service.Object):
615
560
    """A D-Bus object with properties.
616
 
    
 
561
 
617
562
    Classes inheriting from this can use the dbus_service_property
618
563
    decorator to expose methods as D-Bus properties.  It exposes the
619
564
    standard Get(), Set(), and GetAll() methods on the D-Bus.
621
566
    
622
567
    @staticmethod
623
568
    def _is_dbus_property(obj):
624
 
        return getattr(obj, "_dbus_is_property", False)
 
569
        return getattr(obj, u"_dbus_is_property", False)
625
570
    
626
571
    def _get_all_dbus_properties(self):
627
572
        """Returns a generator of (name, attribute) pairs
635
580
        property with the specified name and interface.
636
581
        """
637
582
        for name in (property_name,
638
 
                     property_name + "_dbus_property"):
 
583
                     property_name + u"_dbus_property"):
639
584
            prop = getattr(self, name, None)
640
585
            if (prop is None
641
586
                or not self._is_dbus_property(prop)
645
590
                continue
646
591
            return prop
647
592
        # No such property
648
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
649
 
                                   + interface_name + "."
 
593
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
594
                                   + interface_name + u"."
650
595
                                   + property_name)
651
596
    
652
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
653
 
                         out_signature="v")
 
597
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
598
                         out_signature=u"v")
654
599
    def Get(self, interface_name, property_name):
655
600
        """Standard D-Bus property Get() method, see D-Bus standard.
656
601
        """
657
602
        prop = self._get_dbus_property(interface_name, property_name)
658
 
        if prop._dbus_access == "write":
 
603
        if prop._dbus_access == u"write":
659
604
            raise DBusPropertyAccessException(property_name)
660
605
        value = prop()
661
 
        if not hasattr(value, "variant_level"):
 
606
        if not hasattr(value, u"variant_level"):
662
607
            return value
663
608
        return type(value)(value, variant_level=value.variant_level+1)
664
609
    
665
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
610
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
666
611
    def Set(self, interface_name, property_name, value):
667
612
        """Standard D-Bus property Set() method, see D-Bus standard.
668
613
        """
669
614
        prop = self._get_dbus_property(interface_name, property_name)
670
 
        if prop._dbus_access == "read":
 
615
        if prop._dbus_access == u"read":
671
616
            raise DBusPropertyAccessException(property_name)
672
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
617
        if prop._dbus_get_args_options[u"byte_arrays"]:
673
618
            # The byte_arrays option is not supported yet on
674
619
            # signatures other than "ay".
675
 
            if prop._dbus_signature != "ay":
 
620
            if prop._dbus_signature != u"ay":
676
621
                raise ValueError
677
622
            value = dbus.ByteArray(''.join(unichr(byte)
678
623
                                           for byte in value))
679
624
        prop(value)
680
625
    
681
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
 
                         out_signature="a{sv}")
 
626
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
627
                         out_signature=u"a{sv}")
683
628
    def GetAll(self, interface_name):
684
629
        """Standard D-Bus property GetAll() method, see D-Bus
685
630
        standard.
686
 
        
 
631
 
687
632
        Note: Will not include properties with access="write".
688
633
        """
689
634
        all = {}
693
638
                # Interface non-empty but did not match
694
639
                continue
695
640
            # Ignore write-only properties
696
 
            if prop._dbus_access == "write":
 
641
            if prop._dbus_access == u"write":
697
642
                continue
698
643
            value = prop()
699
 
            if not hasattr(value, "variant_level"):
 
644
            if not hasattr(value, u"variant_level"):
700
645
                all[name] = value
701
646
                continue
702
647
            all[name] = type(value)(value, variant_level=
703
648
                                    value.variant_level+1)
704
 
        return dbus.Dictionary(all, signature="sv")
 
649
        return dbus.Dictionary(all, signature=u"sv")
705
650
    
706
651
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
707
 
                         out_signature="s",
 
652
                         out_signature=u"s",
708
653
                         path_keyword='object_path',
709
654
                         connection_keyword='connection')
710
655
    def Introspect(self, object_path, connection):
715
660
        try:
716
661
            document = xml.dom.minidom.parseString(xmlstring)
717
662
            def make_tag(document, name, prop):
718
 
                e = document.createElement("property")
719
 
                e.setAttribute("name", name)
720
 
                e.setAttribute("type", prop._dbus_signature)
721
 
                e.setAttribute("access", prop._dbus_access)
 
663
                e = document.createElement(u"property")
 
664
                e.setAttribute(u"name", name)
 
665
                e.setAttribute(u"type", prop._dbus_signature)
 
666
                e.setAttribute(u"access", prop._dbus_access)
722
667
                return e
723
 
            for if_tag in document.getElementsByTagName("interface"):
 
668
            for if_tag in document.getElementsByTagName(u"interface"):
724
669
                for tag in (make_tag(document, name, prop)
725
670
                            for name, prop
726
671
                            in self._get_all_dbus_properties()
727
672
                            if prop._dbus_interface
728
 
                            == if_tag.getAttribute("name")):
 
673
                            == if_tag.getAttribute(u"name")):
729
674
                    if_tag.appendChild(tag)
730
675
                # Add the names to the return values for the
731
676
                # "org.freedesktop.DBus.Properties" methods
732
 
                if (if_tag.getAttribute("name")
733
 
                    == "org.freedesktop.DBus.Properties"):
734
 
                    for cn in if_tag.getElementsByTagName("method"):
735
 
                        if cn.getAttribute("name") == "Get":
736
 
                            for arg in cn.getElementsByTagName("arg"):
737
 
                                if (arg.getAttribute("direction")
738
 
                                    == "out"):
739
 
                                    arg.setAttribute("name", "value")
740
 
                        elif cn.getAttribute("name") == "GetAll":
741
 
                            for arg in cn.getElementsByTagName("arg"):
742
 
                                if (arg.getAttribute("direction")
743
 
                                    == "out"):
744
 
                                    arg.setAttribute("name", "props")
745
 
            xmlstring = document.toxml("utf-8")
 
677
                if (if_tag.getAttribute(u"name")
 
678
                    == u"org.freedesktop.DBus.Properties"):
 
679
                    for cn in if_tag.getElementsByTagName(u"method"):
 
680
                        if cn.getAttribute(u"name") == u"Get":
 
681
                            for arg in cn.getElementsByTagName(u"arg"):
 
682
                                if (arg.getAttribute(u"direction")
 
683
                                    == u"out"):
 
684
                                    arg.setAttribute(u"name", u"value")
 
685
                        elif cn.getAttribute(u"name") == u"GetAll":
 
686
                            for arg in cn.getElementsByTagName(u"arg"):
 
687
                                if (arg.getAttribute(u"direction")
 
688
                                    == u"out"):
 
689
                                    arg.setAttribute(u"name", u"props")
 
690
            xmlstring = document.toxml(u"utf-8")
746
691
            document.unlink()
747
692
        except (AttributeError, xml.dom.DOMException,
748
 
                xml.parsers.expat.ExpatError) as error:
749
 
            logger.error("Failed to override Introspection method",
 
693
                xml.parsers.expat.ExpatError), error:
 
694
            logger.error(u"Failed to override Introspection method",
750
695
                         error)
751
696
        return xmlstring
752
697
 
753
698
 
754
 
def datetime_to_dbus (dt, variant_level=0):
755
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
756
 
    if dt is None:
757
 
        return dbus.String("", variant_level = variant_level)
758
 
    return dbus.String(dt.isoformat(),
759
 
                       variant_level=variant_level)
760
 
 
761
 
 
762
699
class ClientDBus(Client, DBusObjectWithProperties):
763
700
    """A Client class using D-Bus
764
701
    
766
703
    dbus_object_path: dbus.ObjectPath
767
704
    bus: dbus.SystemBus()
768
705
    """
769
 
    
770
 
    runtime_expansions = (Client.runtime_expansions
771
 
                          + ("dbus_object_path",))
772
 
    
773
706
    # dbus.service.Object doesn't use super(), so we can't either.
774
707
    
775
708
    def __init__(self, bus = None, *args, **kwargs):
778
711
        Client.__init__(self, *args, **kwargs)
779
712
        # Only now, when this client is initialized, can it show up on
780
713
        # the D-Bus
781
 
        client_object_name = unicode(self.name).translate(
782
 
            {ord("."): ord("_"),
783
 
             ord("-"): ord("_")})
784
714
        self.dbus_object_path = (dbus.ObjectPath
785
 
                                 ("/clients/" + client_object_name))
 
715
                                 (u"/clients/"
 
716
                                  + self.name.replace(u".", u"_")))
786
717
        DBusObjectWithProperties.__init__(self, self.bus,
787
718
                                          self.dbus_object_path)
788
719
        
789
 
    def notifychangeproperty(transform_func,
790
 
                             dbus_name, type_func=lambda x: x,
791
 
                             variant_level=1):
792
 
        """ Modify a variable so that its a property that announce its
793
 
        changes to DBus.
794
 
        transform_fun: Function that takes a value and transform it to
795
 
                       DBus type.
796
 
        dbus_name: DBus name of the variable
797
 
        type_func: Function that transform the value before sending it
798
 
                   to DBus
799
 
        variant_level: DBus variant level. default: 1
800
 
        """
801
 
        real_value = [None,]
802
 
        def setter(self, value):
803
 
            old_value = real_value[0]
804
 
            real_value[0] = value
805
 
            if hasattr(self, "dbus_object_path"):
806
 
                if type_func(old_value) != type_func(real_value[0]):
807
 
                    dbus_value = transform_func(type_func(real_value[0]),
808
 
                                                variant_level)
809
 
                    self.PropertyChanged(dbus.String(dbus_name),
810
 
                                         dbus_value)
811
 
        
812
 
        return property(lambda self: real_value[0], setter)
813
 
    
814
 
    
815
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
816
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
817
 
                                             "ApprovalPending",
818
 
                                             type_func = bool)
819
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
820
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
821
 
                                        "LastEnabled")
822
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
823
 
                                   type_func = lambda checker: checker is not None)
824
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
825
 
                                           "LastCheckedOK")
826
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
827
 
                                                 "LastApprovalRequest")
828
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
829
 
                                               "ApprovedByDefault")
830
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
831
 
                                          type_func = _timedelta_to_milliseconds)
832
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
833
 
                                             type_func = _timedelta_to_milliseconds)
834
 
    host = notifychangeproperty(dbus.String, "Host")
835
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
836
 
                                   type_func = _timedelta_to_milliseconds)
837
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
838
 
                                            type_func = _timedelta_to_milliseconds)
839
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
840
 
                                    type_func = _timedelta_to_milliseconds)
841
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
842
 
    
843
 
    del notifychangeproperty
 
720
    def _get_approvals_pending(self):
 
721
        return self._approvals_pending
 
722
    def _set_approvals_pending(self, value):
 
723
        old_value = self._approvals_pending
 
724
        self._approvals_pending = value
 
725
        bval = bool(value)
 
726
        if (hasattr(self, "dbus_object_path")
 
727
            and bval is not bool(old_value)):
 
728
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
729
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
 
730
                                 dbus_bool)
 
731
 
 
732
    approvals_pending = property(_get_approvals_pending,
 
733
                                 _set_approvals_pending)
 
734
    del _get_approvals_pending, _set_approvals_pending
 
735
    
 
736
    @staticmethod
 
737
    def _datetime_to_dbus(dt, variant_level=0):
 
738
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
739
        return dbus.String(dt.isoformat(),
 
740
                           variant_level=variant_level)
 
741
    
 
742
    def enable(self):
 
743
        oldstate = getattr(self, u"enabled", False)
 
744
        r = Client.enable(self)
 
745
        if oldstate != self.enabled:
 
746
            # Emit D-Bus signals
 
747
            self.PropertyChanged(dbus.String(u"Enabled"),
 
748
                                 dbus.Boolean(True, variant_level=1))
 
749
            self.PropertyChanged(
 
750
                dbus.String(u"LastEnabled"),
 
751
                self._datetime_to_dbus(self.last_enabled,
 
752
                                       variant_level=1))
 
753
        return r
 
754
    
 
755
    def disable(self, quiet = False):
 
756
        oldstate = getattr(self, u"enabled", False)
 
757
        r = Client.disable(self, quiet=quiet)
 
758
        if not quiet and oldstate != self.enabled:
 
759
            # Emit D-Bus signal
 
760
            self.PropertyChanged(dbus.String(u"Enabled"),
 
761
                                 dbus.Boolean(False, variant_level=1))
 
762
        return r
844
763
    
845
764
    def __del__(self, *args, **kwargs):
846
765
        try:
847
766
            self.remove_from_connection()
848
767
        except LookupError:
849
768
            pass
850
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
769
        if hasattr(DBusObjectWithProperties, u"__del__"):
851
770
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
852
771
        Client.__del__(self, *args, **kwargs)
853
772
    
855
774
                         *args, **kwargs):
856
775
        self.checker_callback_tag = None
857
776
        self.checker = None
 
777
        # Emit D-Bus signal
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
779
                             dbus.Boolean(False, variant_level=1))
858
780
        if os.WIFEXITED(condition):
859
781
            exitstatus = os.WEXITSTATUS(condition)
860
782
            # Emit D-Bus signal
870
792
        return Client.checker_callback(self, pid, condition, command,
871
793
                                       *args, **kwargs)
872
794
    
 
795
    def checked_ok(self, *args, **kwargs):
 
796
        r = Client.checked_ok(self, *args, **kwargs)
 
797
        # Emit D-Bus signal
 
798
        self.PropertyChanged(
 
799
            dbus.String(u"LastCheckedOK"),
 
800
            (self._datetime_to_dbus(self.last_checked_ok,
 
801
                                    variant_level=1)))
 
802
        return r
 
803
    
873
804
    def start_checker(self, *args, **kwargs):
874
805
        old_checker = self.checker
875
806
        if self.checker is not None:
882
813
            and old_checker_pid != self.checker.pid):
883
814
            # Emit D-Bus signal
884
815
            self.CheckerStarted(self.current_checker_command)
 
816
            self.PropertyChanged(
 
817
                dbus.String(u"CheckerRunning"),
 
818
                dbus.Boolean(True, variant_level=1))
885
819
        return r
886
820
    
 
821
    def stop_checker(self, *args, **kwargs):
 
822
        old_checker = getattr(self, u"checker", None)
 
823
        r = Client.stop_checker(self, *args, **kwargs)
 
824
        if (old_checker is not None
 
825
            and getattr(self, u"checker", None) is None):
 
826
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
827
                                 dbus.Boolean(False, variant_level=1))
 
828
        return r
 
829
 
887
830
    def _reset_approved(self):
888
831
        self._approved = None
889
832
        return False
891
834
    def approve(self, value=True):
892
835
        self.send_changedstate()
893
836
        self._approved = value
894
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
837
        gobject.timeout_add(self._timedelta_to_milliseconds
895
838
                            (self.approval_duration),
896
839
                            self._reset_approved)
897
840
    
898
841
    
899
842
    ## D-Bus methods, signals & properties
900
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
901
844
    
902
845
    ## Signals
903
846
    
904
847
    # CheckerCompleted - signal
905
 
    @dbus.service.signal(_interface, signature="nxs")
 
848
    @dbus.service.signal(_interface, signature=u"nxs")
906
849
    def CheckerCompleted(self, exitcode, waitstatus, command):
907
850
        "D-Bus signal"
908
851
        pass
909
852
    
910
853
    # CheckerStarted - signal
911
 
    @dbus.service.signal(_interface, signature="s")
 
854
    @dbus.service.signal(_interface, signature=u"s")
912
855
    def CheckerStarted(self, command):
913
856
        "D-Bus signal"
914
857
        pass
915
858
    
916
859
    # PropertyChanged - signal
917
 
    @dbus.service.signal(_interface, signature="sv")
 
860
    @dbus.service.signal(_interface, signature=u"sv")
918
861
    def PropertyChanged(self, property, value):
919
862
        "D-Bus signal"
920
863
        pass
929
872
        pass
930
873
    
931
874
    # Rejected - signal
932
 
    @dbus.service.signal(_interface, signature="s")
 
875
    @dbus.service.signal(_interface, signature=u"s")
933
876
    def Rejected(self, reason):
934
877
        "D-Bus signal"
935
878
        pass
936
879
    
937
880
    # NeedApproval - signal
938
 
    @dbus.service.signal(_interface, signature="tb")
 
881
    @dbus.service.signal(_interface, signature=u"tb")
939
882
    def NeedApproval(self, timeout, default):
940
883
        "D-Bus signal"
941
 
        return self.need_approval()
 
884
        pass
942
885
    
943
886
    ## Methods
944
 
    
 
887
 
945
888
    # Approve - method
946
 
    @dbus.service.method(_interface, in_signature="b")
 
889
    @dbus.service.method(_interface, in_signature=u"b")
947
890
    def Approve(self, value):
948
891
        self.approve(value)
949
 
    
 
892
 
950
893
    # CheckedOK - method
951
894
    @dbus.service.method(_interface)
952
895
    def CheckedOK(self):
953
 
        self.checked_ok()
 
896
        return self.checked_ok()
954
897
    
955
898
    # Enable - method
956
899
    @dbus.service.method(_interface)
978
921
    ## Properties
979
922
    
980
923
    # ApprovalPending - property
981
 
    @dbus_service_property(_interface, signature="b", access="read")
 
924
    @dbus_service_property(_interface, signature=u"b", access=u"read")
982
925
    def ApprovalPending_dbus_property(self):
983
926
        return dbus.Boolean(bool(self.approvals_pending))
984
927
    
985
928
    # ApprovedByDefault - property
986
 
    @dbus_service_property(_interface, signature="b",
987
 
                           access="readwrite")
 
929
    @dbus_service_property(_interface, signature=u"b",
 
930
                           access=u"readwrite")
988
931
    def ApprovedByDefault_dbus_property(self, value=None):
989
932
        if value is None:       # get
990
933
            return dbus.Boolean(self.approved_by_default)
991
934
        self.approved_by_default = bool(value)
 
935
        # Emit D-Bus signal
 
936
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
 
937
                             dbus.Boolean(value, variant_level=1))
992
938
    
993
939
    # ApprovalDelay - property
994
 
    @dbus_service_property(_interface, signature="t",
995
 
                           access="readwrite")
 
940
    @dbus_service_property(_interface, signature=u"t",
 
941
                           access=u"readwrite")
996
942
    def ApprovalDelay_dbus_property(self, value=None):
997
943
        if value is None:       # get
998
944
            return dbus.UInt64(self.approval_delay_milliseconds())
999
945
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
946
        # Emit D-Bus signal
 
947
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
 
948
                             dbus.UInt64(value, variant_level=1))
1000
949
    
1001
950
    # ApprovalDuration - property
1002
 
    @dbus_service_property(_interface, signature="t",
1003
 
                           access="readwrite")
 
951
    @dbus_service_property(_interface, signature=u"t",
 
952
                           access=u"readwrite")
1004
953
    def ApprovalDuration_dbus_property(self, value=None):
1005
954
        if value is None:       # get
1006
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
955
            return dbus.UInt64(self._timedelta_to_milliseconds(
1007
956
                    self.approval_duration))
1008
957
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
958
        # Emit D-Bus signal
 
959
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
 
960
                             dbus.UInt64(value, variant_level=1))
1009
961
    
1010
962
    # Name - property
1011
 
    @dbus_service_property(_interface, signature="s", access="read")
 
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1012
964
    def Name_dbus_property(self):
1013
965
        return dbus.String(self.name)
1014
966
    
1015
967
    # Fingerprint - property
1016
 
    @dbus_service_property(_interface, signature="s", access="read")
 
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1017
969
    def Fingerprint_dbus_property(self):
1018
970
        return dbus.String(self.fingerprint)
1019
971
    
1020
972
    # Host - property
1021
 
    @dbus_service_property(_interface, signature="s",
1022
 
                           access="readwrite")
 
973
    @dbus_service_property(_interface, signature=u"s",
 
974
                           access=u"readwrite")
1023
975
    def Host_dbus_property(self, value=None):
1024
976
        if value is None:       # get
1025
977
            return dbus.String(self.host)
1026
978
        self.host = value
 
979
        # Emit D-Bus signal
 
980
        self.PropertyChanged(dbus.String(u"Host"),
 
981
                             dbus.String(value, variant_level=1))
1027
982
    
1028
983
    # Created - property
1029
 
    @dbus_service_property(_interface, signature="s", access="read")
 
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1030
985
    def Created_dbus_property(self):
1031
 
        return dbus.String(datetime_to_dbus(self.created))
 
986
        return dbus.String(self._datetime_to_dbus(self.created))
1032
987
    
1033
988
    # LastEnabled - property
1034
 
    @dbus_service_property(_interface, signature="s", access="read")
 
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1035
990
    def LastEnabled_dbus_property(self):
1036
 
        return datetime_to_dbus(self.last_enabled)
 
991
        if self.last_enabled is None:
 
992
            return dbus.String(u"")
 
993
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1037
994
    
1038
995
    # Enabled - property
1039
 
    @dbus_service_property(_interface, signature="b",
1040
 
                           access="readwrite")
 
996
    @dbus_service_property(_interface, signature=u"b",
 
997
                           access=u"readwrite")
1041
998
    def Enabled_dbus_property(self, value=None):
1042
999
        if value is None:       # get
1043
1000
            return dbus.Boolean(self.enabled)
1047
1004
            self.disable()
1048
1005
    
1049
1006
    # LastCheckedOK - property
1050
 
    @dbus_service_property(_interface, signature="s",
1051
 
                           access="readwrite")
 
1007
    @dbus_service_property(_interface, signature=u"s",
 
1008
                           access=u"readwrite")
1052
1009
    def LastCheckedOK_dbus_property(self, value=None):
1053
1010
        if value is not None:
1054
1011
            self.checked_ok()
1055
1012
            return
1056
 
        return datetime_to_dbus(self.last_checked_ok)
1057
 
    
1058
 
    # Expires - property
1059
 
    @dbus_service_property(_interface, signature="s", access="read")
1060
 
    def Expires_dbus_property(self):
1061
 
        return datetime_to_dbus(self.expires)
1062
 
    
1063
 
    # LastApprovalRequest - property
1064
 
    @dbus_service_property(_interface, signature="s", access="read")
1065
 
    def LastApprovalRequest_dbus_property(self):
1066
 
        return datetime_to_dbus(self.last_approval_request)
 
1013
        if self.last_checked_ok is None:
 
1014
            return dbus.String(u"")
 
1015
        return dbus.String(self._datetime_to_dbus(self
 
1016
                                                  .last_checked_ok))
1067
1017
    
1068
1018
    # Timeout - property
1069
 
    @dbus_service_property(_interface, signature="t",
1070
 
                           access="readwrite")
 
1019
    @dbus_service_property(_interface, signature=u"t",
 
1020
                           access=u"readwrite")
1071
1021
    def Timeout_dbus_property(self, value=None):
1072
1022
        if value is None:       # get
1073
1023
            return dbus.UInt64(self.timeout_milliseconds())
1074
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
1075
 
        if getattr(self, "disable_initiator_tag", None) is None:
 
1025
        # Emit D-Bus signal
 
1026
        self.PropertyChanged(dbus.String(u"Timeout"),
 
1027
                             dbus.UInt64(value, variant_level=1))
 
1028
        if getattr(self, u"disable_initiator_tag", None) is None:
1076
1029
            return
1077
1030
        # Reschedule timeout
1078
1031
        gobject.source_remove(self.disable_initiator_tag)
1079
1032
        self.disable_initiator_tag = None
1080
 
        self.expires = None
1081
1033
        time_to_die = (self.
1082
1034
                       _timedelta_to_milliseconds((self
1083
1035
                                                   .last_checked_ok
1088
1040
            # The timeout has passed
1089
1041
            self.disable()
1090
1042
        else:
1091
 
            self.expires = (datetime.datetime.utcnow()
1092
 
                            + datetime.timedelta(milliseconds = time_to_die))
1093
1043
            self.disable_initiator_tag = (gobject.timeout_add
1094
1044
                                          (time_to_die, self.disable))
1095
1045
    
1096
 
    # ExtendedTimeout - property
1097
 
    @dbus_service_property(_interface, signature="t",
1098
 
                           access="readwrite")
1099
 
    def ExtendedTimeout_dbus_property(self, value=None):
1100
 
        if value is None:       # get
1101
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1102
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1103
 
    
1104
1046
    # Interval - property
1105
 
    @dbus_service_property(_interface, signature="t",
1106
 
                           access="readwrite")
 
1047
    @dbus_service_property(_interface, signature=u"t",
 
1048
                           access=u"readwrite")
1107
1049
    def Interval_dbus_property(self, value=None):
1108
1050
        if value is None:       # get
1109
1051
            return dbus.UInt64(self.interval_milliseconds())
1110
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
1111
 
        if getattr(self, "checker_initiator_tag", None) is None:
 
1053
        # Emit D-Bus signal
 
1054
        self.PropertyChanged(dbus.String(u"Interval"),
 
1055
                             dbus.UInt64(value, variant_level=1))
 
1056
        if getattr(self, u"checker_initiator_tag", None) is None:
1112
1057
            return
1113
1058
        # Reschedule checker run
1114
1059
        gobject.source_remove(self.checker_initiator_tag)
1115
1060
        self.checker_initiator_tag = (gobject.timeout_add
1116
1061
                                      (value, self.start_checker))
1117
1062
        self.start_checker()    # Start one now, too
1118
 
    
 
1063
 
1119
1064
    # Checker - property
1120
 
    @dbus_service_property(_interface, signature="s",
1121
 
                           access="readwrite")
 
1065
    @dbus_service_property(_interface, signature=u"s",
 
1066
                           access=u"readwrite")
1122
1067
    def Checker_dbus_property(self, value=None):
1123
1068
        if value is None:       # get
1124
1069
            return dbus.String(self.checker_command)
1125
1070
        self.checker_command = value
 
1071
        # Emit D-Bus signal
 
1072
        self.PropertyChanged(dbus.String(u"Checker"),
 
1073
                             dbus.String(self.checker_command,
 
1074
                                         variant_level=1))
1126
1075
    
1127
1076
    # CheckerRunning - property
1128
 
    @dbus_service_property(_interface, signature="b",
1129
 
                           access="readwrite")
 
1077
    @dbus_service_property(_interface, signature=u"b",
 
1078
                           access=u"readwrite")
1130
1079
    def CheckerRunning_dbus_property(self, value=None):
1131
1080
        if value is None:       # get
1132
1081
            return dbus.Boolean(self.checker is not None)
1136
1085
            self.stop_checker()
1137
1086
    
1138
1087
    # ObjectPath - property
1139
 
    @dbus_service_property(_interface, signature="o", access="read")
 
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1140
1089
    def ObjectPath_dbus_property(self):
1141
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
1142
1091
    
1143
1092
    # Secret = property
1144
 
    @dbus_service_property(_interface, signature="ay",
1145
 
                           access="write", byte_arrays=True)
 
1093
    @dbus_service_property(_interface, signature=u"ay",
 
1094
                           access=u"write", byte_arrays=True)
1146
1095
    def Secret_dbus_property(self, value):
1147
1096
        self.secret = str(value)
1148
1097
    
1155
1104
        self._pipe.send(('init', fpr, address))
1156
1105
        if not self._pipe.recv():
1157
1106
            raise KeyError()
1158
 
    
 
1107
 
1159
1108
    def __getattribute__(self, name):
1160
1109
        if(name == '_pipe'):
1161
1110
            return super(ProxyClient, self).__getattribute__(name)
1168
1117
                self._pipe.send(('funcall', name, args, kwargs))
1169
1118
                return self._pipe.recv()[1]
1170
1119
            return func
1171
 
    
 
1120
 
1172
1121
    def __setattr__(self, name, value):
1173
1122
        if(name == '_pipe'):
1174
1123
            return super(ProxyClient, self).__setattr__(name, value)
1183
1132
    
1184
1133
    def handle(self):
1185
1134
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1186
 
            logger.info("TCP connection from: %s",
 
1135
            logger.info(u"TCP connection from: %s",
1187
1136
                        unicode(self.client_address))
1188
 
            logger.debug("Pipe FD: %d",
 
1137
            logger.debug(u"Pipe FD: %d",
1189
1138
                         self.server.child_pipe.fileno())
1190
 
            
 
1139
 
1191
1140
            session = (gnutls.connection
1192
1141
                       .ClientSession(self.request,
1193
1142
                                      gnutls.connection
1194
1143
                                      .X509Credentials()))
1195
 
            
 
1144
 
1196
1145
            # Note: gnutls.connection.X509Credentials is really a
1197
1146
            # generic GnuTLS certificate credentials object so long as
1198
1147
            # no X.509 keys are added to it.  Therefore, we can use it
1199
1148
            # here despite using OpenPGP certificates.
1200
 
            
1201
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1202
 
            #                      "+AES-256-CBC", "+SHA1",
1203
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1204
 
            #                      "+DHE-DSS"))
 
1149
 
 
1150
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
 
1151
            #                      u"+AES-256-CBC", u"+SHA1",
 
1152
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
 
1153
            #                      u"+DHE-DSS"))
1205
1154
            # Use a fallback default, since this MUST be set.
1206
1155
            priority = self.server.gnutls_priority
1207
1156
            if priority is None:
1208
 
                priority = "NORMAL"
 
1157
                priority = u"NORMAL"
1209
1158
            (gnutls.library.functions
1210
1159
             .gnutls_priority_set_direct(session._c_object,
1211
1160
                                         priority, None))
1212
 
            
 
1161
 
1213
1162
            # Start communication using the Mandos protocol
1214
1163
            # Get protocol number
1215
1164
            line = self.request.makefile().readline()
1216
 
            logger.debug("Protocol version: %r", line)
 
1165
            logger.debug(u"Protocol version: %r", line)
1217
1166
            try:
1218
1167
                if int(line.strip().split()[0]) > 1:
1219
1168
                    raise RuntimeError
1220
 
            except (ValueError, IndexError, RuntimeError) as error:
1221
 
                logger.error("Unknown protocol version: %s", error)
 
1169
            except (ValueError, IndexError, RuntimeError), error:
 
1170
                logger.error(u"Unknown protocol version: %s", error)
1222
1171
                return
1223
 
            
 
1172
 
1224
1173
            # Start GnuTLS connection
1225
1174
            try:
1226
1175
                session.handshake()
1227
 
            except gnutls.errors.GNUTLSError as error:
1228
 
                logger.warning("Handshake failed: %s", error)
 
1176
            except gnutls.errors.GNUTLSError, error:
 
1177
                logger.warning(u"Handshake failed: %s", error)
1229
1178
                # Do not run session.bye() here: the session is not
1230
1179
                # established.  Just abandon the request.
1231
1180
                return
1232
 
            logger.debug("Handshake succeeded")
1233
 
            
 
1181
            logger.debug(u"Handshake succeeded")
 
1182
 
1234
1183
            approval_required = False
1235
1184
            try:
1236
1185
                try:
1237
1186
                    fpr = self.fingerprint(self.peer_certificate
1238
1187
                                           (session))
1239
 
                except (TypeError,
1240
 
                        gnutls.errors.GNUTLSError) as error:
1241
 
                    logger.warning("Bad certificate: %s", error)
 
1188
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1189
                    logger.warning(u"Bad certificate: %s", error)
1242
1190
                    return
1243
 
                logger.debug("Fingerprint: %s", fpr)
1244
 
                
 
1191
                logger.debug(u"Fingerprint: %s", fpr)
 
1192
 
1245
1193
                try:
1246
1194
                    client = ProxyClient(child_pipe, fpr,
1247
1195
                                         self.client_address)
1255
1203
                
1256
1204
                while True:
1257
1205
                    if not client.enabled:
1258
 
                        logger.info("Client %s is disabled",
 
1206
                        logger.warning(u"Client %s is disabled",
1259
1207
                                       client.name)
1260
1208
                        if self.server.use_dbus:
1261
1209
                            # Emit D-Bus signal
1266
1214
                        #We are approved or approval is disabled
1267
1215
                        break
1268
1216
                    elif client._approved is None:
1269
 
                        logger.info("Client %s needs approval",
 
1217
                        logger.info(u"Client %s needs approval",
1270
1218
                                    client.name)
1271
1219
                        if self.server.use_dbus:
1272
1220
                            # Emit D-Bus signal
1274
1222
                                client.approval_delay_milliseconds(),
1275
1223
                                client.approved_by_default)
1276
1224
                    else:
1277
 
                        logger.warning("Client %s was not approved",
 
1225
                        logger.warning(u"Client %s was not approved",
1278
1226
                                       client.name)
1279
1227
                        if self.server.use_dbus:
1280
1228
                            # Emit D-Bus signal
1295
1243
                                           client.name)
1296
1244
                            if self.server.use_dbus:
1297
1245
                                # Emit D-Bus signal
1298
 
                                client.Rejected("Approval timed out")
 
1246
                                client.Rejected("Timed out")
1299
1247
                            return
1300
1248
                        else:
1301
1249
                            break
1306
1254
                while sent_size < len(client.secret):
1307
1255
                    try:
1308
1256
                        sent = session.send(client.secret[sent_size:])
1309
 
                    except gnutls.errors.GNUTLSError as error:
 
1257
                    except (gnutls.errors.GNUTLSError), error:
1310
1258
                        logger.warning("gnutls send failed")
1311
1259
                        return
1312
 
                    logger.debug("Sent: %d, remaining: %d",
 
1260
                    logger.debug(u"Sent: %d, remaining: %d",
1313
1261
                                 sent, len(client.secret)
1314
1262
                                 - (sent_size + sent))
1315
1263
                    sent_size += sent
1316
 
                
1317
 
                logger.info("Sending secret to %s", client.name)
 
1264
 
 
1265
                logger.info(u"Sending secret to %s", client.name)
1318
1266
                # bump the timeout as if seen
1319
 
                client.checked_ok(client.extended_timeout)
 
1267
                client.checked_ok()
1320
1268
                if self.server.use_dbus:
1321
1269
                    # Emit D-Bus signal
1322
1270
                    client.GotSecret()
1326
1274
                    client.approvals_pending -= 1
1327
1275
                try:
1328
1276
                    session.bye()
1329
 
                except gnutls.errors.GNUTLSError as error:
 
1277
                except (gnutls.errors.GNUTLSError), error:
1330
1278
                    logger.warning("GnuTLS bye failed")
1331
1279
    
1332
1280
    @staticmethod
1343
1291
                     .gnutls_certificate_get_peers
1344
1292
                     (session._c_object, ctypes.byref(list_size)))
1345
1293
        if not bool(cert_list) and list_size.value != 0:
1346
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1347
 
                                            " certificate")
 
1294
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1295
                                            u" certificate")
1348
1296
        if list_size.value == 0:
1349
1297
            return None
1350
1298
        cert = cert_list[0]
1376
1324
        if crtverify.value != 0:
1377
1325
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1378
1326
            raise (gnutls.errors.CertificateSecurityError
1379
 
                   ("Verify failed"))
 
1327
                   (u"Verify failed"))
1380
1328
        # New buffer for the fingerprint
1381
1329
        buf = ctypes.create_string_buffer(20)
1382
1330
        buf_len = ctypes.c_size_t()
1389
1337
        # Convert the buffer to a Python bytestring
1390
1338
        fpr = ctypes.string_at(buf, buf_len.value)
1391
1339
        # Convert the bytestring to hexadecimal notation
1392
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1340
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1393
1341
        return hex_fpr
1394
1342
 
1395
1343
 
1407
1355
        multiprocessing.Process(target = self.sub_process_main,
1408
1356
                                args = (request, address)).start()
1409
1357
 
1410
 
 
1411
1358
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1412
1359
    """ adds a pipe to the MixIn """
1413
1360
    def process_request(self, request, client_address):
1416
1363
        This function creates a new pipe in self.pipe
1417
1364
        """
1418
1365
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1419
 
        
 
1366
 
1420
1367
        super(MultiprocessingMixInWithPipe,
1421
1368
              self).process_request(request, client_address)
1422
1369
        self.child_pipe.close()
1423
1370
        self.add_pipe(parent_pipe)
1424
 
    
 
1371
 
1425
1372
    def add_pipe(self, parent_pipe):
1426
1373
        """Dummy function; override as necessary"""
1427
 
        raise NotImplementedError
1428
 
 
 
1374
        pass
1429
1375
 
1430
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1431
1377
                     socketserver.TCPServer, object):
1449
1395
        bind to an address or port if they were not specified."""
1450
1396
        if self.interface is not None:
1451
1397
            if SO_BINDTODEVICE is None:
1452
 
                logger.error("SO_BINDTODEVICE does not exist;"
1453
 
                             " cannot bind to interface %s",
 
1398
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1399
                             u" cannot bind to interface %s",
1454
1400
                             self.interface)
1455
1401
            else:
1456
1402
                try:
1457
1403
                    self.socket.setsockopt(socket.SOL_SOCKET,
1458
1404
                                           SO_BINDTODEVICE,
1459
1405
                                           str(self.interface
1460
 
                                               + '\0'))
1461
 
                except socket.error as error:
 
1406
                                               + u'\0'))
 
1407
                except socket.error, error:
1462
1408
                    if error[0] == errno.EPERM:
1463
 
                        logger.error("No permission to"
1464
 
                                     " bind to interface %s",
 
1409
                        logger.error(u"No permission to"
 
1410
                                     u" bind to interface %s",
1465
1411
                                     self.interface)
1466
1412
                    elif error[0] == errno.ENOPROTOOPT:
1467
 
                        logger.error("SO_BINDTODEVICE not available;"
1468
 
                                     " cannot bind to interface %s",
 
1413
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1414
                                     u" cannot bind to interface %s",
1469
1415
                                     self.interface)
1470
1416
                    else:
1471
1417
                        raise
1473
1419
        if self.server_address[0] or self.server_address[1]:
1474
1420
            if not self.server_address[0]:
1475
1421
                if self.address_family == socket.AF_INET6:
1476
 
                    any_address = "::" # in6addr_any
 
1422
                    any_address = u"::" # in6addr_any
1477
1423
                else:
1478
1424
                    any_address = socket.INADDR_ANY
1479
1425
                self.server_address = (any_address,
1528
1474
    def handle_ipc(self, source, condition, parent_pipe=None,
1529
1475
                   client_object=None):
1530
1476
        condition_names = {
1531
 
            gobject.IO_IN: "IN",   # There is data to read.
1532
 
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1477
            gobject.IO_IN: u"IN",   # There is data to read.
 
1478
            gobject.IO_OUT: u"OUT", # Data can be written (without
1533
1479
                                    # blocking).
1534
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1535
 
            gobject.IO_ERR: "ERR", # Error condition.
1536
 
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1480
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
 
1481
            gobject.IO_ERR: u"ERR", # Error condition.
 
1482
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
1537
1483
                                    # broken, usually for pipes and
1538
1484
                                    # sockets).
1539
1485
            }
1541
1487
                                       for cond, name in
1542
1488
                                       condition_names.iteritems()
1543
1489
                                       if cond & condition)
 
1490
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1491
                     conditions_string)
 
1492
 
1544
1493
        # error or the other end of multiprocessing.Pipe has closed
1545
1494
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1546
1495
            return False
1547
1496
        
1548
1497
        # Read a request from the child
1549
1498
        request = parent_pipe.recv()
 
1499
        logger.debug(u"IPC request: %s", repr(request))
1550
1500
        command = request[0]
1551
1501
        
1552
1502
        if command == 'init':
1558
1508
                    client = c
1559
1509
                    break
1560
1510
            else:
1561
 
                logger.info("Client not found for fingerprint: %s, ad"
1562
 
                            "dress: %s", fpr, address)
 
1511
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1512
                               u"dress: %s", fpr, address)
1563
1513
                if self.use_dbus:
1564
1514
                    # Emit D-Bus signal
1565
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1515
                    mandos_dbus_service.ClientNotFound(fpr, address)
1566
1516
                parent_pipe.send(False)
1567
1517
                return False
1568
1518
            
1580
1530
            kwargs = request[3]
1581
1531
            
1582
1532
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1583
 
        
 
1533
 
1584
1534
        if command == 'getattr':
1585
1535
            attrname = request[1]
1586
1536
            if callable(client_object.__getattribute__(attrname)):
1592
1542
            attrname = request[1]
1593
1543
            value = request[2]
1594
1544
            setattr(client_object, attrname, value)
1595
 
        
 
1545
 
1596
1546
        return True
1597
1547
 
1598
1548
 
1599
1549
def string_to_delta(interval):
1600
1550
    """Parse a string and return a datetime.timedelta
1601
1551
    
1602
 
    >>> string_to_delta('7d')
 
1552
    >>> string_to_delta(u'7d')
1603
1553
    datetime.timedelta(7)
1604
 
    >>> string_to_delta('60s')
 
1554
    >>> string_to_delta(u'60s')
1605
1555
    datetime.timedelta(0, 60)
1606
 
    >>> string_to_delta('60m')
 
1556
    >>> string_to_delta(u'60m')
1607
1557
    datetime.timedelta(0, 3600)
1608
 
    >>> string_to_delta('24h')
 
1558
    >>> string_to_delta(u'24h')
1609
1559
    datetime.timedelta(1)
1610
 
    >>> string_to_delta('1w')
 
1560
    >>> string_to_delta(u'1w')
1611
1561
    datetime.timedelta(7)
1612
 
    >>> string_to_delta('5m 30s')
 
1562
    >>> string_to_delta(u'5m 30s')
1613
1563
    datetime.timedelta(0, 330)
1614
1564
    """
1615
1565
    timevalue = datetime.timedelta(0)
1617
1567
        try:
1618
1568
            suffix = unicode(s[-1])
1619
1569
            value = int(s[:-1])
1620
 
            if suffix == "d":
 
1570
            if suffix == u"d":
1621
1571
                delta = datetime.timedelta(value)
1622
 
            elif suffix == "s":
 
1572
            elif suffix == u"s":
1623
1573
                delta = datetime.timedelta(0, value)
1624
 
            elif suffix == "m":
 
1574
            elif suffix == u"m":
1625
1575
                delta = datetime.timedelta(0, 0, 0, 0, value)
1626
 
            elif suffix == "h":
 
1576
            elif suffix == u"h":
1627
1577
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1628
 
            elif suffix == "w":
 
1578
            elif suffix == u"w":
1629
1579
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1630
1580
            else:
1631
 
                raise ValueError("Unknown suffix %r" % suffix)
1632
 
        except (ValueError, IndexError) as e:
1633
 
            raise ValueError(*(e.args))
 
1581
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1582
        except (ValueError, IndexError), e:
 
1583
            raise ValueError(e.message)
1634
1584
        timevalue += delta
1635
1585
    return timevalue
1636
1586
 
1642
1592
    global if_nametoindex
1643
1593
    try:
1644
1594
        if_nametoindex = (ctypes.cdll.LoadLibrary
1645
 
                          (ctypes.util.find_library("c"))
 
1595
                          (ctypes.util.find_library(u"c"))
1646
1596
                          .if_nametoindex)
1647
1597
    except (OSError, AttributeError):
1648
 
        logger.warning("Doing if_nametoindex the hard way")
 
1598
        logger.warning(u"Doing if_nametoindex the hard way")
1649
1599
        def if_nametoindex(interface):
1650
1600
            "Get an interface index the hard way, i.e. using fcntl()"
1651
1601
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1652
1602
            with contextlib.closing(socket.socket()) as s:
1653
1603
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1654
 
                                    struct.pack(str("16s16x"),
 
1604
                                    struct.pack(str(u"16s16x"),
1655
1605
                                                interface))
1656
 
            interface_index = struct.unpack(str("I"),
 
1606
            interface_index = struct.unpack(str(u"I"),
1657
1607
                                            ifreq[16:20])[0]
1658
1608
            return interface_index
1659
1609
    return if_nametoindex(interface)
1667
1617
        sys.exit()
1668
1618
    os.setsid()
1669
1619
    if not nochdir:
1670
 
        os.chdir("/")
 
1620
        os.chdir(u"/")
1671
1621
    if os.fork():
1672
1622
        sys.exit()
1673
1623
    if not noclose:
1675
1625
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1676
1626
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1677
1627
            raise OSError(errno.ENODEV,
1678
 
                          "%s not a character device"
 
1628
                          u"%s not a character device"
1679
1629
                          % os.path.devnull)
1680
1630
        os.dup2(null, sys.stdin.fileno())
1681
1631
        os.dup2(null, sys.stdout.fileno())
1689
1639
    ##################################################################
1690
1640
    # Parsing of options, both command line and config file
1691
1641
    
1692
 
    parser = argparse.ArgumentParser()
1693
 
    parser.add_argument("-v", "--version", action="version",
1694
 
                        version = "%%(prog)s %s" % version,
1695
 
                        help="show version number and exit")
1696
 
    parser.add_argument("-i", "--interface", metavar="IF",
1697
 
                        help="Bind to interface IF")
1698
 
    parser.add_argument("-a", "--address",
1699
 
                        help="Address to listen for requests on")
1700
 
    parser.add_argument("-p", "--port", type=int,
1701
 
                        help="Port number to receive requests on")
1702
 
    parser.add_argument("--check", action="store_true",
1703
 
                        help="Run self-test")
1704
 
    parser.add_argument("--debug", action="store_true",
1705
 
                        help="Debug mode; run in foreground and log"
1706
 
                        " to terminal")
1707
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
1708
 
                        help="Debug level for stdout output")
1709
 
    parser.add_argument("--priority", help="GnuTLS"
1710
 
                        " priority string (see GnuTLS documentation)")
1711
 
    parser.add_argument("--servicename",
1712
 
                        metavar="NAME", help="Zeroconf service name")
1713
 
    parser.add_argument("--configdir",
1714
 
                        default="/etc/mandos", metavar="DIR",
1715
 
                        help="Directory to search for configuration"
1716
 
                        " files")
1717
 
    parser.add_argument("--no-dbus", action="store_false",
1718
 
                        dest="use_dbus", help="Do not provide D-Bus"
1719
 
                        " system bus interface")
1720
 
    parser.add_argument("--no-ipv6", action="store_false",
1721
 
                        dest="use_ipv6", help="Do not use IPv6")
1722
 
    options = parser.parse_args()
 
1642
    parser = optparse.OptionParser(version = "%%prog %s" % version)
 
1643
    parser.add_option("-i", u"--interface", type=u"string",
 
1644
                      metavar="IF", help=u"Bind to interface IF")
 
1645
    parser.add_option("-a", u"--address", type=u"string",
 
1646
                      help=u"Address to listen for requests on")
 
1647
    parser.add_option("-p", u"--port", type=u"int",
 
1648
                      help=u"Port number to receive requests on")
 
1649
    parser.add_option("--check", action=u"store_true",
 
1650
                      help=u"Run self-test")
 
1651
    parser.add_option("--debug", action=u"store_true",
 
1652
                      help=u"Debug mode; run in foreground and log to"
 
1653
                      u" terminal")
 
1654
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
 
1655
                      help=u"Debug level for stdout output")
 
1656
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
 
1657
                      u" priority string (see GnuTLS documentation)")
 
1658
    parser.add_option("--servicename", type=u"string",
 
1659
                      metavar=u"NAME", help=u"Zeroconf service name")
 
1660
    parser.add_option("--configdir", type=u"string",
 
1661
                      default=u"/etc/mandos", metavar=u"DIR",
 
1662
                      help=u"Directory to search for configuration"
 
1663
                      u" files")
 
1664
    parser.add_option("--no-dbus", action=u"store_false",
 
1665
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
 
1666
                      u" system bus interface")
 
1667
    parser.add_option("--no-ipv6", action=u"store_false",
 
1668
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
1669
    options = parser.parse_args()[0]
1723
1670
    
1724
1671
    if options.check:
1725
1672
        import doctest
1727
1674
        sys.exit()
1728
1675
    
1729
1676
    # Default values for config file for server-global settings
1730
 
    server_defaults = { "interface": "",
1731
 
                        "address": "",
1732
 
                        "port": "",
1733
 
                        "debug": "False",
1734
 
                        "priority":
1735
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1736
 
                        "servicename": "Mandos",
1737
 
                        "use_dbus": "True",
1738
 
                        "use_ipv6": "True",
1739
 
                        "debuglevel": "",
 
1677
    server_defaults = { u"interface": u"",
 
1678
                        u"address": u"",
 
1679
                        u"port": u"",
 
1680
                        u"debug": u"False",
 
1681
                        u"priority":
 
1682
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
1683
                        u"servicename": u"Mandos",
 
1684
                        u"use_dbus": u"True",
 
1685
                        u"use_ipv6": u"True",
 
1686
                        u"debuglevel": u"",
1740
1687
                        }
1741
1688
    
1742
1689
    # Parse config file for server-global settings
1743
1690
    server_config = configparser.SafeConfigParser(server_defaults)
1744
1691
    del server_defaults
1745
1692
    server_config.read(os.path.join(options.configdir,
1746
 
                                    "mandos.conf"))
 
1693
                                    u"mandos.conf"))
1747
1694
    # Convert the SafeConfigParser object to a dict
1748
1695
    server_settings = server_config.defaults()
1749
1696
    # Use the appropriate methods on the non-string config options
1750
 
    for option in ("debug", "use_dbus", "use_ipv6"):
1751
 
        server_settings[option] = server_config.getboolean("DEFAULT",
 
1697
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
 
1698
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1752
1699
                                                           option)
1753
1700
    if server_settings["port"]:
1754
 
        server_settings["port"] = server_config.getint("DEFAULT",
1755
 
                                                       "port")
 
1701
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1702
                                                       u"port")
1756
1703
    del server_config
1757
1704
    
1758
1705
    # Override the settings from the config file with command line
1759
1706
    # options, if set.
1760
 
    for option in ("interface", "address", "port", "debug",
1761
 
                   "priority", "servicename", "configdir",
1762
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
1707
    for option in (u"interface", u"address", u"port", u"debug",
 
1708
                   u"priority", u"servicename", u"configdir",
 
1709
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
1763
1710
        value = getattr(options, option)
1764
1711
        if value is not None:
1765
1712
            server_settings[option] = value
1773
1720
    ##################################################################
1774
1721
    
1775
1722
    # For convenience
1776
 
    debug = server_settings["debug"]
1777
 
    debuglevel = server_settings["debuglevel"]
1778
 
    use_dbus = server_settings["use_dbus"]
1779
 
    use_ipv6 = server_settings["use_ipv6"]
1780
 
    
1781
 
    if server_settings["servicename"] != "Mandos":
 
1723
    debug = server_settings[u"debug"]
 
1724
    debuglevel = server_settings[u"debuglevel"]
 
1725
    use_dbus = server_settings[u"use_dbus"]
 
1726
    use_ipv6 = server_settings[u"use_ipv6"]
 
1727
 
 
1728
    if server_settings[u"servicename"] != u"Mandos":
1782
1729
        syslogger.setFormatter(logging.Formatter
1783
 
                               ('Mandos (%s) [%%(process)d]:'
1784
 
                                ' %%(levelname)s: %%(message)s'
1785
 
                                % server_settings["servicename"]))
 
1730
                               (u'Mandos (%s) [%%(process)d]:'
 
1731
                                u' %%(levelname)s: %%(message)s'
 
1732
                                % server_settings[u"servicename"]))
1786
1733
    
1787
1734
    # Parse config file with clients
1788
 
    client_defaults = { "timeout": "5m",
1789
 
                        "extended_timeout": "15m",
1790
 
                        "interval": "2m",
1791
 
                        "checker": "fping -q -- %%(host)s",
1792
 
                        "host": "",
1793
 
                        "approval_delay": "0s",
1794
 
                        "approval_duration": "1s",
 
1735
    client_defaults = { u"timeout": u"1h",
 
1736
                        u"interval": u"5m",
 
1737
                        u"checker": u"fping -q -- %%(host)s",
 
1738
                        u"host": u"",
 
1739
                        u"approval_delay": u"0s",
 
1740
                        u"approval_duration": u"1s",
1795
1741
                        }
1796
1742
    client_config = configparser.SafeConfigParser(client_defaults)
1797
 
    client_config.read(os.path.join(server_settings["configdir"],
1798
 
                                    "clients.conf"))
 
1743
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1744
                                    u"clients.conf"))
1799
1745
    
1800
1746
    global mandos_dbus_service
1801
1747
    mandos_dbus_service = None
1802
1748
    
1803
 
    tcp_server = MandosServer((server_settings["address"],
1804
 
                               server_settings["port"]),
 
1749
    tcp_server = MandosServer((server_settings[u"address"],
 
1750
                               server_settings[u"port"]),
1805
1751
                              ClientHandler,
1806
 
                              interface=(server_settings["interface"]
 
1752
                              interface=(server_settings[u"interface"]
1807
1753
                                         or None),
1808
1754
                              use_ipv6=use_ipv6,
1809
1755
                              gnutls_priority=
1810
 
                              server_settings["priority"],
 
1756
                              server_settings[u"priority"],
1811
1757
                              use_dbus=use_dbus)
1812
 
    if not debug:
1813
 
        pidfilename = "/var/run/mandos.pid"
1814
 
        try:
1815
 
            pidfile = open(pidfilename, "w")
1816
 
        except IOError:
1817
 
            logger.error("Could not open file %r", pidfilename)
 
1758
    pidfilename = u"/var/run/mandos.pid"
 
1759
    try:
 
1760
        pidfile = open(pidfilename, u"w")
 
1761
    except IOError:
 
1762
        logger.error(u"Could not open file %r", pidfilename)
1818
1763
    
1819
1764
    try:
1820
 
        uid = pwd.getpwnam("_mandos").pw_uid
1821
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1765
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1766
        gid = pwd.getpwnam(u"_mandos").pw_gid
1822
1767
    except KeyError:
1823
1768
        try:
1824
 
            uid = pwd.getpwnam("mandos").pw_uid
1825
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1769
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1770
            gid = pwd.getpwnam(u"mandos").pw_gid
1826
1771
        except KeyError:
1827
1772
            try:
1828
 
                uid = pwd.getpwnam("nobody").pw_uid
1829
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1773
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1774
                gid = pwd.getpwnam(u"nobody").pw_gid
1830
1775
            except KeyError:
1831
1776
                uid = 65534
1832
1777
                gid = 65534
1833
1778
    try:
1834
1779
        os.setgid(gid)
1835
1780
        os.setuid(uid)
1836
 
    except OSError as error:
 
1781
    except OSError, error:
1837
1782
        if error[0] != errno.EPERM:
1838
1783
            raise error
1839
1784
    
1844
1789
        level = getattr(logging, debuglevel.upper())
1845
1790
        syslogger.setLevel(level)
1846
1791
        console.setLevel(level)
1847
 
    
 
1792
 
1848
1793
    if debug:
1849
1794
        # Enable all possible GnuTLS debugging
1850
1795
        
1854
1799
        
1855
1800
        @gnutls.library.types.gnutls_log_func
1856
1801
        def debug_gnutls(level, string):
1857
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1802
            logger.debug(u"GnuTLS: %s", string[:-1])
1858
1803
        
1859
1804
        (gnutls.library.functions
1860
1805
         .gnutls_global_set_log_function(debug_gnutls))
1868
1813
        # No console logging
1869
1814
        logger.removeHandler(console)
1870
1815
    
1871
 
    # Need to fork before connecting to D-Bus
1872
 
    if not debug:
1873
 
        # Close all input and output, do double fork, etc.
1874
 
        daemon()
1875
1816
    
1876
1817
    global main_loop
1877
1818
    # From the Avahi example code
1881
1822
    # End of Avahi example code
1882
1823
    if use_dbus:
1883
1824
        try:
1884
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1825
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1885
1826
                                            bus, do_not_queue=True)
1886
 
        except dbus.exceptions.NameExistsException as e:
1887
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
1827
        except dbus.exceptions.NameExistsException, e:
 
1828
            logger.error(unicode(e) + u", disabling D-Bus")
1888
1829
            use_dbus = False
1889
 
            server_settings["use_dbus"] = False
 
1830
            server_settings[u"use_dbus"] = False
1890
1831
            tcp_server.use_dbus = False
1891
1832
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1892
 
    service = AvahiService(name = server_settings["servicename"],
1893
 
                           servicetype = "_mandos._tcp",
 
1833
    service = AvahiService(name = server_settings[u"servicename"],
 
1834
                           servicetype = u"_mandos._tcp",
1894
1835
                           protocol = protocol, bus = bus)
1895
1836
    if server_settings["interface"]:
1896
1837
        service.interface = (if_nametoindex
1897
 
                             (str(server_settings["interface"])))
1898
 
    
 
1838
                             (str(server_settings[u"interface"])))
 
1839
 
 
1840
    if not debug:
 
1841
        # Close all input and output, do double fork, etc.
 
1842
        daemon()
 
1843
        
1899
1844
    global multiprocessing_manager
1900
1845
    multiprocessing_manager = multiprocessing.Manager()
1901
1846
    
1920
1865
                        client_config, section)))
1921
1866
            for section in client_config.sections()))
1922
1867
    if not tcp_server.clients:
1923
 
        logger.warning("No clients defined")
 
1868
        logger.warning(u"No clients defined")
1924
1869
        
 
1870
    try:
 
1871
        with pidfile:
 
1872
            pid = os.getpid()
 
1873
            pidfile.write(str(pid) + "\n")
 
1874
        del pidfile
 
1875
    except IOError:
 
1876
        logger.error(u"Could not write to file %r with PID %d",
 
1877
                     pidfilename, pid)
 
1878
    except NameError:
 
1879
        # "pidfile" was never created
 
1880
        pass
 
1881
    del pidfilename
 
1882
    
1925
1883
    if not debug:
1926
 
        try:
1927
 
            with pidfile:
1928
 
                pid = os.getpid()
1929
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1930
 
            del pidfile
1931
 
        except IOError:
1932
 
            logger.error("Could not write to file %r with PID %d",
1933
 
                         pidfilename, pid)
1934
 
        except NameError:
1935
 
            # "pidfile" was never created
1936
 
            pass
1937
 
        del pidfilename
1938
 
        
1939
1884
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1940
 
    
1941
1885
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1942
1886
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1943
1887
    
1945
1889
        class MandosDBusService(dbus.service.Object):
1946
1890
            """A D-Bus proxy object"""
1947
1891
            def __init__(self):
1948
 
                dbus.service.Object.__init__(self, bus, "/")
1949
 
            _interface = "se.bsnet.fukt.Mandos"
 
1892
                dbus.service.Object.__init__(self, bus, u"/")
 
1893
            _interface = u"se.bsnet.fukt.Mandos"
1950
1894
            
1951
 
            @dbus.service.signal(_interface, signature="o")
 
1895
            @dbus.service.signal(_interface, signature=u"o")
1952
1896
            def ClientAdded(self, objpath):
1953
1897
                "D-Bus signal"
1954
1898
                pass
1955
1899
            
1956
 
            @dbus.service.signal(_interface, signature="ss")
 
1900
            @dbus.service.signal(_interface, signature=u"ss")
1957
1901
            def ClientNotFound(self, fingerprint, address):
1958
1902
                "D-Bus signal"
1959
1903
                pass
1960
1904
            
1961
 
            @dbus.service.signal(_interface, signature="os")
 
1905
            @dbus.service.signal(_interface, signature=u"os")
1962
1906
            def ClientRemoved(self, objpath, name):
1963
1907
                "D-Bus signal"
1964
1908
                pass
1965
1909
            
1966
 
            @dbus.service.method(_interface, out_signature="ao")
 
1910
            @dbus.service.method(_interface, out_signature=u"ao")
1967
1911
            def GetAllClients(self):
1968
1912
                "D-Bus method"
1969
1913
                return dbus.Array(c.dbus_object_path
1970
1914
                                  for c in tcp_server.clients)
1971
1915
            
1972
1916
            @dbus.service.method(_interface,
1973
 
                                 out_signature="a{oa{sv}}")
 
1917
                                 out_signature=u"a{oa{sv}}")
1974
1918
            def GetAllClientsWithProperties(self):
1975
1919
                "D-Bus method"
1976
1920
                return dbus.Dictionary(
1977
 
                    ((c.dbus_object_path, c.GetAll(""))
 
1921
                    ((c.dbus_object_path, c.GetAll(u""))
1978
1922
                     for c in tcp_server.clients),
1979
 
                    signature="oa{sv}")
 
1923
                    signature=u"oa{sv}")
1980
1924
            
1981
 
            @dbus.service.method(_interface, in_signature="o")
 
1925
            @dbus.service.method(_interface, in_signature=u"o")
1982
1926
            def RemoveClient(self, object_path):
1983
1927
                "D-Bus method"
1984
1928
                for c in tcp_server.clients:
2026
1970
    # Find out what port we got
2027
1971
    service.port = tcp_server.socket.getsockname()[1]
2028
1972
    if use_ipv6:
2029
 
        logger.info("Now listening on address %r, port %d,"
 
1973
        logger.info(u"Now listening on address %r, port %d,"
2030
1974
                    " flowinfo %d, scope_id %d"
2031
1975
                    % tcp_server.socket.getsockname())
2032
1976
    else:                       # IPv4
2033
 
        logger.info("Now listening on address %r, port %d"
 
1977
        logger.info(u"Now listening on address %r, port %d"
2034
1978
                    % tcp_server.socket.getsockname())
2035
1979
    
2036
1980
    #service.interface = tcp_server.socket.getsockname()[3]
2039
1983
        # From the Avahi example code
2040
1984
        try:
2041
1985
            service.activate()
2042
 
        except dbus.exceptions.DBusException as error:
2043
 
            logger.critical("DBusException: %s", error)
 
1986
        except dbus.exceptions.DBusException, error:
 
1987
            logger.critical(u"DBusException: %s", error)
2044
1988
            cleanup()
2045
1989
            sys.exit(1)
2046
1990
        # End of Avahi example code
2050
1994
                             (tcp_server.handle_request
2051
1995
                              (*args[2:], **kwargs) or True))
2052
1996
        
2053
 
        logger.debug("Starting main loop")
 
1997
        logger.debug(u"Starting main loop")
2054
1998
        main_loop.run()
2055
 
    except AvahiError as error:
2056
 
        logger.critical("AvahiError: %s", error)
 
1999
    except AvahiError, error:
 
2000
        logger.critical(u"AvahiError: %s", error)
2057
2001
        cleanup()
2058
2002
        sys.exit(1)
2059
2003
    except KeyboardInterrupt:
2060
2004
        if debug:
2061
 
            print("", file=sys.stderr)
2062
 
        logger.debug("Server received KeyboardInterrupt")
2063
 
    logger.debug("Server exiting")
 
2005
            print >> sys.stderr
 
2006
        logger.debug(u"Server received KeyboardInterrupt")
 
2007
    logger.debug(u"Server exiting")
2064
2008
    # Must run before the D-Bus bus name gets deregistered
2065
2009
    cleanup()
2066
2010
 
2067
 
 
2068
2011
if __name__ == '__main__':
2069
2012
    main()