/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")
316
 
        
 
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))
 
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)
 
286
        return self._timedelta_to_milliseconds(self.interval)
328
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
 
def dbus_service_property(dbus_interface, signature="v",
565
 
                          access="readwrite", byte_arrays=False):
 
510
def dbus_service_property(dbus_interface, signature=u"v",
 
511
                          access=u"readwrite", byte_arrays=False):
566
512
    """Decorators for marking methods of a DBusObjectWithProperties to
567
513
    become properties on the D-Bus.
568
514
    
575
521
    """
576
522
    # Encoding deeply encoded byte arrays is not supported yet by the
577
523
    # "Set" method, so we fail early here:
578
 
    if byte_arrays and signature != "ay":
579
 
        raise ValueError("Byte arrays not supported for non-'ay'"
580
 
                         " 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)
581
527
    def decorator(func):
582
528
        func._dbus_is_property = True
583
529
        func._dbus_interface = dbus_interface
584
530
        func._dbus_signature = signature
585
531
        func._dbus_access = access
586
532
        func._dbus_name = func.__name__
587
 
        if func._dbus_name.endswith("_dbus_property"):
 
533
        if func._dbus_name.endswith(u"_dbus_property"):
588
534
            func._dbus_name = func._dbus_name[:-14]
589
 
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
 
535
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
590
536
        return func
591
537
    return decorator
592
538
 
620
566
    
621
567
    @staticmethod
622
568
    def _is_dbus_property(obj):
623
 
        return getattr(obj, "_dbus_is_property", False)
 
569
        return getattr(obj, u"_dbus_is_property", False)
624
570
    
625
571
    def _get_all_dbus_properties(self):
626
572
        """Returns a generator of (name, attribute) pairs
634
580
        property with the specified name and interface.
635
581
        """
636
582
        for name in (property_name,
637
 
                     property_name + "_dbus_property"):
 
583
                     property_name + u"_dbus_property"):
638
584
            prop = getattr(self, name, None)
639
585
            if (prop is None
640
586
                or not self._is_dbus_property(prop)
644
590
                continue
645
591
            return prop
646
592
        # No such property
647
 
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
648
 
                                   + interface_name + "."
 
593
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
 
594
                                   + interface_name + u"."
649
595
                                   + property_name)
650
596
    
651
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
652
 
                         out_signature="v")
 
597
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
 
598
                         out_signature=u"v")
653
599
    def Get(self, interface_name, property_name):
654
600
        """Standard D-Bus property Get() method, see D-Bus standard.
655
601
        """
656
602
        prop = self._get_dbus_property(interface_name, property_name)
657
 
        if prop._dbus_access == "write":
 
603
        if prop._dbus_access == u"write":
658
604
            raise DBusPropertyAccessException(property_name)
659
605
        value = prop()
660
 
        if not hasattr(value, "variant_level"):
 
606
        if not hasattr(value, u"variant_level"):
661
607
            return value
662
608
        return type(value)(value, variant_level=value.variant_level+1)
663
609
    
664
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
 
610
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
665
611
    def Set(self, interface_name, property_name, value):
666
612
        """Standard D-Bus property Set() method, see D-Bus standard.
667
613
        """
668
614
        prop = self._get_dbus_property(interface_name, property_name)
669
 
        if prop._dbus_access == "read":
 
615
        if prop._dbus_access == u"read":
670
616
            raise DBusPropertyAccessException(property_name)
671
 
        if prop._dbus_get_args_options["byte_arrays"]:
 
617
        if prop._dbus_get_args_options[u"byte_arrays"]:
672
618
            # The byte_arrays option is not supported yet on
673
619
            # signatures other than "ay".
674
 
            if prop._dbus_signature != "ay":
 
620
            if prop._dbus_signature != u"ay":
675
621
                raise ValueError
676
622
            value = dbus.ByteArray(''.join(unichr(byte)
677
623
                                           for byte in value))
678
624
        prop(value)
679
625
    
680
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
681
 
                         out_signature="a{sv}")
 
626
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
 
627
                         out_signature=u"a{sv}")
682
628
    def GetAll(self, interface_name):
683
629
        """Standard D-Bus property GetAll() method, see D-Bus
684
630
        standard.
692
638
                # Interface non-empty but did not match
693
639
                continue
694
640
            # Ignore write-only properties
695
 
            if prop._dbus_access == "write":
 
641
            if prop._dbus_access == u"write":
696
642
                continue
697
643
            value = prop()
698
 
            if not hasattr(value, "variant_level"):
 
644
            if not hasattr(value, u"variant_level"):
699
645
                all[name] = value
700
646
                continue
701
647
            all[name] = type(value)(value, variant_level=
702
648
                                    value.variant_level+1)
703
 
        return dbus.Dictionary(all, signature="sv")
 
649
        return dbus.Dictionary(all, signature=u"sv")
704
650
    
705
651
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
706
 
                         out_signature="s",
 
652
                         out_signature=u"s",
707
653
                         path_keyword='object_path',
708
654
                         connection_keyword='connection')
709
655
    def Introspect(self, object_path, connection):
714
660
        try:
715
661
            document = xml.dom.minidom.parseString(xmlstring)
716
662
            def make_tag(document, name, prop):
717
 
                e = document.createElement("property")
718
 
                e.setAttribute("name", name)
719
 
                e.setAttribute("type", prop._dbus_signature)
720
 
                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)
721
667
                return e
722
 
            for if_tag in document.getElementsByTagName("interface"):
 
668
            for if_tag in document.getElementsByTagName(u"interface"):
723
669
                for tag in (make_tag(document, name, prop)
724
670
                            for name, prop
725
671
                            in self._get_all_dbus_properties()
726
672
                            if prop._dbus_interface
727
 
                            == if_tag.getAttribute("name")):
 
673
                            == if_tag.getAttribute(u"name")):
728
674
                    if_tag.appendChild(tag)
729
675
                # Add the names to the return values for the
730
676
                # "org.freedesktop.DBus.Properties" methods
731
 
                if (if_tag.getAttribute("name")
732
 
                    == "org.freedesktop.DBus.Properties"):
733
 
                    for cn in if_tag.getElementsByTagName("method"):
734
 
                        if cn.getAttribute("name") == "Get":
735
 
                            for arg in cn.getElementsByTagName("arg"):
736
 
                                if (arg.getAttribute("direction")
737
 
                                    == "out"):
738
 
                                    arg.setAttribute("name", "value")
739
 
                        elif cn.getAttribute("name") == "GetAll":
740
 
                            for arg in cn.getElementsByTagName("arg"):
741
 
                                if (arg.getAttribute("direction")
742
 
                                    == "out"):
743
 
                                    arg.setAttribute("name", "props")
744
 
            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")
745
691
            document.unlink()
746
692
        except (AttributeError, xml.dom.DOMException,
747
 
                xml.parsers.expat.ExpatError) as error:
748
 
            logger.error("Failed to override Introspection method",
 
693
                xml.parsers.expat.ExpatError), error:
 
694
            logger.error(u"Failed to override Introspection method",
749
695
                         error)
750
696
        return xmlstring
751
697
 
752
698
 
753
 
def datetime_to_dbus (dt, variant_level=0):
754
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
755
 
    if dt is None:
756
 
        return dbus.String("", variant_level = variant_level)
757
 
    return dbus.String(dt.isoformat(),
758
 
                       variant_level=variant_level)
759
 
 
760
699
class ClientDBus(Client, DBusObjectWithProperties):
761
700
    """A Client class using D-Bus
