/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

Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008,2009 Teddy Hogeborn
15
 
# Copyright © 2008,2009 Björn Påhlsson
 
14
# Copyright © 2008-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
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@fukt.bsnet.se>.
 
31
# Contact the authors at <mandos@recompile.se>.
32
32
33
33
 
34
 
from __future__ import division, with_statement, absolute_import
 
34
from __future__ import (division, absolute_import, print_function,
 
35
                        unicode_literals)
35
36
 
36
37
import SocketServer as socketserver
37
38
import socket
38
 
import optparse
 
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
61
62
import functools
62
63
import cPickle as pickle
63
64
import multiprocessing
 
65
import types
 
66
import binascii
 
67
import tempfile
64
68
 
65
69
import dbus
66
70
import dbus.service
71
75
import ctypes.util
72
76
import xml.dom.minidom
73
77
import inspect
 
78
import GnuPGInterface
74
79
 
75
80
try:
76
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
80
85
    except ImportError:
81
86
        SO_BINDTODEVICE = None
82
87
 
83
 
 
84
 
version = "1.0.14"
85
 
 
86
 
#logger = logging.getLogger(u'mandos')
87
 
logger = logging.Logger(u'mandos')
 
88
version = "1.5.3"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
88
92
syslogger = (logging.handlers.SysLogHandler
89
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
90
 
              address = "/dev/log"))
91
 
syslogger.setFormatter(logging.Formatter
92
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
93
 
                        u' %(message)s'))
94
 
logger.addHandler(syslogger)
95
 
 
96
 
console = logging.StreamHandler()
97
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
 
                                       u' %(levelname)s:'
99
 
                                       u' %(message)s'))
100
 
logger.addHandler(console)
 
94
              address = str("/dev/log")))
 
95
 
 
96
try:
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
 
100
except (OSError, AttributeError):
 
101
    def if_nametoindex(interface):
 
102
        "Get an interface index the hard way, i.e. using fcntl()"
 
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
104
        with contextlib.closing(socket.socket()) as s:
 
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
 
110
        return interface_index
 
111
 
 
112
 
 
113
def initlogger(debug, level=logging.WARNING):
 
114
    """init logger and add loglevel"""
 
115
    
 
116
    syslogger.setFormatter(logging.Formatter
 
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
118
                            ' %(message)s'))
 
119
    logger.addHandler(syslogger)
 
120
    
 
121
    if debug:
 
122
        console = logging.StreamHandler()
 
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                               ' [%(process)d]:'
 
125
                                               ' %(levelname)s:'
 
126
                                               ' %(message)s'))
 
127
        logger.addHandler(console)
 
128
    logger.setLevel(level)
 
129
 
 
130
 
 
131
class PGPError(Exception):
 
132
    """Exception if encryption/decryption fails"""
 
133
    pass
 
134
 
 
135
 
 
136
class PGPEngine(object):
 
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
 
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
 
147
    
 
148
    def __enter__(self):
 
149
        return self
 
150
    
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
        self._cleanup()
 
153
        return False
 
154
    
 
155
    def __del__(self):
 
156
        self._cleanup()
 
157
    
 
158
    def _cleanup(self):
 
159
        if self.tempdir is not None:
 
160
            # Delete contents of tempdir
 
161
            for root, dirs, files in os.walk(self.tempdir,
 
162
                                             topdown = False):
 
163
                for filename in files:
 
164
                    os.remove(os.path.join(root, filename))
 
165
                for dirname in dirs:
 
166
                    os.rmdir(os.path.join(root, dirname))
 
167
            # Remove tempdir
 
168
            os.rmdir(self.tempdir)
 
169
            self.tempdir = None
 
170
    
 
171
    def password_encode(self, password):
 
172
        # Passphrase can not be empty and can not contain newlines or
 
173
        # NUL bytes.  So we prefix it and hex encode it.
 
174
        return b"mandos" + binascii.hexlify(password)
 
175
    
 
176
    def encrypt(self, data, password):
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
 
191
        return ciphertext
 
192
    
 
193
    def decrypt(self, data, password):
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
 
208
        return decrypted_plaintext
 
209
 
 
210
 
101
211
 
102
212
class AvahiError(Exception):
103
213
    def __init__(self, value, *args, **kwargs):
119
229
    Attributes:
120
230
    interface: integer; avahi.IF_UNSPEC or an interface index.
121
231
               Used to optionally bind to the specified interface.
122
 
    name: string; Example: u'Mandos'
123
 
    type: string; Example: u'_mandos._tcp'.
 
232
    name: string; Example: 'Mandos'
 
233
    type: string; Example: '_mandos._tcp'.
124
234
                  See <http://www.dns-sd.org/ServiceTypes.html>
125
235
    port: integer; what port to announce
126
236
    TXT: list of strings; TXT record for the service
135
245
    """
136
246
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
137
247
                 servicetype = None, port = None, TXT = None,
138
 
                 domain = u"", host = u"", max_renames = 32768,
 
248
                 domain = "", host = "", max_renames = 32768,
139
249
                 protocol = avahi.PROTO_UNSPEC, bus = None):
140
250
        self.interface = interface
141
251
        self.name = name
150
260
        self.group = None       # our entry group
151
261
        self.server = None
152
262
        self.bus = bus
 
263
        self.entry_group_state_changed_match = None
153
264
    def rename(self):
154
265
        """Derived from the Avahi example code"""
155
266
        if self.rename_count >= self.max_renames:
156
 
            logger.critical(u"No suitable Zeroconf service name found"
157
 
                            u" after %i retries, exiting.",
 
267
            logger.critical("No suitable Zeroconf service name found"
 
268
                            " after %i retries, exiting.",
158
269
                            self.rename_count)
159
 
            raise AvahiServiceError(u"Too many renames")
160
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
 
        logger.info(u"Changing Zeroconf service name to %r ...",
 
270
            raise AvahiServiceError("Too many renames")
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
 
273
        logger.info("Changing Zeroconf service name to %r ...",
162
274
                    self.name)
163
 
        syslogger.setFormatter(logging.Formatter
164
 
                               (u'Mandos (%s) [%%(process)d]:'
165
 
                                u' %%(levelname)s: %%(message)s'
166
 
                                % self.name))
167
275
        self.remove()
168
276
        try:
169
277
            self.add()
170
 
        except dbus.exceptions.DBusException, error:
171
 
            logger.critical(u"DBusException: %s", error)
 
278
        except dbus.exceptions.DBusException as error:
 
279
            logger.critical("DBusException: %s", error)
172
280
            self.cleanup()
173
281
            os._exit(1)
174
282
        self.rename_count += 1
175
283
    def remove(self):
176
284
        """Derived from the Avahi example code"""
 
285
        if self.entry_group_state_changed_match is not None:
 
286
            self.entry_group_state_changed_match.remove()
 
287
            self.entry_group_state_changed_match = None
177
288
        if self.group is not None:
178
289
            self.group.Reset()
179
290
    def add(self):
180
291
        """Derived from the Avahi example code"""
 
292
        self.remove()
181
293
        if self.group is None:
182
294
            self.group = dbus.Interface(
183
295
                self.bus.get_object(avahi.DBUS_NAME,
184
296
                                    self.server.EntryGroupNew()),
185
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
186
 
            self.group.connect_to_signal('StateChanged',
187
 
                                         self
188
 
                                         .entry_group_state_changed)
189
 
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
 
298
        self.entry_group_state_changed_match = (
 
299
            self.group.connect_to_signal(
 
300
                'StateChanged', self.entry_group_state_changed))
 
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
190
302
                     self.name, self.type)
191
303
        self.group.AddService(
192
304
            self.interface,
199
311
        self.group.Commit()
200
312
    def entry_group_state_changed(self, state, error):
201
313
        """Derived from the Avahi example code"""
202
 
        logger.debug(u"Avahi entry group state change: %i", state)
 
314
        logger.debug("Avahi entry group state change: %i", state)
203
315
        
204
316
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
205
 
            logger.debug(u"Zeroconf service established.")
 
317
            logger.debug("Zeroconf service established.")
206
318
        elif state == avahi.ENTRY_GROUP_COLLISION:
207
 
            logger.warning(u"Zeroconf service name collision.")
 
319
            logger.info("Zeroconf service name collision.")
208
320
            self.rename()
209
321
        elif state == avahi.ENTRY_GROUP_FAILURE:
210
 
            logger.critical(u"Avahi: Error in group state changed %s",
 
322
            logger.critical("Avahi: Error in group state changed %s",
211
323
                            unicode(error))
212
 
            raise AvahiGroupError(u"State changed: %s"
 
324
            raise AvahiGroupError("State changed: %s"
213
325
                                  % unicode(error))
214
326
    def cleanup(self):
215
327
        """Derived from the Avahi example code"""
216
328
        if self.group is not None:
217
 
            self.group.Free()
 
329
            try:
 
330
                self.group.Free()
 
331
            except (dbus.exceptions.UnknownMethodException,
 
332
                    dbus.exceptions.DBusException):
 
333
                pass
218
334
            self.group = None
219
 
    def server_state_changed(self, state):
 
335
        self.remove()
 
336
    def server_state_changed(self, state, error=None):
220
337
        """Derived from the Avahi example code"""
221
 
        logger.debug(u"Avahi server state change: %i", state)
222
 
        if state == avahi.SERVER_COLLISION:
223
 
            logger.error(u"Zeroconf server name collision")
224
 
            self.remove()
 
338
        logger.debug("Avahi server state change: %i", state)
 
339
        bad_states = { avahi.SERVER_INVALID:
 
340
                           "Zeroconf server invalid",
 
341
                       avahi.SERVER_REGISTERING: None,
 
342
                       avahi.SERVER_COLLISION:
 
343
                           "Zeroconf server name collision",
 
344
                       avahi.SERVER_FAILURE:
 
345
                           "Zeroconf server failure" }
 
346
        if state in bad_states:
 
347
            if bad_states[state] is not None:
 
348
                if error is None:
 
349
                    logger.error(bad_states[state])
 
350
                else:
 
351
                    logger.error(bad_states[state] + ": %r", error)
 
352
            self.cleanup()
225
353
        elif state == avahi.SERVER_RUNNING:
226
354
            self.add()
 
355
        else:
 
356
            if error is None:
 
357
                logger.debug("Unknown state: %r", state)
 
358
            else:
 
359
                logger.debug("Unknown state: %r: %r", state, error)
227
360
    def activate(self):
228
361
        """Derived from the Avahi example code"""
229
362
        if self.server is None:
230
363
            self.server = dbus.Interface(
231
364
                self.bus.get_object(avahi.DBUS_NAME,
232
 
                                    avahi.DBUS_PATH_SERVER),
 
365
                                    avahi.DBUS_PATH_SERVER,
 
366
                                    follow_name_owner_changes=True),
233
367
                avahi.DBUS_INTERFACE_SERVER)
234
 
        self.server.connect_to_signal(u"StateChanged",
 
368
        self.server.connect_to_signal("StateChanged",
235
369
                                 self.server_state_changed)
236
370
        self.server_state_changed(self.server.GetState())
237
371
 
 
372
class AvahiServiceToSyslog(AvahiService):
 
373
    def rename(self):
 
374
        """Add the new name to the syslog messages"""
 
375
        ret = AvahiService.rename(self)
 
376
        syslogger.setFormatter(logging.Formatter
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
 
380
        return ret
238
381
 
 
382
def timedelta_to_milliseconds(td):
 
383
    "Convert a datetime.timedelta() to milliseconds"
 
384
    return ((td.days * 24 * 60 * 60 * 1000)
 
385
            + (td.seconds * 1000)
 
386
            + (td.microseconds // 1000))
 
387
        
239
388
class Client(object):
240
389
    """A representation of a client host served by this server.
241
390
    
242
391
    Attributes:
243
 
    name:       string; from the config file, used in log messages and
244
 
                        D-Bus identifiers
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
 
393
    approval_delay: datetime.timedelta(); Time to wait for approval
 
394
    approval_duration: datetime.timedelta(); Duration of one approval
 
395
    checker:    subprocess.Popen(); a running checker process used
 
396
                                    to see if the client lives.
 
397
                                    'None' if no process is running.
 
398
    checker_callback_tag: a gobject event source tag, or None
 
399
    checker_command: string; External command which is run to check
 
400
                     if client lives.  %() expansions are done at
 
401
                     runtime with vars(self) as dict, so that for
 
402
                     instance %(name)s can be used in the command.
 
403
    checker_initiator_tag: a gobject event source tag, or None
 
404
    created:    datetime.datetime(); (UTC) object creation
 
405
    client_structure: Object describing what attributes a client has
 
406
                      and is used for storing the client at exit
 
407
    current_checker_command: string; current running checker_command
 
408
    disable_initiator_tag: a gobject event source tag, or None
 
409
    enabled:    bool()
245
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
246
411
                 uniquely identify the client
247
 
    secret:     bytestring; sent verbatim (over TLS) to client
248
412
    host:       string; available for use by the checker command
249
 
    created:    datetime.datetime(); (UTC) object creation
250
 
    last_enabled: datetime.datetime(); (UTC)
251
 
    enabled:    bool()
 
413
    interval:   datetime.timedelta(); How often to start a new checker
 
414
    last_approval_request: datetime.datetime(); (UTC) or None
252
415
    last_checked_ok: datetime.datetime(); (UTC) or None
 
416
    last_checker_status: integer between 0 and 255 reflecting exit
 
417
                         status of last checker. -1 reflects crashed
 
418
                         checker, -2 means no checker completed yet.
 
419
    last_enabled: datetime.datetime(); (UTC) or None
 
420
    name:       string; from the config file, used in log messages and
 
421
                        D-Bus identifiers
 
422
    secret:     bytestring; sent verbatim (over TLS) to client
253
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
254
424
                                      until this client is disabled
255
 
    interval:   datetime.timedelta(); How often to start a new checker
256
 
    disable_hook:  If set, called by disable() as disable_hook(self)
257
 
    checker:    subprocess.Popen(); a running checker process used
258
 
                                    to see if the client lives.
259
 
                                    'None' if no process is running.
260
 
    checker_initiator_tag: a gobject event source tag, or None
261
 
    disable_initiator_tag: - '' -
262
 
    checker_callback_tag:  - '' -
263
 
    checker_command: string; External command which is run to check if
264
 
                     client lives.  %() expansions are done at
265
 
                     runtime with vars(self) as dict, so that for
266
 
                     instance %(name)s can be used in the command.
267
 
    current_checker_command: string; current running checker_command
268
 
    approval_delay: datetime.timedelta(); Time to wait for approval
269
 
    _approved:   bool(); 'None' if not yet approved/disapproved
270
 
    approval_duration: datetime.timedelta(); Duration of one approval
 
425
    extended_timeout:   extra long timeout when secret has been sent
 
426
    runtime_expansions: Allowed attributes for runtime expansion.
 
427
    expires:    datetime.datetime(); time (UTC) when a client will be
 
428
                disabled, or None
