/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 recompile
  • Date: 2011-12-27 14:15:40 UTC
  • Revision ID: teddy@recompile.se-20111227141540-ajrabf33q59jfa7t
Reorder TODO entries

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-2010 Teddy Hogeborn
15
 
# Copyright © 2008-2010 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.2"
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
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
391
    approved:   bool(); 'None' if not yet approved/disapproved
244
392
    approval_delay: datetime.timedelta(); Time to wait for approval
245
393
    approval_duration: datetime.timedelta(); Duration of one approval
246
394
    checker:    subprocess.Popen(); a running checker process used
253
401
                     instance %(name)s can be used in the command.
254
402
    checker_initiator_tag: a gobject event source tag, or None
255
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
256
406
    current_checker_command: string; current running checker_command
257
 
    disable_hook:  If set, called by disable() as disable_hook(self)
258
407
    disable_initiator_tag: a gobject event source tag, or None
259
408
    enabled:    bool()
260
409
    fingerprint: string (40 or 32 hexadecimal digits); used to
263
412
    interval:   datetime.timedelta(); How often to start a new checker
264
413
    last_approval_request: datetime.datetime(); (UTC) or None
265
414
    last_checked_ok: datetime.datetime(); (UTC) or None
266
 
    last_enabled: datetime.datetime(); (UTC)
 
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
267
419
    name:       string; from the config file, used in log messages and
268
420
                        D-Bus identifiers
269
421
    secret:     bytestring; sent verbatim (over TLS) to client
270
422
    timeout:    datetime.timedelta(); How long from last_checked_ok
271
423
                                      until this client is disabled
 
424
    extended_timeout:   extra long timeout when password has been sent
272
425
    runtime_expansions: Allowed attributes for runtime expansion.
 
426
    expires:    datetime.datetime(); time (UTC) when a client will be
 
427
                disabled, or None
273
428
    """
274
429
    
275
 
    runtime_expansions = (u"approval_delay", u"approval_duration",
276
 
                          u"created", u"enabled", u"fingerprint",
277
 
                          u"host", u"interval", u"last_checked_ok",
278
 
                          u"last_enabled", u"name", u"timeout")
279
 
    
280
 
    @staticmethod
281
 
    def _timedelta_to_milliseconds(td):
282
 
        "Convert a datetime.timedelta() to milliseconds"
283
 
        return ((td.days * 24 * 60 * 60 * 1000)
284
 
                + (td.seconds * 1000)
285
 
                + (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
                        }
286
444
    
287
445
    def timeout_milliseconds(self):
288
446
        "Return the 'timeout' attribute in milliseconds"
289
 
        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)
290
452
    
291
453
    def interval_milliseconds(self):
292
454
        "Return the 'interval' attribute in milliseconds"
293
 
        return self._timedelta_to_milliseconds(self.interval)
294
 
 
 
455
        return timedelta_to_milliseconds(self.interval)
 
456
    
295
457
    def approval_delay_milliseconds(self):
296
 
        return self._timedelta_to_milliseconds(self.approval_delay)
297
 
    
298
 
    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):
299
512
        """Note: the 'checker' key in 'config' sets the
300
513
        'checker_command' attribute and *not* the 'checker'
301
514
        attribute."""
302
515
        self.name = name
303
 
        if config is None:
304
 
            config = {}
305
 
        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)
306
521
        # Uppercase and remove spaces from fingerprint for later
307
522
        # comparison purposes with return value from the fingerprint()
308
523
        # function
309
 
        self.fingerprint = (config[u"fingerprint"].upper()
310
 
                            .replace(u" ", u""))
311
 
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
312
 
        if u"secret" in config:
313
 
            self.secret = config[u"secret"].decode(u"base64")
314
 
        elif u"secfile" in config:
315
 
            with open(os.path.expanduser(os.path.expandvars
316
 
                                         (config[u"secfile"])),
317
 
                      "rb") as secfile:
318
 
                self.secret = secfile.read()
319
 
        else:
320
 
            raise TypeError(u"No secret or secfile for client %s"
321
 
                            % self.name)
322
 
        self.host = config.get(u"host", u"")
323
 
        self.created = datetime.datetime.utcnow()
324
 
        self.enabled = False
325
 
        self.last_approval_request = None
326
 
        self.last_enabled = None
327
 
        self.last_checked_ok = None
328
 
        self.timeout = string_to_delta(config[u"timeout"])
329
 
        self.interval = string_to_delta(config[u"interval"])
330
 
        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
331
528
        self.checker = None
332
529
        self.checker_initiator_tag = None
333
530
        self.disable_initiator_tag = None
334
531
        self.checker_callback_tag = None
335
 
        self.checker_command = config[u"checker"]
336
532
        self.current_checker_command = None
337
 
        self.last_connect = None
338
 
        self._approved = None
339
 
        self.approved_by_default = config.get(u"approved_by_default",
340
 
                                              True)
 
533
        self.approved = None
341
534
        self.approvals_pending = 0
342
 
        self.approval_delay = string_to_delta(
343
 
            config[u"approval_delay"])
344
 
        self.approval_duration = string_to_delta(
345
 
            config[u"approval_duration"])
346
 
        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)
347
549
    
 
550
    # Send notice to process children that client state has changed
348
551
    def send_changedstate(self):
349
 
        self.changedstate.acquire()
350
 
        self.changedstate.notify_all()
351
 
        self.changedstate.release()
352
 
        
 
552
        with self.changedstate:
 
553
            self.changedstate.notify_all()
 
554
    
353
555
    def enable(self):
354
556
        """Start this client's checker and timeout hooks"""
355
 
        if getattr(self, u"enabled", False):
 
557
        if getattr(self, "enabled", False):
356
558
            # Already enabled
357
559
            return
358
560
        self.send_changedstate()
 
561
        self.expires = datetime.datetime.utcnow() + self.timeout
 
562
        self.enabled = True
359
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):
360
590
        # Schedule a new checker to be started an 'interval' from now,
361
591
        # and every interval from then on.
362
592
        self.checker_initiator_tag = (gobject.timeout_add
366
596
        self.disable_initiator_tag = (gobject.timeout_add
367
597
                                   (self.timeout_milliseconds(),
368
598
                                    self.disable))
369
 
        self.enabled = True
370
599
        # Also start a new checker *right now*.
371
600
        self.start_checker()
372
601
    
373
 
    def disable(self, quiet=True):
374
 
        """Disable this client."""
375
 
        if not getattr(self, "enabled", False):
376
 
            return False
377
 
        if not quiet:
378
 
            self.send_changedstate()
379
 
        if not quiet:
380
 
            logger.info(u"Disabling client %s", self.name)
381
 
        if getattr(self, u"disable_initiator_tag", False):
382
 
            gobject.source_remove(self.disable_initiator_tag)
383
 
            self.disable_initiator_tag = None
384
 
        if getattr(self, u"checker_initiator_tag", False):
385
 
            gobject.source_remove(self.checker_initiator_tag)
386
 
            self.checker_initiator_tag = None
387
 
        self.stop_checker()
388
 
        if self.disable_hook:
389
 
            self.disable_hook(self)
390
 
        self.enabled = False
391
 
        # Do not run this again if called by a gobject.timeout_add
392
 
        return False
393
 
    
394
 
    def __del__(self):
395
 
        self.disable_hook = None
396
 
        self.disable()
397
 
    
398
602
    def checker_callback(self, pid, condition, command):
399
603
        """The checker has completed, so take appropriate actions."""
400
604
        self.checker_callback_tag = None
401
605
        self.checker = None
402
606
        if os.WIFEXITED(condition):
403
 
            exitstatus = os.WEXITSTATUS(condition)
404
 
            if exitstatus == 0:
405
 
                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",
406
610
                            vars(self))
407
611
                self.checked_ok()
408
612
            else:
