/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Björn Påhlsson
  • Date: 2012-07-03 20:55:09 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 303.
  • Revision ID: belorn@recompile.se-20120703205509-fkeb6uqy4i6gt4b6
added note messages when mandos-monitor starts without running server,
or a server with no clients.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2015 Teddy Hogeborn
15
 
# Copyright © 2008-2015 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 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
36
36
 
37
37
from future_builtins import *
38
38
 
39
 
try:
40
 
    import SocketServer as socketserver
41
 
except ImportError:
42
 
    import socketserver
 
39
import SocketServer as socketserver
43
40
import socket
44
41
import argparse
45
42
import datetime
50
47
import gnutls.library.functions
51
48
import gnutls.library.constants
52
49
import gnutls.library.types
53
 
try:
54
 
    import ConfigParser as configparser
55
 
except ImportError:
56
 
    import configparser
 
50
import ConfigParser as configparser
57
51
import sys
58
52
import re
59
53
import os
68
62
import struct
69
63
import fcntl
70
64
import functools
71
 
try:
72
 
    import cPickle as pickle
73
 
except ImportError:
74
 
    import pickle
 
65
import cPickle as pickle
75
66
import multiprocessing
76
67
import types
77
68
import binascii
78
69
import tempfile
79
70
import itertools
80
71
import collections
81
 
import codecs
82
72
 
83
73
import dbus
84
74
import dbus.service
85
 
try:
86
 
    import gobject
87
 
except ImportError:
88
 
    from gi.repository import GObject as gobject
 
75
import gobject
89
76
import avahi
90
77
from dbus.mainloop.glib import DBusGMainLoop
91
78
import ctypes
92
79
import ctypes.util
93
80
import xml.dom.minidom
94
81
import inspect
 
82
import GnuPGInterface
95
83
 
96
84
try:
97
85
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
101
89
    except ImportError:
102
90
        SO_BINDTODEVICE = None
103
91
 
104
 
if sys.version_info.major == 2:
105
 
    str = unicode
106
 
 
107
 
version = "1.6.9"
 
92
version = "1.6.0"
108
93
stored_state_file = "clients.pickle"
109
94
 
110
95
logger = logging.getLogger()
111
 
syslogger = None
 
96
syslogger = (logging.handlers.SysLogHandler
 
97
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
98
              address = str("/dev/log")))
112
99
 
113
100
try:
114
 
    if_nametoindex = ctypes.cdll.LoadLibrary(
115
 
        ctypes.util.find_library("c")).if_nametoindex
 
101
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
102
                      (ctypes.util.find_library("c"))
 
103
                      .if_nametoindex)
116
104
except (OSError, AttributeError):
117
 
    
118
105
    def if_nametoindex(interface):
119
106
        "Get an interface index the hard way, i.e. using fcntl()"
120
107
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
121
108
        with contextlib.closing(socket.socket()) as s:
122
109
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
123
 
                                struct.pack(b"16s16x", interface))
124
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
 
110
                                struct.pack(str("16s16x"),
 
111
                                            interface))
 
112
        interface_index = struct.unpack(str("I"),
 
113
                                        ifreq[16:20])[0]
125
114
        return interface_index
126
115
 
127
116
 
128
117
def initlogger(debug, level=logging.WARNING):
129
118
    """init logger and add loglevel"""
130
119
    
131
 
    global syslogger
132
 
    syslogger = (logging.handlers.SysLogHandler(
133
 
        facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
 
        address = "/dev/log"))
135
120
    syslogger.setFormatter(logging.Formatter
136
121
                           ('Mandos [%(process)d]: %(levelname)s:'
137
122
                            ' %(message)s'))
154
139
 
155
140
class PGPEngine(object):
156
141
    """A simple class for OpenPGP symmetric encryption & decryption"""
157
 
    
158
142
    def __init__(self):
 
143
        self.gnupg = GnuPGInterface.GnuPG()
159
144
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
160
 
        self.gnupgargs = ['--batch',
161
 
                          '--home', self.tempdir,
162
 
                          '--force-mdc',
163
 
                          '--quiet',
164
 
                          '--no-use-agent']
 
145
        self.gnupg = GnuPGInterface.GnuPG()
 
146
        self.gnupg.options.meta_interactive = False
 
147
        self.gnupg.options.homedir = self.tempdir
 
148
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
149
                                              '--quiet',
 
150
                                              '--no-use-agent'])
165
151
    
166
152
    def __enter__(self):
167
153
        return self
189
175
    def password_encode(self, password):
190
176
        # Passphrase can not be empty and can not contain newlines or
191
177
        # NUL bytes.  So we prefix it and hex encode it.
192
 
        encoded = b"mandos" + binascii.hexlify(password)
193
 
        if len(encoded) > 2048:
194
 
            # GnuPG can't handle long passwords, so encode differently
195
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
 
                       .replace(b"\n", b"\\n")
197
 
                       .replace(b"\0", b"\\x00"))
198
 
        return encoded
 
178
        return b"mandos" + binascii.hexlify(password)
199
179
    
200
180
    def encrypt(self, data, password):
201
 
        passphrase = self.password_encode(password)
202
 
        with tempfile.NamedTemporaryFile(
203
 
                dir=self.tempdir) as passfile:
204
 
            passfile.write(passphrase)
205
 
            passfile.flush()
206
 
            proc = subprocess.Popen(['gpg', '--symmetric',
207
 
                                     '--passphrase-file',
208
 
                                     passfile.name]
209
 
                                    + self.gnupgargs,
210
 
                                    stdin = subprocess.PIPE,
211
 
                                    stdout = subprocess.PIPE,
212
 
                                    stderr = subprocess.PIPE)
213
 
            ciphertext, err = proc.communicate(input = data)
214
 
        if proc.returncode != 0:
215
 
            raise PGPError(err)
 
181
        self.gnupg.passphrase = self.password_encode(password)
 
182
        with open(os.devnull, "w") as devnull:
 
183
            try:
 
184
                proc = self.gnupg.run(['--symmetric'],
 
185
                                      create_fhs=['stdin', 'stdout'],
 
186
                                      attach_fhs={'stderr': devnull})
 
187
                with contextlib.closing(proc.handles['stdin']) as f:
 
188
                    f.write(data)
 
189
                with contextlib.closing(proc.handles['stdout']) as f:
 
190
                    ciphertext = f.read()
 
191
                proc.wait()
 
192
            except IOError as e:
 
193
                raise PGPError(e)
 
194
        self.gnupg.passphrase = None
216
195
        return ciphertext
217
196
    
218
197
    def decrypt(self, data, password):
219
 
        passphrase = self.password_encode(password)
220
 
        with tempfile.NamedTemporaryFile(
221
 
                dir = self.tempdir) as passfile:
222
 
            passfile.write(passphrase)
223
 
            passfile.flush()
224
 
            proc = subprocess.Popen(['gpg', '--decrypt',
225
 
                                     '--passphrase-file',
226
 
                                     passfile.name]
227
 
                                    + self.gnupgargs,
228
 
                                    stdin = subprocess.PIPE,
229
 
                                    stdout = subprocess.PIPE,
230
 
                                    stderr = subprocess.PIPE)
231
 
            decrypted_plaintext, err = proc.communicate(input = data)
232
 
        if proc.returncode != 0:
233
 
            raise PGPError(err)
 
198
        self.gnupg.passphrase = self.password_encode(password)
 
199
        with open(os.devnull, "w") as devnull:
 
200
            try:
 
201
                proc = self.gnupg.run(['--decrypt'],
 
202
                                      create_fhs=['stdin', 'stdout'],
 
203
                                      attach_fhs={'stderr': devnull})
 
204
                with contextlib.closing(proc.handles['stdin']) as f:
 
205
                    f.write(data)
 
206
                with contextlib.closing(proc.handles['stdout']) as f:
 
207
                    decrypted_plaintext = f.read()
 
208
                proc.wait()
 
209
            except IOError as e:
 
210
                raise PGPError(e)
 
211
        self.gnupg.passphrase = None
234
212
        return decrypted_plaintext
235
213
 
236
214
 
237
215
class AvahiError(Exception):
238
216
    def __init__(self, value, *args, **kwargs):
239
217
        self.value = value
240
 
        return super(AvahiError, self).__init__(value, *args,
241
 
                                                **kwargs)
242
 
 
 
218
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
219
    def __unicode__(self):
 
220
        return unicode(repr(self.value))
243
221
 
244
222
class AvahiServiceError(AvahiError):
245
223
    pass
246
224
 
247
 
 
248
225
class AvahiGroupError(AvahiError):
249
226
    pass
250
227
 
257
234
               Used to optionally bind to the specified interface.
258
235
    name: string; Example: 'Mandos'
259
236
    type: string; Example: '_mandos._tcp'.
260
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
237
                  See <http://www.dns-sd.org/ServiceTypes.html>
261
238
    port: integer; what port to announce
262
239
    TXT: list of strings; TXT record for the service
263
240
    domain: string; Domain to publish on, default to .local if empty.
270
247
    bus: dbus.SystemBus()
271
248
    """
272
249
    
273
 
    def __init__(self,
274
 
                 interface = avahi.IF_UNSPEC,
275
 
                 name = None,
276
 
                 servicetype = None,
277
 
                 port = None,
278
 
                 TXT = None,
279
 
                 domain = "",
280
 
                 host = "",
281
 
                 max_renames = 32768,
282
 
                 protocol = avahi.PROTO_UNSPEC,
283
 
                 bus = None):
 
250
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
 
251
                 servicetype = None, port = None, TXT = None,
 
252
                 domain = "", host = "", max_renames = 32768,
 
253
                 protocol = avahi.PROTO_UNSPEC, bus = None):
284
254
        self.interface = interface
285
255
        self.name = name
286
256
        self.type = servicetype
296
266
        self.bus = bus
297
267
        self.entry_group_state_changed_match = None
298
268
    
299
 
    def rename(self, remove=True):
 
269
    def rename(self):
300
270
        """Derived from the Avahi example code"""
301
271
        if self.rename_count >= self.max_renames:
302
272
            logger.critical("No suitable Zeroconf service name found"
303
273
                            " after %i retries, exiting.",
304
274
                            self.rename_count)
305
275
            raise AvahiServiceError("Too many renames")
306
 
        self.name = str(
307
 
            self.server.GetAlternativeServiceName(self.name))
308
 
        self.rename_count += 1
 
276
        self.name = unicode(self.server
 
277
                            .GetAlternativeServiceName(self.name))
309
278
        logger.info("Changing Zeroconf service name to %r ...",
310
279
                    self.name)
311
 
        if remove:
312
 
            self.remove()
 
280
        self.remove()
313
281
        try:
314
282
            self.add()
315
283
        except dbus.exceptions.DBusException as error:
316
 
            if (error.get_dbus_name()
317
 
                == "org.freedesktop.Avahi.CollisionError"):
318
 
                logger.info("Local Zeroconf service name collision.")
319
 
                return self.rename(remove=False)
320
 
            else:
321
 
                logger.critical("D-Bus Exception", exc_info=error)
322
 
                self.cleanup()
323
 
                os._exit(1)
 
284
            logger.critical("D-Bus Exception", exc_info=error)
 
285
            self.cleanup()
 
286
            os._exit(1)
 
287
        self.rename_count += 1
324
288
    
325
289
    def remove(self):
326
290
        """Derived from the Avahi example code"""
364
328
            self.rename()
365
329
        elif state == avahi.ENTRY_GROUP_FAILURE:
366
330
            logger.critical("Avahi: Error in group state changed %s",
367
 
                            str(error))
368
 
            raise AvahiGroupError("State changed: {!s}".format(error))
 
331
                            unicode(error))
 
332
            raise AvahiGroupError("State changed: {0!s}"
 
333
                                  .format(error))
369
334
    
370
335
    def cleanup(self):
371
336
        """Derived from the Avahi example code"""
381
346
    def server_state_changed(self, state, error=None):
382
347
        """Derived from the Avahi example code"""
383
348
        logger.debug("Avahi server state change: %i", state)
384
 
        bad_states = {
385
 
            avahi.SERVER_INVALID: "Zeroconf server invalid",
386
 
            avahi.SERVER_REGISTERING: None,
387
 
            avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
 
            avahi.SERVER_FAILURE: "Zeroconf server failure",
389
 
        }
 
349
        bad_states = { avahi.SERVER_INVALID:
 
350
                           "Zeroconf server invalid",
 
351
                       avahi.SERVER_REGISTERING: None,
 
352
                       avahi.SERVER_COLLISION:
 
353
                           "Zeroconf server name collision",
 
354
                       avahi.SERVER_FAILURE:
 
355
                           "Zeroconf server failure" }
390
356
        if state in bad_states:
391
357
            if bad_states[state] is not None:
392
358
                if error is None:
411
377
                                    follow_name_owner_changes=True),
412
378
                avahi.DBUS_INTERFACE_SERVER)
413
379
        self.server.connect_to_signal("StateChanged",
414
 
                                      self.server_state_changed)
 
380
                                 self.server_state_changed)
415
381
        self.server_state_changed(self.server.GetState())
416
382
 
417
383
 
418
384
class AvahiServiceToSyslog(AvahiService):
419
 
    def rename(self, *args, **kwargs):
 
385
    def rename(self):
420
386
        """Add the new name to the syslog messages"""
421
 
        ret = AvahiService.rename(self, *args, **kwargs)
422
 
        syslogger.setFormatter(logging.Formatter(
423
 
            'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
424
 
            .format(self.name)))
 
387
        ret = AvahiService.rename(self)
 
388
        syslogger.setFormatter(logging.Formatter
 
389
                               ('Mandos ({0}) [%(process)d]:'
 
390
                                ' %(levelname)s: %(message)s'
 
391
                                .format(self.name)))
425
392
        return ret
426
393
 
427
 
def call_pipe(connection,       # : multiprocessing.Connection
428
 
              func, *args, **kwargs):
429
 
    """This function is meant to be called by multiprocessing.Process
