/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: 2012-01-01 17:38:33 UTC
  • Revision ID: teddy@recompile.se-20120101173833-ai39bif1w0ftuyyh
* Makefile (install-server): Add intro(8mandos) man page.
* network-hooks.d/bridge: Add copyright info and year.
* network-hooks.d/openvpn: - '' -
* network-hooks.d/wireless: - '' -

Show diffs side-by-side

added added

removed removed

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