762
701
    
764
703
    dbus_object_path: dbus.ObjectPath
765
704
    bus: dbus.SystemBus()
766
705
    """
767
 
    
768
 
    runtime_expansions = (Client.runtime_expansions
769
 
                          + ("dbus_object_path",))
770
 
    
771
706
    # dbus.service.Object doesn't use super(), so we can't either.
772
707
    
773
708
    def __init__(self, bus = None, *args, **kwargs):
776
711
        Client.__init__(self, *args, **kwargs)
777
712
        # Only now, when this client is initialized, can it show up on
778
713
        # the D-Bus
779
 
        client_object_name = unicode(self.name).translate(
780
 
            {ord("."): ord("_"),
781
 
             ord("-"): ord("_")})
782
714
        self.dbus_object_path = (dbus.ObjectPath
783
 
                                 ("/clients/" + client_object_name))
 
715
                                 (u"/clients/"
 
716
                                  + self.name.replace(u".", u"_")))
784
717
        DBusObjectWithProperties.__init__(self, self.bus,
785
718
                                          self.dbus_object_path)
786
719
        
787
 
    def notifychangeproperty(transform_func,
788
 
                             dbus_name, type_func=lambda x: x,
789
 
                             variant_level=1):
790
 
        """ Modify a variable so that its a property that announce its
791
 
        changes to DBus.
792
 
        transform_fun: Function that takes a value and transform it to
793
 
                       DBus type.
794
 
        dbus_name: DBus name of the variable
795
 
        type_func: Function that transform the value before sending it
796
 
                   to DBus
797
 
        variant_level: DBus variant level. default: 1