271
429
    """
272
430
    
273
 
    @staticmethod
274
 
    def _timedelta_to_milliseconds(td):
275
 
        "Convert a datetime.timedelta() to milliseconds"
276
 
        return ((td.days * 24 * 60 * 60 * 1000)
277
 
                + (td.seconds * 1000)
278
 
                + (td.microseconds // 1000))
 
431
    runtime_expansions = ("approval_delay", "approval_duration",
 
432
                          "created", "enabled", "fingerprint",
 
433
                          "host", "interval", "last_checked_ok",
 
434
                          "last_enabled", "name", "timeout")
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
 
438
                        "checker": "fping -q -- %%(host)s",
 
439
                        "host": "",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
 
442
                        "approved_by_default": "True",
 
443
                        "enabled": "True",
 
444
                        }
279
445
    
280
446
    def timeout_milliseconds(self):
281
447
        "Return the 'timeout' attribute in milliseconds"
282
 
        return self._timedelta_to_milliseconds(self.timeout)
 
448
        return timedelta_to_milliseconds(self.timeout)
 
449
    
 
450
    def extended_timeout_milliseconds(self):
 
451
        "Return the 'extended_timeout' attribute in milliseconds"
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
283
453
    
284
454
    def interval_milliseconds(self):
285
455
        "Return the 'interval' attribute in milliseconds"
286
 
        return self._timedelta_to_milliseconds(self.interval)
287
 
 
 
456
        return timedelta_to_milliseconds(self.interval)
 
457
    
288
458
    def approval_delay_milliseconds(self):
289
 
        return self._timedelta_to_milliseconds(self.approval_delay)
290
 
    
291
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
460
 
 
461
    @staticmethod
 
462
    def config_parser(config):
 
463
        """Construct a new dict of client settings of this form:
 
464
        { client_name: {setting_name: value, ...}, ...}
 
465
        with exceptions for any special settings as defined above.
 
466
        NOTE: Must be a pure function. Must return the same result
 
467
        value given the same arguments.
 
468
        """
 
469
        settings = {}
 
470
        for client_name in config.sections():
 
471
            section = dict(config.items(client_name))
 
472
            client = settings[client_name] = {}
 
473
            
 
474
            client["host"] = section["host"]
 
475
            # Reformat values from string types to Python types
 
476
            client["approved_by_default"] = config.getboolean(
 
477
                client_name, "approved_by_default")
 
478
            client["enabled"] = config.getboolean(client_name,
 
479
                                                  "enabled")
 
480
            
 
481
            client["fingerprint"] = (section["fingerprint"].upper()
 
482
                                     .replace(" ", ""))
 
483
            if "secret" in section:
 
484
                client["secret"] = section["secret"].decode("base64")
 
485
            elif "secfile" in section:
 
486
                with open(os.path.expanduser(os.path.expandvars
 
487
                                             (section["secfile"])),
 
488
                          "rb") as secfile:
 
489
                    client["secret"] = secfile.read()
 
490
            else:
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
 
493
            client["timeout"] = string_to_delta(section["timeout"])
 
494
            client["extended_timeout"] = string_to_delta(
 
495
                section["extended_timeout"])
 
496
            client["interval"] = string_to_delta(section["interval"])
 
497
            client["approval_delay"] = string_to_delta(
 
498
                section["approval_delay"])
 
499
            client["approval_duration"] = string_to_delta(
 
500
                section["approval_duration"])
 
501
            client["checker_command"] = section["checker"]
 
502
            client["last_approval_request"] = None
 
503
            client["last_checked_ok"] = None
 
504
            client["last_checker_status"] = -2
 
505
        
 
506
        return settings
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
292
510
        """Note: the 'checker' key in 'config' sets the
293
511
        'checker_command' attribute and *not* the 'checker'
294
512
        attribute."""
295
513
        self.name = name
296
 
        if config is None:
297
 
            config = {}
298
 
        logger.debug(u"Creating client %r", self.name)
 
514
        # adding all client settings
 
515
        for setting, value in settings.iteritems():
 
516
            setattr(self, setting, value)
 
517
        
 
518
        if self.enabled:
 
519
            if not hasattr(self, "last_enabled"):
 
520
                self.last_enabled = datetime.datetime.utcnow()
 
521
            if not hasattr(self, "expires"):
 
522
                self.expires = (datetime.datetime.utcnow()
 
523
                                + self.timeout)
 
524
        else:
 
525
            self.last_enabled = None
 
526
            self.expires = None
 
527
       
 
528
        logger.debug("Creating client %r", self.name)
299
529
        # Uppercase and remove spaces from fingerprint for later
300
530
        # comparison purposes with return value from the fingerprint()
301
531
        # function
302
 
        self.fingerprint = (config[u"fingerprint"].upper()
303
 
                            .replace(u" ", u""))
304
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
305
 
        if u"secret" in config:
306
 
            self.secret = config[u"secret"].decode(u"base64")
307
 
        elif u"secfile" in config:
308
 
            with open(os.path.expanduser(os.path.expandvars
309
 
                                         (config[u"secfile"])),
310
 
                      "rb") as secfile:
311
 
                self.secret = secfile.read()
312
 
        else:
313
 
            raise TypeError(u"No secret or secfile for client %s"
314
 
                            % self.name)
315
 
        self.host = config.get(u"host", u"")
316
 
        self.created = datetime.datetime.utcnow()
317
 
        self.enabled = False
318
 
        self.last_enabled = None
319
 
        self.last_checked_ok = None
320
 
        self.timeout = string_to_delta(config[u"timeout"])
321
 
        self.interval = string_to_delta(config[u"interval"])
322
 
        self.disable_hook = disable_hook
 
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
323
537
        self.checker = None
324
538
        self.checker_initiator_tag = None
325
539
        self.disable_initiator_tag = None
326
540
        self.checker_callback_tag = None
327
 
        self.checker_command = config[u"checker"]
328
541
        self.current_checker_command = None
329
 
        self.last_connect = None
330
 
        self._approved = None
331
 
        self.approved_by_default = config.get(u"approved_by_default",
332
 
                                              True)
 
542
        self.approved = None
333
543
        self.approvals_pending = 0
334
 
        self.approval_delay = string_to_delta(
335
 
            config[u"approval_delay"])
336
 
        self.approval_duration = string_to_delta(
337
 
            config[u"approval_duration"])
338
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
544
        self.changedstate = (multiprocessing_manager
 
545
                             .Condition(multiprocessing_manager
 
546
                                        .Lock()))
 
547
        self.client_structure = [attr for attr in
 
548
                                 self.__dict__.iterkeys()
 
549
                                 if not attr.startswith("_")]
 
550
        self.client_structure.append("client_structure")
 
551
        
 
552
        for name, t in inspect.getmembers(type(self),
 
553
                                          lambda obj:
 
554
                                              isinstance(obj,
 
555
                                                         property)):
 
556
            if not name.startswith("_"):
 
557
                self.client_structure.append(name)
339
558
    
 
559
    # Send notice to process children that client state has changed
340
560
    def send_changedstate(self):
341
 
        self.changedstate.acquire()
342
 
        self.changedstate.notify_all()
343
 
        self.changedstate.release()
344
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
345
564
    def enable(self):
346
565
        """Start this client's checker and timeout hooks"""
347
 
        if getattr(self, u"enabled", False):
 
566
        if getattr(self, "enabled", False):
348
567
            # Already enabled
349
568
            return
350
569
        self.send_changedstate()
 
570
        self.expires = datetime.datetime.utcnow() + self.timeout
 
571
        self.enabled = True
351
572
        self.last_enabled = datetime.datetime.utcnow()
 
573
        self.init_checker()
 
574
    
 
575
    def disable(self, quiet=True):
 
576
        """Disable this client."""
 
577
        if not getattr(self, "enabled", False):
 
578
            return False
 
579
        if not quiet:
 
580
            self.send_changedstate()
 
581
        if not quiet:
 
582
            logger.info("Disabling client %s", self.name)
 
583
        if getattr(self, "disable_initiator_tag", False):
 
584
            gobject.source_remove(self.disable_initiator_tag)
 
585
            self.disable_initiator_tag = None
 
586
        self.expires = None
 
587
        if getattr(self, "checker_initiator_tag", False):
 
588
            gobject.source_remove(self.checker_initiator_tag)
 
589
            self.checker_initiator_tag = None
 
590
        self.stop_checker()
 
591
        self.enabled = False
 
592
        # Do not run this again if called by a gobject.timeout_add
 
593
        return False
 
594
    
 
595
    def __del__(self):
 
596
        self.disable()
 
597
    
 
598
    def init_checker(self):
352
599
        # Schedule a new checker to be started an 'interval' from now,
353
600
        # and every interval from then on.
354
601
        self.checker_initiator_tag = (gobject.timeout_add
358
605
        self.disable_initiator_tag = (gobject.timeout_add
359
606
                                   (self.timeout_milliseconds(),
360
607
                                    self.disable))
361
 
        self.enabled = True
362
608
        # Also start a new checker *right now*.
363
609
        self.start_checker()
364
610
    
365
 
    def disable(self, quiet=True):
366
 
        """Disable this client."""
367
 
        if not getattr(self, "enabled", False):
368
 
            return False
369
 
        if not quiet:
370
 
            self.send_changedstate()
371
 
        if not quiet:
372
 
            logger.info(u"Disabling client %s", self.name)
373
 
        if getattr(self, u"disable_initiator_tag", False):
374
 
            gobject.source_remove(self.disable_initiator_tag)
375
 
            self.disable_initiator_tag = None
376
 
        if getattr(self, u"checker_initiator_tag", False):
377
 
            gobject.source_remove(self.checker_initiator_tag)
378
 
            self.checker_initiator_tag = None
379
 
        self.stop_checker()
380
 
        if self.disable_hook:
381
 
            self.disable_hook(self)
382
 
        self.enabled = False
383
 
        # Do not run this again if called by a gobject.timeout_add
384
 
        return False
385
 
    
386
 
    def __del__(self):
387
 
        self.disable_hook = None
388
 
        self.disable()
389
 
    
390
611
    def checker_callback(self, pid, condition, command):
391
612
        """The checker has completed, so take appropriate actions."""
392
613
        self.checker_callback_tag = None
393
614
        self.checker = None
394
615
        if os.WIFEXITED(condition):
395
 
            exitstatus = os.WEXITSTATUS(condition)
396
 
            if exitstatus == 0:
397
 
                logger.info(u"Checker for %(name)s succeeded",
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
 
618
                logger.info("Checker for %(name)s succeeded",
398
619
                            vars(self))
399
620
                self.checked_ok()
400
621
            else:
401
 
                logger.info(u"Checker for %(name)s failed",
 
622
                logger.info("Checker for %(name)s failed",
402
623
                            vars(self))
403
624
        else:
404
 
            logger.warning(u"Checker for %(name)s crashed?",
 
625
            self.last_checker_status = -1
 
626
            logger.warning("Checker for %(name)s crashed?",
405
627
                           vars(self))
406
628
    
407
629
    def checked_ok(self):
408
 
        """Bump up the timeout for this client.
409
 
        
410
 
        This should only be called when the client has been seen,
411
 
        alive and well.
412
 
        """
 
630
        """Assert that the client has been seen, alive and well."""
413
631
        self.last_checked_ok = datetime.datetime.utcnow()
414
 
        gobject.source_remove(self.disable_initiator_tag)
415
 
        self.disable_initiator_tag = (gobject.timeout_add
416
 
                                      (self.timeout_milliseconds(),
417
 
                                       self.disable))
 
632
        self.last_checker_status = 0
 
633
        self.bump_timeout()
 
634
    
 
635
    def bump_timeout(self, timeout=None):
 
636
        """Bump up the timeout for this client."""
 
637
        if timeout is None:
 
638
            timeout = self.timeout
 
639
        if self.disable_initiator_tag is not None:
 
640
            gobject.source_remove(self.disable_initiator_tag)
 
641
        if getattr(self, "enabled", False):
 
642
            self.disable_initiator_tag = (gobject.timeout_add
 
643
                                          (timedelta_to_milliseconds
 
644
                                           (timeout), self.disable))
 
645
            self.expires = datetime.datetime.utcnow() + timeout
 
646
    
 
647
    def need_approval(self):
 
648
        self.last_approval_request = datetime.datetime.utcnow()
418
649
    
419
650
    def start_checker(self):
420
651
        """Start a new checker subprocess if one is not running.
433
664
        # If a checker exists, make sure it is not a zombie
434
665
        try:
435
666
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
436
 
        except (AttributeError, OSError), error:
 
667
        except (AttributeError, OSError) as error:
437
668
            if (isinstance(error, OSError)
438
669
                and error.errno != errno.ECHILD):
439
670
                raise error
440
671
        else:
441
672
            if pid:
442
 
                logger.warning(u"Checker was a zombie")
 
673
                logger.warning("Checker was a zombie")
443
674
                gobject.source_remove(self.checker_callback_tag)
444
675
                self.checker_callback(pid, status,
445
676
                                      self.current_checker_command)
450
681
                command = self.checker_command % self.host
451
682
            except TypeError:
452
683
                # Escape attributes for the shell
453
 
                escaped_attrs = dict((key,
454
 
                                      re.escape(unicode(str(val),
455
 
                                                        errors=
456
 
                                                        u'replace')))
457
 
                                     for key, val in
458
 
                                     vars(self).iteritems())
 
684
                escaped_attrs = dict(
 
685
                    (attr,
 
686
                     re.escape(unicode(str(getattr(self, attr, "")),
 
687
                                       errors=
 
688
                                       'replace')))
 
689
                    for attr in
 
690
                    self.runtime_expansions)
 
691
                
459
692
                try:
460
693
                    command = self.checker_command % escaped_attrs
461
 
                except TypeError, error:
462
 
                    logger.error(u'Could not format string "%s":'
463
 
                                 u' %s', self.checker_command, error)
 
694
                except TypeError as error:
 
695
                    logger.error('Could not format string "%s":'
 
696
                                 ' %s', self.checker_command, error)
464
697
                    return True # Try again later
465
698
            self.current_checker_command = command
466
699
            try:
467
 
                logger.info(u"Starting checker %r for %s",
 
700
                logger.info("Starting checker %r for %s",
468
701
                            command, self.name)
469
702
                # We don't need to redirect stdout and stderr, since
470
703
                # in normal mode, that is already done by daemon(),
472
705
                # always replaced by /dev/null.)
473
706
                self.checker = subprocess.Popen(command,
474
707
                                                close_fds=True,
475
 
                                                shell=True, cwd=u"/")
 
708
                                                shell=True, cwd="/")
476
709
                self.checker_callback_tag = (gobject.child_watch_add
477
710
                                             (self.checker.pid,
478
711
                                              self.checker_callback,
483
716
                if pid:
484
717
                    gobject.source_remove(self.checker_callback_tag)
485
718
                    self.checker_callback(pid, status, command)
486
 
            except OSError, error:
487
 
                logger.error(u"Failed to start subprocess: %s",
 
719
            except OSError as error:
 
720
                logger.error("Failed to start subprocess: %s",
488
721
                             error)
489
722
        # Re-run this periodically if run by gobject.timeout_add
490
723
        return True
494
727
        if self.checker_callback_tag:
495
728
            gobject.source_remove(self.checker_callback_tag)
496
729
            self.checker_callback_tag = None
497
 
        if getattr(self, u"checker", None) is None:
 
730
        if getattr(self, "checker", None) is None:
498
731
            return
499
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
732
        logger.debug("Stopping checker for %(name)s", vars(self))
500
733
        try:
501
734
            os.kill(self.checker.pid, signal.SIGTERM)
502
735
            #time.sleep(0.5)
503
736
            #if self.checker.poll() is None:
504
737
            #    os.kill(self.checker.pid, signal.SIGKILL)
505
 
        except OSError, error:
 
738
        except OSError as error:
506
739
            if error.errno != errno.ESRCH: # No such process
507
740
                raise
508
741
        self.checker = None
509
742
 
510
 
def dbus_service_property(dbus_interface, signature=u"v",
511
 
                          access=u"readwrite", byte_arrays=False):
 
743
 
 
744
def dbus_service_property(dbus_interface, signature="v",
 
745
                          access="readwrite", byte_arrays=False):
512
746
    """Decorators for marking methods of a DBusObjectWithProperties to
513
747
    become properties on the D-Bus.
514
748
    
521
755
    """
522
756
    # Encoding deeply encoded byte arrays is not supported yet by the
523
757
    # "Set" method, so we fail early here:
524
 
    if byte_arrays and signature != u"ay":
525
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
526
 
                         u" signature %r" % signature)
 
758
    if byte_arrays and signature != "ay":
 
759
        raise ValueError("Byte arrays not supported for non-'ay'"
 
760
                         " signature %r" % signature)
527
761
    def decorator(func):
528
762
        func._dbus_is_property = True
529
763
        func._dbus_interface = dbus_interface
530
764
        func._dbus_signature = signature
531
765
        func._dbus_access = access
532
766
        func._dbus_name = func.__name__
533
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
767
        if func._dbus_name.endswith("_dbus_property"):
534
768
            func._dbus_name = func._dbus_name[:-14]
535
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
769
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
536
770
        return func
537
771
    return decorator
538
772
 
558
792
 
559
793
class DBusObjectWithProperties(dbus.service.Object):
560
794
    """A D-Bus object with properties.
561
 
 
 
795
    
562
796
    Classes inheriting from this can use the dbus_service_property
563
797
    decorator to expose methods as D-Bus properties.  It exposes the
564
798
    standard Get(), Set(), and GetAll() methods on the D-Bus.
566
800
    
567
801
    @staticmethod
568
802
    def _is_dbus_property(obj):
569
 
        return getattr(obj, u"_dbus_is_property", False)
 
803
        return getattr(obj, "_dbus_is_property", False)
570
804
    
571
805
    def _get_all_dbus_properties(self):
572
806
        """Returns a generator of (name, attribute) pairs
573
807
        """
574
 
        return ((prop._dbus_name, prop)
 
808
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
809
                for cls in self.__class__.__mro__
575
810
                for name, prop in
576
 
                inspect.getmembers(self, self._is_dbus_property))
 
811
                inspect.getmembers(cls, self._is_dbus_property))
577
812
    
578
813
    def _get_dbus_property(self, interface_name, property_name):
579
814
        """Returns a bound method if one exists which is a D-Bus
580
815
        property with the specified name and interface.
581
816
        """
582
 
        for name in (property_name,
583
 
                     property_name + u"_dbus_property"):
584
 
            prop = getattr(self, name, None)
585
 
            if (prop is None
586
 
                or not self._is_dbus_property(prop)
587
 
                or prop._dbus_name != property_name
588
 
                or (interface_name and prop._dbus_interface
589
 
                    and interface_name != prop._dbus_interface)):
590
 
                continue
591
 
            return prop
 
817
        for cls in  self.__class__.__mro__:
 
818
            for name, value in (inspect.getmembers
 
819
                                (cls, self._is_dbus_property)):
 
820
                if (value._dbus_name == property_name
 
821
                    and value._dbus_interface == interface_name):
 
822
                    return value.__get__(self)
 
823
        
592
824
        # No such property
593
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
594
 
                                   + interface_name + u"."
 
825
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
826
                                   + interface_name + "."
595
827
                                   + property_name)
596
828
    
597
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
598
 
                         out_signature=u"v")
 
829
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
830
                         out_signature="v")