430
 
    
431
 
    This function runs func(*args, **kwargs), and writes the resulting
432
 
    return value on the provided multiprocessing.Connection.
433
 
    """
434
 
    connection.send(func(*args, **kwargs))
435
 
    connection.close()
 
394
 
 
395
def timedelta_to_milliseconds(td):
 
396
    "Convert a datetime.timedelta() to milliseconds"
 
397
    return ((td.days * 24 * 60 * 60 * 1000)
 
398
            + (td.seconds * 1000)
 
399
            + (td.microseconds // 1000))
 
400
 
436
401
 
437
402
class Client(object):
438
403
    """A representation of a client host served by this server.
465
430
    last_checker_status: integer between 0 and 255 reflecting exit
466
431
                         status of last checker. -1 reflects crashed
467
432
                         checker, -2 means no checker completed yet.
468
 
    last_checker_signal: The signal which killed the last checker, if
469
 
                         last_checker_status is -1
470
433
    last_enabled: datetime.datetime(); (UTC) or None
471
434
    name:       string; from the config file, used in log messages and
472
435
                        D-Bus identifiers
477
440
    runtime_expansions: Allowed attributes for runtime expansion.
478
441
    expires:    datetime.datetime(); time (UTC) when a client will be
479
442
                disabled, or None
480
 
    server_settings: The server_settings dict from main()
481
443
    """
482
444
    
483
445
    runtime_expansions = ("approval_delay", "approval_duration",
485
447
                          "fingerprint", "host", "interval",
486
448
                          "last_approval_request", "last_checked_ok",
487
449
                          "last_enabled", "name", "timeout")
488
 
    client_defaults = {
489
 
        "timeout": "PT5M",
490
 
        "extended_timeout": "PT15M",
491
 
        "interval": "PT2M",
492
 
        "checker": "fping -q -- %%(host)s",
493
 
        "host": "",
494
 
        "approval_delay": "PT0S",
495
 
        "approval_duration": "PT1S",
496
 
        "approved_by_default": "True",
497
 
        "enabled": "True",
498
 
    }
 
450
    client_defaults = { "timeout": "PT5M",
 
451
                        "extended_timeout": "PT15M",
 
452
                        "interval": "PT2M",
 
453
                        "checker": "fping -q -- %%(host)s",
 
454
                        "host": "",
 
455
                        "approval_delay": "PT0S",
 
456
                        "approval_duration": "PT1S",
 
457
                        "approved_by_default": "True",
 
458
                        "enabled": "True",
 
459
                        }
 
460
    
 
461
    def timeout_milliseconds(self):
 
462
        "Return the 'timeout' attribute in milliseconds"
 
463
        return timedelta_to_milliseconds(self.timeout)
 
464
    
 
465
    def extended_timeout_milliseconds(self):
 
466
        "Return the 'extended_timeout' attribute in milliseconds"
 
467
        return timedelta_to_milliseconds(self.extended_timeout)
 
468
    
 
469
    def interval_milliseconds(self):
 
470
        "Return the 'interval' attribute in milliseconds"
 
471
        return timedelta_to_milliseconds(self.interval)
 
472
    
 
473
    def approval_delay_milliseconds(self):
 
474
        return timedelta_to_milliseconds(self.approval_delay)
499
475
    
500
476
    @staticmethod
501
477
    def config_parser(config):
517
493
            client["enabled"] = config.getboolean(client_name,
518
494
                                                  "enabled")
519
495
            
520
 
            # Uppercase and remove spaces from fingerprint for later
521
 
            # comparison purposes with return value from the
522
 
            # fingerprint() function
523
496
            client["fingerprint"] = (section["fingerprint"].upper()
524
497
                                     .replace(" ", ""))
525
498
            if "secret" in section:
530
503
                          "rb") as secfile:
531
504
                    client["secret"] = secfile.read()
532
505
            else:
533
 
                raise TypeError("No secret or secfile for section {}"
 
506
                raise TypeError("No secret or secfile for section {0}"
534
507
                                .format(section))
535
508
            client["timeout"] = string_to_delta(section["timeout"])
536
509
            client["extended_timeout"] = string_to_delta(
547
520
        
548
521
        return settings
549
522
    
550
 
    def __init__(self, settings, name = None, server_settings=None):
 
523
    def __init__(self, settings, name = None):
551
524
        self.name = name
552
 
        if server_settings is None:
553
 
            server_settings = {}
554
 
        self.server_settings = server_settings
555
525
        # adding all client settings
556
 
        for setting, value in settings.items():
 
526
        for setting, value in settings.iteritems():
557
527
            setattr(self, setting, value)
558
528
        
559
529
        if self.enabled:
567
537
            self.expires = None
568
538
        
569
539
        logger.debug("Creating client %r", self.name)
 
540
        # Uppercase and remove spaces from fingerprint for later
 
541
        # comparison purposes with return value from the fingerprint()
 
542
        # function
570
543
        logger.debug("  Fingerprint: %s", self.fingerprint)
571
544
        self.created = settings.get("created",
572
545
                                    datetime.datetime.utcnow())
579
552
        self.current_checker_command = None
580
553
        self.approved = None
581
554
        self.approvals_pending = 0
582
 
        self.changedstate = multiprocessing_manager.Condition(
583
 
            multiprocessing_manager.Lock())
584
 
        self.client_structure = [attr
585
 
                                 for attr in self.__dict__.iterkeys()
 
555
        self.changedstate = (multiprocessing_manager
 
556
                             .Condition(multiprocessing_manager
 
557
                                        .Lock()))
 
558
        self.client_structure = [attr for attr in
 
559
                                 self.__dict__.iterkeys()
586
560
                                 if not attr.startswith("_")]
587
561
        self.client_structure.append("client_structure")
588
562
        
589
 
        for name, t in inspect.getmembers(
590
 
                type(self), lambda obj: isinstance(obj, property)):
 
563
        for name, t in inspect.getmembers(type(self),
 
564
                                          lambda obj:
 
565
                                              isinstance(obj,
 
566
                                                         property)):
591
567
            if not name.startswith("_"):
592
568
                self.client_structure.append(name)
593
569
    
635
611
        # and every interval from then on.
636
612
        if self.checker_initiator_tag is not None:
637
613
            gobject.source_remove(self.checker_initiator_tag)
638
 
        self.checker_initiator_tag = gobject.timeout_add(
639
 
            int(self.interval.total_seconds() * 1000),
640
 
            self.start_checker)
 
614
        self.checker_initiator_tag = (gobject.timeout_add
 
615
                                      (self.interval_milliseconds(),
 
616
                                       self.start_checker))
641
617
        # Schedule a disable() when 'timeout' has passed
642
618
        if self.disable_initiator_tag is not None:
643
619
            gobject.source_remove(self.disable_initiator_tag)
644
 
        self.disable_initiator_tag = gobject.timeout_add(
645
 
            int(self.timeout.total_seconds() * 1000), self.disable)
 
620
        self.disable_initiator_tag = (gobject.timeout_add
 
621
                                   (self.timeout_milliseconds(),
 
622
                                    self.disable))
646
623
        # Also start a new checker *right now*.
647
624
        self.start_checker()
648
625
    
649
 
    def checker_callback(self, source, condition, connection,
650
 
                         command):
 
626
    def checker_callback(self, pid, condition, command):
651
627
        """The checker has completed, so take appropriate actions."""
652
628
        self.checker_callback_tag = None
653
629
        self.checker = None
654
 
        # Read return code from connection (see call_pipe)
655
 
        returncode = connection.recv()
656
 
        connection.close()
657
 
        
658
 
        if returncode >= 0:
659
 
            self.last_checker_status = returncode
660
 
            self.last_checker_signal = None
 
630
        if os.WIFEXITED(condition):
 
631
            self.last_checker_status = os.WEXITSTATUS(condition)
661
632
            if self.last_checker_status == 0:
662
633
                logger.info("Checker for %(name)s succeeded",
663
634
                            vars(self))
664
635
                self.checked_ok()
665
636
            else:
666
 
                logger.info("Checker for %(name)s failed", vars(self))
 
637
                logger.info("Checker for %(name)s failed",
 
638
                            vars(self))
667
639
        else:
668
640
            self.last_checker_status = -1
669
 
            self.last_checker_signal = -returncode
670
641
            logger.warning("Checker for %(name)s crashed?",
671
642
                           vars(self))
672
 
        return False
673
643
    
674
644
    def checked_ok(self):
675
645
        """Assert that the client has been seen, alive and well."""
676
646
        self.last_checked_ok = datetime.datetime.utcnow()
677
647
        self.last_checker_status = 0
678
 
        self.last_checker_signal = None
679
648
        self.bump_timeout()
680
649
    
681
650
    def bump_timeout(self, timeout=None):
686
655
            gobject.source_remove(self.disable_initiator_tag)
687
656
            self.disable_initiator_tag = None
688
657
        if getattr(self, "enabled", False):
689
 
            self.disable_initiator_tag = gobject.timeout_add(
690
 
                int(timeout.total_seconds() * 1000), self.disable)
 
658
            self.disable_initiator_tag = (gobject.timeout_add
 
659
                                          (timedelta_to_milliseconds
 
660
                                           (timeout), self.disable))
691
661
            self.expires = datetime.datetime.utcnow() + timeout
692
662
    
693
663
    def need_approval(self):
707
677
        # than 'timeout' for the client to be disabled, which is as it
708
678
        # should be.
709
679
        
710
 
        if self.checker is not None and not self.checker.is_alive():
711
 
            logger.warning("Checker was not alive; joining")
712
 
            self.checker.join()
713
 
            self.checker = None
 
680
        # If a checker exists, make sure it is not a zombie
 
681
        try:
 
682
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
683
        except (AttributeError, OSError) as error:
 
684
            if (isinstance(error, OSError)
 
685
                and error.errno != errno.ECHILD):
 
686
                raise error
 
687
        else:
 
688
            if pid:
 
689
                logger.warning("Checker was a zombie")
 
690
                gobject.source_remove(self.checker_callback_tag)
 
691
                self.checker_callback(pid, status,
 
692
                                      self.current_checker_command)
714
693
        # Start a new checker if needed
715
694
        if self.checker is None:
716
695
            # Escape attributes for the shell
717
 
            escaped_attrs = {
718
 
                attr: re.escape(str(getattr(self, attr)))
719
 
                for attr in self.runtime_expansions }
 
696
            escaped_attrs = dict(
 
697
                (attr, re.escape(unicode(getattr(self, attr))))
 
698
                for attr in
 
699
                self.runtime_expansions)
720
700
            try:
721
701
                command = self.checker_command % escaped_attrs
722
702
            except TypeError as error:
723
703
                logger.error('Could not format string "%s"',
724
 
                             self.checker_command,
 
704
                             self.checker_command, exc_info=error)
 
705
                return True # Try again later
 
706
            self.current_checker_command = command
 
707
            try:
 
708
                logger.info("Starting checker %r for %s",
 
709
                            command, self.name)
 
710
                # We don't need to redirect stdout and stderr, since
 
711
                # in normal mode, that is already done by daemon(),
 
712
                # and in debug mode we don't want to.  (Stdin is
 
713
                # always replaced by /dev/null.)
 
714
                self.checker = subprocess.Popen(command,
 
715
                                                close_fds=True,
 
716
                                                shell=True, cwd="/")
 
717
            except OSError as error:
 
718
                logger.error("Failed to start subprocess",
725
719
                             exc_info=error)
726
 
                return True     # Try again later
727
 
            self.current_checker_command = command
728
 
            logger.info("Starting checker %r for %s", command,
729
 
                        self.name)
730
 
            # We don't need to redirect stdout and stderr, since
731
 
            # in normal mode, that is already done by daemon(),
732
 
            # and in debug mode we don't want to.  (Stdin is
733
 
            # always replaced by /dev/null.)
734
 
            # The exception is when not debugging but nevertheless
735
 
            # running in the foreground; use the previously
736
 
            # created wnull.
737
 
            popen_args = { "close_fds": True,
738
 
                           "shell": True,
739
 
                           "cwd": "/" }
740
 
            if (not self.server_settings["debug"]
741
 
                and self.server_settings["foreground"]):
742
 
                popen_args.update({"stdout": wnull,
743
 
                                   "stderr": wnull })
744
 
            pipe = multiprocessing.Pipe(duplex = False)
745
 
            self.checker = multiprocessing.Process(
746
 
                target = call_pipe,
747
 
                args = (pipe[1], subprocess.call, command),
748
 
                kwargs = popen_args)
749
 
            self.checker.start()
750
 
            self.checker_callback_tag = gobject.io_add_watch(
751
 
                pipe[0].fileno(), gobject.IO_IN,
752
 
                self.checker_callback, pipe[0], command)
 
720
                return True
 
721
            self.checker_callback_tag = (gobject.child_watch_add
 
722
                                         (self.checker.pid,
 
723
                                          self.checker_callback,
 
724
                                          data=command))
 
725
            # The checker may have completed before the gobject
 
726
            # watch was added.  Check for this.
 
727
            try:
 
728
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
 
729
            except OSError as error:
 
730
                if error.errno == errno.ECHILD:
 
731
                    # This should never happen
 
732
                    logger.error("Child process vanished",
 
733
                                 exc_info=error)
 
734
                    return True
 
735
                raise
 
736
            if pid:
 
737
                gobject.source_remove(self.checker_callback_tag)
 
738
                self.checker_callback(pid, status, command)
753
739
        # Re-run this periodically if run by gobject.timeout_add
754
740
        return True
755
741
    
761
747
        if getattr(self, "checker", None) is None:
762
748
            return
763
749
        logger.debug("Stopping checker for %(name)s", vars(self))
764
 
        self.checker.terminate()
 
750
        try:
 
751
            self.checker.terminate()
 
752
            #time.sleep(0.5)
 
753
            #if self.checker.poll() is None:
 
754
            #    self.checker.kill()
 
755
        except OSError as error:
 
756
            if error.errno != errno.ESRCH: # No such process
 
757
                raise
765
758
        self.checker = None
766
759
 
767
760
 
768
 
def dbus_service_property(dbus_interface,
769
 
                          signature="v",
770
 
                          access="readwrite",
771
 
                          byte_arrays=False):
 
761
def dbus_service_property(dbus_interface, signature="v",
 
762
                          access="readwrite", byte_arrays=False):
772
763
    """Decorators for marking methods of a DBusObjectWithProperties to
