/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at bsnet
  • Date: 2011-12-25 00:43:51 UTC
  • Revision ID: teddy@fukt.bsnet.se-20111225004351-3hw3msbs8ooesltd
Removed implemented TODO entry

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