599
831
    def Get(self, interface_name, property_name):
600
832
        """Standard D-Bus property Get() method, see D-Bus standard.
601
833
        """
602
834
        prop = self._get_dbus_property(interface_name, property_name)
603
 
        if prop._dbus_access == u"write":
 
835
        if prop._dbus_access == "write":
604
836
            raise DBusPropertyAccessException(property_name)
605
837
        value = prop()
606
 
        if not hasattr(value, u"variant_level"):
 
838
        if not hasattr(value, "variant_level"):
607
839
            return value
608
840
        return type(value)(value, variant_level=value.variant_level+1)
609
841
    
610
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
842
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
611
843
    def Set(self, interface_name, property_name, value):
612
844
        """Standard D-Bus property Set() method, see D-Bus standard.
613
845
        """
614
846
        prop = self._get_dbus_property(interface_name, property_name)
615
 
        if prop._dbus_access == u"read":
 
847
        if prop._dbus_access == "read":
616
848
            raise DBusPropertyAccessException(property_name)
617
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
849
        if prop._dbus_get_args_options["byte_arrays"]:
618
850
            # The byte_arrays option is not supported yet on
619
851
            # signatures other than "ay".
620
 
            if prop._dbus_signature != u"ay":
 
852
            if prop._dbus_signature != "ay":
621
853
                raise ValueError
622
 
            value = dbus.ByteArray(''.join(unichr(byte)
623
 
                                           for byte in value))
 
854
            value = dbus.ByteArray(b''.join(chr(byte)
 
855
                                            for byte in value))
624
856
        prop(value)
625
857
    
626
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
627
 
                         out_signature=u"a{sv}")
 
858
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
859
                         out_signature="a{sv}")
628
860
    def GetAll(self, interface_name):
629
861
        """Standard D-Bus property GetAll() method, see D-Bus
630
862
        standard.
631
 
 
 
863
        
632
864
        Note: Will not include properties with access="write".
633
865
        """
634
 
        all = {}
 
866
        properties = {}
635
867
        for name, prop in self._get_all_dbus_properties():
636
868
            if (interface_name
637
869
                and interface_name != prop._dbus_interface):
638
870
                # Interface non-empty but did not match
639
871
                continue
640
872
            # Ignore write-only properties
641
 
            if prop._dbus_access == u"write":
 
873
            if prop._dbus_access == "write":
642
874
                continue
643
875
            value = prop()
644
 
            if not hasattr(value, u"variant_level"):
645
 
                all[name] = value
 
876
            if not hasattr(value, "variant_level"):
 
877
                properties[name] = value
646
878
                continue
647
 
            all[name] = type(value)(value, variant_level=
648
 
                                    value.variant_level+1)
649
 
        return dbus.Dictionary(all, signature=u"sv")
 
879
            properties[name] = type(value)(value, variant_level=
 
880
                                           value.variant_level+1)
 
881
        return dbus.Dictionary(properties, signature="sv")
650
882
    
651
883
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
652
 
                         out_signature=u"s",
 
884
                         out_signature="s",
653
885
                         path_keyword='object_path',
654
886
                         connection_keyword='connection')
655
887
    def Introspect(self, object_path, connection):
660
892
        try:
661
893
            document = xml.dom.minidom.parseString(xmlstring)
662
894
            def make_tag(document, name, prop):
663
 
                e = document.createElement(u"property")
664
 
                e.setAttribute(u"name", name)
665
 
                e.setAttribute(u"type", prop._dbus_signature)
666
 
                e.setAttribute(u"access", prop._dbus_access)
 
895
                e = document.createElement("property")
 
896
                e.setAttribute("name", name)
 
897
                e.setAttribute("type", prop._dbus_signature)
 
898
                e.setAttribute("access", prop._dbus_access)
667
899
                return e
668
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
900
            for if_tag in document.getElementsByTagName("interface"):
669
901
                for tag in (make_tag(document, name, prop)
670
902
                            for name, prop
671
903
                            in self._get_all_dbus_properties()
672
904
                            if prop._dbus_interface
673
 
                            == if_tag.getAttribute(u"name")):
 
905
                            == if_tag.getAttribute("name")):
674
906
                    if_tag.appendChild(tag)
675
907
                # Add the names to the return values for the
676
908
                # "org.freedesktop.DBus.Properties" methods
677
 
                if (if_tag.getAttribute(u"name")
678
 
                    == u"org.freedesktop.DBus.Properties"):
679
 
                    for cn in if_tag.getElementsByTagName(u"method"):
680
 
                        if cn.getAttribute(u"name") == u"Get":
681
 
                            for arg in cn.getElementsByTagName(u"arg"):
682
 
                                if (arg.getAttribute(u"direction")
683
 
                                    == u"out"):
684
 
                                    arg.setAttribute(u"name", u"value")
685
 
                        elif cn.getAttribute(u"name") == u"GetAll":
686
 
                            for arg in cn.getElementsByTagName(u"arg"):
687
 
                                if (arg.getAttribute(u"direction")
688
 
                                    == u"out"):
689
 
                                    arg.setAttribute(u"name", u"props")
690
 
            xmlstring = document.toxml(u"utf-8")
 
909
                if (if_tag.getAttribute("name")
 
910
                    == "org.freedesktop.DBus.Properties"):
 
911
                    for cn in if_tag.getElementsByTagName("method"):
 
912
                        if cn.getAttribute("name") == "Get":
 
913
                            for arg in cn.getElementsByTagName("arg"):
 
914
                                if (arg.getAttribute("direction")
 
915
                                    == "out"):
 
916
                                    arg.setAttribute("name", "value")
 
917
                        elif cn.getAttribute("name") == "GetAll":
 
918
                            for arg in cn.getElementsByTagName("arg"):
 
919
                                if (arg.getAttribute("direction")
 
920
                                    == "out"):
 
921
                                    arg.setAttribute("name", "props")
 
922
            xmlstring = document.toxml("utf-8")
691
923
            document.unlink()
692
924
        except (AttributeError, xml.dom.DOMException,
693
 
                xml.parsers.expat.ExpatError), error:
694
 
            logger.error(u"Failed to override Introspection method",
 
925
                xml.parsers.expat.ExpatError) as error:
 
926
            logger.error("Failed to override Introspection method",
695
927
                         error)
696
928
        return xmlstring
697
929
 
698
930
 
 
931
def datetime_to_dbus (dt, variant_level=0):
 
932
    """Convert a UTC datetime.datetime() to a D-Bus type."""
 
933
    if dt is None:
 
934
        return dbus.String("", variant_level = variant_level)
 
935
    return dbus.String(dt.isoformat(),
 
936
                       variant_level=variant_level)
 
937
 
 
938
 
 
939
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
940
                                  .__metaclass__):
 
941
    """Applied to an empty subclass of a D-Bus object, this metaclass
 
942
    will add additional D-Bus attributes matching a certain pattern.
 
943
    """
 
944
    def __new__(mcs, name, bases, attr):
 
945
        # Go through all the base classes which could have D-Bus
 
946
        # methods, signals, or properties in them
 
947
        for base in (b for b in bases
 
948
                     if issubclass(b, dbus.service.Object)):
 
949
            # Go though all attributes of the base class
 
950
            for attrname, attribute in inspect.getmembers(base):
 
951
                # Ignore non-D-Bus attributes, and D-Bus attributes
 
952
                # with the wrong interface name
 
953
                if (not hasattr(attribute, "_dbus_interface")
 
954
                    or not attribute._dbus_interface
 
955
                    .startswith("se.recompile.Mandos")):
 
956
                    continue
 
957
                # Create an alternate D-Bus interface name based on
 
958
                # the current name
 
959
                alt_interface = (attribute._dbus_interface
 
960
                                 .replace("se.recompile.Mandos",
 
961
                                          "se.bsnet.fukt.Mandos"))
 
962
                # Is this a D-Bus signal?
 
963
                if getattr(attribute, "_dbus_is_signal", False):
 
964
                    # Extract the original non-method function by
 
965
                    # black magic
 
966
                    nonmethod_func = (dict(
 
967
                            zip(attribute.func_code.co_freevars,
 
968
                                attribute.__closure__))["func"]
 
969
                                      .cell_contents)
 
970
                    # Create a new, but exactly alike, function
 
971
                    # object, and decorate it to be a new D-Bus signal
 
972
                    # with the alternate D-Bus interface name
 
973
                    new_function = (dbus.service.signal
 
974
                                    (alt_interface,
 
975
                                     attribute._dbus_signature)
 
976
                                    (types.FunctionType(
 
977
                                nonmethod_func.func_code,
 
978
                                nonmethod_func.func_globals,
 
979
                                nonmethod_func.func_name,
 
980
                                nonmethod_func.func_defaults,
 
981
                                nonmethod_func.func_closure)))
 
982
                    # Define a creator of a function to call both the
 
983
                    # old and new functions, so both the old and new
 
984
                    # signals gets sent when the function is called
 
985
                    def fixscope(func1, func2):
 
986
                        """This function is a scope container to pass
 
987
                        func1 and func2 to the "call_both" function
 
988
                        outside of its arguments"""
 
989
                        def call_both(*args, **kwargs):
 
990
                            """This function will emit two D-Bus
 
991
                            signals by calling func1 and func2"""
 
992
                            func1(*args, **kwargs)
 
993
                            func2(*args, **kwargs)
 
994
                        return call_both
 
995
                    # Create the "call_both" function and add it to
 
996
                    # the class
 
997
                    attr[attrname] = fixscope(attribute,
 
998
                                              new_function)
 
999
                # Is this a D-Bus method?
 
1000
                elif getattr(attribute, "_dbus_is_method", False):
 
1001
                    # Create a new, but exactly alike, function
 
1002
                    # object.  Decorate it to be a new D-Bus method
 
1003
                    # with the alternate D-Bus interface name.  Add it
 
1004
                    # to the class.
 
1005
                    attr[attrname] = (dbus.service.method
 
1006
                                      (alt_interface,
 
1007
                                       attribute._dbus_in_signature,
 
1008
                                       attribute._dbus_out_signature)
 
1009
                                      (types.FunctionType
 
1010
                                       (attribute.func_code,
 
1011
                                        attribute.func_globals,
 
1012
                                        attribute.func_name,
 
1013
                                        attribute.func_defaults,
 
1014
                                        attribute.func_closure)))
 
1015
                # Is this a D-Bus property?
 
1016
                elif getattr(attribute, "_dbus_is_property", False):
 
1017
                    # Create a new, but exactly alike, function
 
1018
                    # object, and decorate it to be a new D-Bus
 