773
764
    become properties on the D-Bus.
774
765
    
783
774
    # "Set" method, so we fail early here:
784
775
    if byte_arrays and signature != "ay":
785
776
        raise ValueError("Byte arrays not supported for non-'ay'"
786
 
                         " signature {!r}".format(signature))
787
 
    
 
777
                         " signature {0!r}".format(signature))
788
778
    def decorator(func):
789
779
        func._dbus_is_property = True
790
780
        func._dbus_interface = dbus_interface
795
785
            func._dbus_name = func._dbus_name[:-14]
796
786
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
797
787
        return func
798
 
    
799
788
    return decorator
800
789
 
801
790
 
810
799
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
811
800
                    "false"}
812
801
    """
813
 
    
814
802
    def decorator(func):
815
803
        func._dbus_is_interface = True
816
804
        func._dbus_interface = dbus_interface
817
805
        func._dbus_name = dbus_interface
818
806
        return func
819
 
    
820
807
    return decorator
821
808
 
822
809
 
824
811
    """Decorator to annotate D-Bus methods, signals or properties
825
812
    Usage:
826
813
    
827
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
828
 
                       "org.freedesktop.DBus.Property."
829
 
                       "EmitsChangedSignal": "false"})
830
814
    @dbus_service_property("org.example.Interface", signature="b",
831
815
                           access="r")
 
816
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
 
817
                        "org.freedesktop.DBus.Property."
 
818
                        "EmitsChangedSignal": "false"})
832
819
    def Property_dbus_property(self):
833
820
        return dbus.Boolean(False)
834
821
    """
835
 
    
836
822
    def decorator(func):
837
823
        func._dbus_annotations = annotations
838
824
        return func
839
 
    
840
825
    return decorator
841
826
 
842
827
 
843
828
class DBusPropertyException(dbus.exceptions.DBusException):
844
829
    """A base class for D-Bus property-related exceptions
845
830
    """
846
 
    pass
 
831
    def __unicode__(self):
 
832
        return unicode(str(self))
847
833
 
848
834
 
849
835
class DBusPropertyAccessException(DBusPropertyException):
873
859
        If called like _is_dbus_thing("method") it returns a function
874
860
        suitable for use as predicate to inspect.getmembers().
875
861
        """
876
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
 
862
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
877
863
                                   False)
878
864
    
879
865
    def _get_all_dbus_things(self, thing):
880
866
        """Returns a generator of (name, attribute) pairs
881
867
        """
882
 
        return ((getattr(athing.__get__(self), "_dbus_name", name),
 
868
        return ((getattr(athing.__get__(self), "_dbus_name",
 
869
                         name),
883
870
                 athing.__get__(self))
884
871
                for cls in self.__class__.__mro__
885
872
                for name, athing in
886
 
                inspect.getmembers(cls, self._is_dbus_thing(thing)))
 
873
                inspect.getmembers(cls,
 
874
                                   self._is_dbus_thing(thing)))
887
875
    
888
876
    def _get_dbus_property(self, interface_name, property_name):
889
877
        """Returns a bound method if one exists which is a D-Bus
890
878
        property with the specified name and interface.
891
879
        """
892
 
        for cls in self.__class__.__mro__:
893
 
            for name, value in inspect.getmembers(
894
 
                    cls, self._is_dbus_thing("property")):
 
880
        for cls in  self.__class__.__mro__:
 
881
            for name, value in (inspect.getmembers
 
882
                                (cls,
 
883
                                 self._is_dbus_thing("property"))):
895
884
                if (value._dbus_name == property_name
896
885
                    and value._dbus_interface == interface_name):
897
886
                    return value.__get__(self)
898
887
        
899
888
        # No such property
900
 
        raise DBusPropertyNotFound("{}:{}.{}".format(
901
 
            self.dbus_object_path, interface_name, property_name))
 
889
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
890
                                   + interface_name + "."
 
891
                                   + property_name)
902
892
    
903
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
904
 
                         in_signature="ss",
 
893
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
905
894
                         out_signature="v")
906
895
    def Get(self, interface_name, property_name):
907
896
        """Standard D-Bus property Get() method, see D-Bus standard.
925
914
            # The byte_arrays option is not supported yet on
926
915
            # signatures other than "ay".
927
916
            if prop._dbus_signature != "ay":
928
 
                raise ValueError("Byte arrays not supported for non-"
929
 
                                 "'ay' signature {!r}"
930
 
                                 .format(prop._dbus_signature))
 
917
                raise ValueError
931
918
            value = dbus.ByteArray(b''.join(chr(byte)
932
919
                                            for byte in value))
933
920
        prop(value)
934
921
    
935
 
    @dbus.service.method(dbus.PROPERTIES_IFACE,
936
 
                         in_signature="s",
 
922
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
937
923
                         out_signature="a{sv}")
938
924
    def GetAll(self, interface_name):
939
925
        """Standard D-Bus property GetAll() method, see D-Bus
954
940
            if not hasattr(value, "variant_level"):
955
941
                properties[name] = value
956
942
                continue
957
 
            properties[name] = type(value)(
958
 
                value, variant_level = value.variant_level + 1)
 
943
            properties[name] = type(value)(value, variant_level=
 
944
                                           value.variant_level+1)
959
945
        return dbus.Dictionary(properties, signature="sv")
960
946
    
961
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
962
 
    def PropertiesChanged(self, interface_name, changed_properties,
963
 
                          invalidated_properties):
964
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
965
 
        standard.
966
 
        """
967
 
        pass
968
 
    
969
947
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
970
948
                         out_signature="s",
971
949
                         path_keyword='object_path',
979
957
                                                   connection)
980
958
        try:
981
959
            document = xml.dom.minidom.parseString(xmlstring)
982
 
            
983
960
            def make_tag(document, name, prop):
984
961
                e = document.createElement("property")
985
962
                e.setAttribute("name", name)
986
963
                e.setAttribute("type", prop._dbus_signature)
987
964
                e.setAttribute("access", prop._dbus_access)
988
965
                return e
989
 
            
990
966
            for if_tag in document.getElementsByTagName("interface"):
991
967
                # Add property tags
992
968
                for tag in (make_tag(document, name, prop)
1004
980
                            if (name == tag.getAttribute("name")
1005
981
                                and prop._dbus_interface
1006
982
                                == if_tag.getAttribute("name")):
1007
 
                                annots.update(getattr(
1008
 
                                    prop, "_dbus_annotations", {}))
1009
 
                        for name, value in annots.items():
 
983
                                annots.update(getattr
 
984
                                              (prop,
 
985
                                               "_dbus_annotations",
 
986
                                               {}))
 
987
                        for name, value in annots.iteritems():
1010
988
                            ann_tag = document.createElement(
1011
989
                                "annotation")
1012
990
                            ann_tag.setAttribute("name", name)
1015
993
                # Add interface annotation tags
1016
994
                for annotation, value in dict(
1017
995
                    itertools.chain.from_iterable(
1018
 
                        annotations().items()
1019
 
                        for name, annotations
1020
 
                        in self._get_all_dbus_things("interface")
 
996
                        annotations().iteritems()
 
997
                        for name, annotations in
 
998
                        self._get_all_dbus_things("interface")
1021
999
                        if name == if_tag.getAttribute("name")
1022
 
                        )).items():
 
1000
                        )).iteritems():
1023
1001
                    ann_tag = document.createElement("annotation")
1024
1002
                    ann_tag.setAttribute("name", annotation)
1025
1003
                    ann_tag.setAttribute("value", value)
1052
1030
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1053
1031
    if dt is None:
1054
1032
        return dbus.String("", variant_level = variant_level)
1055
 
    return dbus.String(dt.isoformat(), variant_level=variant_level)
 
1033
    return dbus.String(dt.isoformat(),
 
1034
                       variant_level=variant_level)
1056
1035
 
1057
1036
 
1058
1037
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1078
1057
    (from DBusObjectWithProperties) and interfaces (from the
1079
1058
    dbus_interface_annotations decorator).
1080
1059
    """
1081
 
    
1082
1060
    def wrapper(cls):
1083
1061
        for orig_interface_name, alt_interface_name in (
1084
 
                alt_interface_names.items()):
 
1062
            alt_interface_names.iteritems()):
1085
1063
            attr = {}
1086
1064
            interface_names = set()
1087
1065
            # Go though all attributes of the class
1089
1067
                # Ignore non-D-Bus attributes, and D-Bus attributes
1090
1068
                # with the wrong interface name
1091
1069
                if (not hasattr(attribute, "_dbus_interface")
1092
 
                    or not attribute._dbus_interface.startswith(
1093
 
                        orig_interface_name)):
 
1070
                    or not attribute._dbus_interface
 
1071
                    .startswith(orig_interface_name)):
1094
1072
                    continue
1095
1073
                # Create an alternate D-Bus interface name based on
1096
1074
                # the current name
1097
 
                alt_interface = attribute._dbus_interface.replace(
1098
 
                    orig_interface_name, alt_interface_name)
 
1075
                alt_interface = (attribute._dbus_interface
 
1076
                                 .replace(orig_interface_name,
 
1077
                                          alt_interface_name))
1099
1078
                interface_names.add(alt_interface)
1100
1079
                # Is this a D-Bus signal?
1101
1080
                if getattr(attribute, "_dbus_is_signal", False):
1102
 
                    if sys.version_info.major == 2:
1103
 
                        # Extract the original non-method undecorated
1104
 
                        # function by black magic
1105
 
                        nonmethod_func = (dict(
 
1081
                    # Extract the original non-method function by
 
1082
                    # black magic
 
1083
                    nonmethod_func = (dict(
1106
1084
                            zip(attribute.func_code.co_freevars,
1107
 
                                attribute.__closure__))
1108
 
                                          ["func"].cell_contents)
1109
 
                    else:
1110
 
                        nonmethod_func = attribute
 
1085
                                attribute.__closure__))["func"]
 
1086
                                      .cell_contents)
1111
1087
                    # Create a new, but exactly alike, function
1112
1088
                    # object, and decorate it to be a new D-Bus signal
1113
1089
                    # with the alternate D-Bus interface name
1114
 
                    if sys.version_info.major == 2:
1115
 
                        new_function = types.FunctionType(
1116
 
                            nonmethod_func.func_code,
1117
 
                            nonmethod_func.func_globals,
1118
 
                            nonmethod_func.func_name,
1119
 
                            nonmethod_func.func_defaults,
1120
 
                            nonmethod_func.func_closure)
1121
 
                    else:
1122
 
                        new_function = types.FunctionType(
1123
 
                            nonmethod_func.__code__,
1124
 
                            nonmethod_func.__globals__,
1125
 
                            nonmethod_func.__name__,
1126
 
                            nonmethod_func.__defaults__,
1127
 
                            nonmethod_func.__closure__)
1128
 
                    new_function = (dbus.service.signal(
1129
 
                        alt_interface,
1130
 
                        attribute._dbus_signature)(new_function))
 