798
 
        """
799
 
        real_value = [None,]
800
 
        def setter(self, value):
801
 
            old_value = real_value[0]
802
 
            real_value[0] = value
803
 
            if hasattr(self, "dbus_object_path"):
804
 
                if type_func(old_value) != type_func(real_value[0]):
805
 
                    dbus_value = transform_func(type_func(real_value[0]),
806
 
                                                variant_level)
807
 
                    self.PropertyChanged(dbus.String(dbus_name),
808
 
                                         dbus_value)
809
 
 
810
 
        return property(lambda self: real_value[0], setter)
811
 
 
812
 
 
813
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
814
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
815
 
                                             "ApprovalPending",
816
 
                                             type_func = bool)
817
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
818
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
819
 
                                        "LastEnabled")
820
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
821
 
                                   type_func = lambda checker: checker is not None)
822
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
823
 
                                           "LastCheckedOK")
824
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
825
 
                                                 "LastApprovalRequest")
826
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
827
 
                                               "ApprovedByDefault")
828
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
829
 
                                          type_func = _timedelta_to_milliseconds)
830
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
831
 
                                             type_func = _timedelta_to_milliseconds)
832
 
    host = notifychangeproperty(dbus.String, "Host")
833
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
834
 
                                   type_func = _timedelta_to_milliseconds)
835
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
836
 
                                            type_func = _timedelta_to_milliseconds)
837
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
838
 
                                    type_func = _timedelta_to_milliseconds)
839
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
840
 
    
841
 
    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
842
763
    
843
764
    def __del__(self, *args, **kwargs):
844
765
        try:
845
766
            self.remove_from_connection()
846
767
        except LookupError:
847
768
            pass
848
 
        if hasattr(DBusObjectWithProperties, "__del__"):
 
769
        if hasattr(DBusObjectWithProperties, u"__del__"):
849
770
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
850
771
        Client.__del__(self, *args, **kwargs)
851
772
    
853
774
                         *args, **kwargs):
854
775
        self.checker_callback_tag = None
855
776
        self.checker = None
 
777
        # Emit D-Bus signal
 
778
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
 
779
                             dbus.Boolean(False, variant_level=1))
856
780
        if os.WIFEXITED(condition):
857
781
            exitstatus = os.WEXITSTATUS(condition)
858
782
            # Emit D-Bus signal
867
791
        
868
792
        return Client.checker_callback(self, pid, condition, command,
869
793
                                       *args, **kwargs)
870
 
 
 
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
    
871
804
    def start_checker(self, *args, **kwargs):
872
805
        old_checker = self.checker
873
806
        if self.checker is not None:
880
813
            and old_checker_pid != self.checker.pid):
881
814
            # Emit D-Bus signal
882
815
            self.CheckerStarted(self.current_checker_command)
 
816
            self.PropertyChanged(
 
817
                dbus.String(u"CheckerRunning"),
 
818
                dbus.Boolean(True, variant_level=1))
883
819
        return r
884
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
 
885
830
    def _reset_approved(self):
886
831
        self._approved = None
887
832
        return False
889
834
    def approve(self, value=True):
890
835
        self.send_changedstate()
891
836
        self._approved = value
892
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
837
        gobject.timeout_add(self._timedelta_to_milliseconds
893
838
                            (self.approval_duration),
894
839
                            self._reset_approved)
895
840
    
896
841
    
897
842
    ## D-Bus methods, signals & properties
898
 
    _interface = "se.bsnet.fukt.Mandos.Client"
 
843
    _interface = u"se.bsnet.fukt.Mandos.Client"
899
844
    
900
845
    ## Signals
901
846
    
902
847
    # CheckerCompleted - signal
903
 
    @dbus.service.signal(_interface, signature="nxs")
 
848
    @dbus.service.signal(_interface, signature=u"nxs")
904
849
    def CheckerCompleted(self, exitcode, waitstatus, command):
905
850
        "D-Bus signal"
906
851
        pass
907
852
    
908
853
    # CheckerStarted - signal
909
 
    @dbus.service.signal(_interface, signature="s")
 
854
    @dbus.service.signal(_interface, signature=u"s")
910
855
    def CheckerStarted(self, command):
911
856
        "D-Bus signal"
912
857
        pass
913
858
    
914
859
    # PropertyChanged - signal
915
 
    @dbus.service.signal(_interface, signature="sv")
 
860
    @dbus.service.signal(_interface, signature=u"sv")
916
861
    def PropertyChanged(self, property, value):
917
862
        "D-Bus signal"
918
863
        pass
927
872
        pass
928
873
    
929
874
    # Rejected - signal
930
 
    @dbus.service.signal(_interface, signature="s")
 
875
    @dbus.service.signal(_interface, signature=u"s")
931
876
    def Rejected(self, reason):
932
877
        "D-Bus signal"
933
878
        pass
934
879
    
935
880
    # NeedApproval - signal
936
 
    @dbus.service.signal(_interface, signature="tb")
 
881
    @dbus.service.signal(_interface, signature=u"tb")
937
882
    def NeedApproval(self, timeout, default):
938
883
        "D-Bus signal"
939
 
        return self.need_approval()
 
884
        pass
940
885
    
941
886
    ## Methods
942
 
    
 
887
 
943
888
    # Approve - method
944
 
    @dbus.service.method(_interface, in_signature="b")
 
889
    @dbus.service.method(_interface, in_signature=u"b")
945
890
    def Approve(self, value):
946
891
        self.approve(value)
947
 
    
 
892
 
948
893
    # CheckedOK - method
949
894
    @dbus.service.method(_interface)
950
895
    def CheckedOK(self):
951
 
        self.checked_ok()
 
896
        return self.checked_ok()
952
897
    
953
898
    # Enable - method
954
899
    @dbus.service.method(_interface)
976
921
    ## Properties
977
922
    
978
923
    # ApprovalPending - property
979
 
    @dbus_service_property(_interface, signature="b", access="read")
 
924
    @dbus_service_property(_interface, signature=u"b", access=u"read")
980
925
    def ApprovalPending_dbus_property(self):
981
926
        return dbus.Boolean(bool(self.approvals_pending))
982
927
    
983
928
    # ApprovedByDefault - property
984
 
    @dbus_service_property(_interface, signature="b",
985
 
                           access="readwrite")
 
929
    @dbus_service_property(_interface, signature=u"b",
 
930
                           access=u"readwrite")
986
931
    def ApprovedByDefault_dbus_property(self, value=None):
987
932
        if value is None:       # get
988
933
            return dbus.Boolean(self.approved_by_default)
989
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))
990
938
    
991
939
    # ApprovalDelay - property
992
 
    @dbus_service_property(_interface, signature="t",
993
 
                           access="readwrite")
 
940
    @dbus_service_property(_interface, signature=u"t",
 
941
                           access=u"readwrite")
994
942
    def ApprovalDelay_dbus_property(self, value=None):
995
943
        if value is None:       # get
996
944
            return dbus.UInt64(self.approval_delay_milliseconds())
997
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))
998
949
    
999
950
    # ApprovalDuration - property
1000
 
    @dbus_service_property(_interface, signature="t",
1001
 
                           access="readwrite")
 
951
    @dbus_service_property(_interface, signature=u"t",
 
952
                           access=u"readwrite")
1002
953
    def ApprovalDuration_dbus_property(self, value=None):
1003
954
        if value is None:       # get
1004
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
955
            return dbus.UInt64(self._timedelta_to_milliseconds(
1005
956
                    self.approval_duration))
1006
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))
1007
961
    
1008
962
    # Name - property
1009
 
    @dbus_service_property(_interface, signature="s", access="read")
 
963
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1010
964
    def Name_dbus_property(self):
1011
965
        return dbus.String(self.name)
1012
966
    
1013
967
    # Fingerprint - property
1014
 
    @dbus_service_property(_interface, signature="s", access="read")
 
968
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1015
969
    def Fingerprint_dbus_property(self):
1016
970
        return dbus.String(self.fingerprint)
1017
971
    
1018
972
    # Host - property
1019
 
    @dbus_service_property(_interface, signature="s",
1020
 
                           access="readwrite")
 
973
    @dbus_service_property(_interface, signature=u"s",
 
974
                           access=u"readwrite")
1021
975
    def Host_dbus_property(self, value=None):
1022
976
        if value is None:       # get
1023
977
            return dbus.String(self.host)
1024
978
        self.host = value
 
979
        # Emit D-Bus signal
 
980
        self.PropertyChanged(dbus.String(u"Host"),
 
981
                             dbus.String(value, variant_level=1))
1025
982
    
1026
983
    # Created - property
1027
 
    @dbus_service_property(_interface, signature="s", access="read")
 
984
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1028
985
    def Created_dbus_property(self):
1029
 
        return dbus.String(datetime_to_dbus(self.created))
 
986
        return dbus.String(self._datetime_to_dbus(self.created))
1030
987
    
1031
988
    # LastEnabled - property
1032
 
    @dbus_service_property(_interface, signature="s", access="read")
 
989
    @dbus_service_property(_interface, signature=u"s", access=u"read")
1033
990
    def LastEnabled_dbus_property(self):
1034
 
        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))
1035
994
    
1036
995
    # Enabled - property
1037
 
    @dbus_service_property(_interface, signature="b",
1038
 
                           access="readwrite")
 
996
    @dbus_service_property(_interface, signature=u"b",
 
997
                           access=u"readwrite")
1039
998
    def Enabled_dbus_property(self, value=None):
1040
999
        if value is None:       # get
1041
1000
            return dbus.Boolean(self.enabled)
1045
1004
            self.disable()
1046
1005
    
1047
1006
    # LastCheckedOK - property
1048
 
    @dbus_service_property(_interface, signature="s",
1049
 
                           access="readwrite")
 
1007
    @dbus_service_property(_interface, signature=u"s",
 
1008
                           access=u"readwrite")
1050
1009
    def LastCheckedOK_dbus_property(self, value=None):
1051
1010
        if value is not None:
1052
1011
            self.checked_ok()
1053
1012
            return
1054
 
        return datetime_to_dbus(self.last_checked_ok)
1055
 
    
1056
 
    # Expires - property
1057
 
    @dbus_service_property(_interface, signature="s", access="read")
1058
 
    def Expires_dbus_property(self):
1059
 
        return datetime_to_dbus(self.expires)
1060
 
    
1061
 
    # LastApprovalRequest - property
1062
 
    @dbus_service_property(_interface, signature="s", access="read")
1063
 
    def LastApprovalRequest_dbus_property(self):
1064
 
        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))
1065
1017
    
1066
1018
    # Timeout - property
1067
 
    @dbus_service_property(_interface, signature="t",
1068
 
                           access="readwrite")
 
1019
    @dbus_service_property(_interface, signature=u"t",
 
1020
                           access=u"readwrite")
1069
1021
    def Timeout_dbus_property(self, value=None):
1070
1022
        if value is None:       # get
1071
1023
            return dbus.UInt64(self.timeout_milliseconds())
1072
1024
        self.timeout = datetime.timedelta(0, 0, 0, value)
1073
 
        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:
1074
1029
            return
1075
1030
        # Reschedule timeout
1076
1031
        gobject.source_remove(self.disable_initiator_tag)
1077
1032
        self.disable_initiator_tag = None
1078
 
        self.expires = None
1079
1033
        time_to_die = (self.
1080
1034
                       _timedelta_to_milliseconds((self
1081
1035
                                                   .last_checked_ok
1086
1040
            # The timeout has passed
1087
1041
            self.disable()
1088
1042
        else:
1089
 
            self.expires = (datetime.datetime.utcnow()
1090
 
                            + datetime.timedelta(milliseconds = time_to_die))
1091
1043
            self.disable_initiator_tag = (gobject.timeout_add
1092
1044
                                          (time_to_die, self.disable))
1093
 
 
1094
 
    # ExtendedTimeout - property
1095
 
    @dbus_service_property(_interface, signature="t",
1096
 
                           access="readwrite")
1097
 
    def ExtendedTimeout_dbus_property(self, value=None):
1098
 
        if value is None:       # get
1099
 
            return dbus.UInt64(self.extended_timeout_milliseconds())
1100
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1101
 
 
 
1045
    
1102
1046
    # Interval - property
1103
 
    @dbus_service_property(_interface, signature="t",
1104
 
                           access="readwrite")
 
1047
    @dbus_service_property(_interface, signature=u"t",
 
1048
                           access=u"readwrite")
1105
1049
    def Interval_dbus_property(self, value=None):
1106
1050
        if value is None:       # get
1107
1051
            return dbus.UInt64(self.interval_milliseconds())
1108
1052
        self.interval = datetime.timedelta(0, 0, 0, value)
1109
 
        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:
1110
1057
            return
1111
1058
        # Reschedule checker run
1112
1059
        gobject.source_remove(self.checker_initiator_tag)
1115
1062
        self.start_checker()    # Start one now, too
1116
1063
 
1117
1064
    # Checker - property
1118
 
    @dbus_service_property(_interface, signature="s",
1119
 
                           access="readwrite")
 
1065
    @dbus_service_property(_interface, signature=u"s",
 
1066
                           access=u"readwrite")
1120
1067
    def Checker_dbus_property(self, value=None):
1121
1068
        if value is None:       # get
1122
1069
            return dbus.String(self.checker_command)
1123
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))
1124
1075
    
1125
1076
    # CheckerRunning - property
1126
 
    @dbus_service_property(_interface, signature="b",
1127
 
                           access="readwrite")
 
1077
    @dbus_service_property(_interface, signature=u"b",
 
1078
                           access=u"readwrite")
1128
1079
    def CheckerRunning_dbus_property(self, value=None):
1129
1080
        if value is None:       # get
1130
1081
            return dbus.Boolean(self.checker is not None)
1134
1085
            self.stop_checker()
1135
1086
    
1136
1087
    # ObjectPath - property
1137
 
    @dbus_service_property(_interface, signature="o", access="read")
 
1088
    @dbus_service_property(_interface, signature=u"o", access=u"read")
1138
1089
    def ObjectPath_dbus_property(self):
1139
1090
        return self.dbus_object_path # is already a dbus.ObjectPath
1140
1091
    
1141
1092
    # Secret = property
1142
 
    @dbus_service_property(_interface, signature="ay",
1143
 
                           access="write", byte_arrays=True)
 
1093
    @dbus_service_property(_interface, signature=u"ay",
 
1094
                           access=u"write", byte_arrays=True)
1144
1095
    def Secret_dbus_property(self, value):
1145
1096
        self.secret = str(value)
1146
1097
    
1181
1132
    
1182
1133
    def handle(self):
1183
1134
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1184
 
            logger.info("TCP connection from: %s",
 
1135
            logger.info(u"TCP connection from: %s",
1185
1136
                        unicode(self.client_address))
1186
 
            logger.debug("Pipe FD: %d",
 
1137
            logger.debug(u"Pipe FD: %d",
1187
1138
                         self.server.child_pipe.fileno())
1188
1139
 
1189
1140
            session = (gnutls.connection
1196
1147
            # no X.509 keys are added to it.  Therefore, we can use it
1197
1148
            # here despite using OpenPGP certificates.
1198
1149
 
1199
 
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1200
 
            #                      "+AES-256-CBC", "+SHA1",
1201
 
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1202
 
            #                      "+DHE-DSS"))
 
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"))
1203
1154
            # Use a fallback default, since this MUST be set.
1204
1155
            priority = self.server.gnutls_priority
1205
1156
            if priority is None:
1206
 
                priority = "NORMAL"
 
1157
                priority = u"NORMAL"
1207
1158
            (gnutls.library.functions
1208
1159
             .gnutls_priority_set_direct(session._c_object,
1209
1160
                                         priority, None))
1211
1162
            # Start communication using the Mandos protocol
1212
1163
            # Get protocol number
1213
1164
            line = self.request.makefile().readline()
1214
 
            logger.debug("Protocol version: %r", line)
 
1165
            logger.debug(u"Protocol version: %r", line)
1215
1166
            try:
1216
1167
                if int(line.strip().split()[0]) > 1:
1217
1168
                    raise RuntimeError
1218
 
            except (ValueError, IndexError, RuntimeError) as error:
1219
 
                logger.error("Unknown protocol version: %s", error)
 
1169
            except (ValueError, IndexError, RuntimeError), error:
 
1170
                logger.error(u"Unknown protocol version: %s", error)
1220
1171
                return
1221
1172
 
1222
1173
            # Start GnuTLS connection
1223
1174
            try:
1224
1175
                session.handshake()
1225
 
            except gnutls.errors.GNUTLSError as error:
1226
 
                logger.warning("Handshake failed: %s", error)
 
1176
            except gnutls.errors.GNUTLSError, error:
 
1177
                logger.warning(u"Handshake failed: %s", error)
1227
1178
                # Do not run session.bye() here: the session is not
1228
1179
                # established.  Just abandon the request.
1229
1180
                return
1230
 
            logger.debug("Handshake succeeded")
 
1181
            logger.debug(u"Handshake succeeded")
1231
1182
 
1232
1183
            approval_required = False
1233
1184
            try:
1234
1185
                try:
1235
1186
                    fpr = self.fingerprint(self.peer_certificate
1236
1187
                                           (session))
1237
 
                except (TypeError,
1238
 
                        gnutls.errors.GNUTLSError) as error:
1239
 
                    logger.warning("Bad certificate: %s", error)
 
1188
                except (TypeError, gnutls.errors.GNUTLSError), error:
 
1189
                    logger.warning(u"Bad certificate: %s", error)
1240
1190
                    return
1241
 
                logger.debug("Fingerprint: %s", fpr)
 
1191
                logger.debug(u"Fingerprint: %s", fpr)
1242
1192
 
1243
1193
                try:
1244
1194
                    client = ProxyClient(child_pipe, fpr,
1253
1203
                
1254
1204
                while True:
1255
1205
                    if not client.enabled:
1256
 
                        logger.info("Client %s is disabled",
 
1206
                        logger.warning(u"Client %s is disabled",
1257
1207
                                       client.name)
1258
1208
                        if self.server.use_dbus:
1259
1209
                            # Emit D-Bus signal
1264
1214
                        #We are approved or approval is disabled
1265
1215
                        break
1266
1216
                    elif client._approved is None:
1267
 
                        logger.info("Client %s needs approval",
 
1217
                        logger.info(u"Client %s needs approval",
1268
1218
                                    client.name)
1269
1219
                        if self.server.use_dbus:
1270
1220
                            # Emit D-Bus signal
1272
1222
                                client.approval_delay_milliseconds(),
1273
1223
                                client.approved_by_default)
1274
1224
                    else:
1275
 
                        logger.warning("Client %s was not approved",
 
1225
                        logger.warning(u"Client %s was not approved",
1276
1226
                                       client.name)
1277
1227
                        if self.server.use_dbus:
1278
1228
                            # Emit D-Bus signal
1293
1243
                                           client.name)
1294
1244
                            if self.server.use_dbus:
1295
1245
                                # Emit D-Bus signal
1296
 
                                client.Rejected("Approval timed out")
 
1246
                                client.Rejected("Timed out")
1297
1247
                            return
1298
1248
                        else:
1299
1249
                            break
1304
1254
                while sent_size < len(client.secret):
1305
1255
                    try:
1306
1256
                        sent = session.send(client.secret[sent_size:])
1307
 
                    except gnutls.errors.GNUTLSError as error:
 
1257
                    except (gnutls.errors.GNUTLSError), error:
1308
1258
                        logger.warning("gnutls send failed")
1309
1259
                        return
1310
 
                    logger.debug("Sent: %d, remaining: %d",
 
1260
                    logger.debug(u"Sent: %d, remaining: %d",
1311
1261
                                 sent, len(client.secret)
1312
1262
                                 - (sent_size + sent))
1313
1263
                    sent_size += sent
1314
1264
 
1315
 
                logger.info("Sending secret to %s", client.name)
 
1265
                logger.info(u"Sending secret to %s", client.name)
1316
1266
                # bump the timeout as if seen
1317
 
                client.checked_ok(client.extended_timeout)
 
1267
                client.checked_ok()
1318
1268
                if self.server.use_dbus:
1319
1269
                    # Emit D-Bus signal
1320
1270
                    client.GotSecret()
1324
1274
                    client.approvals_pending -= 1
1325
1275
                try:
1326
1276
                    session.bye()
1327
 
                except gnutls.errors.GNUTLSError as error:
 
1277
                except (gnutls.errors.GNUTLSError), error:
1328
1278
                    logger.warning("GnuTLS bye failed")
1329
1279
    
1330
1280
    @staticmethod
1341
1291
                     .gnutls_certificate_get_peers
1342
1292
                     (session._c_object, ctypes.byref(list_size)))
1343
1293
        if not bool(cert_list) and list_size.value != 0:
1344
 
            raise gnutls.errors.GNUTLSError("error getting peer"
1345
 
                                            " certificate")
 
1294
            raise gnutls.errors.GNUTLSError(u"error getting peer"
 
1295
                                            u" certificate")
1346
1296
        if list_size.value == 0:
1347
1297
            return None
1348
1298
        cert = cert_list[0]
1374
1324
        if crtverify.value != 0:
1375
1325
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1376
1326
            raise (gnutls.errors.CertificateSecurityError
1377
 
                   ("Verify failed"))
 
1327
                   (u"Verify failed"))
1378
1328
        # New buffer for the fingerprint
1379
1329
        buf = ctypes.create_string_buffer(20)
1380
1330
        buf_len = ctypes.c_size_t()
1387
1337
        # Convert the buffer to a Python bytestring
1388
1338
        fpr = ctypes.string_at(buf, buf_len.value)
1389
1339
        # Convert the bytestring to hexadecimal notation
1390
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1340
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1391
1341
        return hex_fpr
1392
1342
 
1393
1343
 
1421
1371
 
1422
1372
    def add_pipe(self, parent_pipe):
1423
1373
        """Dummy function; override as necessary"""
1424
 
        raise NotImplementedError
 
1374
        pass
1425
1375
 
1426
1376
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1427
1377
                     socketserver.TCPServer, object):
1445
1395
        bind to an address or port if they were not specified."""
