/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 at bsnet
  • Date: 2011-03-15 20:13:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110315201305-1eptd9mvxem1qtr2
* mandos-ctl: Use the new argparse library instead of optparse.

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