1090
                    new_function = (dbus.service.signal
 
1091
                                    (alt_interface,
 
1092
                                     attribute._dbus_signature)
 
1093
                                    (types.FunctionType(
 
1094
                                nonmethod_func.func_code,
 
1095
                                nonmethod_func.func_globals,
 
1096
                                nonmethod_func.func_name,
 
1097
                                nonmethod_func.func_defaults,
 
1098
                                nonmethod_func.func_closure)))
1131
1099
                    # Copy annotations, if any
1132
1100
                    try:
1133
 
                        new_function._dbus_annotations = dict(
1134
 
                            attribute._dbus_annotations)
 
1101
                        new_function._dbus_annotations = (
 
1102
                            dict(attribute._dbus_annotations))
1135
1103
                    except AttributeError:
1136
1104
                        pass
1137
1105
                    # Define a creator of a function to call both the
1142
1110
                        """This function is a scope container to pass
1143
1111
                        func1 and func2 to the "call_both" function
1144
1112
                        outside of its arguments"""
1145
 
                        
1146
1113
                        def call_both(*args, **kwargs):
1147
1114
                            """This function will emit two D-Bus
1148
1115
                            signals by calling func1 and func2"""
1149
1116
                            func1(*args, **kwargs)
1150
1117
                            func2(*args, **kwargs)
1151
 
                        
1152
1118
                        return call_both
1153
1119
                    # Create the "call_both" function and add it to
1154
1120
                    # the class
1159
1125
                    # object.  Decorate it to be a new D-Bus method
1160
1126
                    # with the alternate D-Bus interface name.  Add it
1161
1127
                    # to the class.
1162
 
                    attr[attrname] = (
1163
 
                        dbus.service.method(
1164
 
                            alt_interface,
1165
 
                            attribute._dbus_in_signature,
1166
 
                            attribute._dbus_out_signature)
1167
 
                        (types.FunctionType(attribute.func_code,
1168
 
                                            attribute.func_globals,
1169
 
                                            attribute.func_name,
1170
 
                                            attribute.func_defaults,
1171
 
                                            attribute.func_closure)))
 
1128
                    attr[attrname] = (dbus.service.method
 
1129
                                      (alt_interface,
 
1130
                                       attribute._dbus_in_signature,
 
1131
                                       attribute._dbus_out_signature)
 
1132
                                      (types.FunctionType
 
1133
                                       (attribute.func_code,
 
1134
                                        attribute.func_globals,
 
1135
                                        attribute.func_name,
 
1136
                                        attribute.func_defaults,
 
1137
                                        attribute.func_closure)))
1172
1138
                    # Copy annotations, if any
1173
1139
                    try:
1174
 
                        attr[attrname]._dbus_annotations = dict(
1175
 
                            attribute._dbus_annotations)
 
1140
                        attr[attrname]._dbus_annotations = (
 
1141
                            dict(attribute._dbus_annotations))
1176
1142
                    except AttributeError:
1177
1143
                        pass
1178
1144
                # Is this a D-Bus property?
1181
1147
                    # object, and decorate it to be a new D-Bus
1182
1148
                    # property with the alternate D-Bus interface
1183
1149
                    # name.  Add it to the class.
1184
 
                    attr[attrname] = (dbus_service_property(
1185
 
                        alt_interface, attribute._dbus_signature,
1186
 
                        attribute._dbus_access,
1187
 
                        attribute._dbus_get_args_options
1188
 
                        ["byte_arrays"])
1189
 
                                      (types.FunctionType(
1190
 
                                          attribute.func_code,
1191
 
                                          attribute.func_globals,
1192
 
                                          attribute.func_name,
1193
 
                                          attribute.func_defaults,
1194
 
                                          attribute.func_closure)))
 
1150
                    attr[attrname] = (dbus_service_property
 
1151
                                      (alt_interface,
 
1152
                                       attribute._dbus_signature,
 
1153
                                       attribute._dbus_access,
 
1154
                                       attribute
 
1155
                                       ._dbus_get_args_options
 
1156
                                       ["byte_arrays"])
 
1157
                                      (types.FunctionType
 
1158
                                       (attribute.func_code,
 
1159
                                        attribute.func_globals,
 
1160
                                        attribute.func_name,
 
1161
                                        attribute.func_defaults,
 
1162
                                        attribute.func_closure)))
1195
1163
                    # Copy annotations, if any
1196
1164
                    try:
1197
 
                        attr[attrname]._dbus_annotations = dict(
1198
 
                            attribute._dbus_annotations)
 
1165
                        attr[attrname]._dbus_annotations = (
 
1166
                            dict(attribute._dbus_annotations))
1199
1167
                    except AttributeError:
1200
1168
                        pass
1201
1169
                # Is this a D-Bus interface?
1204
1172
                    # object.  Decorate it to be a new D-Bus interface
1205
1173
                    # with the alternate D-Bus interface name.  Add it
1206
1174
                    # to the class.
1207
 
                    attr[attrname] = (
1208
 
                        dbus_interface_annotations(alt_interface)
1209
 
                        (types.FunctionType(attribute.func_code,
1210
 
                                            attribute.func_globals,
1211
 
                                            attribute.func_name,
1212
 
                                            attribute.func_defaults,
1213
 
                                            attribute.func_closure)))
 
1175
                    attr[attrname] = (dbus_interface_annotations
 
1176
                                      (alt_interface)
 
1177
                                      (types.FunctionType
 
1178
                                       (attribute.func_code,
 
1179
                                        attribute.func_globals,
 
1180
                                        attribute.func_name,
 
1181
                                        attribute.func_defaults,
 
1182
                                        attribute.func_closure)))
1214
1183
            if deprecate:
1215
1184
                # Deprecate all alternate interfaces
1216
 
                iname="_AlternateDBusNames_interface_annotation{}"
 
1185
                iname="_AlternateDBusNames_interface_annotation{0}"
1217
1186
                for interface_name in interface_names:
1218
 
                    
1219
1187
                    @dbus_interface_annotations(interface_name)
1220
1188
                    def func(self):
1221
1189
                        return { "org.freedesktop.DBus.Deprecated":
1222
 
                                 "true" }
 
1190
                                     "true" }
1223
1191
                    # Find an unused name
1224
1192
                    for aname in (iname.format(i)
1225
1193
                                  for i in itertools.count()):
1229
1197
            if interface_names:
1230
1198
                # Replace the class with a new subclass of it with
1231
1199
                # methods, signals, etc. as created above.
1232
 
                cls = type(b"{}Alternate".format(cls.__name__),
1233
 
                           (cls, ), attr)
 
1200
                cls = type(b"{0}Alternate".format(cls.__name__),
 
1201
                           (cls,), attr)
1234
1202
        return cls
1235
 
    
1236
1203
    return wrapper
1237
1204
 
1238
1205
 
1239
1206
@alternate_dbus_interfaces({"se.recompile.Mandos":
1240
 
                            "se.bsnet.fukt.Mandos"})
 
1207
                                "se.bsnet.fukt.Mandos"})
1241
1208
class ClientDBus(Client, DBusObjectWithProperties):
1242
1209
    """A Client class using D-Bus
1243
1210
    
1247
1214
    """
1248
1215
    
1249
1216
    runtime_expansions = (Client.runtime_expansions
1250
 
                          + ("dbus_object_path", ))
1251
 
    
1252
 
    _interface = "se.recompile.Mandos.Client"
 
1217
                          + ("dbus_object_path",))
1253
1218
    
1254
1219
    # dbus.service.Object doesn't use super(), so we can't either.
1255
1220
    
1258
1223
        Client.__init__(self, *args, **kwargs)
1259
1224
        # Only now, when this client is initialized, can it show up on
1260
1225
        # the D-Bus
1261
 
        client_object_name = str(self.name).translate(
 
1226
        client_object_name = unicode(self.name).translate(
1262
1227
            {ord("."): ord("_"),
1263
1228
             ord("-"): ord("_")})
1264
 
        self.dbus_object_path = dbus.ObjectPath(
1265
 
            "/clients/" + client_object_name)
 
1229
        self.dbus_object_path = (dbus.ObjectPath
 
1230
                                 ("/clients/" + client_object_name))
1266
1231
        DBusObjectWithProperties.__init__(self, self.bus,
1267
1232
                                          self.dbus_object_path)
1268
1233
    
1269
 
    def notifychangeproperty(transform_func, dbus_name,
1270
 
                             type_func=lambda x: x,
1271
 
                             variant_level=1,
1272
 
                             invalidate_only=False,
1273
 
                             _interface=_interface):
 
1234
    def notifychangeproperty(transform_func,
 
1235
                             dbus_name, type_func=lambda x: x,
 
1236
                             variant_level=1):
1274
1237
        """ Modify a variable so that it's a property which announces
1275
1238
        its changes to DBus.
1276
1239
        
1281
1244
                   to the D-Bus.  Default: no transform
1282
1245
        variant_level: D-Bus variant level.  Default: 1
1283
1246
        """
1284
 
        attrname = "_{}".format(dbus_name)
1285
 
        
 
1247
        attrname = "_{0}".format(dbus_name)
1286
1248
        def setter(self, value):
1287
1249
            if hasattr(self, "dbus_object_path"):
1288
1250
                if (not hasattr(self, attrname) or
1289
1251
                    type_func(getattr(self, attrname, None))
1290
1252
                    != type_func(value)):
1291
 
                    if invalidate_only:
1292
 
                        self.PropertiesChanged(
1293
 
                            _interface, dbus.Dictionary(),
1294
 
                            dbus.Array((dbus_name, )))
1295
 
                    else:
1296
 
                        dbus_value = transform_func(
1297
 
                            type_func(value),
1298
 
                            variant_level = variant_level)
1299
 
                        self.PropertyChanged(dbus.String(dbus_name),
1300
 
                                             dbus_value)
1301
 
                        self.PropertiesChanged(
1302
 
                            _interface,
1303
 
                            dbus.Dictionary({ dbus.String(dbus_name):
1304
 
                                              dbus_value }),
1305
 
                            dbus.Array())
 
1253
                    dbus_value = transform_func(type_func(value),
 
1254
                                                variant_level
 
1255
                                                =variant_level)
 
1256
                    self.PropertyChanged(dbus.String(dbus_name),
 
1257
                                         dbus_value)
1306
1258
            setattr(self, attrname, value)
1307
1259
        
1308
1260
        return property(lambda self: getattr(self, attrname), setter)
1314
1266
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1315
1267
    last_enabled = notifychangeproperty(datetime_to_dbus,
1316
1268
                                        "LastEnabled")
1317
 
    checker = notifychangeproperty(
1318
 
        dbus.Boolean, "CheckerRunning",
1319
 
        type_func = lambda checker: checker is not None)
 
1269
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1270
                                   type_func = lambda checker:
 
1271
                                       checker is not None)
1320
1272
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1321
1273
                                           "LastCheckedOK")
1322
1274
    last_checker_status = notifychangeproperty(dbus.Int16,
1325
1277
        datetime_to_dbus, "LastApprovalRequest")
1326
1278
    approved_by_default = notifychangeproperty(dbus.Boolean,
1327
1279
                                               "ApprovedByDefault")
1328
 
    approval_delay = notifychangeproperty(
1329
 
        dbus.UInt64, "ApprovalDelay",
1330
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1280
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1281
                                          "ApprovalDelay",
 
1282
                                          type_func =
 
1283
                                          timedelta_to_milliseconds)
1331
1284
    approval_duration = notifychangeproperty(
1332
1285
        dbus.UInt64, "ApprovalDuration",
1333
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1286
        type_func = timedelta_to_milliseconds)
1334
1287
    host = notifychangeproperty(dbus.String, "Host")
1335
 
    timeout = notifychangeproperty(
1336
 
        dbus.UInt64, "Timeout",
1337
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1288
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1289
                                   type_func =
 
1290
                                   timedelta_to_milliseconds)
1338
1291
    extended_timeout = notifychangeproperty(
1339
1292
        dbus.UInt64, "ExtendedTimeout",
1340
 
        type_func = lambda td: td.total_seconds() * 1000)
1341
 
    interval = notifychangeproperty(
1342
 
        dbus.UInt64, "Interval",
1343
 
        type_func = lambda td: td.total_seconds() * 1000)
 
1293
        type_func = timedelta_to_milliseconds)
 
1294
    interval = notifychangeproperty(dbus.UInt64,
 
1295
                                    "Interval",
 
1296
                                    type_func =
 
1297
                                    timedelta_to_milliseconds)
1344
1298
    checker_command = notifychangeproperty(dbus.String, "Checker")
1345
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1346
 
                                  invalidate_only=True)
1347
1299
    
1348
1300
    del notifychangeproperty
1349
1301
    
1356
1308
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
1357
1309
        Client.__del__(self, *args, **kwargs)
1358
1310
    
1359
 
    def checker_callback(self, source, condition,
1360
 
                         connection, command, *args, **kwargs):
1361
 
        ret = Client.checker_callback(self, source, condition,
1362
 
                                      connection, command, *args,
1363
 
                                      **kwargs)
1364
 
        exitstatus = self.last_checker_status
1365
 
        if exitstatus >= 0:
 