1019
                    # property with the alternate D-Bus interface
 
1020
                    # name.  Add it to the class.
 
1021
                    attr[attrname] = (dbus_service_property
 
1022
                                      (alt_interface,
 
1023
                                       attribute._dbus_signature,
 
1024
                                       attribute._dbus_access,
 
1025
                                       attribute
 
1026
                                       ._dbus_get_args_options
 
1027
                                       ["byte_arrays"])
 
1028
                                      (types.FunctionType
 
1029
                                       (attribute.func_code,
 
1030
                                        attribute.func_globals,
 
1031
                                        attribute.func_name,
 
1032
                                        attribute.func_defaults,
 
1033
                                        attribute.func_closure)))
 
1034
        return type.__new__(mcs, name, bases, attr)
 
1035
 
 
1036
 
699
1037
class ClientDBus(Client, DBusObjectWithProperties):
700
1038
    """A Client class using D-Bus
701
1039
    
703
1041
    dbus_object_path: dbus.ObjectPath
704
1042
    bus: dbus.SystemBus()
705
1043
    """
 
1044
    
 
1045
    runtime_expansions = (Client.runtime_expansions
 
1046
                          + ("dbus_object_path",))
 
1047
    
706
1048
    # dbus.service.Object doesn't use super(), so we can't either.
707
1049
    
708
1050
    def __init__(self, bus = None, *args, **kwargs):
709
 
        self._approvals_pending = 0
710
1051
        self.bus = bus
711
1052
        Client.__init__(self, *args, **kwargs)
712
1053
        # Only now, when this client is initialized, can it show up on
713
1054
        # the D-Bus
 
1055
        client_object_name = unicode(self.name).translate(
 
1056
            {ord("."): ord("_"),
 
1057
             ord("-"): ord("_")})
714
1058
        self.dbus_object_path = (dbus.ObjectPath
715
 
                                 (u"/clients/"
716
 
                                  + self.name.replace(u".", u"_")))
 
1059
                                 ("/clients/" + client_object_name))
717
1060
        DBusObjectWithProperties.__init__(self, self.bus,
718
1061
                                          self.dbus_object_path)
719
1062
        
720
 
    def _get_approvals_pending(self):
721
 
        return self._approvals_pending
722
 
    def _set_approvals_pending(self, value):
723
 
        old_value = self._approvals_pending
724
 
        self._approvals_pending = value
725
 
        bval = bool(value)
726
 
        if (hasattr(self, "dbus_object_path")
727
 
            and bval is not bool(old_value)):
728
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
729
 
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
730
 
                                 dbus_bool)
731
 
 
732
 
    approvals_pending = property(_get_approvals_pending,
733
 
                                 _set_approvals_pending)
734
 
    del _get_approvals_pending, _set_approvals_pending
735
 
    
736
 
    @staticmethod
737
 
    def _datetime_to_dbus(dt, variant_level=0):
738
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
739
 
        return dbus.String(dt.isoformat(),
740
 
                           variant_level=variant_level)
741
 
    
742
 
    def enable(self):
743
 
        oldstate = getattr(self, u"enabled", False)
744
 
        r = Client.enable(self)
745
 
        if oldstate != self.enabled:
746
 
            # Emit D-Bus signals
747
 
            self.PropertyChanged(dbus.String(u"Enabled"),
748
 
                                 dbus.Boolean(True, variant_level=1))
749
 
            self.PropertyChanged(
750
 
                dbus.String(u"LastEnabled"),
751
 
                self._datetime_to_dbus(self.last_enabled,
752
 
                                       variant_level=1))
753
 
        return r
754
 
    
755
 
    def disable(self, quiet = False):
756
 
        oldstate = getattr(self, u"enabled", False)
757
 
        r = Client.disable(self, quiet=quiet)
758
 
        if not quiet and oldstate != self.enabled:
759
 
            # Emit D-Bus signal
760
 
            self.PropertyChanged(dbus.String(u"Enabled"),
761
 
                                 dbus.Boolean(False, variant_level=1))
762
 
        return r
 
1063
    def notifychangeproperty(transform_func,
 
1064
                             dbus_name, type_func=lambda x: x,
 
1065
                             variant_level=1):
 
1066
        """ Modify a variable so that it's a property which announces
 
1067
        its changes to DBus.
 
1068
        
 
1069
        transform_fun: Function that takes a value and a variant_level
 
1070
                       and transforms it to a D-Bus type.
 
1071
        dbus_name: D-Bus name of the variable
 
1072
        type_func: Function that transform the value before sending it
 
1073
                   to the D-Bus.  Default: no transform
 
1074
        variant_level: D-Bus variant level.  Default: 1
 
1075
        """
 
1076
        attrname = "_{0}".format(dbus_name)
 
1077
        def setter(self, value):
 
1078
            if hasattr(self, "dbus_object_path"):
 
1079
                if (not hasattr(self, attrname) or
 
1080
                    type_func(getattr(self, attrname, None))
 
1081
                    != type_func(value)):
 
1082
                    dbus_value = transform_func(type_func(value),
 
1083
                                                variant_level
 
1084
                                                =variant_level)
 
1085
                    self.PropertyChanged(dbus.String(dbus_name),
 
1086
                                         dbus_value)
 
1087
            setattr(self, attrname, value)
 
1088
        
 
1089
        return property(lambda self: getattr(self, attrname), setter)
 
1090
    
 
1091
    
 
1092
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
 
1093
    approvals_pending = notifychangeproperty(dbus.Boolean,
 
1094
                                             "ApprovalPending",
 
1095
                                             type_func = bool)
 
1096
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
 
1097
    last_enabled = notifychangeproperty(datetime_to_dbus,
 
1098
                                        "LastEnabled")
 
1099
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
 
1100
                                   type_func = lambda checker:
 
1101
                                       checker is not None)
 
1102
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
 
1103
                                           "LastCheckedOK")
 
1104
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1105
                                               "LastCheckerStatus")
 
1106
    last_approval_request = notifychangeproperty(
 
1107
        datetime_to_dbus, "LastApprovalRequest")
 
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
 
1109
                                               "ApprovedByDefault")
 
1110
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1111
                                          "ApprovalDelay",
 
1112
                                          type_func =
 
1113
                                          timedelta_to_milliseconds)
 
1114
    approval_duration = notifychangeproperty(
 
1115
        dbus.UInt64, "ApprovalDuration",
 
1116
        type_func = timedelta_to_milliseconds)
 
1117
    host = notifychangeproperty(dbus.String, "Host")
 
1118
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1119
                                   type_func =
 
1120
                                   timedelta_to_milliseconds)
 
1121
    extended_timeout = notifychangeproperty(
 
1122
        dbus.UInt64, "ExtendedTimeout",
 
1123
        type_func = timedelta_to_milliseconds)
 
1124
    interval = notifychangeproperty(dbus.UInt64,
 
1125
                                    "Interval",
 
1126
                                    type_func =
 
1127
                                    timedelta_to_milliseconds)
 
1128
    checker_command = notifychangeproperty(dbus.String, "Checker")
 
1129
    
 
1130
    del notifychangeproperty
763
1131
    
764
1132
    def __del__(self, *args, **kwargs):
765
1133
        try:
766
1134
            self.remove_from_connection()
767
1135
        except LookupError:
768
1136
            pass
769
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
1137
        if hasattr(DBusObjectWithProperties, "__del__"):
770
1138
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
771
1139
        Client.__del__(self, *args, **kwargs)
772
1140
    
774
1142
                         *args, **kwargs):
775
1143
        self.checker_callback_tag = None
776
1144
        self.checker = None
777
 
        # Emit D-Bus signal
778
 
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
779
 
                             dbus.Boolean(False, variant_level=1))
780
1145
        if os.WIFEXITED(condition):
781
1146
            exitstatus = os.WEXITSTATUS(condition)
782
1147
            # Emit D-Bus signal
792
1157
        return Client.checker_callback(self, pid, condition, command,
793
1158
                                       *args, **kwargs)
794
1159
    
795
 
    def checked_ok(self, *args, **kwargs):
796
 
        r = Client.checked_ok(self, *args, **kwargs)
797
 
        # Emit D-Bus signal
798
 
        self.PropertyChanged(
799
 
            dbus.String(u"LastCheckedOK"),
800
 
            (self._datetime_to_dbus(self.last_checked_ok,
801
 
                                    variant_level=1)))
802
 
        return r
803
 
    
804
1160
    def start_checker(self, *args, **kwargs):
805
1161
        old_checker = self.checker
806
1162
        if self.checker is not None:
813
1169
            and old_checker_pid != self.checker.pid):
814
1170
            # Emit D-Bus signal
815
1171
            self.CheckerStarted(self.current_checker_command)
816
 
            self.PropertyChanged(
817
 
                dbus.String(u"CheckerRunning"),
818
 
                dbus.Boolean(True, variant_level=1))
819
1172
        return r
820
1173
    
821
 
    def stop_checker(self, *args, **kwargs):
822
 
        old_checker = getattr(self, u"checker", None)
823
 
        r = Client.stop_checker(self, *args, **kwargs)
824
 
        if (old_checker is not None
825
 
            and getattr(self, u"checker", None) is None):
826
 
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
827
 
                                 dbus.Boolean(False, variant_level=1))
828
 
        return r
829
 
 
830
1174
    def _reset_approved(self):
831
 
        self._approved = None
 
1175
        self.approved = None
832
1176
        return False
833
1177
    
834
1178
    def approve(self, value=True):
835
1179
        self.send_changedstate()
836
 
        self._approved = value
837
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1180
        self.approved = value
 
1181
        gobject.timeout_add(timedelta_to_milliseconds
838
1182
                            (self.approval_duration),
839
1183
                            self._reset_approved)
840
1184
    
841
1185
    
842
1186
    ## D-Bus methods, signals & properties
843
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
1187
    _interface = "se.recompile.Mandos.Client"
844
1188
    
845
1189
    ## Signals
846
1190
    
847
1191
    # CheckerCompleted - signal
848
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
1192
    @dbus.service.signal(_interface, signature="nxs")
849
1193
    def CheckerCompleted(self, exitcode, waitstatus, command):
850
1194
        "D-Bus signal"
851
1195
        pass
852
1196
    
853
1197
    # CheckerStarted - signal
854
 
    @dbus.service.signal(_interface, signature=u"s")
 
1198
    @dbus.service.signal(_interface, signature="s")
855
1199
    def CheckerStarted(self, command):
856
1200
        "D-Bus signal"
857
1201
        pass
858
1202
    
859
1203
    # PropertyChanged - signal
860
 
    @dbus.service.signal(_interface, signature=u"sv")
 
1204
    @dbus.service.signal(_interface, signature="sv")
861
1205
    def PropertyChanged(self, property, value):
862
1206
        "D-Bus signal"
863
1207
        pass
872
1216
        pass
873
1217
    
874
1218
    # Rejected - signal
875
 
    @dbus.service.signal(_interface, signature=u"s")
 
1219
    @dbus.service.signal(_interface, signature="s")
876
1220
    def Rejected(self, reason):
877
1221
        "D-Bus signal"
878
1222
        pass
879
1223
    
880
1224
    # NeedApproval - signal
881
 
    @dbus.service.signal(_interface, signature=u"tb")
 
1225
    @dbus.service.signal(_interface, signature="tb")
882
1226
    def NeedApproval(self, timeout, default):
883
1227
        "D-Bus signal"
884
 
        pass
 
1228
        return self.need_approval()
885
1229
    
886
1230
    ## Methods
887
 
 
 
1231
    
888
1232
    # Approve - method
889
 
    @dbus.service.method(_interface, in_signature=u"b")
 
1233
    @dbus.service.method(_interface, in_signature="b")
890
1234
    def Approve(self, value):
891
1235
        self.approve(value)
892
 
 
 
1236
    
893
1237
    # CheckedOK - method
894
1238
    @dbus.service.method(_interface)
895
1239
    def CheckedOK(self):
896
 
        return self.checked_ok()
 
1240
        self.checked_ok()
897
1241
    
898
1242
    # Enable - method
899
1243
    @dbus.service.method(_interface)
921
1265
    ## Properties
922
1266
    
923
1267
    # ApprovalPending - property
924
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
1268
    @dbus_service_property(_interface, signature="b", access="read")
925
1269
    def ApprovalPending_dbus_property(self):
926
1270
        return dbus.Boolean(bool(self.approvals_pending))
927
1271
    
928
1272
    # ApprovedByDefault - property
929
 
    @dbus_service_property(_interface, signature=u"b",
930
 
                           access=u"readwrite")
 
1273
    @dbus_service_property(_interface, signature="b",
 
1274
                           access="readwrite")
931
1275
    def ApprovedByDefault_dbus_property(self, value=None):
932
1276
        if value is None:       # get
933
1277
            return dbus.Boolean(self.approved_by_default)
934
1278
        self.approved_by_default = bool(value)
935
 
        # Emit D-Bus signal
936
 
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
937
 
                             dbus.Boolean(value, variant_level=1))
938
1279
    
939
1280
    # ApprovalDelay - property
940
 
    @dbus_service_property(_interface, signature=u"t",
941
 
                           access=u"readwrite")
 
1281
    @dbus_service_property(_interface, signature="t",
 
1282
                           access="readwrite")
942
1283
    def ApprovalDelay_dbus_property(self, value=None):
943
1284
        if value is None:       # get
944
1285
            return dbus.UInt64(self.approval_delay_milliseconds())
945
1286
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
946
 
        # Emit D-Bus signal
947
 
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
948
 
                             dbus.UInt64(value, variant_level=1))
949
1287
    
950
1288
    # ApprovalDuration - property
951
 
    @dbus_service_property(_interface, signature=u"t",
952
 
                           access=u"readwrite")
 
1289
    @dbus_service_property(_interface, signature="t",
 
1290
                           access="readwrite")
953
1291
    def ApprovalDuration_dbus_property(self, value=None):
954
1292
        if value is None:       # get
955
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1293
            return dbus.UInt64(timedelta_to_milliseconds(
956
1294
                    self.approval_duration))
957
1295
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
958
 
        # Emit D-Bus signal
959
 
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
960
 
                             dbus.UInt64(value, variant_level=1))
961
1296
    
962
1297
    # Name - property
963
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1298
    @dbus_service_property(_interface, signature="s", access="read")
964
1299
    def Name_dbus_property(self):
965
1300
        return dbus.String(self.name)
966
1301
    
967
1302
    # Fingerprint - property
968
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1303
    @dbus_service_property(_interface, signature="s", access="read")
969
1304
    def Fingerprint_dbus_property(self):
970
1305
        return dbus.String(self.fingerprint)
971
1306
    
972
1307
    # Host - property
973
 
    @dbus_service_property(_interface, signature=u"s",
974
 
                           access=u"readwrite")
 
1308
    @dbus_service_property(_interface, signature="s",
 
1309
                           access="readwrite")
975
1310
    def Host_dbus_property(self, value=None):
976
1311
        if value is None:       # get
977
1312
            return dbus.String(self.host)