1446
1396
        if self.interface is not None:
1447
1397
            if SO_BINDTODEVICE is None:
1448
 
                logger.error("SO_BINDTODEVICE does not exist;"
1449
 
                             " cannot bind to interface %s",
 
1398
                logger.error(u"SO_BINDTODEVICE does not exist;"
 
1399
                             u" cannot bind to interface %s",
1450
1400
                             self.interface)
1451
1401
            else:
1452
1402
                try:
1453
1403
                    self.socket.setsockopt(socket.SOL_SOCKET,
1454
1404
                                           SO_BINDTODEVICE,
1455
1405
                                           str(self.interface
1456
 
                                               + '\0'))
1457
 
                except socket.error as error:
 
1406
                                               + u'\0'))
 
1407
                except socket.error, error:
1458
1408
                    if error[0] == errno.EPERM:
1459
 
                        logger.error("No permission to"
1460
 
                                     " bind to interface %s",
 
1409
                        logger.error(u"No permission to"
 
1410
                                     u" bind to interface %s",
1461
1411
                                     self.interface)
1462
1412
                    elif error[0] == errno.ENOPROTOOPT:
1463
 
                        logger.error("SO_BINDTODEVICE not available;"
1464
 
                                     " cannot bind to interface %s",
 
1413
                        logger.error(u"SO_BINDTODEVICE not available;"
 
1414
                                     u" cannot bind to interface %s",
1465
1415
                                     self.interface)
1466
1416
                    else:
1467
1417
                        raise
1469
1419
        if self.server_address[0] or self.server_address[1]:
1470
1420
            if not self.server_address[0]:
1471
1421
                if self.address_family == socket.AF_INET6:
1472
 
                    any_address = "::" # in6addr_any
 
1422
                    any_address = u"::" # in6addr_any
1473
1423
                else:
1474
1424
                    any_address = socket.INADDR_ANY
1475
1425
                self.server_address = (any_address,
1524
1474
    def handle_ipc(self, source, condition, parent_pipe=None,
1525
1475
                   client_object=None):
1526
1476
        condition_names = {
1527
 
            gobject.IO_IN: "IN",   # There is data to read.
1528
 
            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
1529
1479
                                    # blocking).
1530
 
            gobject.IO_PRI: "PRI", # There is urgent data to read.
1531
 
            gobject.IO_ERR: "ERR", # Error condition.
1532
 
            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
1533
1483
                                    # broken, usually for pipes and
1534
1484
                                    # sockets).
1535
1485
            }
1537
1487
                                       for cond, name in
1538
1488
                                       condition_names.iteritems()
1539
1489
                                       if cond & condition)
 
1490
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
 
1491
                     conditions_string)
 
1492
 
1540
1493
        # error or the other end of multiprocessing.Pipe has closed
1541
1494
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1542
1495
            return False
1543
1496
        
1544
1497
        # Read a request from the child
1545
1498
        request = parent_pipe.recv()
 
1499
        logger.debug(u"IPC request: %s", repr(request))
1546
1500
        command = request[0]
1547
1501
        
1548
1502
        if command == 'init':
1554
1508
                    client = c
1555
1509
                    break
1556
1510
            else:
1557
 
                logger.info("Client not found for fingerprint: %s, ad"
1558
 
                            "dress: %s", fpr, address)
 
1511
                logger.warning(u"Client not found for fingerprint: %s, ad"
 
1512
                               u"dress: %s", fpr, address)
1559
1513
                if self.use_dbus:
1560
1514
                    # Emit D-Bus signal
1561
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1515
                    mandos_dbus_service.ClientNotFound(fpr, address)
1562
1516
                parent_pipe.send(False)
1563
1517
                return False
1564
1518
            
1595
1549
def string_to_delta(interval):
1596
1550
    """Parse a string and return a datetime.timedelta
1597
1551
    
1598
 
    >>> string_to_delta('7d')
 
1552
    >>> string_to_delta(u'7d')
1599
1553
    datetime.timedelta(7)
1600
 
    >>> string_to_delta('60s')
 
1554
    >>> string_to_delta(u'60s')
1601
1555
    datetime.timedelta(0, 60)
1602
 
    >>> string_to_delta('60m')
 
1556
    >>> string_to_delta(u'60m')
1603
1557
    datetime.timedelta(0, 3600)
1604
 
    >>> string_to_delta('24h')
 
1558
    >>> string_to_delta(u'24h')
1605
1559
    datetime.timedelta(1)
1606
 
    >>> string_to_delta('1w')
 
1560
    >>> string_to_delta(u'1w')
1607
1561
    datetime.timedelta(7)
1608
 
    >>> string_to_delta('5m 30s')
 
1562
    >>> string_to_delta(u'5m 30s')
1609
1563
    datetime.timedelta(0, 330)
1610
1564
    """
1611
1565
    timevalue = datetime.timedelta(0)
1613
1567
        try:
1614
1568
            suffix = unicode(s[-1])
1615
1569
            value = int(s[:-1])
1616
 
            if suffix == "d":
 
1570
            if suffix == u"d":
1617
1571
                delta = datetime.timedelta(value)
1618
 
            elif suffix == "s":
 
1572
            elif suffix == u"s":
1619
1573
                delta = datetime.timedelta(0, value)
1620
 
            elif suffix == "m":
 
1574
            elif suffix == u"m":
1621
1575
                delta = datetime.timedelta(0, 0, 0, 0, value)
1622
 
            elif suffix == "h":
 
1576
            elif suffix == u"h":
1623
1577
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1624
 
            elif suffix == "w":
 
1578
            elif suffix == u"w":
1625
1579
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1626
1580
            else:
1627
 
                raise ValueError("Unknown suffix %r" % suffix)
1628
 
        except (ValueError, IndexError) as e:
1629
 
            raise ValueError(*(e.args))
 
1581
                raise ValueError(u"Unknown suffix %r" % suffix)
 
1582
        except (ValueError, IndexError), e:
 
1583
            raise ValueError(e.message)
1630
1584
        timevalue += delta
1631
1585
    return timevalue
1632
1586
 
1638
1592
    global if_nametoindex
1639
1593
    try:
1640
1594
        if_nametoindex = (ctypes.cdll.LoadLibrary
1641
 
                          (ctypes.util.find_library("c"))
 
1595
                          (ctypes.util.find_library(u"c"))
1642
1596
                          .if_nametoindex)
1643
1597
    except (OSError, AttributeError):
1644
 
        logger.warning("Doing if_nametoindex the hard way")
 
1598
        logger.warning(u"Doing if_nametoindex the hard way")
1645
1599
        def if_nametoindex(interface):
1646
1600
            "Get an interface index the hard way, i.e. using fcntl()"
1647
1601
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1648
1602
            with contextlib.closing(socket.socket()) as s:
1649
1603
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1650
 
                                    struct.pack(str("16s16x"),
 
1604
                                    struct.pack(str(u"16s16x"),
1651
1605
                                                interface))
1652
 
            interface_index = struct.unpack(str("I"),
 
1606
            interface_index = struct.unpack(str(u"I"),
1653
1607
                                            ifreq[16:20])[0]
1654
1608
            return interface_index
1655
1609
    return if_nametoindex(interface)
1663
1617
        sys.exit()
1664
1618
    os.setsid()
1665
1619
    if not nochdir:
1666
 
        os.chdir("/")
 
1620
        os.chdir(u"/")
1667
1621
    if os.fork():
1668
1622
        sys.exit()
1669
1623
    if not noclose:
1671
1625
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1672
1626
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1673
1627
            raise OSError(errno.ENODEV,
1674
 
                          "%s not a character device"
 
1628
                          u"%s not a character device"
1675
1629
                          % os.path.devnull)
1676
1630
        os.dup2(null, sys.stdin.fileno())
1677
1631
        os.dup2(null, sys.stdout.fileno())
1685
1639
    ##################################################################
1686
1640
    # Parsing of options, both command line and config file
1687
1641
    
1688
 
    parser = argparse.ArgumentParser()
1689
 
    parser.add_argument("-v", "--version", action="version",
1690
 
                        version = "%%(prog)s %s" % version,
1691
 
                        help="show version number and exit")
1692
 
    parser.add_argument("-i", "--interface", metavar="IF",
1693
 
                        help="Bind to interface IF")
1694
 
    parser.add_argument("-a", "--address",
1695
 
                        help="Address to listen for requests on")
1696
 
    parser.add_argument("-p", "--port", type=int,
1697
 
                        help="Port number to receive requests on")
1698
 
    parser.add_argument("--check", action="store_true",
1699
 
                        help="Run self-test")
1700
 
    parser.add_argument("--debug", action="store_true",
1701
 
                        help="Debug mode; run in foreground and log"
1702
 
                        " to terminal")
1703
 
    parser.add_argument("--debuglevel", metavar="LEVEL",
1704
 
                        help="Debug level for stdout output")
1705
 
    parser.add_argument("--priority", help="GnuTLS"
1706
 
                        " priority string (see GnuTLS documentation)")
1707
 
    parser.add_argument("--servicename",
1708
 
                        metavar="NAME", help="Zeroconf service name")
1709
 
    parser.add_argument("--configdir",
1710
 
                        default="/etc/mandos", metavar="DIR",
1711
 
                        help="Directory to search for configuration"
1712
 
                        " files")
1713
 
    parser.add_argument("--no-dbus", action="store_false",
1714
 
                        dest="use_dbus", help="Do not provide D-Bus"
1715
 
                        " system bus interface")
1716
 
    parser.add_argument("--no-ipv6", action="store_false",
1717
 
                        dest="use_ipv6", help="Do not use IPv6")
1718
 
    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]
1719
1670
    
1720
1671
    if options.check:
1721
1672
        import doctest
1723
1674
        sys.exit()
1724
1675
    
1725
1676
    # Default values for config file for server-global settings
1726
 
    server_defaults = { "interface": "",
1727
 
                        "address": "",
1728
 
                        "port": "",
1729
 
                        "debug": "False",
1730
 
                        "priority":
1731
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1732
 
                        "servicename": "Mandos",
1733
 
                        "use_dbus": "True",
1734
 
                        "use_ipv6": "True",
1735
 
                        "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"",
1736
1687
                        }
1737
1688
    
1738
1689
    # Parse config file for server-global settings
1739
1690
    server_config = configparser.SafeConfigParser(server_defaults)
1740
1691
    del server_defaults
1741
1692
    server_config.read(os.path.join(options.configdir,
1742
 
                                    "mandos.conf"))
 
1693
                                    u"mandos.conf"))