1311
    def checker_callback(self, pid, condition, command,
 
1312
                         *args, **kwargs):
 
1313
        self.checker_callback_tag = None
 
1314
        self.checker = None
 
1315
        if os.WIFEXITED(condition):
 
1316
            exitstatus = os.WEXITSTATUS(condition)
1366
1317
            # Emit D-Bus signal
1367
1318
            self.CheckerCompleted(dbus.Int16(exitstatus),
1368
 
                                  dbus.Int64(0),
 
1319
                                  dbus.Int64(condition),
1369
1320
                                  dbus.String(command))
1370
1321
        else:
1371
1322
            # Emit D-Bus signal
1372
1323
            self.CheckerCompleted(dbus.Int16(-1),
1373
 
                                  dbus.Int64(
1374
 
                                      self.last_checker_signal),
 
1324
                                  dbus.Int64(condition),
1375
1325
                                  dbus.String(command))
1376
 
        return ret
 
1326
        
 
1327
        return Client.checker_callback(self, pid, condition, command,
 
1328
                                       *args, **kwargs)
1377
1329
    
1378
1330
    def start_checker(self, *args, **kwargs):
1379
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
1331
        old_checker = self.checker
 
1332
        if self.checker is not None:
 
1333
            old_checker_pid = self.checker.pid
 
1334
        else:
 
1335
            old_checker_pid = None
1380
1336
        r = Client.start_checker(self, *args, **kwargs)
1381
1337
        # Only if new checker process was started
1382
1338
        if (self.checker is not None
1391
1347
    
1392
1348
    def approve(self, value=True):
1393
1349
        self.approved = value
1394
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1395
 
                                * 1000), self._reset_approved)
 
1350
        gobject.timeout_add(timedelta_to_milliseconds
 
1351
                            (self.approval_duration),
 
1352
                            self._reset_approved)
1396
1353
        self.send_changedstate()
1397
1354
    
1398
1355
    ## D-Bus methods, signals & properties
 
1356
    _interface = "se.recompile.Mandos.Client"
1399
1357
    
1400
1358
    ## Interfaces
1401
1359
    
 
1360
    @dbus_interface_annotations(_interface)
 
1361
    def _foo(self):
 
1362
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
 
1363
                     "false"}
 
1364
    
1402
1365
    ## Signals
1403
1366
    
1404
1367
    # CheckerCompleted - signal
1414
1377
        pass
1415
1378
    
1416
1379
    # PropertyChanged - signal
1417
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1418
1380
    @dbus.service.signal(_interface, signature="sv")
1419
1381
    def PropertyChanged(self, property, value):
1420
1382
        "D-Bus signal"
1484
1446
        return dbus.Boolean(bool(self.approvals_pending))
1485
1447
    
1486
1448
    # ApprovedByDefault - property
1487
 
    @dbus_service_property(_interface,
1488
 
                           signature="b",
 
1449
    @dbus_service_property(_interface, signature="b",
1489
1450
                           access="readwrite")
1490
1451
    def ApprovedByDefault_dbus_property(self, value=None):
1491
1452
        if value is None:       # get
1493
1454
        self.approved_by_default = bool(value)
1494
1455
    
1495
1456
    # ApprovalDelay - property
1496
 
    @dbus_service_property(_interface,
1497
 
                           signature="t",
 
1457
    @dbus_service_property(_interface, signature="t",
1498
1458
                           access="readwrite")
1499
1459
    def ApprovalDelay_dbus_property(self, value=None):
1500
1460
        if value is None:       # get
1501
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1502
 
                               * 1000)
 
1461
            return dbus.UInt64(self.approval_delay_milliseconds())
1503
1462
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
1504
1463
    
1505
1464
    # ApprovalDuration - property
1506
 
    @dbus_service_property(_interface,
1507
 
                           signature="t",
 
1465
    @dbus_service_property(_interface, signature="t",
1508
1466
                           access="readwrite")
1509
1467
    def ApprovalDuration_dbus_property(self, value=None):
1510
1468
        if value is None:       # get
1511
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1512
 
                               * 1000)
 
1469
            return dbus.UInt64(timedelta_to_milliseconds(
 
1470
                    self.approval_duration))
1513
1471
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1514
1472
    
1515
1473
    # Name - property
1523
1481
        return dbus.String(self.fingerprint)
1524
1482
    
1525
1483
    # Host - property
1526
 
    @dbus_service_property(_interface,
1527
 
                           signature="s",
 
1484
    @dbus_service_property(_interface, signature="s",
1528
1485
                           access="readwrite")
1529
1486
    def Host_dbus_property(self, value=None):
1530
1487
        if value is None:       # get
1531
1488
            return dbus.String(self.host)
1532
 
        self.host = str(value)
 
1489
        self.host = unicode(value)
1533
1490
    
1534
1491
    # Created - property
1535
1492
    @dbus_service_property(_interface, signature="s", access="read")
1542
1499
        return datetime_to_dbus(self.last_enabled)
1543
1500
    
1544
1501
    # Enabled - property
1545
 
    @dbus_service_property(_interface,
1546
 
                           signature="b",
 
1502
    @dbus_service_property(_interface, signature="b",
1547
1503
                           access="readwrite")
1548
1504
    def Enabled_dbus_property(self, value=None):
1549
1505
        if value is None:       # get
1554
1510
            self.disable()
1555
1511
    
1556
1512
    # LastCheckedOK - property
1557
 
    @dbus_service_property(_interface,
1558
 
                           signature="s",
 
1513
    @dbus_service_property(_interface, signature="s",
1559
1514
                           access="readwrite")
1560
1515
    def LastCheckedOK_dbus_property(self, value=None):
1561
1516
        if value is not None:
1564
1519
        return datetime_to_dbus(self.last_checked_ok)
1565
1520
    
1566
1521
    # LastCheckerStatus - property
1567
 
    @dbus_service_property(_interface, signature="n", access="read")
 
1522
    @dbus_service_property(_interface, signature="n",
 
1523
                           access="read")
1568
1524
    def LastCheckerStatus_dbus_property(self):
1569
1525
        return dbus.Int16(self.last_checker_status)
1570
1526
    
1579
1535
        return datetime_to_dbus(self.last_approval_request)
1580
1536
    
1581
1537
    # Timeout - property
1582
 
    @dbus_service_property(_interface,
1583
 
                           signature="t",
 
1538
    @dbus_service_property(_interface, signature="t",
1584
1539
                           access="readwrite")
1585
1540
    def Timeout_dbus_property(self, value=None):
1586
1541
        if value is None:       # get
1587
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
 
1542
            return dbus.UInt64(self.timeout_milliseconds())
1588
1543
        old_timeout = self.timeout
1589
1544
        self.timeout = datetime.timedelta(0, 0, 0, value)
1590
1545
        # Reschedule disabling
1599
1554
                    is None):
1600
1555
                    return
1601
1556
                gobject.source_remove(self.disable_initiator_tag)
1602
 
                self.disable_initiator_tag = gobject.timeout_add(
1603
 
                    int((self.expires - now).total_seconds() * 1000),
1604
 
                    self.disable)
 
1557
                self.disable_initiator_tag = (
 
1558
                    gobject.timeout_add(
 
1559
                        timedelta_to_milliseconds(self.expires - now),
 
1560
                        self.disable))
1605
1561
    
1606
1562
    # ExtendedTimeout - property
1607
 
    @dbus_service_property(_interface,
1608
 
                           signature="t",
 
1563
    @dbus_service_property(_interface, signature="t",
1609
1564
                           access="readwrite")
1610
1565
    def ExtendedTimeout_dbus_property(self, value=None):
1611
1566
        if value is None:       # get
1612
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1613
 
                               * 1000)
 
1567
            return dbus.UInt64(self.extended_timeout_milliseconds())
1614
1568
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1615
1569
    
1616
1570
    # Interval - property
1617
 
    @dbus_service_property(_interface,
1618
 
                           signature="t",
 
1571
    @dbus_service_property(_interface, signature="t",
1619
1572
                           access="readwrite")
1620
1573
    def Interval_dbus_property(self, value=None):
1621
1574
        if value is None:       # get
1622
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1575
            return dbus.UInt64(self.interval_milliseconds())
1623
1576
        self.interval = datetime.timedelta(0, 0, 0, value)
1624
1577
        if getattr(self, "checker_initiator_tag", None) is None:
1625
1578
            return
1626
1579
        if self.enabled:
1627
1580
            # Reschedule checker run
1628
1581
            gobject.source_remove(self.checker_initiator_tag)
1629
 
            self.checker_initiator_tag = gobject.timeout_add(
1630
 
                value, self.start_checker)
1631
 
            self.start_checker() # Start one now, too
 
1582
            self.checker_initiator_tag = (gobject.timeout_add
 
1583
                                          (value, self.start_checker))
 
1584
            self.start_checker()    # Start one now, too
1632
1585
    
1633
1586
    # Checker - property
1634
 
    @dbus_service_property(_interface,
1635
 
                           signature="s",
 
1587
    @dbus_service_property(_interface, signature="s",
1636
1588
                           access="readwrite")
1637
1589
    def Checker_dbus_property(self, value=None):
1638
1590
        if value is None:       # get
1639
1591
            return dbus.String(self.checker_command)
1640
 
        self.checker_command = str(value)
 
1592
        self.checker_command = unicode(value)
1641
1593
    
1642
1594
    # CheckerRunning - property
1643
 
    @dbus_service_property(_interface,
1644
 
                           signature="b",
 
1595
    @dbus_service_property(_interface, signature="b",
1645
1596
                           access="readwrite")
1646
1597
    def CheckerRunning_dbus_property(self, value=None):
1647
1598
        if value is None:       # get
1657
1608
        return self.dbus_object_path # is already a dbus.ObjectPath
1658
1609
    
1659
1610
    # Secret = property
1660
 
    @dbus_service_property(_interface,
1661
 
                           signature="ay",
1662
 
                           access="write",
1663
 
                           byte_arrays=True)
 
1611
    @dbus_service_property(_interface, signature="ay",
 
1612
                           access="write", byte_arrays=True)
1664
1613
    def Secret_dbus_property(self, value):
1665
 
        self.secret = bytes(value)
 
1614
        self.secret = str(value)
1666
1615
    
1667
1616
    del _interface
1668
1617
 
1672
1621
        self._pipe = child_pipe
1673
1622
        self._pipe.send(('init', fpr, address))
1674
1623
        if not self._pipe.recv():
1675
 
            raise KeyError(fpr)
 
1624
            raise KeyError()
1676
1625
    
1677
1626
    def __getattribute__(self, name):
1678
1627
        if name == '_pipe':
1682
1631
        if data[0] == 'data':
1683
1632
            return data[1]
1684
1633
        if data[0] == 'function':
1685
 
            
1686
1634
            def func(*args, **kwargs):
1687
1635
                self._pipe.send(('funcall', name, args, kwargs))
1688
1636
                return self._pipe.recv()[1]
1689
 
            
1690
1637
            return func
1691
1638
    
1692
1639
    def __setattr__(self, name, value):
1704
1651
    def handle(self):
1705
1652
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1706
1653
            logger.info("TCP connection from: %s",
1707
 
                        str(self.client_address))
 
1654
                        unicode(self.client_address))
1708
1655
            logger.debug("Pipe FD: %d",
1709
1656
                         self.server.child_pipe.fileno())
1710
1657
            
1711
 
            session = gnutls.connection.ClientSession(
1712
 
                self.request, gnutls.connection .X509Credentials())
 
1658
            session = (gnutls.connection
 
1659
                       .ClientSession(self.request,
 
1660
                                      gnutls.connection
 
1661
                                      .X509Credentials()))
1713
1662
            
1714
1663
            # Note: gnutls.connection.X509Credentials is really a
1715
1664
            # generic GnuTLS certificate credentials object so long as
1724
1673
            priority = self.server.gnutls_priority
1725
1674
            if priority is None:
1726
1675
                priority = "NORMAL"
1727
 
            gnutls.library.functions.gnutls_priority_set_direct(
1728
 
                session._c_object, priority, None)
 
1676
            (gnutls.library.functions
 
1677
             .gnutls_priority_set_direct(session._c_object,
 
1678
                                         priority, None))
1729
1679
            
1730
1680
            # Start communication using the Mandos protocol
1731
1681
            # Get protocol number
1733
1683
            logger.debug("Protocol version: %r", line)
1734
1684
            try:
1735
1685
                if int(line.strip().split()[0]) > 1:
1736
 
                    raise RuntimeError(line)
 
1686
                    raise RuntimeError
1737
1687
            except (ValueError, IndexError, RuntimeError) as error:
1738
1688
                logger.error("Unknown protocol version: %s", error)
1739
1689
                return
1751
1701
            approval_required = False
1752
1702
            try:
1753
1703
                try:
1754
 
                    fpr = self.fingerprint(
1755
 
                        self.peer_certificate(session))
 
1704
                    fpr = self.fingerprint(self.peer_certificate
 
1705
                                           (session))
1756
1706
                except (TypeError,
1757
1707
                        gnutls.errors.GNUTLSError) as error:
1758
1708
                    logger.warning("Bad certificate: %s", error)
1773
1723
                while True:
1774
1724
                    if not client.enabled:
1775
1725
                        logger.info("Client %s is disabled",
1776
 
                                    client.name)
 
1726
                                       client.name)
1777
1727
                        if self.server.use_dbus:
1778
1728
                            # Emit D-Bus signal
1779
1729
                            client.Rejected("Disabled")
1788
1738
                        if self.server.use_dbus:
1789
1739
                            # Emit D-Bus signal
1790
1740
                            client.NeedApproval(
1791
 
                                client.approval_delay.total_seconds()
1792
 
                                * 1000, client.approved_by_default)
 
1741
                                client.approval_delay_milliseconds(),
 
1742
                                client.approved_by_default)
1793
1743
                    else:
1794
1744
                        logger.warning("Client %s was not approved",
1795
1745
                                       client.name)
1801
1751
                    #wait until timeout or approved
1802
1752
                    time = datetime.datetime.now()
1803
1753
                    client.changedstate.acquire()
1804
 
                    client.changedstate.wait(delay.total_seconds())
 
1754
                    client.changedstate.wait(
 
1755
                        float(timedelta_to_milliseconds(delay)
 
1756
                              / 1000))
1805
1757
                    client.changedstate.release()
1806
1758
                    time2 = datetime.datetime.now()
1807
1759
                    if (time2 - time) >= delay:
1826
1778
                        logger.warning("gnutls send failed",
1827
1779
                                       exc_info=error)
1828
1780
                        return
1829
 
                    logger.debug("Sent: %d, remaining: %d", sent,
1830
 
                                 len(client.secret) - (sent_size
1831
 
                                                       + sent))
 
1781
                    logger.debug("Sent: %d, remaining: %d",
 
1782
                                 sent, len(client.secret)
 
1783
                                 - (sent_size + sent))
1832
1784
                    sent_size += sent
1833
1785
                
1834
1786
                logger.info("Sending secret to %s", client.name)
1851
1803
    def peer_certificate(session):
1852
1804
        "Return the peer's OpenPGP certificate as a bytestring"
1853
1805
        # If not an OpenPGP certificate...
1854
 
        if (gnutls.library.functions.gnutls_certificate_type_get(
1855
 
                session._c_object)
 
1806
        if (gnutls.library.functions
 
1807
            .gnutls_certificate_type_get(session._c_object)
1856
1808
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1857
1809
            # ...do the normal thing
1858
1810
            return session.peer_certificate
1872
1824
    def fingerprint(openpgp):
1873
1825
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
1874
1826
        # New GnuTLS "datum" with the OpenPGP public key
1875
 
        datum = gnutls.library.types.gnutls_datum_t(
1876
 
            ctypes.cast(ctypes.c_char_p(openpgp),
1877
 
                        ctypes.POINTER(ctypes.c_ubyte)),
1878
 
            ctypes.c_uint(len(openpgp)))
 
1827
        datum = (gnutls.library.types
 
1828
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
1829
                                             ctypes.POINTER
 
1830
                                             (ctypes.c_ubyte)),
 
1831
                                 ctypes.c_uint(len(openpgp))))
1879
1832
        # New empty GnuTLS certificate
1880
1833
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
1881
 
        gnutls.library.functions.gnutls_openpgp_crt_init(
1882
 
            ctypes.byref(crt))
 
1834
        (gnutls.library.functions
 
1835
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
1883
1836
        # Import the OpenPGP public key into the certificate
1884
 
        gnutls.library.functions.gnutls_openpgp_crt_import(
1885
 
            crt, ctypes.byref(datum),
1886
 
            gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
 
1837
        (gnutls.library.functions
 
1838
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
1839
                                    gnutls.library.constants
 
1840
                                    .GNUTLS_OPENPGP_FMT_RAW))
1887
1841
        # Verify the self signature in the key
1888
1842
        crtverify = ctypes.c_uint()
1889
 
        gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1890
 
            crt, 0, ctypes.byref(crtverify))
 
1843
        (gnutls.library.functions
 
1844
         .gnutls_openpgp_crt_verify_self(crt, 0,
 
1845
                                         ctypes.byref(crtverify)))
1891
1846
        if crtverify.value != 0:
1892
1847
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1893
 
            raise gnutls.errors.CertificateSecurityError(
1894
 
                "Verify failed")
 
1848
            raise (gnutls.errors.CertificateSecurityError
 
1849
                   ("Verify failed"))
1895
1850
        # New buffer for the fingerprint
1896
1851
        buf = ctypes.create_string_buffer(20)
1897
1852
        buf_len = ctypes.c_size_t()
1898
1853
        # Get the fingerprint from the certificate into the buffer
1899
 
        gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1900
 
            crt, ctypes.byref(buf), ctypes.byref(buf_len))
 
1854
        (gnutls.library.functions
 
1855
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
1856
                                             ctypes.byref(buf_len)))
1901
1857
        # Deinit the certificate
1902
1858
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1903
1859
        # Convert the buffer to a Python bytestring
1909
1865
 
1910
1866
class MultiprocessingMixIn(object):
1911
1867
    """Like socketserver.ThreadingMixIn, but with multiprocessing"""
1912
 
    
1913
1868
    def sub_process_main(self, request, address):
1914
1869
        try:
1915
1870
            self.finish_request(request, address)
1927
1882
 
1928
1883
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1929
1884
    """ adds a pipe to the MixIn """
1930
 
    
1931
1885
    def process_request(self, request, client_address):
1932
1886
        """Overrides and wraps the original process_request().
1933
1887
        
1942
1896
    
1943
1897
    def add_pipe(self, parent_pipe, proc):
1944
1898
        """Dummy function; override as necessary"""
1945
 
        raise NotImplementedError()
 
1899
        raise NotImplementedError
1946
1900
 
1947
1901
 
1948
1902
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1954
1908
        interface:      None or a network interface name (string)
1955
1909
        use_ipv6:       Boolean; to use IPv6 or not
1956
1910
    """
1957
 
    
1958
1911
    def __init__(self, server_address, RequestHandlerClass,
1959
 
                 interface=None,
1960
 
                 use_ipv6=True,
1961
 
                 socketfd=None):
 
1912
                 interface=None, use_ipv6=True, socketfd=None):
1962
1913
        """If socketfd is set, use that file descriptor instead of
1963
1914
        creating a new one with socket.socket().
1964
1915
        """
2005
1956
                             self.interface)