978
 
        self.host = value
979
 
        # Emit D-Bus signal
980
 
        self.PropertyChanged(dbus.String(u"Host"),
981
 
                             dbus.String(value, variant_level=1))
 
1313
        self.host = unicode(value)
982
1314
    
983
1315
    # Created - property
984
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1316
    @dbus_service_property(_interface, signature="s", access="read")
985
1317
    def Created_dbus_property(self):
986
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1318
        return datetime_to_dbus(self.created)
987
1319
    
988
1320
    # LastEnabled - property
989
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1321
    @dbus_service_property(_interface, signature="s", access="read")
990
1322
    def LastEnabled_dbus_property(self):
991
 
        if self.last_enabled is None:
992
 
            return dbus.String(u"")
993
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
1323
        return datetime_to_dbus(self.last_enabled)
994
1324
    
995
1325
    # Enabled - property
996
 
    @dbus_service_property(_interface, signature=u"b",
997
 
                           access=u"readwrite")
 
1326
    @dbus_service_property(_interface, signature="b",
 
1327
                           access="readwrite")
998
1328
    def Enabled_dbus_property(self, value=None):
999
1329
        if value is None:       # get
1000
1330
            return dbus.Boolean(self.enabled)
1004
1334
            self.disable()
1005
1335
    
1006
1336
    # LastCheckedOK - property
1007
 
    @dbus_service_property(_interface, signature=u"s",
1008
 
                           access=u"readwrite")
 
1337
    @dbus_service_property(_interface, signature="s",
 
1338
                           access="readwrite")
1009
1339
    def LastCheckedOK_dbus_property(self, value=None):
1010
1340
        if value is not None:
1011
1341
            self.checked_ok()
1012
1342
            return
1013
 
        if self.last_checked_ok is None:
1014
 
            return dbus.String(u"")
1015
 
        return dbus.String(self._datetime_to_dbus(self
1016
 
                                                  .last_checked_ok))
 
1343
        return datetime_to_dbus(self.last_checked_ok)
 
1344
    
 
1345
    # LastCheckerStatus - property
 
1346
    @dbus_service_property(_interface, signature="n",
 
1347
                           access="read")
 
1348
    def LastCheckerStatus_dbus_property(self):
 
1349
        return dbus.Int16(self.last_checker_status)
 
1350
    
 
1351
    # Expires - property
 
1352
    @dbus_service_property(_interface, signature="s", access="read")
 
1353
    def Expires_dbus_property(self):
 
1354
        return datetime_to_dbus(self.expires)
 
1355
    
 
1356
    # LastApprovalRequest - property
 
1357
    @dbus_service_property(_interface, signature="s", access="read")
 
1358
    def LastApprovalRequest_dbus_property(self):
 
1359
        return datetime_to_dbus(self.last_approval_request)
1017
1360
    
1018
1361
    # Timeout - property
1019
 
    @dbus_service_property(_interface, signature=u"t",
1020
 
                           access=u"readwrite")
 
1362
    @dbus_service_property(_interface, signature="t",
 
1363
                           access="readwrite")
1021
1364
    def Timeout_dbus_property(self, value=None):
1022
1365
        if value is None:       # get
1023
1366
            return dbus.UInt64(self.timeout_milliseconds())
1024
1367
        self.timeout = datetime.timedelta(0, 0, 0, value)
1025
 
        # Emit D-Bus signal
1026
 
        self.PropertyChanged(dbus.String(u"Timeout"),
1027
 
                             dbus.UInt64(value, variant_level=1))
1028
 
        if getattr(self, u"disable_initiator_tag", None) is None:
1029
 
            return
1030
1368
        # Reschedule timeout
1031
 
        gobject.source_remove(self.disable_initiator_tag)
1032
 
        self.disable_initiator_tag = None
1033
 
        time_to_die = (self.
1034
 
                       _timedelta_to_milliseconds((self
1035
 
                                                   .last_checked_ok
1036
 
                                                   + self.timeout)
1037
 
                                                  - datetime.datetime
1038
 
                                                  .utcnow()))
1039
 
        if time_to_die <= 0:
1040
 
            # The timeout has passed
1041
 
            self.disable()
1042
 
        else:
1043
 
            self.disable_initiator_tag = (gobject.timeout_add
1044
 
                                          (time_to_die, self.disable))
 
1369
        if self.enabled:
 
1370
            now = datetime.datetime.utcnow()
 
1371
            time_to_die = timedelta_to_milliseconds(
 
1372
                (self.last_checked_ok + self.timeout) - now)
 
1373
            if time_to_die <= 0:
 
1374
                # The timeout has passed
 
1375
                self.disable()
 
1376
            else:
 
1377
                self.expires = (now +
 
1378
                                datetime.timedelta(milliseconds =
 
1379
                                                   time_to_die))
 
1380
                if (getattr(self, "disable_initiator_tag", None)
 
1381
                    is None):
 
1382
                    return
 
1383
                gobject.source_remove(self.disable_initiator_tag)
 
1384
                self.disable_initiator_tag = (gobject.timeout_add
 
1385
                                              (time_to_die,
 
1386
                                               self.disable))
 
1387
    
 
1388
    # ExtendedTimeout - property
 
1389
    @dbus_service_property(_interface, signature="t",
 
1390
                           access="readwrite")
 
1391
    def ExtendedTimeout_dbus_property(self, value=None):
 
1392
        if value is None:       # get
 
1393
            return dbus.UInt64(self.extended_timeout_milliseconds())
 
1394
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1045
1395
    
1046
1396
    # Interval - property
1047
 
    @dbus_service_property(_interface, signature=u"t",
1048
 
                           access=u"readwrite")
 
1397
    @dbus_service_property(_interface, signature="t",
 
1398
                           access="readwrite")
1049
1399
    def Interval_dbus_property(self, value=None):
1050
1400
        if value is None:       # get
1051
1401
            return dbus.UInt64(self.interval_milliseconds())
1052
1402
        self.interval = datetime.timedelta(0, 0, 0, value)
1053
 
        # Emit D-Bus signal
1054
 
        self.PropertyChanged(dbus.String(u"Interval"),
1055
 
                             dbus.UInt64(value, variant_level=1))
1056
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1403
        if getattr(self, "checker_initiator_tag", None) is None:
1057
1404
            return
1058
 
        # Reschedule checker run
1059
 
        gobject.source_remove(self.checker_initiator_tag)
1060
 
        self.checker_initiator_tag = (gobject.timeout_add
1061
 
                                      (value, self.start_checker))
1062
 
        self.start_checker()    # Start one now, too
1063
 
 
 
1405
        if self.enabled:
 
1406
            # Reschedule checker run
 
1407
            gobject.source_remove(self.checker_initiator_tag)
 
1408
            self.checker_initiator_tag = (gobject.timeout_add
 
1409
                                          (value, self.start_checker))
 
1410
            self.start_checker()    # Start one now, too
 
1411
    
1064
1412
    # Checker - property
1065
 
    @dbus_service_property(_interface, signature=u"s",
1066
 
                           access=u"readwrite")
 
1413
    @dbus_service_property(_interface, signature="s",
 
1414
                           access="readwrite")
1067
1415
    def Checker_dbus_property(self, value=None):
1068
1416
        if value is None:       # get
1069
1417
            return dbus.String(self.checker_command)
1070
 
        self.checker_command = value
1071
 
        # Emit D-Bus signal
1072
 
        self.PropertyChanged(dbus.String(u"Checker"),
1073
 
                             dbus.String(self.checker_command,
1074
 
                                         variant_level=1))
 
1418
        self.checker_command = unicode(value)
1075
1419
    
1076
1420
    # CheckerRunning - property
1077
 
    @dbus_service_property(_interface, signature=u"b",
1078
 
                           access=u"readwrite")
 
1421
    @dbus_service_property(_interface, signature="b",
 
1422
                           access="readwrite")
1079
1423
    def CheckerRunning_dbus_property(self, value=None):
1080
1424
        if value is None:       # get
1081
1425
            return dbus.Boolean(self.checker is not None)
1085
1429
            self.stop_checker()
1086
1430
    
1087
1431
    # ObjectPath - property
1088
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1432
    @dbus_service_property(_interface, signature="o", access="read")
1089
1433
    def ObjectPath_dbus_property(self):
1090
1434
        return self.dbus_object_path # is already a dbus.ObjectPath
1091
1435
    
1092
1436
    # Secret = property
1093
 
    @dbus_service_property(_interface, signature=u"ay",
1094
 
                           access=u"write", byte_arrays=True)
 
1437
    @dbus_service_property(_interface, signature="ay",
 
1438
                           access="write", byte_arrays=True)
1095
1439
    def Secret_dbus_property(self, value):
1096
1440
        self.secret = str(value)
1097
1441
    
1104
1448
        self._pipe.send(('init', fpr, address))
1105
1449
        if not self._pipe.recv():
1106
1450
            raise KeyError()
1107
 
 
 
1451
    
1108
1452
    def __getattribute__(self, name):
1109
 
        if(name == '_pipe'):
 
1453
        if name == '_pipe':
1110
1454
            return super(ProxyClient, self).__getattribute__(name)
1111
1455
        self._pipe.send(('getattr', name))
1112
1456
        data = self._pipe.recv()
1117
1461
                self._pipe.send(('funcall', name, args, kwargs))
1118
1462
                return self._pipe.recv()[1]
1119
1463
            return func
1120
 
 
 
1464
    
1121
1465
    def __setattr__(self, name, value):
1122
 
        if(name == '_pipe'):
 
1466
        if name == '_pipe':
1123
1467
            return super(ProxyClient, self).__setattr__(name, value)
1124
1468
        self._pipe.send(('setattr', name, value))
1125
1469
 
1126
1470
 
 
1471
class ClientDBusTransitional(ClientDBus):
 
1472
    __metaclass__ = AlternateDBusNamesMetaclass
 
1473
 
 
1474
 
1127
1475
class ClientHandler(socketserver.BaseRequestHandler, object):
1128
1476
    """A class to handle client connections.
1129
1477
    
1132
1480
    
1133
1481
    def handle(self):
1134
1482
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1135
 
            logger.info(u"TCP connection from: %s",
 
1483
            logger.info("TCP connection from: %s",
1136
1484
                        unicode(self.client_address))
1137
 
            logger.debug(u"Pipe FD: %d",
 
1485
            logger.debug("Pipe FD: %d",
1138
1486
                         self.server.child_pipe.fileno())
1139
 
 
 
1487
            
1140
1488
            session = (gnutls.connection
1141
1489
                       .ClientSession(self.request,
1142
1490
                                      gnutls.connection
1143
1491
                                      .X509Credentials()))
1144
 
 
 
1492
            
1145
1493
            # Note: gnutls.connection.X509Credentials is really a
1146
1494
            # generic GnuTLS certificate credentials object so long as
1147
1495
            # no X.509 keys are added to it.  Therefore, we can use it
1148
1496
            # here despite using OpenPGP certificates.
1149
 
 
1150
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1151
 
            #                      u"+AES-256-CBC", u"+SHA1",
1152
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1153
 
            #                      u"+DHE-DSS"))
 
1497
            
 
1498
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1499
            #                      "+AES-256-CBC", "+SHA1",
 
1500
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1501
            #                      "+DHE-DSS"))
1154
1502
            # Use a fallback default, since this MUST be set.
1155
1503
            priority = self.server.gnutls_priority
1156
1504
            if priority is None:
1157
 
                priority = u"NORMAL"
 
1505
                priority = "NORMAL"
1158
1506
            (gnutls.library.functions
1159
1507
             .gnutls_priority_set_direct(session._c_object,
1160
1508
                                         priority, None))
1161
 
 
 
1509
            
1162
1510
            # Start communication using the Mandos protocol
1163
1511
            # Get protocol number
1164
1512
            line = self.request.makefile().readline()
1165
 
            logger.debug(u"Protocol version: %r", line)
 
1513
            logger.debug("Protocol version: %r", line)
1166
1514
            try:
1167
1515
                if int(line.strip().split()[0]) > 1:
1168
1516
                    raise RuntimeError
1169
 
            except (ValueError, IndexError, RuntimeError), error:
1170
 
                logger.error(u"Unknown protocol version: %s", error)
 
1517
            except (ValueError, IndexError, RuntimeError) as error:
 
1518
                logger.error("Unknown protocol version: %s", error)
1171
1519
                return
1172
 
 
 
1520
            
1173
1521
            # Start GnuTLS connection
1174
1522
            try:
1175
1523
                session.handshake()
1176
 
            except gnutls.errors.GNUTLSError, error:
1177
 
                logger.warning(u"Handshake failed: %s", error)
 
1524
            except gnutls.errors.GNUTLSError as error:
 
1525
                logger.warning("Handshake failed: %s", error)
1178
1526
                # Do not run session.bye() here: the session is not
1179
1527
                # established.  Just abandon the request.
1180
1528
                return
1181
 
            logger.debug(u"Handshake succeeded")
1182
 
 
 
1529
            logger.debug("Handshake succeeded")
 
1530
            
1183
1531
            approval_required = False
1184
1532
            try:
1185
1533
                try:
1186
1534
                    fpr = self.fingerprint(self.peer_certificate
1187
1535
                                           (session))
1188
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1189
 
                    logger.warning(u"Bad certificate: %s", error)
 
1536
                except (TypeError,
 
1537
                        gnutls.errors.GNUTLSError) as error:
 
1538
                    logger.warning("Bad certificate: %s", error)
1190
1539
                    return
1191
 
                logger.debug(u"Fingerprint: %s", fpr)
1192
 
 
 
1540
                logger.debug("Fingerprint: %s", fpr)
 
1541
                
1193
1542
                try:
1194
1543
                    client = ProxyClient(child_pipe, fpr,
1195
1544
                                         self.client_address)
1203
1552
                
1204
1553
                while True:
1205
1554
                    if not client.enabled:
1206
 
                        logger.warning(u"Client %s is disabled",
 
1555
                        logger.info("Client %s is disabled",
1207
1556
                                       client.name)
1208
1557
                        if self.server.use_dbus:
1209
1558
                            # Emit D-Bus signal
1210
 
                            client.Rejected("Disabled")                    
 
1559
                            client.Rejected("Disabled")
1211
1560
                        return
1212
1561
                    
1213
 
                    if client._approved or not client.approval_delay:
 
1562
                    if client.approved or not client.approval_delay:
1214
1563
                        #We are approved or approval is disabled
1215
1564
                        break
1216
 
                    elif client._approved is None:
1217
 
                        logger.info(u"Client %s needs approval",
 
1565
                    elif client.approved is None:
 
1566
                        logger.info("Client %s needs approval",
1218
1567
                                    client.name)
1219
1568
                        if self.server.use_dbus:
1220
1569
                            # Emit D-Bus signal
1222
1571
                                client.approval_delay_milliseconds(),
1223
1572
                                client.approved_by_default)
1224
1573
                    else:
1225
 
                        logger.warning(u"Client %s was not approved",
 
1574
                        logger.warning("Client %s was not approved",
1226
1575
                                       client.name)
1227
1576
                        if self.server.use_dbus:
1228
1577
                            # Emit D-Bus signal
1230
1579
                        return
1231
1580
                    
1232
1581
                    #wait until timeout or approved
1233
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1234
1582
                    time = datetime.datetime.now()
1235
1583
                    client.changedstate.acquire()
1236
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1584
                    (client.changedstate.wait
 
1585
                     (float(client.timedelta_to_milliseconds(delay)
 
1586
                            / 1000)))
1237
1587
                    client.changedstate.release()
1238
1588
                    time2 = datetime.datetime.now()
1239
1589
                    if (time2 - time) >= delay:
1254
1604
                while sent_size < len(client.secret):
1255
1605
                    try:
1256
1606
                        sent = session.send(client.secret[sent_size:])
1257
 
                    except (gnutls.errors.GNUTLSError), error:
 
1607
                    except gnutls.errors.GNUTLSError as error:
1258
1608
                        logger.warning("gnutls send failed")
1259
1609
                        return
1260
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1610
                    logger.debug("Sent: %d, remaining: %d",
1261
1611
                                 sent, len(client.secret)
1262
1612
                                 - (sent_size + sent))
1263
1613
                    sent_size += sent
1264
 
 
1265
 
                logger.info(u"Sending secret to %s", client.name)
1266
 
                # bump the timeout as if seen
1267
 
                client.checked_ok()
 
1614
                
 
1615
                logger.info("Sending secret to %s", client.name)
 
1616
                # bump the timeout using extended_timeout
 
1617
                client.bump_timeout(client.extended_timeout)
1268
1618
                if self.server.use_dbus:
1269
1619
                    # Emit D-Bus signal
1270
1620
                    client.GotSecret()
1274
1624
                    client.approvals_pending -= 1
1275
1625
                try:
1276
1626
                    session.bye()
1277
 
                except (gnutls.errors.GNUTLSError), error:
 
1627
                except gnutls.errors.GNUTLSError as error:
1278
1628
                    logger.warning("GnuTLS bye failed")
1279
1629
    
1280
1630
    @staticmethod
1291
1641
                     .gnutls_certificate_get_peers
1292
1642
                     (session._c_object, ctypes.byref(list_size)))
1293
1643
        if not bool(cert_list) and list_size.value != 0:
1294
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1295
 
                                            u" certificate")
 
1644
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1645
                                            " certificate")
1296
1646
        if list_size.value == 0:
1297
1647
            return None
1298
1648
        cert = cert_list[0]
1324
1674
        if crtverify.value != 0:
1325
1675
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1326
1676
            raise (gnutls.errors.CertificateSecurityError
1327
 
                   (u"Verify failed"))
 
1677
                   ("Verify failed"))
1328
1678
        # New buffer for the fingerprint
1329
1679
        buf = ctypes.create_string_buffer(20)
1330
1680
        buf_len = ctypes.c_size_t()
1337
1687
        # Convert the buffer to a Python bytestring
1338
1688
        fpr = ctypes.string_at(buf, buf_len.value)
1339
1689
        # Convert the bytestring to hexadecimal notation
1340
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1690
        hex_fpr = binascii.hexlify(fpr).upper()
1341
1691
        return hex_fpr
1342
1692
 
1343
1693
 
1346
1696
    def sub_process_main(self, request, address):
1347
1697
        try:
1348
1698
            self.finish_request(request, address)
1349
 
        except:
 
1699
        except Exception:
1350
1700
            self.handle_error(request, address)
1351
1701
        self.close_request(request)
1352
 
            
 
1702
    
1353
1703
    def process_request(self, request, address):
1354
1704
        """Start a new process to process the request."""
1355
 
        multiprocessing.Process(target = self.sub_process_main,
1356
 
                                args = (request, address)).start()
 
1705
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1706
                                       args = (request,
 
1707
                                               address))
 
1708
        proc.start()
 
1709
        return proc
 
1710
 
1357
1711
 
1358
1712
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1359
1713
    """ adds a pipe to the MixIn """
1363
1717
        This function creates a new pipe in self.pipe
1364
1718
        """