1743
1694
    # Convert the SafeConfigParser object to a dict
1744
1695
    server_settings = server_config.defaults()
1745
1696
    # Use the appropriate methods on the non-string config options
1746
 
    for option in ("debug", "use_dbus", "use_ipv6"):
1747
 
        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",
1748
1699
                                                           option)
1749
1700
    if server_settings["port"]:
1750
 
        server_settings["port"] = server_config.getint("DEFAULT",
1751
 
                                                       "port")
 
1701
        server_settings["port"] = server_config.getint(u"DEFAULT",
 
1702
                                                       u"port")
1752
1703
    del server_config
1753
1704
    
1754
1705
    # Override the settings from the config file with command line
1755
1706
    # options, if set.
1756
 
    for option in ("interface", "address", "port", "debug",
1757
 
                   "priority", "servicename", "configdir",
1758
 
                   "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"):
1759
1710
        value = getattr(options, option)
1760
1711
        if value is not None:
1761
1712
            server_settings[option] = value
1769
1720
    ##################################################################
1770
1721
    
1771
1722
    # For convenience
1772
 
    debug = server_settings["debug"]
1773
 
    debuglevel = server_settings["debuglevel"]
1774
 
    use_dbus = server_settings["use_dbus"]
1775
 
    use_ipv6 = server_settings["use_ipv6"]
 
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"]
1776
1727
 
