/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-01-08 10:19:33 UTC
  • Revision ID: teddy@recompile.se-20120108101933-xbtodqgepxax8hn1
Tags: version-1.5.2-1
* Makefile (version): Changed to "1.5.2".
* NEWS (Version 1.5.2): New entry.
* debian/changelog (1.5.2-1): - '' -

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