1365
1719
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1366
 
 
1367
 
        super(MultiprocessingMixInWithPipe,
1368
 
              self).process_request(request, client_address)
 
1720
        
 
1721
        proc = MultiprocessingMixIn.process_request(self, request,
 
1722
                                                    client_address)
1369
1723
        self.child_pipe.close()
1370
 
        self.add_pipe(parent_pipe)
1371
 
 
1372
 
    def add_pipe(self, parent_pipe):
 
1724
        self.add_pipe(parent_pipe, proc)
 
1725
    
 
1726
    def add_pipe(self, parent_pipe, proc):
1373
1727
        """Dummy function; override as necessary"""
1374
 
        pass
 
1728
        raise NotImplementedError
 
1729
 
1375
1730
 
1376
1731
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1377
1732
                     socketserver.TCPServer, object):
1395
1750
        bind to an address or port if they were not specified."""
1396
1751
        if self.interface is not None:
1397
1752
            if SO_BINDTODEVICE is None:
1398
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1399
 
                             u" cannot bind to interface %s",
 
1753
                logger.error("SO_BINDTODEVICE does not exist;"
 
1754
                             " cannot bind to interface %s",
1400
1755
                             self.interface)
1401
1756
            else:
1402
1757
                try:
1403
1758
                    self.socket.setsockopt(socket.SOL_SOCKET,
1404
1759
                                           SO_BINDTODEVICE,
1405
1760
                                           str(self.interface
1406
 
                                               + u'\0'))
1407
 
                except socket.error, error:
 
1761
                                               + '\0'))
 
1762
                except socket.error as error:
1408
1763
                    if error[0] == errno.EPERM:
1409
 
                        logger.error(u"No permission to"
1410
 
                                     u" bind to interface %s",
 
1764
                        logger.error("No permission to"
 
1765
                                     " bind to interface %s",
1411
1766
                                     self.interface)
1412
1767
                    elif error[0] == errno.ENOPROTOOPT:
1413
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1414
 
                                     u" cannot bind to interface %s",
 
1768
                        logger.error("SO_BINDTODEVICE not available;"
 
1769
                                     " cannot bind to interface %s",
1415
1770
                                     self.interface)
1416
1771
                    else:
1417
1772
                        raise
1419
1774
        if self.server_address[0] or self.server_address[1]:
1420
1775
            if not self.server_address[0]:
1421
1776
                if self.address_family == socket.AF_INET6:
1422
 
                    any_address = u"::" # in6addr_any
 
1777
                    any_address = "::" # in6addr_any
1423
1778
                else:
1424
1779
                    any_address = socket.INADDR_ANY
1425
1780
                self.server_address = (any_address,
1452
1807
        self.enabled = False
1453
1808
        self.clients = clients
1454
1809
        if self.clients is None:
1455
 
            self.clients = set()
 
1810
            self.clients = {}
1456
1811
        self.use_dbus = use_dbus
1457
1812
        self.gnutls_priority = gnutls_priority
1458
1813
        IPv6_TCPServer.__init__(self, server_address,
1462
1817
    def server_activate(self):
1463
1818
        if self.enabled:
1464
1819
            return socketserver.TCPServer.server_activate(self)
 
1820
    
1465
1821
    def enable(self):
1466
1822
        self.enabled = True
1467
 
    def add_pipe(self, parent_pipe):
 
1823
    
 
1824
    def add_pipe(self, parent_pipe, proc):
1468
1825
        # Call "handle_ipc" for both data and EOF events
1469
1826
        gobject.io_add_watch(parent_pipe.fileno(),
1470
1827
                             gobject.IO_IN | gobject.IO_HUP,
1471
1828
                             functools.partial(self.handle_ipc,
1472
 
                                               parent_pipe = parent_pipe))
1473
 
        
 
1829
                                               parent_pipe =
 
1830
                                               parent_pipe,
 
1831
                                               proc = proc))
 
1832
    
1474
1833
    def handle_ipc(self, source, condition, parent_pipe=None,
1475
 
                   client_object=None):
 
1834
                   proc = None, client_object=None):
1476
1835
        condition_names = {
1477
 
            gobject.IO_IN: u"IN",   # There is data to read.
1478
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
 
1836
            gobject.IO_IN: "IN",   # There is data to read.
 
1837
            gobject.IO_OUT: "OUT", # Data can be written (without
1479
1838
                                    # blocking).
1480
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1481
 
            gobject.IO_ERR: u"ERR", # Error condition.
1482
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
 
1839
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1840
            gobject.IO_ERR: "ERR", # Error condition.
 
1841
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
1483
1842
                                    # broken, usually for pipes and
1484
1843
                                    # sockets).
1485
1844
            }
1487
1846
                                       for cond, name in
1488
1847
                                       condition_names.iteritems()
1489
1848
                                       if cond & condition)
1490
 
        # error or the other end of multiprocessing.Pipe has closed
 
1849
        # error, or the other end of multiprocessing.Pipe has closed
1491
1850
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1851
            # Wait for other process to exit
 
1852
            proc.join()
1492
1853
            return False
1493
1854
        
1494
1855
        # Read a request from the child
1499
1860
            fpr = request[1]
1500
1861
            address = request[2]
1501
1862
            
1502
 
            for c in self.clients:
 
1863
            for c in self.clients.itervalues():
1503
1864
                if c.fingerprint == fpr:
1504
1865
                    client = c
1505
1866
                    break
1506
1867
            else:
1507
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
1508
 
                               u"dress: %s", fpr, address)
 
1868
                logger.info("Client not found for fingerprint: %s, ad"
 
1869
                            "dress: %s", fpr, address)
1509
1870
                if self.use_dbus:
1510
1871
                    # Emit D-Bus signal
1511
 
                    mandos_dbus_service.ClientNotFound(fpr, address)
 
1872
                    mandos_dbus_service.ClientNotFound(fpr,
 
1873
                                                       address[0])
1512
1874
                parent_pipe.send(False)
1513
1875
                return False
1514
1876
            
1515
1877
            gobject.io_add_watch(parent_pipe.fileno(),
1516
1878
                                 gobject.IO_IN | gobject.IO_HUP,
1517
1879
                                 functools.partial(self.handle_ipc,
1518
 
                                                   parent_pipe = parent_pipe,
1519
 
                                                   client_object = client))
 
1880
                                                   parent_pipe =
 
1881
                                                   parent_pipe,
 
1882
                                                   proc = proc,
 
1883
                                                   client_object =
 
1884
                                                   client))
1520
1885
            parent_pipe.send(True)
1521
 
            # remove the old hook in favor of the new above hook on same fileno
 
1886
            # remove the old hook in favor of the new above hook on
 
1887
            # same fileno
1522
1888
            return False
1523
1889
        if command == 'funcall':
1524
1890
            funcname = request[1]
1525
1891
            args = request[2]
1526
1892
            kwargs = request[3]
1527
1893
            
1528
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1529
 
 
 
1894
            parent_pipe.send(('data', getattr(client_object,
 
1895
                                              funcname)(*args,
 
1896
                                                         **kwargs)))
 
1897
        
1530
1898
        if command == 'getattr':
1531
1899
            attrname = request[1]
1532
1900
            if callable(client_object.__getattribute__(attrname)):
1533
1901
                parent_pipe.send(('function',))
1534
1902
            else:
1535
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1903
                parent_pipe.send(('data', client_object
 
1904
                                  .__getattribute__(attrname)))
1536
1905
        
1537
1906
        if command == 'setattr':
1538
1907
            attrname = request[1]
1539
1908
            value = request[2]
1540
1909
            setattr(client_object, attrname, value)
1541
 
 
 
1910
        
1542
1911
        return True
1543
1912
 
1544
1913
 
1545
1914
def string_to_delta(interval):
1546
1915
    """Parse a string and return a datetime.timedelta
1547
1916
    
1548
 
    >>> string_to_delta(u'7d')
 
1917
    >>> string_to_delta('7d')
1549
1918
    datetime.timedelta(7)
1550
 
    >>> string_to_delta(u'60s')
 
1919
    >>> string_to_delta('60s')
1551
1920
    datetime.timedelta(0, 60)
1552
 
    >>> string_to_delta(u'60m')
 
1921
    >>> string_to_delta('60m')
1553
1922
    datetime.timedelta(0, 3600)
1554
 
    >>> string_to_delta(u'24h')
 
1923
    >>> string_to_delta('24h')
1555
1924
    datetime.timedelta(1)
1556
 
    >>> string_to_delta(u'1w')
 
1925
    >>> string_to_delta('1w')
1557
1926
    datetime.timedelta(7)
1558
 
    >>> string_to_delta(u'5m 30s')
 
1927
    >>> string_to_delta('5m 30s')
1559
1928
    datetime.timedelta(0, 330)
1560
1929
    """
1561
1930
    timevalue = datetime.timedelta(0)
1563
1932
        try:
1564
1933
            suffix = unicode(s[-1])
1565
1934
            value = int(s[:-1])
1566
 
            if suffix == u"d":
 
1935
            if suffix == "d":
1567
1936
                delta = datetime.timedelta(value)
1568
 
            elif suffix == u"s":
 
1937
            elif suffix == "s":
1569
1938
                delta = datetime.timedelta(0, value)
1570
 
            elif suffix == u"m":
 
1939
            elif suffix == "m":
1571
1940
                delta = datetime.timedelta(0, 0, 0, 0, value)
1572
 
            elif suffix == u"h":
 
1941
            elif suffix == "h":
1573
1942
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1574
 
            elif suffix == u"w":
 
1943
            elif suffix == "w":
1575
1944
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1576
1945
            else:
1577
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1578
 
        except (ValueError, IndexError), e:
1579
 
            raise ValueError(e.message)
 
1946
                raise ValueError("Unknown suffix %r" % suffix)
 
1947
        except (ValueError, IndexError) as e:
 
1948
            raise ValueError(*(e.args))
1580
1949
        timevalue += delta
1581
1950
    return timevalue
1582
1951
 
1583
1952
 
1584
 
def if_nametoindex(interface):
1585
 
    """Call the C function if_nametoindex(), or equivalent
1586
 
    
1587
 
    Note: This function cannot accept a unicode string."""
1588
 
    global if_nametoindex
1589
 
    try:
1590
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1591
 
                          (ctypes.util.find_library(u"c"))
1592
 
                          .if_nametoindex)
1593
 
    except (OSError, AttributeError):
1594
 
        logger.warning(u"Doing if_nametoindex the hard way")
1595
 
        def if_nametoindex(interface):
1596
 
            "Get an interface index the hard way, i.e. using fcntl()"
1597
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1598
 
            with contextlib.closing(socket.socket()) as s:
1599
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1600
 
                                    struct.pack(str(u"16s16x"),
1601
 
                                                interface))
1602
 
            interface_index = struct.unpack(str(u"I"),
1603
 
                                            ifreq[16:20])[0]
1604
 
            return interface_index
1605
 
    return if_nametoindex(interface)
1606
 
 
1607
 
 
1608
1953
def daemon(nochdir = False, noclose = False):
1609
1954
    """See daemon(3).  Standard BSD Unix function.