409
 
                logger.info(u"Checker for %(name)s failed",
 
613
                logger.info("Checker for %(name)s failed",
410
614
                            vars(self))
411
615
        else:
412
 
            logger.warning(u"Checker for %(name)s crashed?",
 
616
            self.last_checker_status = -1
 
617
            logger.warning("Checker for %(name)s crashed?",
413
618
                           vars(self))
414
619
    
415
 
    def checked_ok(self):
 
620
    def checked_ok(self, timeout=None):
416
621
        """Bump up the timeout for this client.
417
622
        
418
623
        This should only be called when the client has been seen,
419
624
        alive and well.
420
625
        """
 
626
        if timeout is None:
 
627
            timeout = self.timeout
421
628
        self.last_checked_ok = datetime.datetime.utcnow()
422
 
        gobject.source_remove(self.disable_initiator_tag)
423
 
        self.disable_initiator_tag = (gobject.timeout_add
424
 
                                      (self.timeout_milliseconds(),
425
 
                                       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
426
636
    
427
637
    def need_approval(self):
428
638
        self.last_approval_request = datetime.datetime.utcnow()
444
654
        # If a checker exists, make sure it is not a zombie
445
655
        try:
446
656
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
447
 
        except (AttributeError, OSError), error:
 
657
        except (AttributeError, OSError) as error:
448
658
            if (isinstance(error, OSError)
449
659
                and error.errno != errno.ECHILD):
450
660
                raise error
451
661
        else:
452
662
            if pid:
453
 
                logger.warning(u"Checker was a zombie")
 
663
                logger.warning("Checker was a zombie")
454
664
                gobject.source_remove(self.checker_callback_tag)
455
665
                self.checker_callback(pid, status,
456
666
                                      self.current_checker_command)
463
673
                # Escape attributes for the shell
464
674
                escaped_attrs = dict(
465
675
                    (attr,
466
 
                     re.escape(unicode(str(getattr(self, attr, u"")),
 
676
                     re.escape(unicode(str(getattr(self, attr, "")),
467
677
                                       errors=
468
 
                                       u'replace')))
 
678
                                       'replace')))
469
679
                    for attr in
470
680
                    self.runtime_expansions)
471
 
 
 
681
                
472
682
                try:
473
683
                    command = self.checker_command % escaped_attrs
474
 
                except TypeError, error:
475
 
                    logger.error(u'Could not format string "%s":'
476
 
                                 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)
477
687
                    return True # Try again later
478
688
            self.current_checker_command = command
479
689
            try:
480
 
                logger.info(u"Starting checker %r for %s",
 
690
                logger.info("Starting checker %r for %s",
481
691
                            command, self.name)
482
692
                # We don't need to redirect stdout and stderr, since
483
693
                # in normal mode, that is already done by daemon(),
485
695
                # always replaced by /dev/null.)
486
696
                self.checker = subprocess.Popen(command,
487
697
                                                close_fds=True,
488
 
                                                shell=True, cwd=u"/")
 
698
                                                shell=True, cwd="/")
489
699
                self.checker_callback_tag = (gobject.child_watch_add
490
700
                                             (self.checker.pid,
491
701
                                              self.checker_callback,
496
706
                if pid:
497
707
                    gobject.source_remove(self.checker_callback_tag)
498
708
                    self.checker_callback(pid, status, command)
499
 
            except OSError, error:
500
 
                logger.error(u"Failed to start subprocess: %s",
 
709
            except OSError as error:
 
710
                logger.error("Failed to start subprocess: %s",
501
711
                             error)
502
712
        # Re-run this periodically if run by gobject.timeout_add
503
713
        return True
507
717
        if self.checker_callback_tag:
508
718
            gobject.source_remove(self.checker_callback_tag)
509
719
            self.checker_callback_tag = None
510
 
        if getattr(self, u"checker", None) is None:
 
720
        if getattr(self, "checker", None) is None:
511
721
            return
512
 
        logger.debug(u"Stopping checker for %(name)s", vars(self))
 
722
        logger.debug("Stopping checker for %(name)s", vars(self))
513
723
        try:
514
724
            os.kill(self.checker.pid, signal.SIGTERM)
515
725
            #time.sleep(0.5)
516
726
            #if self.checker.poll() is None:
517
727
            #    os.kill(self.checker.pid, signal.SIGKILL)
518
 
        except OSError, error:
 
728
        except OSError as error:
519
729
            if error.errno != errno.ESRCH: # No such process
520
730
                raise
521
731
        self.checker = None
522
732
 
523
 
def dbus_service_property(dbus_interface, signature=u"v",
524
 
                          access=u"readwrite", byte_arrays=False):
 
733
 
 
734
def dbus_service_property(dbus_interface, signature="v",
 
735
                          access="readwrite", byte_arrays=False):
525
736
    """Decorators for marking methods of a DBusObjectWithProperties to
526
737
    become properties on the D-Bus.
527
738
    
534
745
    """
535
746
    # Encoding deeply encoded byte arrays is not supported yet by the
536
747
    # "Set" method, so we fail early here:
537
 
    if byte_arrays and signature != u"ay":
538
 
        raise ValueError(u"Byte arrays not supported for non-'ay'"
539
 
                         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)
540
751
    def decorator(func):
541
752
        func._dbus_is_property = True
542
753
        func._dbus_interface = dbus_interface
543
754
        func._dbus_signature = signature
544
755
        func._dbus_access = access
545
756
        func._dbus_name = func.__name__
546
 
        if func._dbus_name.endswith(u"_dbus_property"):
 
757
        if func._dbus_name.endswith("_dbus_property"):
547
758
            func._dbus_name = func._dbus_name[:-14]
548
 
        func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
 
759
        func._dbus_get_args_options = {'byte_arrays': byte_arrays }
549
760
        return func
550
761
    return decorator
551
762
 
571
782
 
572
783
class DBusObjectWithProperties(dbus.service.Object):
573
784
    """A D-Bus object with properties.
574
 
 
 
785
    
575
786
    Classes inheriting from this can use the dbus_service_property
576
787
    decorator to expose methods as D-Bus properties.  It exposes the
577
788
    standard Get(), Set(), and GetAll() methods on the D-Bus.
579
790
    
580
791
    @staticmethod
581
792
    def _is_dbus_property(obj):
582
 
        return getattr(obj, u"_dbus_is_property", False)
 
793
        return getattr(obj, "_dbus_is_property", False)
583
794
    
584
795
    def _get_all_dbus_properties(self):
585
796
        """Returns a generator of (name, attribute) pairs
586
797
        """
587
 
        return ((prop._dbus_name, prop)
 
798
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
 
799
                for cls in self.__class__.__mro__
588
800
                for name, prop in
589
 
                inspect.getmembers(self, self._is_dbus_property))
 
801
                inspect.getmembers(cls, self._is_dbus_property))
590
802
    
591
803
    def _get_dbus_property(self, interface_name, property_name):
592
804
        """Returns a bound method if one exists which is a D-Bus
593
805
        property with the specified name and interface.
594
806
        """
595
 
        for name in (property_name,
596
 
                     property_name + u"_dbus_property"):
597
 
            prop = getattr(self, name, None)
598
 
            if (prop is None
599
 
                or not self._is_dbus_property(prop)
600
 
                or prop._dbus_name != property_name
601
 
                or (interface_name and prop._dbus_interface
602
 
                    and interface_name != prop._dbus_interface)):
603
 
                continue
604
 
            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
        
605
814
        # No such property
606
 
        raise DBusPropertyNotFound(self.dbus_object_path + u":"
607
 
                                   + interface_name + u"."
 
815
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
 
816
                                   + interface_name + "."
608
817
                                   + property_name)
609
818
    
610
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
611
 
                         out_signature=u"v")
 
819
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
 
820
                         out_signature="v")
612
821
    def Get(self, interface_name, property_name):
613
822
        """Standard D-Bus property Get() method, see D-Bus standard.
614
823
        """
615
824
        prop = self._get_dbus_property(interface_name, property_name)
616
 
        if prop._dbus_access == u"write":
 
825
        if prop._dbus_access == "write":
617
826
            raise DBusPropertyAccessException(property_name)
618
827
        value = prop()
619
 
        if not hasattr(value, u"variant_level"):
 
828
        if not hasattr(value, "variant_level"):
620
829
            return value
621
830
        return type(value)(value, variant_level=value.variant_level+1)
622
831
    
623
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
 
832
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
624
833
    def Set(self, interface_name, property_name, value):
625
834
        """Standard D-Bus property Set() method, see D-Bus standard.
626
835
        """
627
836
        prop = self._get_dbus_property(interface_name, property_name)
628
 
        if prop._dbus_access == u"read":
 
837
        if prop._dbus_access == "read":
629
838
            raise DBusPropertyAccessException(property_name)
630
 
        if prop._dbus_get_args_options[u"byte_arrays"]:
 
839
        if prop._dbus_get_args_options["byte_arrays"]:
631
840
            # The byte_arrays option is not supported yet on
632
841
            # signatures other than "ay".
633
 
            if prop._dbus_signature != u"ay":
 
842
            if prop._dbus_signature != "ay":
634
843
                raise ValueError
635
844
            value = dbus.ByteArray(''.join(unichr(byte)
636
845
                                           for byte in value))
637
846
        prop(value)
638
847
    
639
 
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
640
 
                         out_signature=u"a{sv}")
 
848
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
 
849
                         out_signature="a{sv}")
641
850
    def GetAll(self, interface_name):
642
851
        """Standard D-Bus property GetAll() method, see D-Bus
643
852
        standard.
644
 
 
 
853
        
645
854
        Note: Will not include properties with access="write".
646
855
        """
647
 
        all = {}
 
856
        properties = {}
648
857
        for name, prop in self._get_all_dbus_properties():
649
858
            if (interface_name
650
859
                and interface_name != prop._dbus_interface):
651
860
                # Interface non-empty but did not match
652
861
                continue
653
862
            # Ignore write-only properties
654
 
            if prop._dbus_access == u"write":
 
863
            if prop._dbus_access == "write":
655
864
                continue
656
865
            value = prop()
657
 
            if not hasattr(value, u"variant_level"):
658
 
                all[name] = value
 
866
            if not hasattr(value, "variant_level"):
 
867
                properties[name] = value
659
868
                continue
660
 
            all[name] = type(value)(value, variant_level=
661
 
                                    value.variant_level+1)
662
 
        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")
663
872
    
664
873
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
665
 
                         out_signature=u"s",
 
874
                         out_signature="s",
666
875
                         path_keyword='object_path',
667
876
                         connection_keyword='connection')
668
877
    def Introspect(self, object_path, connection):
673
882
        try:
674
883
            document = xml.dom.minidom.parseString(xmlstring)
675
884
            def make_tag(document, name, prop):
676
 
                e = document.createElement(u"property")
677
 
                e.setAttribute(u"name", name)
678
 
                e.setAttribute(u"type", prop._dbus_signature)
679
 
                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)
680
889
                return e
681
 
            for if_tag in document.getElementsByTagName(u"interface"):
 
890
            for if_tag in document.getElementsByTagName("interface"):
682
891
                for tag in (make_tag(document, name, prop)
683
892
                            for name, prop
684
893
                            in self._get_all_dbus_properties()
685
894
                            if prop._dbus_interface
686
 
                            == if_tag.getAttribute(u"name")):
 
895
                            == if_tag.getAttribute("name")):
687
896
                    if_tag.appendChild(tag)
688
897
                # Add the names to the return values for the
689
898
                # "org.freedesktop.DBus.Properties" methods
690
 
                if (if_tag.getAttribute(u"name")
691
 
                    == u"org.freedesktop.DBus.Properties"):
692
 
                    for cn in if_tag.getElementsByTagName(u"method"):
693
 
                        if cn.getAttribute(u"name") == u"Get":
694
 
                            for arg in cn.getElementsByTagName(u"arg"):
695
 
                                if (arg.getAttribute(u"direction")
696
 
                                    == u"out"):
697
 
                                    arg.setAttribute(u"name", u"value")
698
 
                        elif cn.getAttribute(u"name") == u"GetAll":
699
 
                            for arg in cn.getElementsByTagName(u"arg"):
700
 
                                if (arg.getAttribute(u"direction")
701
 
                                    == u"out"):
702
 
                                    arg.setAttribute(u"name", u"props")
703
 
            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")
704
913
            document.unlink()
705
914
        except (AttributeError, xml.dom.DOMException,
706
 
                xml.parsers.expat.ExpatError), error:
707
 
            logger.error(u"Failed to override Introspection method",
 
915
                xml.parsers.expat.ExpatError) as error:
 
916
            logger.error("Failed to override Introspection method",
708
917
                         error)
709
918
        return xmlstring
710
919
 
711
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
 
712
1027
class ClientDBus(Client, DBusObjectWithProperties):
713
1028
    """A Client class using D-Bus
714
1029
    
718
1033
    """
719
1034
    
720
1035
    runtime_expansions = (Client.runtime_expansions
721
 
                          + (u"dbus_object_path",))
 
1036
                          + ("dbus_object_path",))
722
1037
    
723
1038
    # dbus.service.Object doesn't use super(), so we can't either.
724
1039
    
725
1040
    def __init__(self, bus = None, *args, **kwargs):
726
 
        self._approvals_pending = 0
727
1041
        self.bus = bus
728
1042
        Client.__init__(self, *args, **kwargs)
 
1043
        self._approvals_pending = 0
 
1044
        
 
1045
        self._approvals_pending = 0
729
1046
        # Only now, when this client is initialized, can it show up on
730
1047
        # the D-Bus
731
1048
        client_object_name = unicode(self.name).translate(
732
 
            {ord(u"."): ord(u"_"),
733
 
             ord(u"-"): ord(u"_")})
 
1049
            {ord("."): ord("_"),
 
1050
             ord("-"): ord("_")})
734
1051
        self.dbus_object_path = (dbus.ObjectPath
735
 
                                 (u"/clients/" + client_object_name))
 
1052
                                 ("/clients/" + client_object_name))
736
1053
        DBusObjectWithProperties.__init__(self, self.bus,
737
1054
                                          self.dbus_object_path)
738
1055
        
739
 
    def _get_approvals_pending(self):
740
 
        return self._approvals_pending
741
 
    def _set_approvals_pending(self, value):
742
 
        old_value = self._approvals_pending
743
 
        self._approvals_pending = value
744
 
        bval = bool(value)
745
 
        if (hasattr(self, "dbus_object_path")
746
 
            and bval is not bool(old_value)):
747
 
            dbus_bool = dbus.Boolean(bval, variant_level=1)
748
 
            self.PropertyChanged(dbus.String(u"ApprovalPending"),
749
 
                                 dbus_bool)
750
 
 
751
 
    approvals_pending = property(_get_approvals_pending,
752
 
                                 _set_approvals_pending)
753
 
    del _get_approvals_pending, _set_approvals_pending
754
 
    
755
 
    @staticmethod
756
 
    def _datetime_to_dbus(dt, variant_level=0):
757
 
        """Convert a UTC datetime.datetime() to a D-Bus type."""
758
 
        return dbus.String(dt.isoformat(),
759
 
                           variant_level=variant_level)
760
 
    
761
 
    def enable(self):
762
 
        oldstate = getattr(self, u"enabled", False)
763
 
        r = Client.enable(self)
764
 
        if oldstate != self.enabled:
765
 
            # Emit D-Bus signals
766
 
            self.PropertyChanged(dbus.String(u"Enabled"),
767
 
                                 dbus.Boolean(True, variant_level=1))
768
 
            self.PropertyChanged(
769
 
                dbus.String(u"LastEnabled"),
770
 
                self._datetime_to_dbus(self.last_enabled,
771
 
                                       variant_level=1))
772
 
        return r
773
 
    
774
 
    def disable(self, quiet = False):
775
 
        oldstate = getattr(self, u"enabled", False)
776
 
        r = Client.disable(self, quiet=quiet)
777
 
        if not quiet and oldstate != self.enabled:
778
 
            # Emit D-Bus signal
779
 
            self.PropertyChanged(dbus.String(u"Enabled"),
780
 
                                 dbus.Boolean(False, variant_level=1))
781
 
        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
782
1122
    
783
1123
    def __del__(self, *args, **kwargs):
784
1124
        try:
785
1125
            self.remove_from_connection()
786
1126
        except LookupError:
787
1127
            pass
788
 
        if hasattr(DBusObjectWithProperties, u"__del__"):
 
1128
        if hasattr(DBusObjectWithProperties, "__del__"):
789
1129
            DBusObjectWithProperties.__del__(self, *args, **kwargs)
790
1130
        Client.__del__(self, *args, **kwargs)
791
1131
    
793
1133
                         *args, **kwargs):
794
1134
        self.checker_callback_tag = None
795
1135
        self.checker = None
796
 
        # Emit D-Bus signal
797
 
        self.PropertyChanged(dbus.String(u"CheckerRunning"),
798
 
                             dbus.Boolean(False, variant_level=1))
799
1136
        if os.WIFEXITED(condition):
800
1137
            exitstatus = os.WEXITSTATUS(condition)
801
1138
            # Emit D-Bus signal
811
1148
        return Client.checker_callback(self, pid, condition, command,
812
1149
                                       *args, **kwargs)
813
1150
    
814
 
    def checked_ok(self, *args, **kwargs):
815
 
        r = Client.checked_ok(self, *args, **kwargs)
816
 
        # Emit D-Bus signal
817
 
        self.PropertyChanged(
818
 
            dbus.String(u"LastCheckedOK"),
819
 
            (self._datetime_to_dbus(self.last_checked_ok,
820
 
                                    variant_level=1)))
821
 
        return r
822
 
    
823
 
    def need_approval(self, *args, **kwargs):
824
 
        r = Client.need_approval(self, *args, **kwargs)
825
 
        # Emit D-Bus signal
826
 
        self.PropertyChanged(
827
 
            dbus.String(u"LastApprovalRequest"),
828
 
            (self._datetime_to_dbus(self.last_approval_request,
829
 
                                    variant_level=1)))
830
 
        return r
831
 
    
832
1151
    def start_checker(self, *args, **kwargs):
833
1152
        old_checker = self.checker
834
1153
        if self.checker is not None:
841
1160
            and old_checker_pid != self.checker.pid):
842
1161
            # Emit D-Bus signal
843
1162
            self.CheckerStarted(self.current_checker_command)
844
 
            self.PropertyChanged(
845
 
                dbus.String(u"CheckerRunning"),
846
 
                dbus.Boolean(True, variant_level=1))
847
1163
        return r
848
1164
    
849
 
    def stop_checker(self, *args, **kwargs):
850
 
        old_checker = getattr(self, u"checker", None)
851
 
        r = Client.stop_checker(self, *args, **kwargs)
852
 
        if (old_checker is not None
853
 
            and getattr(self, u"checker", None) is None):
854
 
            self.PropertyChanged(dbus.String(u"CheckerRunning"),
855
 
                                 dbus.Boolean(False, variant_level=1))
856
 
        return r
857
 
 
858
1165
    def _reset_approved(self):
859
 
        self._approved = None
 
1166
        self.approved = None
860
1167
        return False
861
1168
    
862
1169
    def approve(self, value=True):
863
1170
        self.send_changedstate()
864
 
        self._approved = value
865
 
        gobject.timeout_add(self._timedelta_to_milliseconds
 
1171
        self.approved = value
 
1172
        gobject.timeout_add(timedelta_to_milliseconds
866
1173
                            (self.approval_duration),
867
1174
                            self._reset_approved)
868
1175
    
869
1176
    
870
1177
    ## D-Bus methods, signals & properties
871
 
    _interface = u"se.bsnet.fukt.Mandos.Client"
 
1178
    _interface = "se.recompile.Mandos.Client"
872
1179
    
873
1180
    ## Signals
874
1181
    
875
1182
    # CheckerCompleted - signal
876
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
1183
    @dbus.service.signal(_interface, signature="nxs")
877
1184
    def CheckerCompleted(self, exitcode, waitstatus, command):
878
1185
        "D-Bus signal"
879
1186
        pass
880
1187
    
881
1188
    # CheckerStarted - signal
882
 
    @dbus.service.signal(_interface, signature=u"s")
 
1189
    @dbus.service.signal(_interface, signature="s")
883
1190
    def CheckerStarted(self, command):
884
1191
        "D-Bus signal"
885
1192
        pass
886
1193
    
887
1194
    # PropertyChanged - signal
888
 
    @dbus.service.signal(_interface, signature=u"sv")
 
1195
    @dbus.service.signal(_interface, signature="sv")
889
1196
    def PropertyChanged(self, property, value):
890
1197
        "D-Bus signal"
891
1198
        pass
900
1207
        pass
901
1208
    
902
1209
    # Rejected - signal
903
 
    @dbus.service.signal(_interface, signature=u"s")
 
1210
    @dbus.service.signal(_interface, signature="s")
904
1211
    def Rejected(self, reason):
905
1212
        "D-Bus signal"
906
1213
        pass
907
1214
    
908
1215
    # NeedApproval - signal
909
 
    @dbus.service.signal(_interface, signature=u"tb")
 
1216
    @dbus.service.signal(_interface, signature="tb")
910
1217
    def NeedApproval(self, timeout, default):
911
1218
        "D-Bus signal"
912
1219
        return self.need_approval()
913
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
        """
 
1227
        pass
 
1228
    
914
1229
    ## Methods
915
1230
    
916
1231
    # Approve - method
917
 
    @dbus.service.method(_interface, in_signature=u"b")
 
1232
    @dbus.service.method(_interface, in_signature="b")
918
1233
    def Approve(self, value):
919
1234
        self.approve(value)
920
1235
    
921
1236
    # CheckedOK - method
922
1237
    @dbus.service.method(_interface)
923
1238
    def CheckedOK(self):
924
 
        return self.checked_ok()
 
1239
        self.checked_ok()
925
1240
    
926
1241
    # Enable - method
927
1242
    @dbus.service.method(_interface)
949
1264
    ## Properties
950
1265
    
951
1266
    # ApprovalPending - property
952
 
    @dbus_service_property(_interface, signature=u"b", access=u"read")
 
1267
    @dbus_service_property(_interface, signature="b", access="read")
953
1268
    def ApprovalPending_dbus_property(self):
954
1269
        return dbus.Boolean(bool(self.approvals_pending))
955
1270
    
956
1271
    # ApprovedByDefault - property
957
 
    @dbus_service_property(_interface, signature=u"b",
958
 
                           access=u"readwrite")
 
1272
    @dbus_service_property(_interface, signature="b",
 
1273
                           access="readwrite")
959
1274
    def ApprovedByDefault_dbus_property(self, value=None):
960
1275
        if value is None:       # get
961
1276
            return dbus.Boolean(self.approved_by_default)
962
1277
        self.approved_by_default = bool(value)
963
 
        # Emit D-Bus signal
964
 
        self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
965
 
                             dbus.Boolean(value, variant_level=1))
966
1278
    
967
1279
    # ApprovalDelay - property
968
 
    @dbus_service_property(_interface, signature=u"t",
969
 
                           access=u"readwrite")
 
1280
    @dbus_service_property(_interface, signature="t",
 
1281
                           access="readwrite")
970
1282
    def ApprovalDelay_dbus_property(self, value=None):
971
1283
        if value is None:       # get
972
1284
            return dbus.UInt64(self.approval_delay_milliseconds())
973
1285
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
974
 
        # Emit D-Bus signal
975
 
        self.PropertyChanged(dbus.String(u"ApprovalDelay"),
976
 
                             dbus.UInt64(value, variant_level=1))
977
1286
    
978
1287
    # ApprovalDuration - property
979
 
    @dbus_service_property(_interface, signature=u"t",
980
 
                           access=u"readwrite")
 
1288
    @dbus_service_property(_interface, signature="t",
 
1289
                           access="readwrite")
981
1290
    def ApprovalDuration_dbus_property(self, value=None):
982
1291
        if value is None:       # get
983
 
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
1292
            return dbus.UInt64(timedelta_to_milliseconds(
984
1293
                    self.approval_duration))
985
1294
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
986
 
        # Emit D-Bus signal
987
 
        self.PropertyChanged(dbus.String(u"ApprovalDuration"),
988
 
                             dbus.UInt64(value, variant_level=1))
989
1295
    
990
1296
    # Name - property
991
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1297
    @dbus_service_property(_interface, signature="s", access="read")
992
1298
    def Name_dbus_property(self):
993
1299
        return dbus.String(self.name)
994
1300
    
995
1301
    # Fingerprint - property
996
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1302
    @dbus_service_property(_interface, signature="s", access="read")
997
1303
    def Fingerprint_dbus_property(self):
998
1304
        return dbus.String(self.fingerprint)
999
1305
    
1000
1306
    # Host - property
1001
 
    @dbus_service_property(_interface, signature=u"s",
1002
 
                           access=u"readwrite")
 
1307
    @dbus_service_property(_interface, signature="s",
 
1308
                           access="readwrite")
1003
1309
    def Host_dbus_property(self, value=None):
1004
1310
        if value is None:       # get
1005
1311
            return dbus.String(self.host)
1006
 
        self.host = value
1007
 
        # Emit D-Bus signal
1008
 
        self.PropertyChanged(dbus.String(u"Host"),
1009
 
                             dbus.String(value, variant_level=1))
 
1312
        self.host = unicode(value)
1010
1313
    
1011
1314
    # Created - property
1012
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1315
    @dbus_service_property(_interface, signature="s", access="read")
1013
1316
    def Created_dbus_property(self):
1014
 
        return dbus.String(self._datetime_to_dbus(self.created))
 
1317
        return datetime_to_dbus(self.created)
1015
1318
    
1016
1319
    # LastEnabled - property
1017
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1320
    @dbus_service_property(_interface, signature="s", access="read")
1018
1321
    def LastEnabled_dbus_property(self):
1019
 
        if self.last_enabled is None:
1020
 
            return dbus.String(u"")
1021
 
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
 
1322
        return datetime_to_dbus(self.last_enabled)
1022
1323
    
1023
1324
    # Enabled - property
1024
 
    @dbus_service_property(_interface, signature=u"b",
1025
 
                           access=u"readwrite")
 
1325
    @dbus_service_property(_interface, signature="b",
 
1326
                           access="readwrite")
1026
1327
    def Enabled_dbus_property(self, value=None):
1027
1328
        if value is None:       # get
1028
1329
            return dbus.Boolean(self.enabled)
1032
1333
            self.disable()
1033
1334
    
1034
1335
    # LastCheckedOK - property
1035
 
    @dbus_service_property(_interface, signature=u"s",
1036
 
                           access=u"readwrite")
 
1336
    @dbus_service_property(_interface, signature="s",
 
1337
                           access="readwrite")
1037
1338
    def LastCheckedOK_dbus_property(self, value=None):
1038
1339
        if value is not None:
1039
1340
            self.checked_ok()
1040
1341
            return
1041
 
        if self.last_checked_ok is None:
1042
 
            return dbus.String(u"")
1043
 
        return dbus.String(self._datetime_to_dbus(self
1044
 
                                                  .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)
1045
1348
    
1046
1349
    # LastApprovalRequest - property
1047
 
    @dbus_service_property(_interface, signature=u"s", access=u"read")
 
1350
    @dbus_service_property(_interface, signature="s", access="read")
1048
1351
    def LastApprovalRequest_dbus_property(self):
1049
 
        if self.last_approval_request is None:
1050
 
            return dbus.String(u"")
1051
 
        return dbus.String(self.
1052
 
                           _datetime_to_dbus(self
1053
 
                                             .last_approval_request))
 
1352
        return datetime_to_dbus(self.last_approval_request)
1054
1353
    
1055
1354
    # Timeout - property
1056
 
    @dbus_service_property(_interface, signature=u"t",
1057
 
                           access=u"readwrite")
 
1355
    @dbus_service_property(_interface, signature="t",
 
1356
                           access="readwrite")
1058
1357
    def Timeout_dbus_property(self, value=None):
1059
1358
        if value is None:       # get
1060
1359
            return dbus.UInt64(self.timeout_milliseconds())
1061
1360
        self.timeout = datetime.timedelta(0, 0, 0, value)
1062
 
        # Emit D-Bus signal
1063
 
        self.PropertyChanged(dbus.String(u"Timeout"),
1064
 
                             dbus.UInt64(value, variant_level=1))
1065
 
        if getattr(self, u"disable_initiator_tag", None) is None:
 
1361
        if getattr(self, "disable_initiator_tag", None) is None:
1066
1362
            return
1067
1363
        # Reschedule timeout
1068
1364
        gobject.source_remove(self.disable_initiator_tag)
1069
1365
        self.disable_initiator_tag = None
1070
 
        time_to_die = (self.
1071
 
                       _timedelta_to_milliseconds((self
1072
 
                                                   .last_checked_ok
1073
 
                                                   + self.timeout)
1074
 
                                                  - datetime.datetime
1075
 
                                                  .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())
1076
1372
        if time_to_die <= 0:
1077
1373
            # The timeout has passed
1078
1374
            self.disable()
1079
1375
        else:
 
1376
            self.expires = (datetime.datetime.utcnow()
 
1377
                            + datetime.timedelta(milliseconds =
 
1378
                                                 time_to_die))
1080
1379
            self.disable_initiator_tag = (gobject.timeout_add
1081
1380
                                          (time_to_die, self.disable))
1082
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
    
1083
1390
    # Interval - property
1084
 
    @dbus_service_property(_interface, signature=u"t",
1085
 
                           access=u"readwrite")
 
1391
    @dbus_service_property(_interface, signature="t",
 
1392
                           access="readwrite")
1086
1393
    def Interval_dbus_property(self, value=None):
1087
1394
        if value is None:       # get
1088
1395
            return dbus.UInt64(self.interval_milliseconds())
1089
1396
        self.interval = datetime.timedelta(0, 0, 0, value)
1090
 
        # Emit D-Bus signal
1091
 
        self.PropertyChanged(dbus.String(u"Interval"),
1092
 
                             dbus.UInt64(value, variant_level=1))
1093
 
        if getattr(self, u"checker_initiator_tag", None) is None:
 
1397
        if getattr(self, "checker_initiator_tag", None) is None:
1094
1398
            return
1095
 
        # Reschedule checker run
1096
 
        gobject.source_remove(self.checker_initiator_tag)
1097
 
        self.checker_initiator_tag = (gobject.timeout_add
1098
 
                                      (value, self.start_checker))
1099
 
        self.start_checker()    # Start one now, too
1100
 
 
 
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
    
1101
1406
    # Checker - property
1102
 
    @dbus_service_property(_interface, signature=u"s",
1103
 
                           access=u"readwrite")
 
1407
    @dbus_service_property(_interface, signature="s",
 
1408
                           access="readwrite")
1104
1409
    def Checker_dbus_property(self, value=None):
1105
1410
        if value is None:       # get
1106
1411
            return dbus.String(self.checker_command)
1107
 
        self.checker_command = value
1108
 
        # Emit D-Bus signal
1109
 
        self.PropertyChanged(dbus.String(u"Checker"),
1110
 
                             dbus.String(self.checker_command,
1111
 
                                         variant_level=1))
 
1412
        self.checker_command = unicode(value)
1112
1413
    
1113
1414
    # CheckerRunning - property
1114
 
    @dbus_service_property(_interface, signature=u"b",
1115
 
                           access=u"readwrite")
 
1415
    @dbus_service_property(_interface, signature="b",
 
1416
                           access="readwrite")
1116
1417
    def CheckerRunning_dbus_property(self, value=None):
1117
1418
        if value is None:       # get
1118
1419
            return dbus.Boolean(self.checker is not None)
1122
1423
            self.stop_checker()
1123
1424
    
1124
1425
    # ObjectPath - property
1125
 
    @dbus_service_property(_interface, signature=u"o", access=u"read")
 
1426
    @dbus_service_property(_interface, signature="o", access="read")
1126
1427
    def ObjectPath_dbus_property(self):
1127
1428
        return self.dbus_object_path # is already a dbus.ObjectPath
1128
1429
    
1129
1430
    # Secret = property
1130
 
    @dbus_service_property(_interface, signature=u"ay",
1131
 
                           access=u"write", byte_arrays=True)
 
1431
    @dbus_service_property(_interface, signature="ay",
 
1432
                           access="write", byte_arrays=True)
1132
1433
    def Secret_dbus_property(self, value):
1133
1434
        self.secret = str(value)
1134
1435
    
1141
1442
        self._pipe.send(('init', fpr, address))
1142
1443
        if not self._pipe.recv():
1143
1444
            raise KeyError()
1144
 
 
 
1445
    
1145
1446
    def __getattribute__(self, name):
1146
 
        if(name == '_pipe'):
 
1447
        if name == '_pipe':
1147
1448
            return super(ProxyClient, self).__getattribute__(name)
1148
1449
        self._pipe.send(('getattr', name))
1149
1450
        data = self._pipe.recv()
1154
1455
                self._pipe.send(('funcall', name, args, kwargs))
1155
1456
                return self._pipe.recv()[1]
1156
1457
            return func
1157
 
 
 
1458
    
1158
1459
    def __setattr__(self, name, value):
1159
 
        if(name == '_pipe'):
 
1460
        if name == '_pipe':
1160
1461
            return super(ProxyClient, self).__setattr__(name, value)
1161
1462
        self._pipe.send(('setattr', name, value))
1162
1463
 
1163
1464
 
 
1465
class ClientDBusTransitional(ClientDBus):
 
1466
    __metaclass__ = AlternateDBusNamesMetaclass
 
1467
 
 
1468
 
1164
1469
class ClientHandler(socketserver.BaseRequestHandler, object):
1165
1470
    """A class to handle client connections.
1166
1471
    
1169
1474
    
1170
1475
    def handle(self):
1171
1476
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1172
 
            logger.info(u"TCP connection from: %s",
 
1477
            logger.info("TCP connection from: %s",
1173
1478
                        unicode(self.client_address))
1174
 
            logger.debug(u"Pipe FD: %d",
 
1479
            logger.debug("Pipe FD: %d",
1175
1480
                         self.server.child_pipe.fileno())
1176
 
 
 
1481
            
1177
1482
            session = (gnutls.connection
1178
1483
                       .ClientSession(self.request,
1179
1484
                                      gnutls.connection
1180
1485
                                      .X509Credentials()))
1181
 
 
 
1486
            
1182
1487
            # Note: gnutls.connection.X509Credentials is really a
1183
1488
            # generic GnuTLS certificate credentials object so long as
1184
1489
            # no X.509 keys are added to it.  Therefore, we can use it
1185
1490
            # here despite using OpenPGP certificates.
1186
 
 
1187
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1188
 
            #                      u"+AES-256-CBC", u"+SHA1",
1189
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
1190
 
            #                      u"+DHE-DSS"))
 
1491
            
 
1492
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
 
1493
            #                      "+AES-256-CBC", "+SHA1",
 
1494
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
 
1495
            #                      "+DHE-DSS"))
1191
1496
            # Use a fallback default, since this MUST be set.
1192
1497
            priority = self.server.gnutls_priority
1193
1498
            if priority is None:
1194
 
                priority = u"NORMAL"
 
1499
                priority = "NORMAL"
1195
1500
            (gnutls.library.functions
1196
1501
             .gnutls_priority_set_direct(session._c_object,
1197
1502
                                         priority, None))
1198
 
 
 
1503
            
1199
1504
            # Start communication using the Mandos protocol
1200
1505
            # Get protocol number
1201
1506
            line = self.request.makefile().readline()
1202
 
            logger.debug(u"Protocol version: %r", line)
 
1507
            logger.debug("Protocol version: %r", line)
1203
1508
            try:
1204
1509
                if int(line.strip().split()[0]) > 1:
1205
1510
                    raise RuntimeError
1206
 
            except (ValueError, IndexError, RuntimeError), error:
1207
 
                logger.error(u"Unknown protocol version: %s", error)
 
1511
            except (ValueError, IndexError, RuntimeError) as error:
 
1512
                logger.error("Unknown protocol version: %s", error)
1208
1513
                return
1209
 
 
 
1514
            
1210
1515
            # Start GnuTLS connection
1211
1516
            try:
1212
1517
                session.handshake()
1213
 
            except gnutls.errors.GNUTLSError, error:
1214
 
                logger.warning(u"Handshake failed: %s", error)
 
1518
            except gnutls.errors.GNUTLSError as error:
 
1519
                logger.warning("Handshake failed: %s", error)
1215
1520
                # Do not run session.bye() here: the session is not
1216
1521
                # established.  Just abandon the request.
1217
1522
                return
1218
 
            logger.debug(u"Handshake succeeded")
1219
 
 
 
1523
            logger.debug("Handshake succeeded")
 
1524
            
1220
1525
            approval_required = False
1221
1526
            try:
1222
1527
                try:
1223
1528
                    fpr = self.fingerprint(self.peer_certificate
1224
1529
                                           (session))
1225
 
                except (TypeError, gnutls.errors.GNUTLSError), error:
1226
 
                    logger.warning(u"Bad certificate: %s", error)
 
1530
                except (TypeError,
 
1531
                        gnutls.errors.GNUTLSError) as error:
 
1532
                    logger.warning("Bad certificate: %s", error)
1227
1533
                    return
1228
 
                logger.debug(u"Fingerprint: %s", fpr)
1229
 
 
 
1534
                logger.debug("Fingerprint: %s", fpr)
 
1535
                
1230
1536
                try:
1231
1537
                    client = ProxyClient(child_pipe, fpr,
1232
1538
                                         self.client_address)
1233
1539
                except KeyError:
1234
1540
                    return
1235
1541
                
 
1542
                if self.server.use_dbus:
 
1543
                    # Emit D-Bus signal
 
1544
                    client.NewRequest(str(self.client_address))
 
1545
                
1236
1546
                if client.approval_delay:
1237
1547
                    delay = client.approval_delay
1238
1548
                    client.approvals_pending += 1
1240
1550
                
1241
1551
                while True:
1242
1552
                    if not client.enabled:
1243
 
                        logger.warning(u"Client %s is disabled",
 
1553
                        logger.info("Client %s is disabled",
1244
1554
                                       client.name)
1245
1555
                        if self.server.use_dbus:
1246
1556
                            # Emit D-Bus signal
1247
 
                            client.Rejected("Disabled")                    
 
1557
                            client.Rejected("Disabled")
1248
1558
                        return
1249
1559
                    
1250
 
                    if client._approved or not client.approval_delay:
 
1560
                    if client.approved or not client.approval_delay:
1251
1561
                        #We are approved or approval is disabled
1252
1562
                        break
1253
 
                    elif client._approved is None:
1254
 
                        logger.info(u"Client %s needs approval",
 
1563
                    elif client.approved is None:
 
1564
                        logger.info("Client %s needs approval",
1255
1565
                                    client.name)
1256
1566
                        if self.server.use_dbus:
1257
1567
                            # Emit D-Bus signal
1259
1569
                                client.approval_delay_milliseconds(),
1260
1570
                                client.approved_by_default)
1261
1571
                    else:
1262
 
                        logger.warning(u"Client %s was not approved",
 
1572
                        logger.warning("Client %s was not approved",
1263
1573
                                       client.name)
1264
1574
                        if self.server.use_dbus:
1265
1575
                            # Emit D-Bus signal
1267
1577
                        return
1268
1578
                    
1269
1579
                    #wait until timeout or approved
1270
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1271
1580
                    time = datetime.datetime.now()
1272
1581
                    client.changedstate.acquire()
1273
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1582
                    (client.changedstate.wait
 
1583
                     (float(client.timedelta_to_milliseconds(delay)
 
1584
                            / 1000)))
1274
1585
                    client.changedstate.release()
1275
1586
                    time2 = datetime.datetime.now()
1276
1587
                    if (time2 - time) >= delay:
1291
1602
                while sent_size < len(client.secret):
1292
1603
                    try:
1293
1604
                        sent = session.send(client.secret[sent_size:])
1294
 
                    except (gnutls.errors.GNUTLSError), error:
 
1605
                    except gnutls.errors.GNUTLSError as error:
1295
1606
                        logger.warning("gnutls send failed")
1296
1607
                        return
1297
 
                    logger.debug(u"Sent: %d, remaining: %d",
 
1608
                    logger.debug("Sent: %d, remaining: %d",
1298
1609
                                 sent, len(client.secret)
1299
1610
                                 - (sent_size + sent))
1300
1611
                    sent_size += sent
1301
 
 
1302
 
                logger.info(u"Sending secret to %s", client.name)
1303
 
                # bump the timeout as if seen
1304
 
                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)
1305
1616
                if self.server.use_dbus:
1306
1617
                    # Emit D-Bus signal
1307
1618
                    client.GotSecret()
1311
1622
                    client.approvals_pending -= 1
1312
1623
                try:
1313
1624
                    session.bye()
1314
 
                except (gnutls.errors.GNUTLSError), error:
 
1625
                except gnutls.errors.GNUTLSError as error:
1315
1626
                    logger.warning("GnuTLS bye failed")
1316
1627
    
1317
1628
    @staticmethod
1328
1639
                     .gnutls_certificate_get_peers
1329
1640
                     (session._c_object, ctypes.byref(list_size)))
1330
1641
        if not bool(cert_list) and list_size.value != 0:
1331
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
1332
 
                                            u" certificate")
 
1642
            raise gnutls.errors.GNUTLSError("error getting peer"
 
1643
                                            " certificate")
1333
1644
        if list_size.value == 0:
1334
1645
            return None
1335
1646
        cert = cert_list[0]
1361
1672
        if crtverify.value != 0:
1362
1673
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1363
1674
            raise (gnutls.errors.CertificateSecurityError
1364
 
                   (u"Verify failed"))
 
1675
                   ("Verify failed"))
1365
1676
        # New buffer for the fingerprint
1366
1677
        buf = ctypes.create_string_buffer(20)
1367
1678
        buf_len = ctypes.c_size_t()
1374
1685
        # Convert the buffer to a Python bytestring
1375
1686
        fpr = ctypes.string_at(buf, buf_len.value)
1376
1687
        # Convert the bytestring to hexadecimal notation
1377
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
1688
        hex_fpr = binascii.hexlify(fpr).upper()
1378
1689
        return hex_fpr
1379
1690
 
1380
1691
 
1383
1694
    def sub_process_main(self, request, address):
1384
1695
        try:
1385
1696
            self.finish_request(request, address)
1386
 
        except:
 
1697
        except Exception:
1387
1698
            self.handle_error(request, address)
1388
1699
        self.close_request(request)
1389
 
            
 
1700
    
1390
1701
    def process_request(self, request, address):
1391
1702
        """Start a new process to process the request."""
1392
 
        multiprocessing.Process(target = self.sub_process_main,
1393
 
                                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
 
1394
1709
 
1395
1710
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1396
1711
    """ adds a pipe to the MixIn """
1400
1715
        This function creates a new pipe in self.pipe
1401
1716
        """
1402
1717
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1403
 
 
1404
 
        super(MultiprocessingMixInWithPipe,
1405
 
              self).process_request(request, client_address)
 
1718
        
 
1719
        proc = MultiprocessingMixIn.process_request(self, request,
 
1720
                                                    client_address)
1406
1721
        self.child_pipe.close()
1407
 
        self.add_pipe(parent_pipe)
1408
 
 
1409
 
    def add_pipe(self, parent_pipe):
 
1722
        self.add_pipe(parent_pipe, proc)
 
1723
    
 
1724
    def add_pipe(self, parent_pipe, proc):
1410
1725
        """Dummy function; override as necessary"""
1411
 
        pass
 
1726
        raise NotImplementedError
 
1727
 
1412
1728
 
1413
1729
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1414
1730
                     socketserver.TCPServer, object):
1432
1748
        bind to an address or port if they were not specified."""
1433
1749
        if self.interface is not None:
1434
1750
            if SO_BINDTODEVICE is None:
1435
 
                logger.error(u"SO_BINDTODEVICE does not exist;"
1436
 
                             u" cannot bind to interface %s",
 
1751
                logger.error("SO_BINDTODEVICE does not exist;"
 
1752
                             " cannot bind to interface %s",
1437
1753
                             self.interface)
1438
1754
            else:
1439
1755
                try:
1440
1756
                    self.socket.setsockopt(socket.SOL_SOCKET,
1441
1757
                                           SO_BINDTODEVICE,
1442
1758
                                           str(self.interface
1443
 
                                               + u'\0'))
1444
 
                except socket.error, error:
 
1759
                                               + '\0'))
 
1760
                except socket.error as error:
1445
1761
                    if error[0] == errno.EPERM:
1446
 
                        logger.error(u"No permission to"
1447
 
                                     u" bind to interface %s",
 
1762
                        logger.error("No permission to"
 
1763
                                     " bind to interface %s",
1448
1764
                                     self.interface)
1449
1765
                    elif error[0] == errno.ENOPROTOOPT:
1450
 
                        logger.error(u"SO_BINDTODEVICE not available;"
1451
 
                                     u" cannot bind to interface %s",
 
1766
                        logger.error("SO_BINDTODEVICE not available;"
 
1767
                                     " cannot bind to interface %s",
1452
1768
                                     self.interface)
1453
1769
                    else:
1454
1770
                        raise
1456
1772
        if self.server_address[0] or self.server_address[1]:
1457
1773
            if not self.server_address[0]:
1458
1774
                if self.address_family == socket.AF_INET6:
1459
 
                    any_address = u"::" # in6addr_any
 
1775
                    any_address = "::" # in6addr_any
1460
1776
                else:
1461
1777
                    any_address = socket.INADDR_ANY
1462
1778
                self.server_address = (any_address,
1489
1805
        self.enabled = False
1490
1806
        self.clients = clients
1491
1807
        if self.clients is None:
1492
 
            self.clients = set()
 
1808
            self.clients = {}
1493
1809
        self.use_dbus = use_dbus
1494
1810
        self.gnutls_priority = gnutls_priority
1495
1811
        IPv6_TCPServer.__init__(self, server_address,
1499
1815
    def server_activate(self):
1500
1816
        if self.enabled:
1501
1817
            return socketserver.TCPServer.server_activate(self)
 
1818
    
1502
1819
    def enable(self):
1503
1820
        self.enabled = True
1504
 
    def add_pipe(self, parent_pipe):
 
1821
    
 
1822
    def add_pipe(self, parent_pipe, proc):
1505
1823
        # Call "handle_ipc" for both data and EOF events
1506
1824
        gobject.io_add_watch(parent_pipe.fileno(),
1507
1825
                             gobject.IO_IN | gobject.IO_HUP,
1508
1826
                             functools.partial(self.handle_ipc,
1509
 
                                               parent_pipe = parent_pipe))
1510
 
        
 
1827
                                               parent_pipe =
 
1828
                                               parent_pipe,
 
1829
                                               proc = proc))
 
1830
    
1511
1831
    def handle_ipc(self, source, condition, parent_pipe=None,
1512
 
                   client_object=None):
 
1832
                   proc = None, client_object=None):
1513
1833
        condition_names = {
1514
 
            gobject.IO_IN: u"IN",   # There is data to read.
1515
 
            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
1516
1836
                                    # blocking).
1517
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
1518
 
            gobject.IO_ERR: u"ERR", # Error condition.
1519
 
            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
1520
1840
                                    # broken, usually for pipes and
1521
1841
                                    # sockets).
1522
1842
            }
1524
1844
                                       for cond, name in
1525
1845
                                       condition_names.iteritems()
1526
1846
                                       if cond & condition)
1527
 
        # error or the other end of multiprocessing.Pipe has closed
 
1847
        # error, or the other end of multiprocessing.Pipe has closed
1528
1848
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1849
            # Wait for other process to exit
 
1850
            proc.join()
1529
1851
            return False
1530
1852
        
1531
1853
        # Read a request from the child
1536
1858
            fpr = request[1]
1537
1859
            address = request[2]
1538
1860
            
1539
 
            for c in self.clients:
 
1861
            for c in self.clients.itervalues():
1540
1862
                if c.fingerprint == fpr:
1541
1863
                    client = c
1542
1864
                    break
1543
1865
            else:
1544
 
                logger.warning(u"Client not found for fingerprint: %s, ad"
1545
 
                               u"dress: %s", fpr, address)
 
1866
                logger.info("Client not found for fingerprint: %s, ad"
 
1867
                            "dress: %s", fpr, address)
1546
1868
                if self.use_dbus:
1547
1869
                    # Emit D-Bus signal
1548
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1870
                    mandos_dbus_service.ClientNotFound(fpr,
 
1871
                                                       address[0])
1549
1872
                parent_pipe.send(False)
1550
1873
                return False
1551
1874
            
1552
1875
            gobject.io_add_watch(parent_pipe.fileno(),
1553
1876
                                 gobject.IO_IN | gobject.IO_HUP,
1554
1877
                                 functools.partial(self.handle_ipc,
1555
 
                                                   parent_pipe = parent_pipe,
1556
 
                                                   client_object = client))
 
1878
                                                   parent_pipe =
 
1879
                                                   parent_pipe,
 
1880
                                                   proc = proc,
 
1881
                                                   client_object =
 
1882
                                                   client))
1557
1883
            parent_pipe.send(True)
1558
 
            # 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
1559
1886
            return False
1560
1887
        if command == 'funcall':
1561
1888
            funcname = request[1]
1562
1889
            args = request[2]
1563
1890
            kwargs = request[3]
1564
1891
            
1565
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1566
 
 
 
1892
            parent_pipe.send(('data', getattr(client_object,
 
1893
                                              funcname)(*args,
 
1894
                                                         **kwargs)))
 
1895
        
1567
1896
        if command == 'getattr':
1568
1897
            attrname = request[1]
1569
1898
            if callable(client_object.__getattribute__(attrname)):
1570
1899
                parent_pipe.send(('function',))
1571
1900
            else:
1572
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1901
                parent_pipe.send(('data', client_object
 
1902
                                  .__getattribute__(attrname)))
1573
1903
        
1574
1904
        if command == 'setattr':
1575
1905
            attrname = request[1]
1576
1906
            value = request[2]
1577
1907
            setattr(client_object, attrname, value)
1578
 
 
 
1908
        
1579
1909
        return True
1580
1910
 
1581
1911
 
1582
1912
def string_to_delta(interval):
1583
1913
    """Parse a string and return a datetime.timedelta
1584
1914
    
1585
 
    >>> string_to_delta(u'7d')
 
1915
    >>> string_to_delta('7d')
1586
1916
    datetime.timedelta(7)
1587
 
    >>> string_to_delta(u'60s')
 
1917
    >>> string_to_delta('60s')
1588
1918
    datetime.timedelta(0, 60)
1589
 
    >>> string_to_delta(u'60m')
 
1919
    >>> string_to_delta('60m')
1590
1920
    datetime.timedelta(0, 3600)
1591
 
    >>> string_to_delta(u'24h')
 
1921
    >>> string_to_delta('24h')
1592
1922
    datetime.timedelta(1)
1593
 
    >>> string_to_delta(u'1w')
 
1923
    >>> string_to_delta('1w')
1594
1924
    datetime.timedelta(7)
1595
 
    >>> string_to_delta(u'5m 30s')
 
1925
    >>> string_to_delta('5m 30s')
1596
1926
    datetime.timedelta(0, 330)
1597
1927
    """
1598
1928
    timevalue = datetime.timedelta(0)
1600
1930
        try:
1601
1931
            suffix = unicode(s[-1])
1602
1932
            value = int(s[:-1])
1603
 
            if suffix == u"d":
 
1933
            if suffix == "d":
1604
1934
                delta = datetime.timedelta(value)
1605
 
            elif suffix == u"s":
 
1935
            elif suffix == "s":
1606
1936
                delta = datetime.timedelta(0, value)
1607
 
            elif suffix == u"m":
 
1937
            elif suffix == "m":
1608
1938
                delta = datetime.timedelta(0, 0, 0, 0, value)
1609
 
            elif suffix == u"h":
 
1939
            elif suffix == "h":
1610
1940
                delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1611
 
            elif suffix == u"w":
 
1941
            elif suffix == "w":
1612
1942
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1613
1943
            else:
1614
 
                raise ValueError(u"Unknown suffix %r" % suffix)
1615
 
        except (ValueError, IndexError), e:
1616
 
            raise ValueError(e.message)
 
1944
                raise ValueError("Unknown suffix %r" % suffix)
 
1945
        except (ValueError, IndexError) as e:
 
1946
            raise ValueError(*(e.args))
1617
1947
        timevalue += delta
1618
1948
    return timevalue
1619
1949
 
1620
1950
 
1621
 
def if_nametoindex(interface):
1622
 
    """Call the C function if_nametoindex(), or equivalent
1623
 
    
1624
 
    Note: This function cannot accept a unicode string."""
1625
 
    global if_nametoindex
1626
 
    try:
1627
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1628
 
                          (ctypes.util.find_library(u"c"))
1629
 
                          .if_nametoindex)
1630
 
    except (OSError, AttributeError):
1631
 
        logger.warning(u"Doing if_nametoindex the hard way")
1632
 
        def if_nametoindex(interface):
1633
 
            "Get an interface index the hard way, i.e. using fcntl()"
1634
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1635
 
            with contextlib.closing(socket.socket()) as s:
1636
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1637
 
                                    struct.pack(str(u"16s16x"),
1638
 
                                                interface))
1639
 
            interface_index = struct.unpack(str(u"I"),
1640
 
                                            ifreq[16:20])[0]
1641
 
            return interface_index
1642
 
    return if_nametoindex(interface)
1643
 
 
1644
 
 
1645
1951
def daemon(nochdir = False, noclose = False):
1646
1952
    """See daemon(3).  Standard BSD Unix function.
1647
1953
    
1650
1956
        sys.exit()
1651
1957
    os.setsid()
1652
1958
    if not nochdir:
1653
 
        os.chdir(u"/")
 
1959
        os.chdir("/")
1654
1960
    if os.fork():
1655
1961
        sys.exit()
1656
1962
    if not noclose:
1658
1964
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1659
1965
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1660
1966
            raise OSError(errno.ENODEV,
1661
 
                          u"%s not a character device"
 
1967
                          "%s not a character device"
1662
1968
                          % os.path.devnull)
1663
1969
        os.dup2(null, sys.stdin.fileno())
1664
1970
        os.dup2(null, sys.stdout.fileno())
1672
1978
    ##################################################################
1673
1979
    # Parsing of options, both command line and config file
1674
1980
    
1675
 
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1676
 
    parser.add_option("-i", u"--interface", type=u"string",
1677
 
                      metavar="IF", help=u"Bind to interface IF")
1678
 
    parser.add_option("-a", u"--address", type=u"string",
1679
 
                      help=u"Address to listen for requests on")
1680
 
    parser.add_option("-p", u"--port", type=u"int",
1681
 
                      help=u"Port number to receive requests on")
1682
 
    parser.add_option("--check", action=u"store_true",
1683
 
                      help=u"Run self-test")
1684
 
    parser.add_option("--debug", action=u"store_true",
1685
 
                      help=u"Debug mode; run in foreground and log to"
1686
 
                      u" terminal")
1687
 
    parser.add_option("--debuglevel", type=u"string", metavar="LEVEL",
1688
 
                      help=u"Debug level for stdout output")
1689
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1690
 
                      u" priority string (see GnuTLS documentation)")
1691
 
    parser.add_option("--servicename", type=u"string",
1692
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1693
 
    parser.add_option("--configdir", type=u"string",
1694
 
                      default=u"/etc/mandos", metavar=u"DIR",
1695
 
                      help=u"Directory to search for configuration"
1696
 
                      u" files")
1697
 
    parser.add_option("--no-dbus", action=u"store_false",
1698
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1699
 
                      u" system bus interface")
1700
 
    parser.add_option("--no-ipv6", action=u"store_false",
1701
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
1702
 
    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()
1703
2018
    
1704
2019
    if options.check:
1705
2020
        import doctest
1707
2022
        sys.exit()
1708
2023
    
1709
2024
    # Default values for config file for server-global settings
1710
 
    server_defaults = { u"interface": u"",
1711
 
                        u"address": u"",
1712
 
                        u"port": u"",
1713
 
                        u"debug": u"False",
1714
 
                        u"priority":
1715
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1716
 
                        u"servicename": u"Mandos",
1717
 
                        u"use_dbus": u"True",
1718
 
                        u"use_ipv6": u"True",
1719
 
                        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"
1720
2037
                        }
1721
2038
    
1722
2039
    # Parse config file for server-global settings
1723
2040
    server_config = configparser.SafeConfigParser(server_defaults)
1724
2041
    del server_defaults
1725
2042
    server_config.read(os.path.join(options.configdir,
1726
 
                                    u"mandos.conf"))
 
2043
                                    "mandos.conf"))
1727
2044
    # Convert the SafeConfigParser object to a dict
1728
2045
    server_settings = server_config.defaults()
1729
2046
    # Use the appropriate methods on the non-string config options
1730
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1731
 
        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",
1732
2049
                                                           option)
1733
2050
    if server_settings["port"]:
1734
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1735
 
                                                       u"port")
 
2051
        server_settings["port"] = server_config.getint("DEFAULT",
 
2052
                                                       "port")
1736
2053
    del server_config
1737
2054
    
1738
2055
    # Override the settings from the config file with command line
1739
2056
    # options, if set.
1740
 
    for option in (u"interface", u"address", u"port", u"debug",
1741
 
                   u"priority", u"servicename", u"configdir",
1742
 
                   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"):
1743
2061
        value = getattr(options, option)
1744
2062
        if value is not None:
1745
2063
            server_settings[option] = value
1753
2071
    ##################################################################
1754
2072
    
1755
2073
    # For convenience
1756
 
    debug = server_settings[u"debug"]
1757
 
    debuglevel = server_settings[u"debuglevel"]
1758
 
    use_dbus = server_settings[u"use_dbus"]
1759
 
    use_ipv6 = server_settings[u"use_ipv6"]
1760
 
 
1761
 
    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":
1762
2091
        syslogger.setFormatter(logging.Formatter
1763
 
                               (u'Mandos (%s) [%%(process)d]:'
1764
 
                                u' %%(levelname)s: %%(message)s'
1765
 
                                % server_settings[u"servicename"]))
 
2092
                               ('Mandos (%s) [%%(process)d]:'
 
2093
                                ' %%(levelname)s: %%(message)s'
 
2094
                                % server_settings["servicename"]))
1766
2095
    
1767
2096
    # Parse config file with clients
1768
 
    client_defaults = { u"timeout": u"1h",
1769
 
                        u"interval": u"5m",
1770
 
                        u"checker": u"fping -q -- %%(host)s",
1771
 
                        u"host": u"",
1772
 
                        u"approval_delay": u"0s",
1773
 
                        u"approval_duration": u"1s",
1774
 
                        }
1775
 
    client_config = configparser.SafeConfigParser(client_defaults)
1776
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1777
 
                                    u"clients.conf"))
 
2097
    client_config = configparser.SafeConfigParser(Client.client_defaults)
 
2098
    client_config.read(os.path.join(server_settings["configdir"],
 
2099
                                    "clients.conf"))
1778
2100
    
1779
2101
    global mandos_dbus_service
1780
2102
    mandos_dbus_service = None
1781
2103
    
1782
 
    tcp_server = MandosServer((server_settings[u"address"],
1783
 
                               server_settings[u"port"]),
 
2104
    tcp_server = MandosServer((server_settings["address"],
 
2105
                               server_settings["port"]),
1784
2106
                              ClientHandler,
1785
 
                              interface=(server_settings[u"interface"]
 
2107
                              interface=(server_settings["interface"]
1786
2108
                                         or None),
1787
2109
                              use_ipv6=use_ipv6,
1788
2110
                              gnutls_priority=
1789
 
                              server_settings[u"priority"],
 
2111
                              server_settings["priority"],
1790
2112
                              use_dbus=use_dbus)
1791
2113
    if not debug:
1792
 
        pidfilename = u"/var/run/mandos.pid"
 
2114
        pidfilename = "/var/run/mandos.pid"
1793
2115
        try:
1794
 
            pidfile = open(pidfilename, u"w")
 
2116
            pidfile = open(pidfilename, "w")
1795
2117
        except IOError:
1796
 
            logger.error(u"Could not open file %r", pidfilename)
 
2118
            logger.error("Could not open file %r", pidfilename)
1797
2119
    
1798
2120
    try:
1799
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1800
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
2121
        uid = pwd.getpwnam("_mandos").pw_uid
 
2122
        gid = pwd.getpwnam("_mandos").pw_gid
1801
2123
    except KeyError:
1802
2124
        try:
1803
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1804
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
2125
            uid = pwd.getpwnam("mandos").pw_uid
 
2126
            gid = pwd.getpwnam("mandos").pw_gid
1805
2127
        except KeyError:
1806
2128
            try:
1807
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1808
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
2129
                uid = pwd.getpwnam("nobody").pw_uid
 
2130
                gid = pwd.getpwnam("nobody").pw_gid
1809
2131
            except KeyError:
1810
2132
                uid = 65534
1811
2133
                gid = 65534
1812
2134
    try:
1813
2135
        os.setgid(gid)
1814
2136
        os.setuid(uid)
1815
 
    except OSError, error:
 
2137
    except OSError as error:
1816
2138
        if error[0] != errno.EPERM:
1817
2139
            raise error
1818
2140
    
1819
 
    if not debug and not debuglevel:
1820
 
        syslogger.setLevel(logging.WARNING)
1821
 
        console.setLevel(logging.WARNING)
1822
 
    if debuglevel:
1823
 
        level = getattr(logging, debuglevel.upper())
1824
 
        syslogger.setLevel(level)
1825
 
        console.setLevel(level)
1826
 
 
1827
2141
    if debug:
1828
2142
        # Enable all possible GnuTLS debugging
1829
2143
        
1833
2147
        
1834
2148
        @gnutls.library.types.gnutls_log_func
1835
2149
        def debug_gnutls(level, string):
1836
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
2150
            logger.debug("GnuTLS: %s", string[:-1])
1837
2151
        
1838
2152
        (gnutls.library.functions
1839
2153
         .gnutls_global_set_log_function(debug_gnutls))
1843
2157
        os.dup2(null, sys.stdin.fileno())
1844
2158
        if null > 2:
1845
2159
            os.close(null)
1846
 
    else:
1847
 
        # No console logging
1848
 
        logger.removeHandler(console)
1849
 
    
 
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()
1850
2167
    
1851
2168
    global main_loop
1852
2169
    # From the Avahi example code
1856
2173
    # End of Avahi example code
1857
2174
    if use_dbus:
1858
2175
        try:
1859
 
            bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
 
2176
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1860
2177
                                            bus, do_not_queue=True)
1861
 
        except dbus.exceptions.NameExistsException, e:
1862
 
            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")
1863
2183
            use_dbus = False
1864
 
            server_settings[u"use_dbus"] = False
 
2184
            server_settings["use_dbus"] = False
1865
2185
            tcp_server.use_dbus = False
1866
2186
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1867
 
    service = AvahiService(name = server_settings[u"servicename"],
1868
 
                           servicetype = u"_mandos._tcp",
1869
 
                           protocol = protocol, bus = bus)
 
2187
    service = AvahiServiceToSyslog(name =
 
2188
                                   server_settings["servicename"],
 
2189
                                   servicetype = "_mandos._tcp",
 
2190
                                   protocol = protocol, bus = bus)
1870
2191
    if server_settings["interface"]:
1871
2192
        service.interface = (if_nametoindex
1872
 
                             (str(server_settings[u"interface"])))
1873
 
 
1874
 
    if not debug:
1875
 
        # Close all input and output, do double fork, etc.
1876
 
        daemon()
1877
 
        
 
2193
                             (str(server_settings["interface"])))
 
2194
    
1878
2195
    global multiprocessing_manager
1879
2196
    multiprocessing_manager = multiprocessing.Manager()
1880
2197
    
1881
2198
    client_class = Client
1882
2199
    if use_dbus:
1883
 
        client_class = functools.partial(ClientDBus, bus = bus)
1884
 
    def client_config_items(config, section):
1885
 
        special_settings = {
1886
 
            "approved_by_default":
1887
 
                lambda: config.getboolean(section,
1888
 
                                          "approved_by_default"),
1889
 
            }
1890
 
        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
                    
1891
2266
            try:
1892
 
                yield (name, special_settings[name]())
1893
 
            except KeyError:
1894
 
                yield (name, value)
1895
 
    
1896
 
    tcp_server.clients.update(set(
1897
 
            client_class(name = section,
1898
 
                         config= dict(client_config_items(
1899
 
                        client_config, section)))
1900
 
            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
    
1901
2290
    if not tcp_server.clients:
1902
 
        logger.warning(u"No clients defined")
 
2291
        logger.warning("No clients defined")
1903
2292
        
1904
2293
    if not debug:
1905
2294
        try:
1906
2295
            with pidfile:
1907
2296
                pid = os.getpid()
1908
 
                pidfile.write(str(pid) + "\n")
 
2297
                pidfile.write(str(pid) + "\n".encode("utf-8"))
1909
2298
            del pidfile
1910
2299
        except IOError:
1911
 
            logger.error(u"Could not write to file %r with PID %d",
 
2300
            logger.error("Could not write to file %r with PID %d",
1912
2301
                         pidfilename, pid)
1913
2302
        except NameError:
1914
2303
            # "pidfile" was never created
1915
2304
            pass
1916
2305
        del pidfilename
1917
 
        
1918
2306
        signal.signal(signal.SIGINT, signal.SIG_IGN)
1919
 
 
 
2307
    
1920
2308
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1921
2309
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1922
2310
    
1924
2312
        class MandosDBusService(dbus.service.Object):
1925
2313
            """A D-Bus proxy object"""
1926
2314
            def __init__(self):
1927
 
                dbus.service.Object.__init__(self, bus, u"/")
1928
 
            _interface = u"se.bsnet.fukt.Mandos"
 
2315
                dbus.service.Object.__init__(self, bus, "/")
 
2316
            _interface = "se.recompile.Mandos"
1929
2317
            
1930
 
            @dbus.service.signal(_interface, signature=u"o")
 
2318
            @dbus.service.signal(_interface, signature="o")
1931
2319
            def ClientAdded(self, objpath):
1932
2320
                "D-Bus signal"
1933
2321
                pass
1934
2322
            
1935
 
            @dbus.service.signal(_interface, signature=u"ss")
 
2323
            @dbus.service.signal(_interface, signature="ss")
1936
2324
            def ClientNotFound(self, fingerprint, address):
1937
2325
                "D-Bus signal"
1938
2326
                pass
1939
2327
            
1940
 
            @dbus.service.signal(_interface, signature=u"os")
 
2328
            @dbus.service.signal(_interface, signature="os")
1941
2329
            def ClientRemoved(self, objpath, name):
1942
2330
                "D-Bus signal"
1943
2331
                pass
1944
2332
            
1945
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
2333
            @dbus.service.method(_interface, out_signature="ao")
1946
2334
            def GetAllClients(self):
1947
2335
                "D-Bus method"
1948
2336
                return dbus.Array(c.dbus_object_path
1949
 
                                  for c in tcp_server.clients)
 
2337
                                  for c in
 
2338
                                  tcp_server.clients.itervalues())
1950
2339
            
1951
2340
            @dbus.service.method(_interface,
1952
 
                                 out_signature=u"a{oa{sv}}")
 
2341
                                 out_signature="a{oa{sv}}")
1953
2342
            def GetAllClientsWithProperties(self):
1954
2343
                "D-Bus method"
1955
2344
                return dbus.Dictionary(
1956
 
                    ((c.dbus_object_path, c.GetAll(u""))
1957
 
                     for c in tcp_server.clients),
1958
 
                    signature=u"oa{sv}")
 
2345
                    ((c.dbus_object_path, c.GetAll(""))
 
2346
                     for c in tcp_server.clients.itervalues()),
 
2347
                    signature="oa{sv}")
1959
2348
            
1960
 
            @dbus.service.method(_interface, in_signature=u"o")
 
2349
            @dbus.service.method(_interface, in_signature="o")
1961
2350
            def RemoveClient(self, object_path):
1962
2351
                "D-Bus method"
1963
 
                for c in tcp_server.clients:
 
2352
                for c in tcp_server.clients.itervalues():
1964
2353
                    if c.dbus_object_path == object_path:
1965
 
                        tcp_server.clients.remove(c)
 
2354
                        del tcp_server.clients[c.name]
1966
2355
                        c.remove_from_connection()
1967
2356
                        # Don't signal anything except ClientRemoved
1968
2357
                        c.disable(quiet=True)
1973
2362
            
1974
2363
            del _interface
1975
2364
        
1976
 
        mandos_dbus_service = MandosDBusService()
 
2365
        class MandosDBusServiceTransitional(MandosDBusService):
 
2366
            __metaclass__ = AlternateDBusNamesMetaclass
 
2367
        mandos_dbus_service = MandosDBusServiceTransitional()
1977
2368
    
1978
2369
    def cleanup():
1979
2370
        "Cleanup function; run on exit"
1980
2371
        service.cleanup()
1981
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
1982
2426
        while tcp_server.clients:
1983
 
            client = tcp_server.clients.pop()
 
2427
            name, client = tcp_server.clients.popitem()
1984
2428
            if use_dbus:
1985
2429
                client.remove_from_connection()
1986
 
            client.disable_hook = None
1987
2430
            # Don't signal anything except ClientRemoved
1988
2431
            client.disable(quiet=True)
1989
2432
            if use_dbus:
1990
2433
                # Emit D-Bus signal
1991
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2434
                mandos_dbus_service.ClientRemoved(client
 
2435
                                                  .dbus_object_path,
1992
2436
                                                  client.name)
 
2437
        client_settings.clear()
1993
2438
    
1994
2439
    atexit.register(cleanup)
1995
2440
    
1996
 
    for client in tcp_server.clients:
 
2441
    for client in tcp_server.clients.itervalues():
1997
2442
        if use_dbus:
1998
2443
            # Emit D-Bus signal
1999
2444
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2000
 
        client.enable()
 
2445
        # Need to initiate checking of clients
 
2446
        if client.enabled:
 
2447
            client.init_checker()
2001
2448
    
2002
2449
    tcp_server.enable()
2003
2450
    tcp_server.server_activate()
2005
2452
    # Find out what port we got
2006
2453
    service.port = tcp_server.socket.getsockname()[1]
2007
2454
    if use_ipv6:
2008
 
        logger.info(u"Now listening on address %r, port %d,"
 
2455
        logger.info("Now listening on address %r, port %d,"
2009
2456
                    " flowinfo %d, scope_id %d"
2010
2457
                    % tcp_server.socket.getsockname())
2011
2458
    else:                       # IPv4
2012
 
        logger.info(u"Now listening on address %r, port %d"
 
2459
        logger.info("Now listening on address %r, port %d"
2013
2460
                    % tcp_server.socket.getsockname())
2014
2461
    
2015
2462
    #service.interface = tcp_server.socket.getsockname()[3]
2018
2465
        # From the Avahi example code
2019
2466
        try:
2020
2467
            service.activate()
2021
 
        except dbus.exceptions.DBusException, error:
2022
 
            logger.critical(u"DBusException: %s", error)
 
2468
        except dbus.exceptions.DBusException as error:
 
2469
            logger.critical("DBusException: %s", error)
2023
2470
            cleanup()
2024
2471
            sys.exit(1)
2025
2472
        # End of Avahi example code
2029
2476
                             (tcp_server.handle_request
2030
2477
                              (*args[2:], **kwargs) or True))
2031
2478
        
2032
 
        logger.debug(u"Starting main loop")
 
2479
        logger.debug("Starting main loop")
2033
2480
        main_loop.run()
2034
 
    except AvahiError, error:
2035
 
        logger.critical(u"AvahiError: %s", error)
 
2481
    except AvahiError as error:
 
2482
        logger.critical("AvahiError: %s", error)
2036
2483
        cleanup()
2037
2484
        sys.exit(1)
2038
2485
    except KeyboardInterrupt:
2039
2486
        if debug:
2040
 
            print >> sys.stderr
2041
 
        logger.debug(u"Server received KeyboardInterrupt")
2042
 
    logger.debug(u"Server exiting")
 
2487
            print("", file=sys.stderr)
 
2488
        logger.debug("Server received KeyboardInterrupt")
 
2489
    logger.debug("Server exiting")
2043
2490
    # Must run before the D-Bus bus name gets deregistered
2044
2491
    cleanup()
2045
2492