2006
1957
            else:
2007
1958
                try:
2008
 
                    self.socket.setsockopt(
2009
 
                        socket.SOL_SOCKET, SO_BINDTODEVICE,
2010
 
                        (self.interface + "\0").encode("utf-8"))
 
1959
                    self.socket.setsockopt(socket.SOL_SOCKET,
 
1960
                                           SO_BINDTODEVICE,
 
1961
                                           str(self.interface + '\0'))
2011
1962
                except socket.error as error:
2012
1963
                    if error.errno == errno.EPERM:
2013
1964
                        logger.error("No permission to bind to"
2027
1978
                if self.address_family == socket.AF_INET6:
2028
1979
                    any_address = "::" # in6addr_any
2029
1980
                else:
2030
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1981
                    any_address = socket.INADDR_ANY
2031
1982
                self.server_address = (any_address,
2032
1983
                                       self.server_address[1])
2033
1984
            elif not self.server_address[1]:
2034
 
                self.server_address = (self.server_address[0], 0)
 
1985
                self.server_address = (self.server_address[0],
 
1986
                                       0)
2035
1987
#                 if self.interface:
2036
1988
#                     self.server_address = (self.server_address[0],
2037
1989
#                                            0, # port
2051
2003
    
2052
2004
    Assumes a gobject.MainLoop event loop.
2053
2005
    """
2054
 
    
2055
2006
    def __init__(self, server_address, RequestHandlerClass,
2056
 
                 interface=None,
2057
 
                 use_ipv6=True,
2058
 
                 clients=None,
2059
 
                 gnutls_priority=None,
2060
 
                 use_dbus=True,
2061
 
                 socketfd=None):
 
2007
                 interface=None, use_ipv6=True, clients=None,
 
2008
                 gnutls_priority=None, use_dbus=True, socketfd=None):
2062
2009
        self.enabled = False
2063
2010
        self.clients = clients
2064
2011
        if self.clients is None:
2070
2017
                                interface = interface,
2071
2018
                                use_ipv6 = use_ipv6,
2072
2019
                                socketfd = socketfd)
2073
 
    
2074
2020
    def server_activate(self):
2075
2021
        if self.enabled:
2076
2022
            return socketserver.TCPServer.server_activate(self)
2080
2026
    
2081
2027
    def add_pipe(self, parent_pipe, proc):
2082
2028
        # Call "handle_ipc" for both data and EOF events
2083
 
        gobject.io_add_watch(
2084
 
            parent_pipe.fileno(),
2085
 
            gobject.IO_IN | gobject.IO_HUP,
2086
 
            functools.partial(self.handle_ipc,
2087
 
                              parent_pipe = parent_pipe,
2088
 
                              proc = proc))
 
2029
        gobject.io_add_watch(parent_pipe.fileno(),
 
2030
                             gobject.IO_IN | gobject.IO_HUP,
 
2031
                             functools.partial(self.handle_ipc,
 
2032
                                               parent_pipe =
 
2033
                                               parent_pipe,
 
2034
                                               proc = proc))
2089
2035
    
2090
 
    def handle_ipc(self, source, condition,
2091
 
                   parent_pipe=None,
2092
 
                   proc = None,
2093
 
                   client_object=None):
 
2036
    def handle_ipc(self, source, condition, parent_pipe=None,
 
2037
                   proc = None, client_object=None):
2094
2038
        # error, or the other end of multiprocessing.Pipe has closed
2095
2039
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2096
2040
            # Wait for other process to exit
2119
2063
                parent_pipe.send(False)
2120
2064
                return False
2121
2065
            
2122
 
            gobject.io_add_watch(
2123
 
                parent_pipe.fileno(),
2124
 
                gobject.IO_IN | gobject.IO_HUP,
2125
 
                functools.partial(self.handle_ipc,
2126
 
                                  parent_pipe = parent_pipe,
2127
 
                                  proc = proc,
2128
 
                                  client_object = client))
 
2066
            gobject.io_add_watch(parent_pipe.fileno(),
 
2067
                                 gobject.IO_IN | gobject.IO_HUP,
 
2068
                                 functools.partial(self.handle_ipc,
 
2069
                                                   parent_pipe =
 
2070
                                                   parent_pipe,
 
2071
                                                   proc = proc,
 
2072
                                                   client_object =
 
2073
                                                   client))
2129
2074
            parent_pipe.send(True)
2130
2075
            # remove the old hook in favor of the new above hook on
2131
2076
            # same fileno
2137
2082
            
2138
2083
            parent_pipe.send(('data', getattr(client_object,
2139
2084
                                              funcname)(*args,
2140
 
                                                        **kwargs)))
 
2085
                                                         **kwargs)))
2141
2086
        
2142
2087
        if command == 'getattr':
2143
2088
            attrname = request[1]
2144
 
            if isinstance(client_object.__getattribute__(attrname),
2145
 
                          collections.Callable):
2146
 
                parent_pipe.send(('function', ))
 
2089
            if callable(client_object.__getattribute__(attrname)):
 
2090
                parent_pipe.send(('function',))
2147
2091
            else:
2148
 
                parent_pipe.send((
2149
 
                    'data', client_object.__getattribute__(attrname)))
 
2092
                parent_pipe.send(('data', client_object
 
2093
                                  .__getattribute__(attrname)))
2150
2094
        
2151
2095
        if command == 'setattr':
2152
2096
            attrname = request[1]
2183
2127
    # avoid excessive use of external libraries.
2184
2128
    
2185
2129
    # New type for defining tokens, syntax, and semantics all-in-one
2186
 
    Token = collections.namedtuple("Token", (
2187
 
        "regexp",  # To match token; if "value" is not None, must have
2188
 
                   # a "group" containing digits
2189
 
        "value",   # datetime.timedelta or None
2190
 
        "followers"))           # Tokens valid after this token
 
2130
    Token = collections.namedtuple("Token",
 
2131
                                   ("regexp", # To match token; if
 
2132
                                              # "value" is not None,
 
2133
                                              # must have a "group"
 
2134
                                              # containing digits
 
2135
                                    "value",  # datetime.timedelta or
 
2136
                                              # None
 
2137
                                    "followers")) # Tokens valid after
 
2138
                                                  # this token
2191
2139
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2192
2140
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2193
2141
    token_end = Token(re.compile(r"$"), None, frozenset())
2194
2142
    token_second = Token(re.compile(r"(\d+)S"),
2195
2143
                         datetime.timedelta(seconds=1),
2196
 
                         frozenset((token_end, )))
 
2144
                         frozenset((token_end,)))
2197
2145
    token_minute = Token(re.compile(r"(\d+)M"),
2198
2146
                         datetime.timedelta(minutes=1),
2199
2147
                         frozenset((token_second, token_end)))
2215
2163
                       frozenset((token_month, token_end)))
2216
2164
    token_week = Token(re.compile(r"(\d+)W"),
2217
2165
                       datetime.timedelta(weeks=1),
2218
 
                       frozenset((token_end, )))
 
2166
                       frozenset((token_end,)))
2219
2167
    token_duration = Token(re.compile(r"P"), None,
2220
2168
                           frozenset((token_year, token_month,
2221
2169
                                      token_day, token_time,
2222
 
                                      token_week)))
 
2170
                                      token_week))),
2223
2171
    # Define starting values
2224
2172
    value = datetime.timedelta() # Value so far
2225
2173
    found_token = None
2226
 
    followers = frozenset((token_duration, )) # Following valid tokens
 
2174
    followers = frozenset(token_duration,) # Following valid tokens
2227
2175
    s = duration                # String left to parse
2228
2176
    # Loop until end token is found
2229
2177
    while found_token is not token_end:
2246
2194
                break
2247
2195
        else:
2248
2196
            # No currently valid tokens were found
2249
 
            raise ValueError("Invalid RFC 3339 duration: {!r}"
2250
 
                             .format(duration))
 
2197
            raise ValueError("Invalid RFC 3339 duration")
2251
2198
    # End token found
2252
2199
    return value
2253
2200
 
2277
2224
    timevalue = datetime.timedelta(0)
2278
2225
    for s in interval.split():
2279
2226
        try:
2280
 
            suffix = s[-1]
 
2227
            suffix = unicode(s[-1])
2281
2228
            value = int(s[:-1])
2282
2229
            if suffix == "d":
2283
2230
                delta = datetime.timedelta(value)
2290
2237
            elif suffix == "w":
2291
2238
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2292
2239
            else:
2293
 
                raise ValueError("Unknown suffix {!r}".format(suffix))
2294
 
        except IndexError as e:
 
2240
                raise ValueError("Unknown suffix {0!r}"
 
2241
                                 .format(suffix))
 
2242
        except (ValueError, IndexError) as e:
2295
2243
            raise ValueError(*(e.args))
2296
2244
        timevalue += delta
2297
2245
    return timevalue
2313
2261
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2314
2262
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2315
2263
            raise OSError(errno.ENODEV,
2316
 
                          "{} not a character device"
 
2264
                          "{0} not a character device"
2317
2265
                          .format(os.devnull))
2318
2266
        os.dup2(null, sys.stdin.fileno())
2319
2267
        os.dup2(null, sys.stdout.fileno())
2329
2277
    
2330
2278
    parser = argparse.ArgumentParser()
2331
2279
    parser.add_argument("-v", "--version", action="version",
2332
 
                        version = "%(prog)s {}".format(version),
 
2280
                        version = "%(prog)s {0}".format(version),
2333
2281
                        help="show version number and exit")
2334
2282
    parser.add_argument("-i", "--interface", metavar="IF",
2335
2283
                        help="Bind to interface IF")
2341
2289
                        help="Run self-test")
2342
2290
    parser.add_argument("--debug", action="store_true",
2343
2291
                        help="Debug mode; run in foreground and log"
2344
 
                        " to terminal", default=None)
 
2292
                        " to terminal")
2345
2293
    parser.add_argument("--debuglevel", metavar="LEVEL",
2346
2294
                        help="Debug level for stdout output")
2347
2295
    parser.add_argument("--priority", help="GnuTLS"
2354
2302
                        " files")
2355
2303
    parser.add_argument("--no-dbus", action="store_false",
2356
2304
                        dest="use_dbus", help="Do not provide D-Bus"
2357
 
                        " system bus interface", default=None)
 
2305
                        " system bus interface")
2358
2306
    parser.add_argument("--no-ipv6", action="store_false",
2359
 
                        dest="use_ipv6", help="Do not use IPv6",
2360
 
                        default=None)
 
2307
                        dest="use_ipv6", help="Do not use IPv6")
2361
2308
    parser.add_argument("--no-restore", action="store_false",
2362
2309
                        dest="restore", help="Do not restore stored"
2363
 
                        " state", default=None)
 
2310
                        " state")
2364
2311
    parser.add_argument("--socket", type=int,
2365
2312
                        help="Specify a file descriptor to a network"
2366
2313
                        " socket to use instead of creating one")
2367
2314
    parser.add_argument("--statedir", metavar="DIR",
2368
2315
                        help="Directory to save/restore state in")
2369
2316
    parser.add_argument("--foreground", action="store_true",
2370
 
                        help="Run in foreground", default=None)
2371
 
    parser.add_argument("--no-zeroconf", action="store_false",
2372
 
                        dest="zeroconf", help="Do not use Zeroconf",
2373
 
                        default=None)
 
2317
                        help="Run in foreground")
2374
2318
    
2375
2319
    options = parser.parse_args()
2376
2320
    
2377
2321
    if options.check:
2378
2322
        import doctest
2379
 
        fail_count, test_count = doctest.testmod()
2380
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
2323
        doctest.testmod()
 
2324
        sys.exit()
2381
2325
    
2382
2326
    # Default values for config file for server-global settings
2383
2327
    server_defaults = { "interface": "",
2385
2329
                        "port": "",
2386
2330
                        "debug": "False",
2387
2331
                        "priority":
2388
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2389
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
2332
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2390
2333
                        "servicename": "Mandos",
2391
2334
                        "use_dbus": "True",
2392
2335
                        "use_ipv6": "True",
2395
2338
                        "socket": "",
2396
2339
                        "statedir": "/var/lib/mandos",
2397
2340
                        "foreground": "False",
2398
 
                        "zeroconf": "True",
2399
 
                    }
 
2341
                        }
2400
2342
    
2401
2343
    # Parse config file for server-global settings
2402
2344
    server_config = configparser.SafeConfigParser(server_defaults)
2403
2345
    del server_defaults
2404
 
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
 
2346
    server_config.read(os.path.join(options.configdir,
 
2347
                                    "mandos.conf"))
2405
2348
    # Convert the SafeConfigParser object to a dict
2406
2349
    server_settings = server_config.defaults()
2407
2350
    # Use the appropriate methods on the non-string config options
2425
2368
    # Override the settings from the config file with command line
2426
2369
    # options, if set.
2427
2370
    for option in ("interface", "address", "port", "debug",
2428
 
                   "priority", "servicename", "configdir", "use_dbus",
2429
 
                   "use_ipv6", "debuglevel", "restore", "statedir",
2430
 
                   "socket", "foreground", "zeroconf"):
 
2371
                   "priority", "servicename", "configdir",
 
2372
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2373
                   "statedir", "socket", "foreground"):
2431
2374
        value = getattr(options, option)
2432
2375
        if value is not None:
2433
2376
            server_settings[option] = value
2434
2377
    del options
2435
2378
    # Force all strings to be unicode
2436
2379
    for option in server_settings.keys():
2437
 
        if isinstance(server_settings[option], bytes):
2438
 
            server_settings[option] = (server_settings[option]
2439
 
                                       .decode("utf-8"))
2440
 
    # Force all boolean options to be boolean
2441
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2442
 
                   "foreground", "zeroconf"):
2443
 
        server_settings[option] = bool(server_settings[option])
 
2380
        if type(server_settings[option]) is str:
 
2381
            server_settings[option] = unicode(server_settings[option])
2444
2382
    # Debug implies foreground
2445
2383
    if server_settings["debug"]:
2446
2384
        server_settings["foreground"] = True
2448
2386
    
2449
2387
    ##################################################################
2450
2388
    
2451
 
    if (not server_settings["zeroconf"]
2452
 
        and not (server_settings["port"]
2453
 
                 or server_settings["socket"] != "")):
2454
 
        parser.error("Needs port or socket to work without Zeroconf")
2455
 
    
2456
2389
    # For convenience
2457
2390
    debug = server_settings["debug"]
2458
2391
    debuglevel = server_settings["debuglevel"]
2461
2394
    stored_state_path = os.path.join(server_settings["statedir"],
2462
2395
                                     stored_state_file)
2463
2396
    foreground = server_settings["foreground"]
2464
 
    zeroconf = server_settings["zeroconf"]
2465
2397
    
2466
2398
    if debug:
2467
2399
        initlogger(debug, logging.DEBUG)
2473
2405
            initlogger(debug, level)
2474
2406
    
2475
2407
    if server_settings["servicename"] != "Mandos":
2476
 
        syslogger.setFormatter(
2477
 
            logging.Formatter('Mandos ({}) [%(process)d]:'
2478
 
                              ' %(levelname)s: %(message)s'.format(
2479
 
                                  server_settings["servicename"])))
 
2408
        syslogger.setFormatter(logging.Formatter
 
2409
                               ('Mandos ({0}) [%(process)d]:'
 
2410
                                ' %(levelname)s: %(message)s'
 
2411
                                .format(server_settings
 
2412
                                        ["servicename"])))
2480
2413
    
2481
2414
    # Parse config file with clients
2482
2415
    client_config = configparser.SafeConfigParser(Client
2487
2420
    global mandos_dbus_service
2488
2421
    mandos_dbus_service = None
2489
2422
    
2490
 
    socketfd = None
2491
 
    if server_settings["socket"] != "":
2492
 
        socketfd = server_settings["socket"]
2493
 
    tcp_server = MandosServer(
2494
 
        (server_settings["address"], server_settings["port"]),
2495
 
        ClientHandler,
2496
 
        interface=(server_settings["interface"] or None),
2497
 
        use_ipv6=use_ipv6,
2498
 
        gnutls_priority=server_settings["priority"],
2499
 
        use_dbus=use_dbus,
2500
 
        socketfd=socketfd)
 
2423
    tcp_server = MandosServer((server_settings["address"],
 
2424
                               server_settings["port"]),
 
2425
                              ClientHandler,
 
2426
                              interface=(server_settings["interface"]
 
2427
                                         or None),
 
2428
                              use_ipv6=use_ipv6,
 
2429
                              gnutls_priority=
 
2430
                              server_settings["priority"],
 
2431
                              use_dbus=use_dbus,
 
2432
                              socketfd=(server_settings["socket"]
 
2433
                                        or None))
2501
2434
    if not foreground:
2502
 
        pidfilename = "/run/mandos.pid"
2503
 
        if not os.path.isdir("/run/."):
2504
 
            pidfilename = "/var/run/mandos.pid"
 
2435
        pidfilename = "/var/run/mandos.pid"
2505
2436
        pidfile = None
2506
2437
        try:
2507
 
            pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
 
2438
            pidfile = open(pidfilename, "w")
2508
2439
        except IOError as e:
2509
2440
            logger.error("Could not open file %r", pidfilename,
2510
2441
                         exc_info=e)
2524
2455
        os.setuid(uid)
2525
2456
    except OSError as error:
2526
2457
        if error.errno != errno.EPERM:
2527
 
            raise
 
2458
            raise error
2528
2459
    
2529
2460
    if debug:
2530
2461
        # Enable all possible GnuTLS debugging
2537
2468
        def debug_gnutls(level, string):
2538
2469
            logger.debug("GnuTLS: %s", string[:-1])
2539
2470
        
2540
 
        gnutls.library.functions.gnutls_global_set_log_function(
2541
 
            debug_gnutls)
 
2471
        (gnutls.library.functions
 
2472
         .gnutls_global_set_log_function(debug_gnutls))
2542
2473
        
2543
2474
        # Redirect stdin so all checkers get /dev/null
2544
2475
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2564
2495
    if use_dbus:
2565
2496
        try:
2566
2497
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2567
 
                                            bus,
2568
 
                                            do_not_queue=True)
2569
 
            old_bus_name = dbus.service.BusName(
2570
 
                "se.bsnet.fukt.Mandos", bus,
2571
 
                do_not_queue=True)
2572
 
        except dbus.exceptions.DBusException as e:
 
2498
                                            bus, do_not_queue=True)
 
2499
            old_bus_name = (dbus.service.BusName
 
2500
                            ("se.bsnet.fukt.Mandos", bus,
 
2501
                             do_not_queue=True))
 
2502
        except dbus.exceptions.NameExistsException as e:
2573
2503
            logger.error("Disabling D-Bus:", exc_info=e)
2574
2504
            use_dbus = False
2575
2505
            server_settings["use_dbus"] = False
2576
2506
            tcp_server.use_dbus = False
2577
 
    if zeroconf:
2578
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2579
 
        service = AvahiServiceToSyslog(
2580
 
            name = server_settings["servicename"],
2581
 
            servicetype = "_mandos._tcp",
2582
 
            protocol = protocol,
2583
 
            bus = bus)
2584
 
        if server_settings["interface"]:
2585
 
            service.interface = if_nametoindex(
2586
 
                server_settings["interface"].encode("utf-8"))
 
2507
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
2508
    service = AvahiServiceToSyslog(name =
 
2509
                                   server_settings["servicename"],
 
2510
                                   servicetype = "_mandos._tcp",
 
2511
                                   protocol = protocol, bus = bus)
 
2512
    if server_settings["interface"]:
 
2513
        service.interface = (if_nametoindex
 
2514
                             (str(server_settings["interface"])))
2587
2515
    
2588
2516
    global multiprocessing_manager
2589
2517
    multiprocessing_manager = multiprocessing.Manager()
2596
2524
    old_client_settings = {}
2597
2525
    clients_data = {}
2598
2526
    
2599
 
    # This is used to redirect stdout and stderr for checker processes
2600
 
    global wnull
2601
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2602
 
    # Only used if server is running in foreground but not in debug
2603
 
    # mode
2604
 
    if debug or not foreground:
2605
 
        wnull.close()
2606
 
    
2607
2527
    # Get client data and settings from last running state.
2608
2528
    if server_settings["restore"]:
2609
2529
        try:
2610
2530
            with open(stored_state_path, "rb") as stored_state:
2611
 
                clients_data, old_client_settings = pickle.load(
2612
 
                    stored_state)
 
2531
                clients_data, old_client_settings = (pickle.load
 
2532
                                                     (stored_state))
2613
2533
            os.remove(stored_state_path)
2614
2534
        except IOError as e:
2615
2535
            if e.errno == errno.ENOENT:
2616
 
                logger.warning("Could not load persistent state:"
2617
 
                               " {}".format(os.strerror(e.errno)))
 
2536
                logger.warning("Could not load persistent state: {0}"
 
2537
                                .format(os.strerror(e.errno)))
2618
2538
            else:
2619
2539
                logger.critical("Could not load persistent state:",
2620
2540
                                exc_info=e)
2621
2541
                raise
2622
2542
        except EOFError as e:
2623
2543
            logger.warning("Could not load persistent state: "
2624
 
                           "EOFError:",
2625
 
                           exc_info=e)
 
2544
                           "EOFError:", exc_info=e)
2626
2545
    
2627
2546
    with PGPEngine() as pgp:
2628
 
        for client_name, client in clients_data.items():
2629
 
            # Skip removed clients
2630
 
            if client_name not in client_settings:
2631
 
                continue
2632
 
            
 
2547
        for client_name, client in clients_data.iteritems():
2633
2548
            # Decide which value to use after restoring saved state.
2634
2549
            # We have three different values: Old config file,
2635
2550
            # new config file, and saved state.
2640
2555
                    # For each value in new config, check if it
2641
2556
                    # differs from the old config value (Except for
2642
2557
                    # the "secret" attribute)
2643
 
                    if (name != "secret"
2644
 
                        and (value !=
2645
 
                             old_client_settings[client_name][name])):
 
2558
                    if (name != "secret" and
 
2559
                        value != old_client_settings[client_name]
 
2560
                        [name]):
2646
2561
                        client[name] = value
2647
2562
                except KeyError:
2648
2563
                    pass
2649
2564
            
2650
2565
            # Clients who has passed its expire date can still be
2651
 
            # enabled if its last checker was successful.  A Client
 
2566
            # enabled if its last checker was successful.  Clients
2652
2567
            # whose checker succeeded before we stored its state is
2653
2568
            # assumed to have successfully run all checkers during
2654
2569
            # downtime.
2656
2571
                if datetime.datetime.utcnow() >= client["expires"]:
2657
2572
                    if not client["last_checked_ok"]:
2658
2573
                        logger.warning(
2659
 
                            "disabling client {} - Client never "
2660
 
                            "performed a successful checker".format(
2661
 
                                client_name))
 
2574
                            "disabling client {0} - Client never "
 
2575
                            "performed a successful checker"
 
2576
                            .format(client_name))
2662
2577
                        client["enabled"] = False
2663
2578
                    elif client["last_checker_status"] != 0:
2664
2579
                        logger.warning(
2665
 
                            "disabling client {} - Client last"
2666
 
                            " checker failed with error code"
2667
 
                            " {}".format(
2668
 
                                client_name,
2669
 
                                client["last_checker_status"]))
 
2580
                            "disabling client {0} - Client "
 
2581
                            "last checker failed with error code {1}"
 
2582
                            .format(client_name,
 
2583
                                    client["last_checker_status"]))
2670
2584
                        client["enabled"] = False
2671
2585
                    else:
2672
 
                        client["expires"] = (
2673
 
                            datetime.datetime.utcnow()
2674
 
                            + client["timeout"])
 
2586
                        client["expires"] = (datetime.datetime
 
2587
                                             .utcnow()
 
2588
                                             + client["timeout"])
2675
2589
                        logger.debug("Last checker succeeded,"
2676
 
                                     " keeping {} enabled".format(
2677
 
                                         client_name))
 
2590
                                     " keeping {0} enabled"
 
2591
                                     .format(client_name))
2678
2592
            try:
2679
 
                client["secret"] = pgp.decrypt(
2680
 
                    client["encrypted_secret"],
2681
 
                    client_settings[client_name]["secret"])
 
2593
                client["secret"] = (
 
2594
                    pgp.decrypt(client["encrypted_secret"],
 
2595
                                client_settings[client_name]
 
2596
                                ["secret"]))
2682
2597
            except PGPError:
2683
2598
                # If decryption fails, we use secret from new settings
2684
 
                logger.debug("Failed to decrypt {} old secret".format(
2685
 
                    client_name))
2686
 
                client["secret"] = (client_settings[client_name]
2687
 
                                    ["secret"])
 
2599
                logger.debug("Failed to decrypt {0} old secret"
 
2600
                             .format(client_name))
 
2601
                client["secret"] = (
 
2602
                    client_settings[client_name]["secret"])
2688
2603
    
2689
2604
    # Add/remove clients based on new changes made to config
2690
2605
    for client_name in (set(old_client_settings)
2695
2610
        clients_data[client_name] = client_settings[client_name]
2696
2611
    
2697
2612
    # Create all client objects
2698
 
    for client_name, client in clients_data.items():
 
2613
    for client_name, client in clients_data.iteritems():
2699
2614
        tcp_server.clients[client_name] = client_class(
2700
 
            name = client_name,
2701
 
            settings = client,
2702
 
            server_settings = server_settings)
 
2615
            name = client_name, settings = client)
2703
2616
    
2704
2617
    if not tcp_server.clients:
2705
2618
        logger.warning("No clients defined")
2706
2619
    
2707
2620
    if not foreground:
2708
2621
        if pidfile is not None:
2709
 
            pid = os.getpid()
2710
2622
            try:
2711
2623
                with pidfile:
2712
 
                    print(pid, file=pidfile)
 
2624
                    pid = os.getpid()
 
2625
                    pidfile.write(str(pid) + "\n".encode("utf-8"))
2713
2626
            except IOError:
2714
2627
                logger.error("Could not write to file %r with PID %d",
2715
2628
                             pidfilename, pid)
2720
2633
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2721
2634
    
2722
2635
    if use_dbus:
2723
 
        
2724
 
        @alternate_dbus_interfaces(
2725
 
            { "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
 
2636
        @alternate_dbus_interfaces({"se.recompile.Mandos":
 
2637
                                        "se.bsnet.fukt.Mandos"})
2726
2638
        class MandosDBusService(DBusObjectWithProperties):
2727
2639
            """A D-Bus proxy object"""
2728
 
            
2729
2640
            def __init__(self):
2730
2641
                dbus.service.Object.__init__(self, bus, "/")
2731
 
            
2732
2642
            _interface = "se.recompile.Mandos"
2733
2643
            
2734
2644
            @dbus_interface_annotations(_interface)
2735
2645
            def _foo(self):
2736
 
                return {
2737
 
                    "org.freedesktop.DBus.Property.EmitsChangedSignal":
2738
 
                    "false" }
 
2646
                return { "org.freedesktop.DBus.Property"
 
2647
                         ".EmitsChangedSignal":
 
2648
                             "false"}
2739
2649
            
2740
2650
            @dbus.service.signal(_interface, signature="o")
2741
2651
            def ClientAdded(self, objpath):
2755
2665
            @dbus.service.method(_interface, out_signature="ao")
2756
2666
            def GetAllClients(self):
2757
2667
                "D-Bus method"
2758
 
                return dbus.Array(c.dbus_object_path for c in
 
2668
                return dbus.Array(c.dbus_object_path
 
2669
                                  for c in
2759
2670
                                  tcp_server.clients.itervalues())
2760
2671
            
2761
2672
            @dbus.service.method(_interface,
2763
2674
            def GetAllClientsWithProperties(self):
2764
2675
                "D-Bus method"
2765
2676
                return dbus.Dictionary(
2766
 
                    { c.dbus_object_path: c.GetAll("")
2767
 
                      for c in tcp_server.clients.itervalues() },
 
2677
                    ((c.dbus_object_path, c.GetAll(""))
 
2678
                     for c in tcp_server.clients.itervalues()),
2768
2679
                    signature="oa{sv}")
2769
2680
            
2770
2681
            @dbus.service.method(_interface, in_signature="o")
2787
2698
    
2788
2699
    def cleanup():
2789
2700
        "Cleanup function; run on exit"
2790
 
        if zeroconf:
2791
 
            service.cleanup()
 
2701
        service.cleanup()
2792
2702
        
2793
2703
        multiprocessing.active_children()
2794
 
        wnull.close()
2795
2704
        if not (tcp_server.clients or client_settings):
2796
2705
            return
2797
2706
        
2808
2717
                
2809
2718
                # A list of attributes that can not be pickled
2810
2719
                # + secret.
2811
 
                exclude = { "bus", "changedstate", "secret",
2812
 
                            "checker", "server_settings" }
2813
 
                for name, typ in inspect.getmembers(dbus.service
2814
 
                                                    .Object):
 
2720
                exclude = set(("bus", "changedstate", "secret",
 
2721
                               "checker"))
 
2722
                for name, typ in (inspect.getmembers
 
2723
                                  (dbus.service.Object)):
2815
2724
                    exclude.add(name)
2816
2725
                
2817
2726
                client_dict["encrypted_secret"] = (client
2824
2733
                del client_settings[client.name]["secret"]
2825
2734
        
2826
2735
        try:
2827
 
            with tempfile.NamedTemporaryFile(
2828
 
                    mode='wb',
2829
 
                    suffix=".pickle",
2830
 
                    prefix='clients-',
2831
 
                    dir=os.path.dirname(stored_state_path),
2832
 
                    delete=False) as stored_state:
 
2736
            with (tempfile.NamedTemporaryFile
 
2737
                  (mode='wb', suffix=".pickle", prefix='clients-',
 
2738
                   dir=os.path.dirname(stored_state_path),
 
2739
                   delete=False)) as stored_state:
2833
2740
                pickle.dump((clients, client_settings), stored_state)
2834
 
                tempname = stored_state.name
 
2741
                tempname=stored_state.name
2835
2742
            os.rename(tempname, stored_state_path)
2836
2743
        except (IOError, OSError) as e:
2837
2744
            if not debug:
2840
2747
                except NameError:
2841
2748
                    pass
2842
2749
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2843
 
                logger.warning("Could not save persistent state: {}"
 
2750
                logger.warning("Could not save persistent state: {0}"
2844
2751
                               .format(os.strerror(e.errno)))
2845
2752
            else:
2846
2753
                logger.warning("Could not save persistent state:",
2847
2754
                               exc_info=e)
2848
 
                raise
 
2755
                raise e
2849
2756
        
2850
2757
        # Delete all clients, and settings from config
2851
2758
        while tcp_server.clients:
2856
2763
            client.disable(quiet=True)
2857
2764
            if use_dbus:
2858
2765
                # Emit D-Bus signal
2859
 
                mandos_dbus_service.ClientRemoved(
2860
 
                    client.dbus_object_path, client.name)
 
2766
                mandos_dbus_service.ClientRemoved(client
 
2767
                                                  .dbus_object_path,
 
2768
                                                  client.name)
2861
2769
        client_settings.clear()
2862
2770
    
2863
2771
    atexit.register(cleanup)
2874
2782
    tcp_server.server_activate()
2875
2783
    
2876
2784
    # Find out what port we got
2877
 
    if zeroconf:
2878
 
        service.port = tcp_server.socket.getsockname()[1]
 
2785
    service.port = tcp_server.socket.getsockname()[1]
2879
2786
    if use_ipv6:
2880
2787
        logger.info("Now listening on address %r, port %d,"
2881
2788
                    " flowinfo %d, scope_id %d",
2887
2794
    #service.interface = tcp_server.socket.getsockname()[3]
2888
2795
    
2889
2796
    try:
2890
 
        if zeroconf:
2891
 
            # From the Avahi example code
2892
 
            try:
2893
 
                service.activate()
2894
 
            except dbus.exceptions.DBusException as error:
2895
 
                logger.critical("D-Bus Exception", exc_info=error)
2896
 
                cleanup()
2897
 
                sys.exit(1)
2898
 
            # End of Avahi example code
 
2797
        # From the Avahi example code
 
2798
        try:
 
2799
            service.activate()
 
2800
        except dbus.exceptions.DBusException as error:
 
2801
            logger.critical("D-Bus Exception", exc_info=error)
 
2802
            cleanup()
 
2803
            sys.exit(1)
 
2804
        # End of Avahi example code
2899
2805
        
2900
2806
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2901
2807
                             lambda *args, **kwargs:
2916
2822
    # Must run before the D-Bus bus name gets deregistered
2917
2823
    cleanup()
2918
2824
 
2919
 
 
2920
2825
if __name__ == '__main__':
2921
2826
    main()