1610
1955
    
1613
1958
        sys.exit()
1614
1959
    os.setsid()
1615
1960
    if not nochdir:
1616
 
        os.chdir(u"/")
 
1961
        os.chdir("/")
1617
1962
    if os.fork():
1618
1963
        sys.exit()
1619
1964
    if not noclose:
1621
1966
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1622
1967
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1623
1968
            raise OSError(errno.ENODEV,
1624
 
                          u"%s not a character device"
 
1969
                          "%s not a character device"
1625
1970
                          % os.path.devnull)
1626
1971
        os.dup2(null, sys.stdin.fileno())
1627
1972
        os.dup2(null, sys.stdout.fileno())
1635
1980
    ##################################################################
1636
1981
    # Parsing of options, both command line and config file
1637
1982
    
1638
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1639
 
    parser.add_option("-i", u"--interface", type=u"string",
1640
 
                      metavar="IF", help=u"Bind to interface IF")
1641
 
    parser.add_option("-a", u"--address", type=u"string",
1642
 
                      help=u"Address to listen for requests on")
1643
 
    parser.add_option("-p", u"--port", type=u"int",
1644
 
                      help=u"Port number to receive requests on")
1645
 
    parser.add_option("--check", action=u"store_true",
1646
 
                      help=u"Run self-test")
1647
 
    parser.add_option("--debug", action=u"store_true",
1648
 
                      help=u"Debug mode; run in foreground and log to"
1649
 
                      u" terminal")
1650
 
    parser.add_option("--debuglevel", type=u"string", metavar="Level",
1651
 
                      help=u"Debug level for stdout output")
1652
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1653
 
                      u" priority string (see GnuTLS documentation)")
1654
 
    parser.add_option("--servicename", type=u"string",
1655
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1656
 
    parser.add_option("--configdir", type=u"string",
1657
 
                      default=u"/etc/mandos", metavar=u"DIR",
1658
 
                      help=u"Directory to search for configuration"
1659
 
                      u" files")
1660
 
    parser.add_option("--no-dbus", action=u"store_false",
1661
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1662
 
                      u" system bus interface")
1663
 
    parser.add_option("--no-ipv6", action=u"store_false",
1664
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1665
 
    options = parser.parse_args()[0]
 
1983
    parser = argparse.ArgumentParser()
 
1984
    parser.add_argument("-v", "--version", action="version",
 
1985
                        version = "%%(prog)s %s" % version,
 
1986
                        help="show version number and exit")
 
1987
    parser.add_argument("-i", "--interface", metavar="IF",
 
1988
                        help="Bind to interface IF")
 
1989
    parser.add_argument("-a", "--address",
 
1990
                        help="Address to listen for requests on")
 
1991
    parser.add_argument("-p", "--port", type=int,
 
1992
                        help="Port number to receive requests on")
 
1993
    parser.add_argument("--check", action="store_true",
 
1994
                        help="Run self-test")
 
1995
    parser.add_argument("--debug", action="store_true",
 
1996
                        help="Debug mode; run in foreground and log"
 
1997
                        " to terminal")
 
1998
    parser.add_argument("--debuglevel", metavar="LEVEL",
 
1999
                        help="Debug level for stdout output")
 
2000
    parser.add_argument("--priority", help="GnuTLS"
 
2001
                        " priority string (see GnuTLS documentation)")
 
2002
    parser.add_argument("--servicename",
 
2003
                        metavar="NAME", help="Zeroconf service name")
 
2004
    parser.add_argument("--configdir",
 
2005
                        default="/etc/mandos", metavar="DIR",
 
2006
                        help="Directory to search for configuration"
 
2007
                        " files")
 
2008
    parser.add_argument("--no-dbus", action="store_false",
 
2009
                        dest="use_dbus", help="Do not provide D-Bus"
 
2010
                        " system bus interface")
 
2011
    parser.add_argument("--no-ipv6", action="store_false",
 
2012
                        dest="use_ipv6", help="Do not use IPv6")
 
2013
    parser.add_argument("--no-restore", action="store_false",
 
2014
                        dest="restore", help="Do not restore stored"
 
2015
                        " state")
 
2016
    parser.add_argument("--statedir", metavar="DIR",
 
2017
                        help="Directory to save/restore state in")
 
2018
    
 
2019
    options = parser.parse_args()
1666
2020
    
1667
2021
    if options.check:
1668
2022
        import doctest
1670
2024
        sys.exit()
1671
2025
    
1672
2026
    # Default values for config file for server-global settings
1673
 
    server_defaults = { u"interface": u"",
1674
 
                        u"address": u"",
1675
 
                        u"port": u"",
1676
 
                        u"debug": u"False",
1677
 
                        u"priority":
1678
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1679
 
                        u"servicename": u"Mandos",
1680
 
                        u"use_dbus": u"True",
1681
 
                        u"use_ipv6": u"True",
1682
 
                        u"debuglevel": u"",
 
2027
    server_defaults = { "interface": "",
 
2028
                        "address": "",
 
2029
                        "port": "",
 
2030
                        "debug": "False",
 
2031
                        "priority":
 
2032
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
2033
                        "servicename": "Mandos",
 
2034
                        "use_dbus": "True",
 
2035
                        "use_ipv6": "True",
 
2036
                        "debuglevel": "",
 
2037
                        "restore": "True",
 
2038
                        "statedir": "/var/lib/mandos"
1683
2039
                        }
1684
2040
    
1685
2041
    # Parse config file for server-global settings
1686
2042
    server_config = configparser.SafeConfigParser(server_defaults)
1687
2043
    del server_defaults
1688
2044
    server_config.read(os.path.join(options.configdir,
1689
 
                                    u"mandos.conf"))
 
2045
                                    "mandos.conf"))
1690
2046
    # Convert the SafeConfigParser object to a dict
1691
2047
    server_settings = server_config.defaults()
1692
2048
    # Use the appropriate methods on the non-string config options
1693
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1694
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
 
2049
    for option in ("debug", "use_dbus", "use_ipv6"):
 
2050
        server_settings[option] = server_config.getboolean("DEFAULT",
1695
2051
                                                           option)
1696
2052
    if server_settings["port"]:
1697
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1698
 
                                                       u"port")
 
2053
        server_settings["port"] = server_config.getint("DEFAULT",
 
2054
                                                       "port")
1699
2055
    del server_config
1700
2056
    
1701
2057
    # Override the settings from the config file with command line
1702
2058
    # options, if set.
1703
 
    for option in (u"interface", u"address", u"port", u"debug",
1704
 
                   u"priority", u"servicename", u"configdir",
1705
 
                   u"use_dbus", u"use_ipv6", u"debuglevel"):
 
2059
    for option in ("interface", "address", "port", "debug",
 
2060
                   "priority", "servicename", "configdir",
 
2061
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2062
                   "statedir"):
1706
2063
        value = getattr(options, option)
1707
2064
        if value is not None:
1708
2065
            server_settings[option] = value
1716
2073
    ##################################################################
1717
2074
    
1718
2075
    # For convenience
1719
 
    debug = server_settings[u"debug"]
1720
 
    debuglevel = server_settings[u"debuglevel"]
1721
 
    use_dbus = server_settings[u"use_dbus"]
1722
 
    use_ipv6 = server_settings[u"use_ipv6"]
1723
 
 
1724
 
    if server_settings[u"servicename"] != u"Mandos":
 
2076
    debug = server_settings["debug"]
 
2077
    debuglevel = server_settings["debuglevel"]
 
2078
    use_dbus = server_settings["use_dbus"]
 
2079
    use_ipv6 = server_settings["use_ipv6"]
 
2080
    stored_state_path = os.path.join(server_settings["statedir"],
 
2081
                                     stored_state_file)
 
2082
    
 
2083
    if debug:
 
2084
        initlogger(debug, logging.DEBUG)
 
2085
    else:
 
2086
        if not debuglevel:
 
2087
            initlogger(debug)
 
2088
        else:
 
2089
            level = getattr(logging, debuglevel.upper())
 
2090
            initlogger(debug, level)
 
2091
    
 
2092
    if server_settings["servicename"] != "Mandos":
1725
2093
        syslogger.setFormatter(logging.Formatter
1726
 
                               (u'Mandos (%s) [%%(process)d]:'
1727
 
                                u' %%(levelname)s: %%(message)s'
1728
 
                                % server_settings[u"servicename"]))
 
2094
                               ('Mandos (%s) [%%(process)d]:'
 
2095
                                ' %%(levelname)s: %%(message)s'
 
2096
                                % server_settings["servicename"]))
1729
2097
    
1730
2098
    # Parse config file with clients
1731
 
    client_defaults = { u"timeout": u"1h",
1732
 
                        u"interval": u"5m",
1733
 
                        u"checker": u"fping -q -- %%(host)s",
1734
 
                        u"host": u"",
1735
 
                        u"approval_delay": u"0s",
1736
 
                        u"approval_duration": u"1s",
1737
 
                        }
1738
 
    client_config = configparser.SafeConfigParser(client_defaults)
1739
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1740
 
                                    u"clients.conf"))
 
2099
    client_config = configparser.SafeConfigParser(Client
 
2100
                                                  .client_defaults)
 
2101
    client_config.read(os.path.join(server_settings["configdir"],
 
2102
                                    "clients.conf"))
1741
2103
    
1742
2104
    global mandos_dbus_service
1743
2105
    mandos_dbus_service = None
1744
2106
    
1745
 
    tcp_server = MandosServer((server_settings[u"address"],
1746
 
                               server_settings[u"port"]),
 
2107
    tcp_server = MandosServer((server_settings["address"],
 
2108
                               server_settings["port"]),
1747
2109
                              ClientHandler,
1748
 
                              interface=(server_settings[u"interface"]
 
2110
                              interface=(server_settings["interface"]
1749
2111
                                         or None),
1750
2112
                              use_ipv6=use_ipv6,
1751
2113
                              gnutls_priority=
1752
 
                              server_settings[u"priority"],
 
2114
                              server_settings["priority"],
1753
2115
                              use_dbus=use_dbus)
1754
 
    pidfilename = u"/var/run/mandos.pid"
1755
 
    try:
1756
 
        pidfile = open(pidfilename, u"w")
1757
 
    except IOError:
1758
 
        logger.error(u"Could not open file %r", pidfilename)
 
2116
    if not debug:
 
2117
        pidfilename = "/var/run/mandos.pid"
 
2118
        try:
 
2119
            pidfile = open(pidfilename, "w")
 
2120
        except IOError:
 
2121
            logger.error("Could not open file %r", pidfilename)
1759
2122
    
1760
2123
    try:
1761
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1762
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
2124
        uid = pwd.getpwnam("_mandos").pw_uid
 
2125
        gid = pwd.getpwnam("_mandos").pw_gid
1763
2126
    except KeyError:
1764
2127
        try:
1765
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1766
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
2128
            uid = pwd.getpwnam("mandos").pw_uid
 
2129
            gid = pwd.getpwnam("mandos").pw_gid
1767
2130
        except KeyError:
1768
2131
            try:
1769
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1770
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
2132
                uid = pwd.getpwnam("nobody").pw_uid
 
2133
                gid = pwd.getpwnam("nobody").pw_gid
1771
2134
            except KeyError:
1772
2135
                uid = 65534
1773
2136
                gid = 65534
1774
2137
    try:
1775
2138
        os.setgid(gid)
1776
2139
        os.setuid(uid)
1777
 
    except OSError, error:
 
2140
    except OSError as error:
1778
2141
        if error[0] != errno.EPERM:
1779
2142
            raise error
1780
2143
    
1781
 
    if not debug and not debuglevel:
1782
 
        syslogger.setLevel(logging.WARNING)
1783
 
        console.setLevel(logging.WARNING)
1784
 
    if debuglevel:
1785
 
        level = getattr(logging, debuglevel.upper())
1786
 
        syslogger.setLevel(level)
1787
 
        console.setLevel(level)
1788
 
 
1789
2144
    if debug:
1790
2145
        # Enable all possible GnuTLS debugging
1791
2146
        
1795
2150
        
1796
2151
        @gnutls.library.types.gnutls_log_func
1797
2152
        def debug_gnutls(level, string):
1798
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
2153
            logger.debug("GnuTLS: %s", string[:-1])
1799
2154
        
1800
2155
        (gnutls.library.functions
1801
2156
         .gnutls_global_set_log_function(debug_gnutls))
1805
2160
        os.dup2(null, sys.stdin.fileno())
1806
2161
        if null > 2:
1807
2162
            os.close(null)
1808
 
    else:
1809
 
        # No console logging
1810
 
        logger.removeHandler(console)
1811
 
    
 
2163
    
 
2164
    # Need to fork before connecting to D-Bus
 
2165
    if not debug:
 
2166
        # Close all input and output, do double fork, etc.
 
2167
        daemon()
 
2168
    
 
2169
    gobject.threads_init()
1812
2170
    
1813
2171
    global main_loop
1814
2172
    # From the Avahi example code
1818
2176
    # End of Avahi example code
1819
2177
    if use_dbus:
1820
2178
        try:
1821
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
2179
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1822
2180
                                            bus, do_not_queue=True)
1823
 
        except dbus.exceptions.NameExistsException, e:
1824
 
            logger.error(unicode(e) + u", disabling D-Bus")
 
2181
            old_bus_name = (dbus.service.BusName
 
2182
                            ("se.bsnet.fukt.Mandos", bus,
 
2183
                             do_not_queue=True))
 
2184
        except dbus.exceptions.NameExistsException as e:
 
2185
            logger.error(unicode(e) + ", disabling D-Bus")
1825
2186
            use_dbus = False
1826
 
            server_settings[u"use_dbus"] = False
 
2187
            server_settings["use_dbus"] = False
1827
2188
            tcp_server.use_dbus = False
1828
2189
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1829
 
    service = AvahiService(name = server_settings[u"servicename"],
1830
 
                           servicetype = u"_mandos._tcp",
1831
 
                           protocol = protocol, bus = bus)
 
2190
    service = AvahiServiceToSyslog(name =
 
2191
                                   server_settings["servicename"],
 
2192
                                   servicetype = "_mandos._tcp",
 
2193
                                   protocol = protocol, bus = bus)
1832
2194
    if server_settings["interface"]:
1833
2195
        service.interface = (if_nametoindex
1834
 
                             (str(server_settings[u"interface"])))
1835
 
 
1836
 
    if not debug:
1837
 
        # Close all input and output, do double fork, etc.
1838
 
        daemon()
1839
 
        
 
2196
                             (str(server_settings["interface"])))
 
2197
    
1840
2198
    global multiprocessing_manager
1841
2199
    multiprocessing_manager = multiprocessing.Manager()
1842
2200
    
1843
2201
    client_class = Client
1844
2202
    if use_dbus:
1845
 
        client_class = functools.partial(ClientDBus, bus = bus)
