/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

working new feature: network-hooks - Enables user-scripts to take up
                     interfaces during bootup

Show diffs side-by-side

added added

removed removed

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