1777
 
    if server_settings["servicename"] != "Mandos":
 
1728
    if server_settings[u"servicename"] != u"Mandos":
1778
1729
        syslogger.setFormatter(logging.Formatter
1779
 
                               ('Mandos (%s) [%%(process)d]:'
1780
 
                                ' %%(levelname)s: %%(message)s'
1781
 
                                % server_settings["servicename"]))
 
1730
                               (u'Mandos (%s) [%%(process)d]:'
 
1731
                                u' %%(levelname)s: %%(message)s'
 
1732
                                % server_settings[u"servicename"]))
1782
1733
    
1783
1734
    # Parse config file with clients
1784
 
    client_defaults = { "timeout": "5m",
1785
 
                        "extended_timeout": "15m",
1786
 
                        "interval": "2m",
1787
 
                        "checker": "fping -q -- %%(host)s",
1788
 
                        "host": "",
1789
 
                        "approval_delay": "0s",
1790
 
                        "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",
1791
1741
                        }
1792
1742
    client_config = configparser.SafeConfigParser(client_defaults)
1793
 
    client_config.read(os.path.join(server_settings["configdir"],
1794
 
                                    "clients.conf"))
 
1743
    client_config.read(os.path.join(server_settings[u"configdir"],
 
1744
                                    u"clients.conf"))