1846
 
    def client_config_items(config, section):
1847
 
        special_settings = {
1848
 
            "approved_by_default":
1849
 
                lambda: config.getboolean(section,
1850
 
                                          "approved_by_default"),
1851
 
            }
1852
 
        for name, value in config.items(section):
 
2203
        client_class = functools.partial(ClientDBusTransitional,
 
2204
                                         bus = bus)
 
2205
    
 
2206
    client_settings = Client.config_parser(client_config)
 
2207
    old_client_settings = {}
 
2208
    clients_data = {}
 
2209
    
 
2210
    # Get client data and settings from last running state.
 
2211
    if server_settings["restore"]:
 
2212
        try:
 
2213
            with open(stored_state_path, "rb") as stored_state:
 
2214
                clients_data, old_client_settings = (pickle.load
 
2215
                                                     (stored_state))
 
2216
            os.remove(stored_state_path)
 
2217
        except IOError as e:
 
2218
            logger.warning("Could not load persistent state: {0}"
 
2219
                           .format(e))
 
2220
            if e.errno != errno.ENOENT:
 
2221
                raise
 
2222
        except EOFError as e:
 
2223
            logger.warning("Could not load persistent state: "
 
2224
                           "EOFError: {0}".format(e))
 
2225
    
 
2226
    with PGPEngine() as pgp:
 
2227
        for client_name, client in clients_data.iteritems():
 
2228
            # Decide which value to use after restoring saved state.
 
2229
            # We have three different values: Old config file,
 
2230
            # new config file, and saved state.
 
2231
            # New config value takes precedence if it differs from old
 
2232
            # config value, otherwise use saved state.
 
2233
            for name, value in client_settings[client_name].items():
 
2234
                try:
 
2235
                    # For each value in new config, check if it
 
2236
                    # differs from the old config value (Except for
 
2237
                    # the "secret" attribute)
 
2238
                    if (name != "secret" and
 
2239
                        value != old_client_settings[client_name]
 
2240
                        [name]):
 
2241
                        client[name] = value
 
2242
                except KeyError:
 
2243
                    pass
 
2244
            
 
2245
            # Clients who has passed its expire date can still be
 
2246
            # enabled if its last checker was successful.  Clients
 
2247
            # whose checker succeeded before we stored its state is
 
2248
            # assumed to have successfully run all checkers during
 
2249
            # downtime.
 
2250
            if client["enabled"]:
 
2251
                if datetime.datetime.utcnow() >= client["expires"]:
 
2252
                    if not client["last_checked_ok"]:
 
2253
                        logger.warning(
 
2254
                            "disabling client {0} - Client never "
 
2255
                            "performed a successful checker"
 
2256
                            .format(client_name))
 
2257
                        client["enabled"] = False
 
2258
                    elif client["last_checker_status"] != 0:
 
2259
                        logger.warning(
 
2260
                            "disabling client {0} - Client "
 
2261
                            "last checker failed with error code {1}"
 
2262
                            .format(client_name,
 
2263
                                    client["last_checker_status"]))
 
2264
                        client["enabled"] = False
 
2265
                    else:
 
2266
                        client["expires"] = (datetime.datetime
 
2267
                                             .utcnow()
 
2268
                                             + client["timeout"])
 
2269
                        logger.debug("Last checker succeeded,"
 
2270
                                     " keeping {0} enabled"
 
2271
                                     .format(client_name))
1853
2272
            try:
1854
 
                yield (name, special_settings[name]())
1855
 
            except KeyError:
1856
 
                yield (name, value)
1857
 
    
1858
 
    tcp_server.clients.update(set(
1859
 
            client_class(name = section,
1860
 
                         config= dict(client_config_items(
1861
 
                        client_config, section)))
1862
 
            for section in client_config.sections()))
 
2273
                client["secret"] = (
 
2274
                    pgp.decrypt(client["encrypted_secret"],
 
2275
                                client_settings[client_name]
 
2276
                                ["secret"]))
 
2277
            except PGPError:
 
2278
                # If decryption fails, we use secret from new settings
 
2279
                logger.debug("Failed to decrypt {0} old secret"
 
2280
                             .format(client_name))
 
2281
                client["secret"] = (
 
2282
                    client_settings[client_name]["secret"])
 
2283
 
 
2284
    
 
2285
    # Add/remove clients based on new changes made to config
 
2286
    for client_name in (set(old_client_settings)
 
2287
                        - set(client_settings)):
 
2288
        del clients_data[client_name]
 
2289
    for client_name in (set(client_settings)
 
2290
                        - set(old_client_settings)):
 
2291
        clients_data[client_name] = client_settings[client_name]
 
2292
 
 
2293
    # Create all client objects
 
2294
    for client_name, client in clients_data.iteritems():
 
2295
        tcp_server.clients[client_name] = client_class(
 
2296
            name = client_name, settings = client)
 
2297
    
1863
2298
    if not tcp_server.clients:
1864
 
        logger.warning(u"No clients defined")
 
2299
        logger.warning("No clients defined")
1865
2300
        
1866
 
    try:
1867
 
        with pidfile:
1868
 
            pid = os.getpid()
1869
 
            pidfile.write(str(pid) + "\n")
1870
 
        del pidfile
1871
 
    except IOError:
1872
 
        logger.error(u"Could not write to file %r with PID %d",
1873
 
                     pidfilename, pid)
1874
 
    except NameError:
1875
 
        # "pidfile" was never created
1876
 
        pass
1877
 
    del pidfilename
1878
 
    
1879
2301
    if not debug:
 
2302
        try:
 
2303
            with pidfile:
 
2304
                pid = os.getpid()
 
2305
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
2306
            del pidfile
 
2307
        except IOError:
 
2308
            logger.error("Could not write to file %r with PID %d",
 
2309
                         pidfilename, pid)
 
2310
        except NameError:
 
2311
            # "pidfile" was never created
 
2312
            pass
 
2313
        del pidfilename
1880
2314
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
2315
    
1881
2316
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1882
2317
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1883
2318
    
1885
2320
        class MandosDBusService(dbus.service.Object):
1886
2321
            """A D-Bus proxy object"""
1887
2322
            def __init__(self):
1888
 
                dbus.service.Object.__init__(self, bus, u"/")
1889
 
            _interface = u"se.bsnet.fukt.Mandos"
 
2323
                dbus.service.Object.__init__(self, bus, "/")
 
2324
            _interface = "se.recompile.Mandos"
1890
2325
            
1891
 
            @dbus.service.signal(_interface, signature=u"o")
 
2326
            @dbus.service.signal(_interface, signature="o")
1892
2327
            def ClientAdded(self, objpath):
1893
2328
                "D-Bus signal"
1894
2329
                pass
1895
2330
            
1896
 
            @dbus.service.signal(_interface, signature=u"ss")
 
2331
            @dbus.service.signal(_interface, signature="ss")
1897
2332
            def ClientNotFound(self, fingerprint, address):
1898
2333
                "D-Bus signal"
1899
2334
                pass
1900
2335
            
1901
 
            @dbus.service.signal(_interface, signature=u"os")
 
2336
            @dbus.service.signal(_interface, signature="os")
1902
2337
            def ClientRemoved(self, objpath, name):
1903
2338
                "D-Bus signal"
1904
2339
                pass
1905
2340
            
1906
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
2341
            @dbus.service.method(_interface, out_signature="ao")
1907
2342
            def GetAllClients(self):
1908
2343
                "D-Bus method"
1909
2344
                return dbus.Array(c.dbus_object_path
1910
 
                                  for c in tcp_server.clients)
 
2345
                                  for c in
 
2346
                                  tcp_server.clients.itervalues())
1911
2347
            
1912
2348
            @dbus.service.method(_interface,
1913
 
                                 out_signature=u"a{oa{sv}}")
 
2349
                                 out_signature="a{oa{sv}}")
1914
2350
            def GetAllClientsWithProperties(self):
1915
2351
                "D-Bus method"
1916
2352
                return dbus.Dictionary(
1917
 
                    ((c.dbus_object_path, c.GetAll(u""))
1918
 
                     for c in tcp_server.clients),
1919
 
                    signature=u"oa{sv}")
 
2353
                    ((c.dbus_object_path, c.GetAll(""))
 
2354
                     for c in tcp_server.clients.itervalues()),
 
2355
                    signature="oa{sv}")
1920
2356
            
1921
 
            @dbus.service.method(_interface, in_signature=u"o")
 
2357
            @dbus.service.method(_interface, in_signature="o")
1922
2358
            def RemoveClient(self, object_path):
1923
2359
                "D-Bus method"
1924
 
                for c in tcp_server.clients:
 
2360
                for c in tcp_server.clients.itervalues():
1925
2361
                    if c.dbus_object_path == object_path:
1926
 
                        tcp_server.clients.remove(c)
 
2362
                        del tcp_server.clients[c.name]
1927
2363
                        c.remove_from_connection()
1928
2364
                        # Don't signal anything except ClientRemoved
1929
2365
                        c.disable(quiet=True)
1934
2370
            
1935
2371
            del _interface
1936
2372
        
1937
 
        mandos_dbus_service = MandosDBusService()
 
2373
        class MandosDBusServiceTransitional(MandosDBusService):
 
2374
            __metaclass__ = AlternateDBusNamesMetaclass
 
2375
        mandos_dbus_service = MandosDBusServiceTransitional()
1938
2376
    
1939
2377
    def cleanup():
1940
2378
        "Cleanup function; run on exit"
1941
2379
        service.cleanup()
1942
2380
        
 
2381
        multiprocessing.active_children()
 
2382
        if not (tcp_server.clients or client_settings):
 
2383
            return
 
2384
        
 
2385
        # Store client before exiting. Secrets are encrypted with key
 
2386
        # based on what config file has. If config file is
 
2387
        # removed/edited, old secret will thus be unrecovable.
 
2388
        clients = {}
 
2389
        with PGPEngine() as pgp:
 
2390
            for client in tcp_server.clients.itervalues():
 
2391
                key = client_settings[client.name]["secret"]
 
2392
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2393
                                                      key)
 
2394
                client_dict = {}
 
2395
                
 
2396
                # A list of attributes that can not be pickled
 
2397
                # + secret.
 
2398
                exclude = set(("bus", "changedstate", "secret",
 
2399
                               "checker"))
 
2400
                for name, typ in (inspect.getmembers
 
2401
                                  (dbus.service.Object)):
 
2402
                    exclude.add(name)
 
2403
                
 
2404
                client_dict["encrypted_secret"] = (client
 
2405
                                                   .encrypted_secret)
 
2406
                for attr in client.client_structure:
 
2407
                    if attr not in exclude:
 
2408
                        client_dict[attr] = getattr(client, attr)
 
2409
                
 
2410
                clients[client.name] = client_dict
 
2411
                del client_settings[client.name]["secret"]
 
2412
        
 
2413
        try:
 
2414
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2415
                                                prefix="clients-",
 
2416
                                                dir=os.path.dirname
 
2417
                                                (stored_state_path))
 
2418
            with os.fdopen(tempfd, "wb") as stored_state:
 
2419
                pickle.dump((clients, client_settings), stored_state)
 
2420
            os.rename(tempname, stored_state_path)
 
2421
        except (IOError, OSError) as e:
 
2422
            logger.warning("Could not save persistent state: {0}"
 
2423
                           .format(e))
 
2424
            if not debug:
 
2425
                try:
 
2426
                    os.remove(tempname)
 
2427
                except NameError:
 
2428
                    pass
 
2429
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2430
                                   errno.EEXIST)):
 
2431
                raise e
 
2432
        
 
2433
        # Delete all clients, and settings from config
1943
2434
        while tcp_server.clients:
1944
 
            client = tcp_server.clients.pop()
 
2435
            name, client = tcp_server.clients.popitem()
1945
2436
            if use_dbus:
1946
2437
                client.remove_from_connection()
1947
 
            client.disable_hook = None
1948
2438
            # Don't signal anything except ClientRemoved
1949
2439
            client.disable(quiet=True)
1950
2440
            if use_dbus:
1951
2441
                # Emit D-Bus signal
1952
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2442
                mandos_dbus_service.ClientRemoved(client
 
2443
                                                  .dbus_object_path,
1953
2444
                                                  client.name)
 
2445
        client_settings.clear()
1954
2446
    
1955
2447
    atexit.register(cleanup)
1956
2448
    
1957
 
    for client in tcp_server.clients:
 
2449
    for client in tcp_server.clients.itervalues():
1958
2450
        if use_dbus:
1959
2451
            # Emit D-Bus signal
1960
2452
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
1961
 
        client.enable()
 
2453
        # Need to initiate checking of clients
 
2454
        if client.enabled:
 
2455
            client.init_checker()
1962
2456
    
1963
2457
    tcp_server.enable()
1964
2458
    tcp_server.server_activate()
1966
2460
    # Find out what port we got
1967
2461
    service.port = tcp_server.socket.getsockname()[1]
1968
2462
    if use_ipv6:
1969
 
        logger.info(u"Now listening on address %r, port %d,"
 
2463
        logger.info("Now listening on address %r, port %d,"
1970
2464
                    " flowinfo %d, scope_id %d"
1971
2465
                    % tcp_server.socket.getsockname())
1972
2466
    else:                       # IPv4
1973
 
        logger.info(u"Now listening on address %r, port %d"
 
2467
        logger.info("Now listening on address %r, port %d"
1974
2468
                    % tcp_server.socket.getsockname())
1975
2469
    
1976
2470
    #service.interface = tcp_server.socket.getsockname()[3]
1979
2473
        # From the Avahi example code
1980
2474
        try:
1981
2475
            service.activate()
1982
 
        except dbus.exceptions.DBusException, error:
1983
 
            logger.critical(u"DBusException: %s", error)
 
2476
        except dbus.exceptions.DBusException as error:
 
2477
            logger.critical("DBusException: %s", error)
1984
2478
            cleanup()
1985
2479
            sys.exit(1)
1986
2480
        # End of Avahi example code
1990
2484
                             (tcp_server.handle_request
1991
2485
                              (*args[2:], **kwargs) or True))
1992
2486
        
1993
 
        logger.debug(u"Starting main loop")
 
2487
        logger.debug("Starting main loop")
1994
2488
        main_loop.run()
1995
 
    except AvahiError, error:
1996
 
        logger.critical(u"AvahiError: %s", error)
 
2489
    except AvahiError as error:
 
2490
        logger.critical("AvahiError: %s", error)
1997
2491
        cleanup()
1998
2492
        sys.exit(1)
1999
2493
    except KeyboardInterrupt:
2000
2494
        if debug:
2001
 
            print >> sys.stderr
2002
 
        logger.debug(u"Server received KeyboardInterrupt")
2003
 
    logger.debug(u"Server exiting")
 
2495
            print("", file=sys.stderr)
 
2496
        logger.debug("Server received KeyboardInterrupt")
 
2497
    logger.debug("Server exiting")
2004
2498
    # Must run before the D-Bus bus name gets deregistered
2005
2499
    cleanup()
2006
2500