/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-02-15 19:27:23 UTC
  • mto: This revision was merged to the branch mainline in revision 465.
  • Revision ID: teddy@fukt.bsnet.se-20110215192723-qpftjhlvzadm5cjc
* mandos-ctl: Use unicode string literals.

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