1795
1745
    
1796
1746
    global mandos_dbus_service
1797
1747
    mandos_dbus_service = None
1798
1748
    
1799
 
    tcp_server = MandosServer((server_settings["address"],
1800
 
                               server_settings["port"]),
 
1749
    tcp_server = MandosServer((server_settings[u"address"],
 
1750
                               server_settings[u"port"]),
1801
1751
                              ClientHandler,
1802
 
                              interface=(server_settings["interface"]
 
1752
                              interface=(server_settings[u"interface"]
1803
1753
                                         or None),
1804
1754
                              use_ipv6=use_ipv6,
1805
1755
                              gnutls_priority=
1806
 
                              server_settings["priority"],
 
1756
                              server_settings[u"priority"],
1807
1757
                              use_dbus=use_dbus)
1808
 
    if not debug:
1809
 
        pidfilename = "/var/run/mandos.pid"
1810
 
        try:
1811
 
            pidfile = open(pidfilename, "w")
1812
 
        except IOError:
1813
 
            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)
1814
1763
    
1815
1764
    try:
1816
 
        uid = pwd.getpwnam("_mandos").pw_uid
1817
 
        gid = pwd.getpwnam("_mandos").pw_gid
 
1765
        uid = pwd.getpwnam(u"_mandos").pw_uid
 
1766
        gid = pwd.getpwnam(u"_mandos").pw_gid
1818
1767
    except KeyError:
1819
1768
        try:
1820
 
            uid = pwd.getpwnam("mandos").pw_uid
1821
 
            gid = pwd.getpwnam("mandos").pw_gid
 
1769
            uid = pwd.getpwnam(u"mandos").pw_uid
 
1770
            gid = pwd.getpwnam(u"mandos").pw_gid
1822
1771
        except KeyError:
1823
1772
            try:
1824
 
                uid = pwd.getpwnam("nobody").pw_uid
1825
 
                gid = pwd.getpwnam("nobody").pw_gid
 
1773
                uid = pwd.getpwnam(u"nobody").pw_uid
 
1774
                gid = pwd.getpwnam(u"nobody").pw_gid
1826
1775
            except KeyError:
1827
1776
                uid = 65534
1828
1777
                gid = 65534
1829
1778
    try:
1830
1779
        os.setgid(gid)
1831
1780
        os.setuid(uid)
1832
 
    except OSError as error:
 
1781
    except OSError, error:
1833
1782
        if error[0] != errno.EPERM:
1834
1783
            raise error
1835
1784
    
1850
1799
        
1851
1800
        @gnutls.library.types.gnutls_log_func
1852
1801
        def debug_gnutls(level, string):
1853
 
            logger.debug("GnuTLS: %s", string[:-1])
 
1802
            logger.debug(u"GnuTLS: %s", string[:-1])
1854
1803
        
1855
1804
        (gnutls.library.functions
1856
1805
         .gnutls_global_set_log_function(debug_gnutls))
1864
1813
        # No console logging
1865
1814
        logger.removeHandler(console)
1866
1815
    
1867
 
    # Need to fork before connecting to D-Bus
1868
 
    if not debug:
1869
 
        # Close all input and output, do double fork, etc.
1870
 
        daemon()
1871
1816
    
1872
1817
    global main_loop
1873
1818
    # From the Avahi example code
1877
1822
    # End of Avahi example code
1878
1823
    if use_dbus:
1879
1824
        try:
1880
 
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1825
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1881
1826
                                            bus, do_not_queue=True)
1882
 
        except dbus.exceptions.NameExistsException as e:
1883
 
            logger.error(unicode(e) + ", disabling D-Bus")
 
1827
        except dbus.exceptions.NameExistsException, e:
 
1828
            logger.error(unicode(e) + u", disabling D-Bus")
1884
1829
            use_dbus = False
1885
 
            server_settings["use_dbus"] = False
 
1830
            server_settings[u"use_dbus"] = False
1886
1831
            tcp_server.use_dbus = False
1887
1832
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1888
 
    service = AvahiService(name = server_settings["servicename"],
1889
 
                           servicetype = "_mandos._tcp",
 
1833
    service = AvahiService(name = server_settings[u"servicename"],
 
1834
                           servicetype = u"_mandos._tcp",
1890
1835
                           protocol = protocol, bus = bus)
1891
1836
    if server_settings["interface"]:
1892
1837
        service.interface = (if_nametoindex
1893
 
                             (str(server_settings["interface"])))
1894
 
    
 
1838
                             (str(server_settings[u"interface"])))
 
1839
 
 
1840
    if not debug:
 
1841
        # Close all input and output, do double fork, etc.
 
1842
        daemon()
 
1843
        
1895
1844
    global multiprocessing_manager
1896
1845
    multiprocessing_manager = multiprocessing.Manager()
1897
1846
    
1916
1865
                        client_config, section)))
1917
1866
            for section in client_config.sections()))
1918
1867
    if not tcp_server.clients:
1919
 
        logger.warning("No clients defined")
 
1868
        logger.warning(u"No clients defined")
1920
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
    
1921
1883
    if not debug:
1922
 
        try:
1923
 
            with pidfile:
1924
 
                pid = os.getpid()
1925
 
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1926
 
            del pidfile
1927
 
        except IOError:
1928
 
            logger.error("Could not write to file %r with PID %d",
1929
 
                         pidfilename, pid)
1930
 
        except NameError:
1931
 
            # "pidfile" was never created
1932
 
            pass
1933
 
        del pidfilename
1934
 
        
1935
1884
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1936
 
 
1937
1885
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1938
1886
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1939
1887
    
1941
1889
        class MandosDBusService(dbus.service.Object):
1942
1890
            """A D-Bus proxy object"""
1943
1891
            def __init__(self):
1944
 
                dbus.service.Object.__init__(self, bus, "/")
1945
 
            _interface = "se.bsnet.fukt.Mandos"
 
1892
                dbus.service.Object.__init__(self, bus, u"/")
 
1893
            _interface = u"se.bsnet.fukt.Mandos"
1946
1894
            
1947
 
            @dbus.service.signal(_interface, signature="o")
 
1895
            @dbus.service.signal(_interface, signature=u"o")
1948
1896
            def ClientAdded(self, objpath):
1949
1897
                "D-Bus signal"
1950
1898
                pass
1951
1899
            
1952
 
            @dbus.service.signal(_interface, signature="ss")
 
1900
            @dbus.service.signal(_interface, signature=u"ss")
1953
1901
            def ClientNotFound(self, fingerprint, address):
1954
1902
                "D-Bus signal"
1955
1903
                pass
1956
1904
            
1957
 
            @dbus.service.signal(_interface, signature="os")
 
1905
            @dbus.service.signal(_interface, signature=u"os")
1958
1906
            def ClientRemoved(self, objpath, name):
1959
1907
                "D-Bus signal"
1960
1908
                pass
1961
1909
            
1962
 
            @dbus.service.method(_interface, out_signature="ao")
 
1910
            @dbus.service.method(_interface, out_signature=u"ao")
1963
1911
            def GetAllClients(self):
1964
1912
                "D-Bus method"
1965
1913
                return dbus.Array(c.dbus_object_path
1966
1914
                                  for c in tcp_server.clients)
1967
1915
            
1968
1916
            @dbus.service.method(_interface,
1969
 
                                 out_signature="a{oa{sv}}")
 
1917
                                 out_signature=u"a{oa{sv}}")
1970
1918
            def GetAllClientsWithProperties(self):
1971
1919
                "D-Bus method"
1972
1920
                return dbus.Dictionary(
1973
 
                    ((c.dbus_object_path, c.GetAll(""))
 
1921
                    ((c.dbus_object_path, c.GetAll(u""))
1974
1922
                     for c in tcp_server.clients),
1975
 
                    signature="oa{sv}")
 
1923
                    signature=u"oa{sv}")
1976
1924
            
1977
 
            @dbus.service.method(_interface, in_signature="o")
 
1925
            @dbus.service.method(_interface, in_signature=u"o")
1978
1926
            def RemoveClient(self, object_path):
1979
1927
                "D-Bus method"
1980
1928
                for c in tcp_server.clients:
2022
1970
    # Find out what port we got
2023
1971
    service.port = tcp_server.socket.getsockname()[1]
2024
1972
    if use_ipv6:
2025
 
        logger.info("Now listening on address %r, port %d,"
 
1973
        logger.info(u"Now listening on address %r, port %d,"
2026
1974
                    " flowinfo %d, scope_id %d"
2027
1975
                    % tcp_server.socket.getsockname())
2028
1976
    else:                       # IPv4
2029
 
        logger.info("Now listening on address %r, port %d"
 
1977
        logger.info(u"Now listening on address %r, port %d"
2030
1978
                    % tcp_server.socket.getsockname())
2031
1979
    
2032
1980
    #service.interface = tcp_server.socket.getsockname()[3]
2035
1983
        # From the Avahi example code
2036
1984
        try:
2037
1985
            service.activate()
2038
 
        except dbus.exceptions.DBusException as error:
2039
 
            logger.critical("DBusException: %s", error)
 
1986
        except dbus.exceptions.DBusException, error:
 
1987
            logger.critical(u"DBusException: %s", error)
2040
1988
            cleanup()
2041
1989
            sys.exit(1)
2042
1990
        # End of Avahi example code
2046
1994
                             (tcp_server.handle_request
2047
1995
                              (*args[2:], **kwargs) or True))
2048
1996
        
2049
 
        logger.debug("Starting main loop")
 
1997
        logger.debug(u"Starting main loop")
2050
1998
        main_loop.run()
2051
 
    except AvahiError as error:
2052
 
        logger.critical("AvahiError: %s", error)
 
1999
    except AvahiError, error:
 
2000
        logger.critical(u"AvahiError: %s", error)
2053
2001
        cleanup()
2054
2002
        sys.exit(1)
2055
2003
    except KeyboardInterrupt:
2056
2004
        if debug:
2057
 
            print("", file=sys.stderr)
2058
 
        logger.debug("Server received KeyboardInterrupt")
2059
 
    logger.debug("Server exiting")
 
2005
            print >> sys.stderr
 
2006
        logger.debug(u"Server received KeyboardInterrupt")
 
2007
    logger.debug(u"Server exiting")
2060
2008
    # Must run before the D-Bus bus name gets deregistered
2061
2009
    cleanup()
2062
2010