/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-03-17 18:19:08 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110317181908-mwaptiv1bpgvzuf9
* plugins.d/password-prompt.c (conflict_detection): Don't print error
                                                    on ENOENT when
                                                    opening
                                                    /proc/*/cmdline.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python2.7
 
1
#!/usr/bin/python
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2014 Teddy Hogeborn
15
 
# Copyright © 2008-2014 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program.  If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
31
 
# Contact the authors at <mandos@recompile.se>.
 
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
33
33
 
34
34
from __future__ import (division, absolute_import, print_function,
35
35
                        unicode_literals)
36
36
 
37
 
from future_builtins import *
38
 
 
39
37
import SocketServer as socketserver
40
38
import socket
41
39
import argparse
64
62
import functools
65
63
import cPickle as pickle
66
64
import multiprocessing
67
 
import types
68
 
import binascii
69
 
import tempfile
70
 
import itertools
71
 
import collections
72
65
 
73
66
import dbus
74
67
import dbus.service
88
81
    except ImportError:
89
82
        SO_BINDTODEVICE = None
90
83
 
91
 
if sys.version_info.major == 2:
92
 
    str = unicode
93
 
 
94
 
version = "1.6.9"
95
 
stored_state_file = "clients.pickle"
96
 
 
97
 
logger = logging.getLogger()
98
 
syslogger = None
99
 
 
100
 
try:
101
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
102
 
                      (ctypes.util.find_library("c"))
103
 
                      .if_nametoindex)
104
 
except (OSError, AttributeError):
105
 
    def if_nametoindex(interface):
106
 
        "Get an interface index the hard way, i.e. using fcntl()"
107
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
108
 
        with contextlib.closing(socket.socket()) as s:
109
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
110
 
                                struct.pack(b"16s16x", interface))
111
 
        interface_index = struct.unpack("I", ifreq[16:20])[0]
112
 
        return interface_index
113
 
 
114
 
 
115
 
def initlogger(debug, level=logging.WARNING):
116
 
    """init logger and add loglevel"""
117
 
    
118
 
    global syslogger
119
 
    syslogger = (logging.handlers.SysLogHandler
120
 
                 (facility =
121
 
                  logging.handlers.SysLogHandler.LOG_DAEMON,
122
 
                  address = "/dev/log"))
123
 
    syslogger.setFormatter(logging.Formatter
124
 
                           ('Mandos [%(process)d]: %(levelname)s:'
125
 
                            ' %(message)s'))
126
 
    logger.addHandler(syslogger)
127
 
    
128
 
    if debug:
129
 
        console = logging.StreamHandler()
130
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
131
 
                                               ' [%(process)d]:'
132
 
                                               ' %(levelname)s:'
133
 
                                               ' %(message)s'))
134
 
        logger.addHandler(console)
135
 
    logger.setLevel(level)
136
 
 
137
 
 
138
 
class PGPError(Exception):
139
 
    """Exception if encryption/decryption fails"""
140
 
    pass
141
 
 
142
 
 
143
 
class PGPEngine(object):
144
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
145
 
    def __init__(self):
146
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
147
 
        self.gnupgargs = ['--batch',
148
 
                          '--home', self.tempdir,
149
 
                          '--force-mdc',
150
 
                          '--quiet',
151
 
                          '--no-use-agent']
152
 
    
153
 
    def __enter__(self):
154
 
        return self
155
 
    
156
 
    def __exit__(self, exc_type, exc_value, traceback):
157
 
        self._cleanup()
158
 
        return False
159
 
    
160
 
    def __del__(self):
161
 
        self._cleanup()
162
 
    
163
 
    def _cleanup(self):
164
 
        if self.tempdir is not None:
165
 
            # Delete contents of tempdir
166
 
            for root, dirs, files in os.walk(self.tempdir,
167
 
                                             topdown = False):
168
 
                for filename in files:
169
 
                    os.remove(os.path.join(root, filename))
170
 
                for dirname in dirs:
171
 
                    os.rmdir(os.path.join(root, dirname))
172
 
            # Remove tempdir
173
 
            os.rmdir(self.tempdir)
174
 
            self.tempdir = None
175
 
    
176
 
    def password_encode(self, password):
177
 
        # Passphrase can not be empty and can not contain newlines or
178
 
        # NUL bytes.  So we prefix it and hex encode it.
179
 
        encoded = b"mandos" + binascii.hexlify(password)
180
 
        if len(encoded) > 2048:
181
 
            # GnuPG can't handle long passwords, so encode differently
182
 
            encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
183
 
                       .replace(b"\n", b"\\n")
184
 
                       .replace(b"\0", b"\\x00"))
185
 
        return encoded
186
 
    
187
 
    def encrypt(self, data, password):
188
 
        passphrase = self.password_encode(password)
189
 
        with tempfile.NamedTemporaryFile(dir=self.tempdir
190
 
                                         ) as passfile:
191
 
            passfile.write(passphrase)
192
 
            passfile.flush()
193
 
            proc = subprocess.Popen(['gpg', '--symmetric',
194
 
                                     '--passphrase-file',
195
 
                                     passfile.name]
196
 
                                    + self.gnupgargs,
197
 
                                    stdin = subprocess.PIPE,
198
 
                                    stdout = subprocess.PIPE,
199
 
                                    stderr = subprocess.PIPE)
200
 
            ciphertext, err = proc.communicate(input = data)
201
 
        if proc.returncode != 0:
202
 
            raise PGPError(err)
203
 
        return ciphertext
204
 
    
205
 
    def decrypt(self, data, password):
206
 
        passphrase = self.password_encode(password)
207
 
        with tempfile.NamedTemporaryFile(dir = self.tempdir
208
 
                                         ) as passfile:
209
 
            passfile.write(passphrase)
210
 
            passfile.flush()
211
 
            proc = subprocess.Popen(['gpg', '--decrypt',
212
 
                                     '--passphrase-file',
213
 
                                     passfile.name]
214
 
                                    + self.gnupgargs,
215
 
                                    stdin = subprocess.PIPE,
216
 
                                    stdout = subprocess.PIPE,
217
 
                                    stderr = subprocess.PIPE)
218
 
            decrypted_plaintext, err = proc.communicate(input
219
 
                                                        = data)
220
 
        if proc.returncode != 0:
221
 
            raise PGPError(err)
222
 
        return decrypted_plaintext
223
 
 
 
84
 
 
85
version = "1.3.0"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
 
89
syslogger = (logging.handlers.SysLogHandler
 
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
 
91
              address = str("/dev/log")))
 
92
syslogger.setFormatter(logging.Formatter
 
93
                       ('Mandos [%(process)d]: %(levelname)s:'
 
94
                        ' %(message)s'))
 
95
logger.addHandler(syslogger)
 
96
 
 
97
console = logging.StreamHandler()
 
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
99
                                       ' %(levelname)s:'
 
100
                                       ' %(message)s'))
 
101
logger.addHandler(console)
224
102
 
225
103
class AvahiError(Exception):
226
104
    def __init__(self, value, *args, **kwargs):
227
105
        self.value = value
228
 
        return super(AvahiError, self).__init__(value, *args,
229
 
                                                **kwargs)
 
106
        super(AvahiError, self).__init__(value, *args, **kwargs)
 
107
    def __unicode__(self):
 
108
        return unicode(repr(self.value))
230
109
 
231
110
class AvahiServiceError(AvahiError):
232
111
    pass
243
122
               Used to optionally bind to the specified interface.
244
123
    name: string; Example: 'Mandos'
245
124
    type: string; Example: '_mandos._tcp'.
246
 
     See <https://www.iana.org/assignments/service-names-port-numbers>
 
125
                  See <http://www.dns-sd.org/ServiceTypes.html>
247
126
    port: integer; what port to announce
248
127
    TXT: list of strings; TXT record for the service
249
128
    domain: string; Domain to publish on, default to .local if empty.
255
134
    server: D-Bus Server
256
135
    bus: dbus.SystemBus()
257
136
    """
258
 
    
259
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
260
138
                 servicetype = None, port = None, TXT = None,
261
139
                 domain = "", host = "", max_renames = 32768,
273
151
        self.group = None       # our entry group
274
152
        self.server = None
275
153
        self.bus = bus
276
 
        self.entry_group_state_changed_match = None
277
 
    
278
 
    def rename(self, remove=True):
 
154
    def rename(self):
279
155
        """Derived from the Avahi example code"""
280
156
        if self.rename_count >= self.max_renames:
281
157
            logger.critical("No suitable Zeroconf service name found"
282
158
                            " after %i retries, exiting.",
283
159
                            self.rename_count)
284
160
            raise AvahiServiceError("Too many renames")
285
 
        self.name = str(self.server
286
 
                        .GetAlternativeServiceName(self.name))
287
 
        self.rename_count += 1
 
161
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
288
162
        logger.info("Changing Zeroconf service name to %r ...",
289
163
                    self.name)
290
 
        if remove:
291
 
            self.remove()
 
164
        syslogger.setFormatter(logging.Formatter
 
165
                               ('Mandos (%s) [%%(process)d]:'
 
166
                                ' %%(levelname)s: %%(message)s'
 
167
                                % self.name))
 
168
        self.remove()
292
169
        try:
293
170
            self.add()
294
 
        except dbus.exceptions.DBusException as error:
295
 
            if (error.get_dbus_name()
296
 
                == "org.freedesktop.Avahi.CollisionError"):
297
 
                logger.info("Local Zeroconf service name collision.")
298
 
                return self.rename(remove=False)
299
 
            else:
300
 
                logger.critical("D-Bus Exception", exc_info=error)
301
 
                self.cleanup()
302
 
                os._exit(1)
303
 
    
 
171
        except dbus.exceptions.DBusException, error:
 
172
            logger.critical("DBusException: %s", error)
 
173
            self.cleanup()
 
174
            os._exit(1)
 
175
        self.rename_count += 1
304
176
    def remove(self):
305
177
        """Derived from the Avahi example code"""
306
 
        if self.entry_group_state_changed_match is not None:
307
 
            self.entry_group_state_changed_match.remove()
308
 
            self.entry_group_state_changed_match = None
309
178
        if self.group is not None:
310
179
            self.group.Reset()
311
 
    
312
180
    def add(self):
313
181
        """Derived from the Avahi example code"""
314
 
        self.remove()
315
182
        if self.group is None:
316
183
            self.group = dbus.Interface(
317
184
                self.bus.get_object(avahi.DBUS_NAME,
318
185
                                    self.server.EntryGroupNew()),
319
186
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
320
 
        self.entry_group_state_changed_match = (
321
 
            self.group.connect_to_signal(
322
 
                'StateChanged', self.entry_group_state_changed))
 
187
            self.group.connect_to_signal('StateChanged',
 
188
                                         self
 
189
                                         .entry_group_state_changed)
323
190
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
324
191
                     self.name, self.type)
325
192
        self.group.AddService(
331
198
            dbus.UInt16(self.port),
332
199
            avahi.string_array_to_txt_array(self.TXT))
333
200
        self.group.Commit()
334
 
    
335
201
    def entry_group_state_changed(self, state, error):
336
202
        """Derived from the Avahi example code"""
337
203
        logger.debug("Avahi entry group state change: %i", state)
343
209
            self.rename()
344
210
        elif state == avahi.ENTRY_GROUP_FAILURE:
345
211
            logger.critical("Avahi: Error in group state changed %s",
346
 
                            str(error))
347
 
            raise AvahiGroupError("State changed: {!s}"
348
 
                                  .format(error))
349
 
    
 
212
                            unicode(error))
 
213
            raise AvahiGroupError("State changed: %s"
 
214
                                  % unicode(error))
350
215
    def cleanup(self):
351
216
        """Derived from the Avahi example code"""
352
217
        if self.group is not None:
353
 
            try:
354
 
                self.group.Free()
355
 
            except (dbus.exceptions.UnknownMethodException,
356
 
                    dbus.exceptions.DBusException):
357
 
                pass
 
218
            self.group.Free()
358
219
            self.group = None
359
 
        self.remove()
360
 
    
361
 
    def server_state_changed(self, state, error=None):
 
220
    def server_state_changed(self, state):
362
221
        """Derived from the Avahi example code"""
363
222
        logger.debug("Avahi server state change: %i", state)
364
 
        bad_states = { avahi.SERVER_INVALID:
365
 
                           "Zeroconf server invalid",
366
 
                       avahi.SERVER_REGISTERING: None,
367
 
                       avahi.SERVER_COLLISION:
368
 
                           "Zeroconf server name collision",
369
 
                       avahi.SERVER_FAILURE:
370
 
                           "Zeroconf server failure" }
371
 
        if state in bad_states:
372
 
            if bad_states[state] is not None:
373
 
                if error is None:
374
 
                    logger.error(bad_states[state])
375
 
                else:
376
 
                    logger.error(bad_states[state] + ": %r", error)
377
 
            self.cleanup()
 
223
        if state == avahi.SERVER_COLLISION:
 
224
            logger.error("Zeroconf server name collision")
 
225
            self.remove()
378
226
        elif state == avahi.SERVER_RUNNING:
379
227
            self.add()
380
 
        else:
381
 
            if error is None:
382
 
                logger.debug("Unknown state: %r", state)
383
 
            else:
384
 
                logger.debug("Unknown state: %r: %r", state, error)
385
 
    
386
228
    def activate(self):
387
229
        """Derived from the Avahi example code"""
388
230
        if self.server is None:
389
231
            self.server = dbus.Interface(
390
232
                self.bus.get_object(avahi.DBUS_NAME,
391
 
                                    avahi.DBUS_PATH_SERVER,
392
 
                                    follow_name_owner_changes=True),
 
233
                                    avahi.DBUS_PATH_SERVER),
393
234
                avahi.DBUS_INTERFACE_SERVER)
394
235
        self.server.connect_to_signal("StateChanged",
395
236
                                 self.server_state_changed)
396
237
        self.server_state_changed(self.server.GetState())
397
238
 
398
239
 
399
 
class AvahiServiceToSyslog(AvahiService):
400
 
    def rename(self, *args, **kwargs):
401
 
        """Add the new name to the syslog messages"""
402
 
        ret = AvahiService.rename(self, *args, **kwargs)
403
 
        syslogger.setFormatter(logging.Formatter
404
 
                               ('Mandos ({}) [%(process)d]:'
405
 
                                ' %(levelname)s: %(message)s'
406
 
                                .format(self.name)))
407
 
        return ret
408
 
 
409
 
 
410
240
class Client(object):
411
241
    """A representation of a client host served by this server.
412
242
    
413
243
    Attributes:
414
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
244
    _approved:   bool(); 'None' if not yet approved/disapproved
415
245
    approval_delay: datetime.timedelta(); Time to wait for approval
416
246
    approval_duration: datetime.timedelta(); Duration of one approval
417
247
    checker:    subprocess.Popen(); a running checker process used
424
254
                     instance %(name)s can be used in the command.
425
255
    checker_initiator_tag: a gobject event source tag, or None
426
256
    created:    datetime.datetime(); (UTC) object creation
427
 
    client_structure: Object describing what attributes a client has
428
 
                      and is used for storing the client at exit
429
257
    current_checker_command: string; current running checker_command
 
258
    disable_hook:  If set, called by disable() as disable_hook(self)
430
259
    disable_initiator_tag: a gobject event source tag, or None
431
260
    enabled:    bool()
432
261
    fingerprint: string (40 or 32 hexadecimal digits); used to
435
264
    interval:   datetime.timedelta(); How often to start a new checker
436
265
    last_approval_request: datetime.datetime(); (UTC) or None
437
266
    last_checked_ok: datetime.datetime(); (UTC) or None
438
 
    last_checker_status: integer between 0 and 255 reflecting exit
439
 
                         status of last checker. -1 reflects crashed
440
 
                         checker, -2 means no checker completed yet.
441
 
    last_enabled: datetime.datetime(); (UTC) or None
 
267
    last_enabled: datetime.datetime(); (UTC)
442
268
    name:       string; from the config file, used in log messages and
443
269
                        D-Bus identifiers
444
270
    secret:     bytestring; sent verbatim (over TLS) to client
445
271
    timeout:    datetime.timedelta(); How long from last_checked_ok
446
272
                                      until this client is disabled
447
 
    extended_timeout:   extra long timeout when secret has been sent
448
273
    runtime_expansions: Allowed attributes for runtime expansion.
449
 
    expires:    datetime.datetime(); time (UTC) when a client will be
450
 
                disabled, or None
451
 
    server_settings: The server_settings dict from main()
452
274
    """
453
275
    
454
276
    runtime_expansions = ("approval_delay", "approval_duration",
455
 
                          "created", "enabled", "expires",
456
 
                          "fingerprint", "host", "interval",
457
 
                          "last_approval_request", "last_checked_ok",
 
277
                          "created", "enabled", "fingerprint",
 
278
                          "host", "interval", "last_checked_ok",
458
279
                          "last_enabled", "name", "timeout")
459
 
    client_defaults = { "timeout": "PT5M",
460
 
                        "extended_timeout": "PT15M",
461
 
                        "interval": "PT2M",
462
 
                        "checker": "fping -q -- %%(host)s",
463
 
                        "host": "",
464
 
                        "approval_delay": "PT0S",
465
 
                        "approval_duration": "PT1S",
466
 
                        "approved_by_default": "True",
467
 
                        "enabled": "True",
468
 
                        }
469
280
    
470
281
    @staticmethod
471
 
    def config_parser(config):
472
 
        """Construct a new dict of client settings of this form:
473
 
        { client_name: {setting_name: value, ...}, ...}
474
 
        with exceptions for any special settings as defined above.
475
 
        NOTE: Must be a pure function. Must return the same result
476
 
        value given the same arguments.
477
 
        """
478
 
        settings = {}
479
 
        for client_name in config.sections():
480
 
            section = dict(config.items(client_name))
481
 
            client = settings[client_name] = {}
482
 
            
483
 
            client["host"] = section["host"]
484
 
            # Reformat values from string types to Python types
485
 
            client["approved_by_default"] = config.getboolean(
486
 
                client_name, "approved_by_default")
487
 
            client["enabled"] = config.getboolean(client_name,
488
 
                                                  "enabled")
489
 
            
490
 
            # Uppercase and remove spaces from fingerprint for later
491
 
            # comparison purposes with return value from the
492
 
            # fingerprint() function
493
 
            client["fingerprint"] = (section["fingerprint"].upper()
494
 
                                     .replace(" ", ""))
495
 
            if "secret" in section:
496
 
                client["secret"] = section["secret"].decode("base64")
497
 
            elif "secfile" in section:
498
 
                with open(os.path.expanduser(os.path.expandvars
499
 
                                             (section["secfile"])),
500
 
                          "rb") as secfile:
501
 
                    client["secret"] = secfile.read()
502
 
            else:
503
 
                raise TypeError("No secret or secfile for section {}"
504
 
                                .format(section))
505
 
            client["timeout"] = string_to_delta(section["timeout"])
506
 
            client["extended_timeout"] = string_to_delta(
507
 
                section["extended_timeout"])
508
 
            client["interval"] = string_to_delta(section["interval"])
509
 
            client["approval_delay"] = string_to_delta(
510
 
                section["approval_delay"])
511
 
            client["approval_duration"] = string_to_delta(
512
 
                section["approval_duration"])
513
 
            client["checker_command"] = section["checker"]
514
 
            client["last_approval_request"] = None
515
 
            client["last_checked_ok"] = None
516
 
            client["last_checker_status"] = -2
517
 
        
518
 
        return settings
519
 
    
520
 
    def __init__(self, settings, name = None, server_settings=None):
 
282
    def _timedelta_to_milliseconds(td):
 
283
        "Convert a datetime.timedelta() to milliseconds"
 
284
        return ((td.days * 24 * 60 * 60 * 1000)
 
285
                + (td.seconds * 1000)
 
286
                + (td.microseconds // 1000))
 
287
    
 
288
    def timeout_milliseconds(self):
 
289
        "Return the 'timeout' attribute in milliseconds"
 
290
        return self._timedelta_to_milliseconds(self.timeout)
 
291
    
 
292
    def interval_milliseconds(self):
 
293
        "Return the 'interval' attribute in milliseconds"
 
294
        return self._timedelta_to_milliseconds(self.interval)
 
295
 
 
296
    def approval_delay_milliseconds(self):
 
297
        return self._timedelta_to_milliseconds(self.approval_delay)
 
298
    
 
299
    def __init__(self, name = None, disable_hook=None, config=None):
 
300
        """Note: the 'checker' key in 'config' sets the
 
301
        'checker_command' attribute and *not* the 'checker'
 
302
        attribute."""
521
303
        self.name = name
522
 
        if server_settings is None:
523
 
            server_settings = {}
524
 
        self.server_settings = server_settings
525
 
        # adding all client settings
526
 
        for setting, value in settings.items():
527
 
            setattr(self, setting, value)
528
 
        
529
 
        if self.enabled:
530
 
            if not hasattr(self, "last_enabled"):
531
 
                self.last_enabled = datetime.datetime.utcnow()
532
 
            if not hasattr(self, "expires"):
533
 
                self.expires = (datetime.datetime.utcnow()
534
 
                                + self.timeout)
535
 
        else:
536
 
            self.last_enabled = None
537
 
            self.expires = None
538
 
        
 
304
        if config is None:
 
305
            config = {}
539
306
        logger.debug("Creating client %r", self.name)
 
307
        # Uppercase and remove spaces from fingerprint for later
 
308
        # comparison purposes with return value from the fingerprint()
 
309
        # function
 
310
        self.fingerprint = (config["fingerprint"].upper()
 
311
                            .replace(" ", ""))
540
312
        logger.debug("  Fingerprint: %s", self.fingerprint)
541
 
        self.created = settings.get("created",
542
 
                                    datetime.datetime.utcnow())
543
 
        
544
 
        # attributes specific for this server instance
 
313
        if "secret" in config:
 
314
            self.secret = config["secret"].decode("base64")
 
315
        elif "secfile" in config:
 
316
            with open(os.path.expanduser(os.path.expandvars
 
317
                                         (config["secfile"])),
 
318
                      "rb") as secfile:
 
319
                self.secret = secfile.read()
 
320
        else:
 
321
            raise TypeError("No secret or secfile for client %s"
 
322
                            % self.name)
 
323
        self.host = config.get("host", "")
 
324
        self.created = datetime.datetime.utcnow()
 
325
        self.enabled = False
 
326
        self.last_approval_request = None
 
327
        self.last_enabled = None
 
328
        self.last_checked_ok = None
 
329
        self.timeout = string_to_delta(config["timeout"])
 
330
        self.interval = string_to_delta(config["interval"])
 
331
        self.disable_hook = disable_hook
545
332
        self.checker = None
546
333
        self.checker_initiator_tag = None
547
334
        self.disable_initiator_tag = None
548
335
        self.checker_callback_tag = None
 
336
        self.checker_command = config["checker"]
549
337
        self.current_checker_command = None
550
 
        self.approved = None
 
338
        self.last_connect = None
 
339
        self._approved = None
 
340
        self.approved_by_default = config.get("approved_by_default",
 
341
                                              True)
551
342
        self.approvals_pending = 0
552
 
        self.changedstate = (multiprocessing_manager
553
 
                             .Condition(multiprocessing_manager
554
 
                                        .Lock()))
555
 
        self.client_structure = [attr for attr in
556
 
                                 self.__dict__.iterkeys()
557
 
                                 if not attr.startswith("_")]
558
 
        self.client_structure.append("client_structure")
559
 
        
560
 
        for name, t in inspect.getmembers(type(self),
561
 
                                          lambda obj:
562
 
                                              isinstance(obj,
563
 
                                                         property)):
564
 
            if not name.startswith("_"):
565
 
                self.client_structure.append(name)
 
343
        self.approval_delay = string_to_delta(
 
344
            config["approval_delay"])
 
345
        self.approval_duration = string_to_delta(
 
346
            config["approval_duration"])
 
347
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
566
348
    
567
 
    # Send notice to process children that client state has changed
568
349
    def send_changedstate(self):
569
 
        with self.changedstate:
570
 
            self.changedstate.notify_all()
571
 
    
 
350
        self.changedstate.acquire()
 
351
        self.changedstate.notify_all()
 
352
        self.changedstate.release()
 
353
        
572
354
    def enable(self):
573
355
        """Start this client's checker and timeout hooks"""
574
356
        if getattr(self, "enabled", False):
575
357
            # Already enabled
576
358
            return
577
 
        self.expires = datetime.datetime.utcnow() + self.timeout
578
 
        self.enabled = True
 
359
        self.send_changedstate()
579
360
        self.last_enabled = datetime.datetime.utcnow()
580
 
        self.init_checker()
581
 
        self.send_changedstate()
 
361
        # Schedule a new checker to be started an 'interval' from now,
 
362
        # and every interval from then on.
 
363
        self.checker_initiator_tag = (gobject.timeout_add
 
364
                                      (self.interval_milliseconds(),
 
365
                                       self.start_checker))
 
366
        # Schedule a disable() when 'timeout' has passed
 
367
        self.disable_initiator_tag = (gobject.timeout_add
 
368
                                   (self.timeout_milliseconds(),
 
369
                                    self.disable))
 
370
        self.enabled = True
 
371
        # Also start a new checker *right now*.
 
372
        self.start_checker()
582
373
    
583
374
    def disable(self, quiet=True):
584
375
        """Disable this client."""
585
376
        if not getattr(self, "enabled", False):
586
377
            return False
587
378
        if not quiet:
 
379
            self.send_changedstate()
 
380
        if not quiet:
588
381
            logger.info("Disabling client %s", self.name)
589
 
        if getattr(self, "disable_initiator_tag", None) is not None:
 
382
        if getattr(self, "disable_initiator_tag", False):
590
383
            gobject.source_remove(self.disable_initiator_tag)
591
384
            self.disable_initiator_tag = None
592
 
        self.expires = None
593
 
        if getattr(self, "checker_initiator_tag", None) is not None:
 
385
        if getattr(self, "checker_initiator_tag", False):
594
386
            gobject.source_remove(self.checker_initiator_tag)
595
387
            self.checker_initiator_tag = None
596
388
        self.stop_checker()
 
389
        if self.disable_hook:
 
390
            self.disable_hook(self)
597
391
        self.enabled = False
598
 
        if not quiet:
599
 
            self.send_changedstate()
600
392
        # Do not run this again if called by a gobject.timeout_add
601
393
        return False
602
394
    
603
395
    def __del__(self):
 
396
        self.disable_hook = None
604
397
        self.disable()
605
398
    
606
 
    def init_checker(self):
607
 
        # Schedule a new checker to be started an 'interval' from now,
608
 
        # and every interval from then on.
609
 
        if self.checker_initiator_tag is not None:
610
 
            gobject.source_remove(self.checker_initiator_tag)
611
 
        self.checker_initiator_tag = (gobject.timeout_add
612
 
                                      (int(self.interval
613
 
                                           .total_seconds() * 1000),
614
 
                                       self.start_checker))
615
 
        # Schedule a disable() when 'timeout' has passed
616
 
        if self.disable_initiator_tag is not None:
617
 
            gobject.source_remove(self.disable_initiator_tag)
618
 
        self.disable_initiator_tag = (gobject.timeout_add
619
 
                                      (int(self.timeout
620
 
                                           .total_seconds() * 1000),
621
 
                                       self.disable))
622
 
        # Also start a new checker *right now*.
623
 
        self.start_checker()
624
 
    
625
399
    def checker_callback(self, pid, condition, command):
626
400
        """The checker has completed, so take appropriate actions."""
627
401
        self.checker_callback_tag = None
628
402
        self.checker = None
629
403
        if os.WIFEXITED(condition):
630
 
            self.last_checker_status = os.WEXITSTATUS(condition)
631
 
            if self.last_checker_status == 0:
 
404
            exitstatus = os.WEXITSTATUS(condition)
 
405
            if exitstatus == 0:
632
406
                logger.info("Checker for %(name)s succeeded",
633
407
                            vars(self))
634
408
                self.checked_ok()
636
410
                logger.info("Checker for %(name)s failed",
637
411
                            vars(self))
638
412
        else:
639
 
            self.last_checker_status = -1
640
413
            logger.warning("Checker for %(name)s crashed?",
641
414
                           vars(self))
642
415
    
643
416
    def checked_ok(self):
644
 
        """Assert that the client has been seen, alive and well."""
 
417
        """Bump up the timeout for this client.
 
418
        
 
419
        This should only be called when the client has been seen,
 
420
        alive and well.
 
421
        """
645
422
        self.last_checked_ok = datetime.datetime.utcnow()
646
 
        self.last_checker_status = 0
647
 
        self.bump_timeout()
648
 
    
649
 
    def bump_timeout(self, timeout=None):
650
 
        """Bump up the timeout for this client."""
651
 
        if timeout is None:
652
 
            timeout = self.timeout
653
 
        if self.disable_initiator_tag is not None:
654
 
            gobject.source_remove(self.disable_initiator_tag)
655
 
            self.disable_initiator_tag = None
656
 
        if getattr(self, "enabled", False):
657
 
            self.disable_initiator_tag = (gobject.timeout_add
658
 
                                          (int(timeout.total_seconds()
659
 
                                               * 1000), self.disable))
660
 
            self.expires = datetime.datetime.utcnow() + timeout
 
423
        gobject.source_remove(self.disable_initiator_tag)
 
424
        self.disable_initiator_tag = (gobject.timeout_add
 
425
                                      (self.timeout_milliseconds(),
 
426
                                       self.disable))
661
427
    
662
428
    def need_approval(self):
663
429
        self.last_approval_request = datetime.datetime.utcnow()
668
434
        If a checker already exists, leave it running and do
669
435
        nothing."""
670
436
        # The reason for not killing a running checker is that if we
671
 
        # did that, and if a checker (for some reason) started running
672
 
        # slowly and taking more than 'interval' time, then the client
673
 
        # would inevitably timeout, since no checker would get a
674
 
        # chance to run to completion.  If we instead leave running
 
437
        # did that, then if a checker (for some reason) started
 
438
        # running slowly and taking more than 'interval' time, the
 
439
        # client would inevitably timeout, since no checker would get
 
440
        # a chance to run to completion.  If we instead leave running
675
441
        # checkers alone, the checker would have to take more time
676
442
        # than 'timeout' for the client to be disabled, which is as it
677
443
        # should be.
679
445
        # If a checker exists, make sure it is not a zombie
680
446
        try:
681
447
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
682
 
        except AttributeError:
683
 
            pass
684
 
        except OSError as error:
685
 
            if error.errno != errno.ECHILD:
686
 
                raise
 
448
        except (AttributeError, OSError), error:
 
449
            if (isinstance(error, OSError)
 
450
                and error.errno != errno.ECHILD):
 
451
                raise error
687
452
        else:
688
453
            if pid:
689
454
                logger.warning("Checker was a zombie")
692
457
                                      self.current_checker_command)
693
458
        # Start a new checker if needed
694
459
        if self.checker is None:
695
 
            # Escape attributes for the shell
696
 
            escaped_attrs = { attr:
697
 
                                  re.escape(str(getattr(self, attr)))
698
 
                              for attr in self.runtime_expansions }
699
460
            try:
700
 
                command = self.checker_command % escaped_attrs
701
 
            except TypeError as error:
702
 
                logger.error('Could not format string "%s"',
703
 
                             self.checker_command, exc_info=error)
704
 
                return True # Try again later
 
461
                # In case checker_command has exactly one % operator
 
462
                command = self.checker_command % self.host
 
463
            except TypeError:
 
464
                # Escape attributes for the shell
 
465
                escaped_attrs = dict(
 
466
                    (attr,
 
467
                     re.escape(unicode(str(getattr(self, attr, "")),
 
468
                                       errors=
 
469
                                       'replace')))
 
470
                    for attr in
 
471
                    self.runtime_expansions)
 
472
 
 
473
                try:
 
474
                    command = self.checker_command % escaped_attrs
 
475
                except TypeError, error:
 
476
                    logger.error('Could not format string "%s":'
 
477
                                 ' %s', self.checker_command, error)
 
478
                    return True # Try again later
705
479
            self.current_checker_command = command
706
480
            try:
707
481
                logger.info("Starting checker %r for %s",
710
484
                # in normal mode, that is already done by daemon(),
711
485
                # and in debug mode we don't want to.  (Stdin is
712
486
                # always replaced by /dev/null.)
713
 
                # The exception is when not debugging but nevertheless
714
 
                # running in the foreground; use the previously
715
 
                # created wnull.
716
 
                popen_args = {}
717
 
                if (not self.server_settings["debug"]
718
 
                    and self.server_settings["foreground"]):
719
 
                    popen_args.update({"stdout": wnull,
720
 
                                       "stderr": wnull })
721
487
                self.checker = subprocess.Popen(command,
722
488
                                                close_fds=True,
723
 
                                                shell=True, cwd="/",
724
 
                                                **popen_args)
725
 
            except OSError as error:
726
 
                logger.error("Failed to start subprocess",
727
 
                             exc_info=error)
728
 
                return True
729
 
            self.checker_callback_tag = (gobject.child_watch_add
730
 
                                         (self.checker.pid,
731
 
                                          self.checker_callback,
732
 
                                          data=command))
733
 
            # The checker may have completed before the gobject
734
 
            # watch was added.  Check for this.
735
 
            try:
 
489
                                                shell=True, cwd="/")
 
490
                self.checker_callback_tag = (gobject.child_watch_add
 
491
                                             (self.checker.pid,
 
492
                                              self.checker_callback,
 
493
                                              data=command))
 
494
                # The checker may have completed before the gobject
 
495
                # watch was added.  Check for this.
736
496
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
737
 
            except OSError as error:
738
 
                if error.errno == errno.ECHILD:
739
 
                    # This should never happen
740
 
                    logger.error("Child process vanished",
741
 
                                 exc_info=error)
742
 
                    return True
743
 
                raise
744
 
            if pid:
745
 
                gobject.source_remove(self.checker_callback_tag)
746
 
                self.checker_callback(pid, status, command)
 
497
                if pid:
 
498
                    gobject.source_remove(self.checker_callback_tag)
 
499
                    self.checker_callback(pid, status, command)
 
500
            except OSError, error:
 
501
                logger.error("Failed to start subprocess: %s",
 
502
                             error)
747
503
        # Re-run this periodically if run by gobject.timeout_add
748
504
        return True
749
505
    
756
512
            return
757
513
        logger.debug("Stopping checker for %(name)s", vars(self))
758
514
        try:
759
 
            self.checker.terminate()
 
515
            os.kill(self.checker.pid, signal.SIGTERM)
760
516
            #time.sleep(0.5)
761
517
            #if self.checker.poll() is None:
762
 
            #    self.checker.kill()
763
 
        except OSError as error:
 
518
            #    os.kill(self.checker.pid, signal.SIGKILL)
 
519
        except OSError, error:
764
520
            if error.errno != errno.ESRCH: # No such process
765
521
                raise
766
522
        self.checker = None
767
523
 
768
 
 
769
524
def dbus_service_property(dbus_interface, signature="v",
770
525
                          access="readwrite", byte_arrays=False):
771
526
    """Decorators for marking methods of a DBusObjectWithProperties to
782
537
    # "Set" method, so we fail early here:
783
538
    if byte_arrays and signature != "ay":
784
539
        raise ValueError("Byte arrays not supported for non-'ay'"
785
 
                         " signature {!r}".format(signature))
 
540
                         " signature %r" % signature)
786
541
    def decorator(func):
787
542
        func._dbus_is_property = True
788
543
        func._dbus_interface = dbus_interface
796
551
    return decorator
797
552
 
798
553
 
799
 
def dbus_interface_annotations(dbus_interface):
800
 
    """Decorator for marking functions returning interface annotations
801
 
    
802
 
    Usage:
803
 
    
804
 
    @dbus_interface_annotations("org.example.Interface")
805
 
    def _foo(self):  # Function name does not matter
806
 
        return {"org.freedesktop.DBus.Deprecated": "true",
807
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
808
 
                    "false"}
809
 
    """
810
 
    def decorator(func):
811
 
        func._dbus_is_interface = True
812
 
        func._dbus_interface = dbus_interface
813
 
        func._dbus_name = dbus_interface
814
 
        return func
815
 
    return decorator
816
 
 
817
 
 
818
 
def dbus_annotations(annotations):
819
 
    """Decorator to annotate D-Bus methods, signals or properties
820
 
    Usage:
821
 
    
822
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
823
 
                       "org.freedesktop.DBus.Property."
824
 
                       "EmitsChangedSignal": "false"})
825
 
    @dbus_service_property("org.example.Interface", signature="b",
826
 
                           access="r")
827
 
    def Property_dbus_property(self):
828
 
        return dbus.Boolean(False)
829
 
    """
830
 
    def decorator(func):
831
 
        func._dbus_annotations = annotations
832
 
        return func
833
 
    return decorator
834
 
 
835
 
 
836
554
class DBusPropertyException(dbus.exceptions.DBusException):
837
555
    """A base class for D-Bus property-related exceptions
838
556
    """
839
 
    pass
 
557
    def __unicode__(self):
 
558
        return unicode(str(self))
 
559
 
840
560
 
841
561
class DBusPropertyAccessException(DBusPropertyException):
842
562
    """A property's access permissions disallows an operation.
852
572
 
853
573
class DBusObjectWithProperties(dbus.service.Object):
854
574
    """A D-Bus object with properties.
855
 
    
 
575
 
856
576
    Classes inheriting from this can use the dbus_service_property
857
577
    decorator to expose methods as D-Bus properties.  It exposes the
858
578
    standard Get(), Set(), and GetAll() methods on the D-Bus.
859
579
    """
860
580
    
861
581
    @staticmethod
862
 
    def _is_dbus_thing(thing):
863
 
        """Returns a function testing if an attribute is a D-Bus thing
864
 
        
865
 
        If called like _is_dbus_thing("method") it returns a function
866
 
        suitable for use as predicate to inspect.getmembers().
867
 
        """
868
 
        return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
869
 
                                   False)
 
582
    def _is_dbus_property(obj):
 
583
        return getattr(obj, "_dbus_is_property", False)
870
584
    
871
 
    def _get_all_dbus_things(self, thing):
 
585
    def _get_all_dbus_properties(self):
872
586
        """Returns a generator of (name, attribute) pairs
873
587
        """
874
 
        return ((getattr(athing.__get__(self), "_dbus_name",
875
 
                         name),
876
 
                 athing.__get__(self))
877
 
                for cls in self.__class__.__mro__
878
 
                for name, athing in
879
 
                inspect.getmembers(cls,
880
 
                                   self._is_dbus_thing(thing)))
 
588
        return ((prop._dbus_name, prop)
 
589
                for name, prop in
 
590
                inspect.getmembers(self, self._is_dbus_property))
881
591
    
882
592
    def _get_dbus_property(self, interface_name, property_name):
883
593
        """Returns a bound method if one exists which is a D-Bus
884
594
        property with the specified name and interface.
885
595
        """
886
 
        for cls in  self.__class__.__mro__:
887
 
            for name, value in (inspect.getmembers
888
 
                                (cls,
889
 
                                 self._is_dbus_thing("property"))):
890
 
                if (value._dbus_name == property_name
891
 
                    and value._dbus_interface == interface_name):
892
 
                    return value.__get__(self)
893
 
        
 
596
        for name in (property_name,
 
597
                     property_name + "_dbus_property"):
 
598
            prop = getattr(self, name, None)
 
599
            if (prop is None
 
600
                or not self._is_dbus_property(prop)
 
601
                or prop._dbus_name != property_name
 
602
                or (interface_name and prop._dbus_interface
 
603
                    and interface_name != prop._dbus_interface)):
 
604
                continue
 
605
            return prop
894
606
        # No such property
895
607
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
896
608
                                   + interface_name + "."
920
632
            # The byte_arrays option is not supported yet on
921
633
            # signatures other than "ay".
922
634
            if prop._dbus_signature != "ay":
923
 
                raise ValueError("Byte arrays not supported for non-"
924
 
                                 "'ay' signature {!r}"
925
 
                                 .format(prop._dbus_signature))
926
 
            value = dbus.ByteArray(b''.join(chr(byte)
927
 
                                            for byte in value))
 
635
                raise ValueError
 
636
            value = dbus.ByteArray(''.join(unichr(byte)
 
637
                                           for byte in value))
928
638
        prop(value)
929
639
    
930
640
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
932
642
    def GetAll(self, interface_name):
933
643
        """Standard D-Bus property GetAll() method, see D-Bus
934
644
        standard.
935
 
        
 
645
 
936
646
        Note: Will not include properties with access="write".
937
647
        """
938
 
        properties = {}
939
 
        for name, prop in self._get_all_dbus_things("property"):
 
648
        all = {}
 
649
        for name, prop in self._get_all_dbus_properties():
940
650
            if (interface_name
941
651
                and interface_name != prop._dbus_interface):
942
652
                # Interface non-empty but did not match
946
656
                continue
947
657
            value = prop()
948
658
            if not hasattr(value, "variant_level"):
949
 
                properties[name] = value
 
659
                all[name] = value
950
660
                continue
951
 
            properties[name] = type(value)(value, variant_level=
952
 
                                           value.variant_level+1)
953
 
        return dbus.Dictionary(properties, signature="sv")
954
 
    
955
 
    @dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
956
 
    def PropertiesChanged(self, interface_name, changed_properties,
957
 
                          invalidated_properties):
958
 
        """Standard D-Bus PropertiesChanged() signal, see D-Bus
959
 
        standard.
960
 
        """
961
 
        pass
 
661
            all[name] = type(value)(value, variant_level=
 
662
                                    value.variant_level+1)
 
663
        return dbus.Dictionary(all, signature="sv")
962
664
    
963
665
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
964
666
                         out_signature="s",
965
667
                         path_keyword='object_path',
966
668
                         connection_keyword='connection')
967
669
    def Introspect(self, object_path, connection):
968
 
        """Overloading of standard D-Bus method.
969
 
        
970
 
        Inserts property tags and interface annotation tags.
 
670
        """Standard D-Bus method, overloaded to insert property tags.
971
671
        """
972
672
        xmlstring = dbus.service.Object.Introspect(self, object_path,
973
673
                                                   connection)
980
680
                e.setAttribute("access", prop._dbus_access)
981
681
                return e
982
682
            for if_tag in document.getElementsByTagName("interface"):
983
 
                # Add property tags
984
683
                for tag in (make_tag(document, name, prop)
985
684
                            for name, prop
986
 
                            in self._get_all_dbus_things("property")
 
685
                            in self._get_all_dbus_properties()
987
686
                            if prop._dbus_interface
988
687
                            == if_tag.getAttribute("name")):
989
688
                    if_tag.appendChild(tag)
990
 
                # Add annotation tags
991
 
                for typ in ("method", "signal", "property"):
992
 
                    for tag in if_tag.getElementsByTagName(typ):
993
 
                        annots = dict()
994
 
                        for name, prop in (self.
995
 
                                           _get_all_dbus_things(typ)):
996
 
                            if (name == tag.getAttribute("name")
997
 
                                and prop._dbus_interface
998
 
                                == if_tag.getAttribute("name")):
999
 
                                annots.update(getattr
1000
 
                                              (prop,
1001
 
                                               "_dbus_annotations",
1002
 
                                               {}))
1003
 
                        for name, value in annots.items():
1004
 
                            ann_tag = document.createElement(
1005
 
                                "annotation")
1006
 
                            ann_tag.setAttribute("name", name)
1007
 
                            ann_tag.setAttribute("value", value)
1008
 
                            tag.appendChild(ann_tag)
1009
 
                # Add interface annotation tags
1010
 
                for annotation, value in dict(
1011
 
                    itertools.chain.from_iterable(
1012
 
                        annotations().items()
1013
 
                        for name, annotations in
1014
 
                        self._get_all_dbus_things("interface")
1015
 
                        if name == if_tag.getAttribute("name")
1016
 
                        )).items():
1017
 
                    ann_tag = document.createElement("annotation")
1018
 
                    ann_tag.setAttribute("name", annotation)
1019
 
                    ann_tag.setAttribute("value", value)
1020
 
                    if_tag.appendChild(ann_tag)
1021
689
                # Add the names to the return values for the
1022
690
                # "org.freedesktop.DBus.Properties" methods
1023
691
                if (if_tag.getAttribute("name")
1036
704
            xmlstring = document.toxml("utf-8")
1037
705
            document.unlink()
1038
706
        except (AttributeError, xml.dom.DOMException,
1039
 
                xml.parsers.expat.ExpatError) as error:
 
707
                xml.parsers.expat.ExpatError), error:
1040
708
            logger.error("Failed to override Introspection method",
1041
 
                         exc_info=error)
 
709
                         error)
1042
710
        return xmlstring
1043
711
 
1044
712
 
1045
 
def datetime_to_dbus(dt, variant_level=0):
1046
 
    """Convert a UTC datetime.datetime() to a D-Bus type."""
1047
 
    if dt is None:
1048
 
        return dbus.String("", variant_level = variant_level)
1049
 
    return dbus.String(dt.isoformat(),
1050
 
                       variant_level=variant_level)
1051
 
 
1052
 
 
1053
 
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1054
 
    """A class decorator; applied to a subclass of
1055
 
    dbus.service.Object, it will add alternate D-Bus attributes with
1056
 
    interface names according to the "alt_interface_names" mapping.
1057
 
    Usage:
1058
 
    
1059
 
    @alternate_dbus_interfaces({"org.example.Interface":
1060
 
                                    "net.example.AlternateInterface"})
1061
 
    class SampleDBusObject(dbus.service.Object):
1062
 
        @dbus.service.method("org.example.Interface")
1063
 
        def SampleDBusMethod():
1064
 
            pass
1065
 
    
1066
 
    The above "SampleDBusMethod" on "SampleDBusObject" will be
1067
 
    reachable via two interfaces: "org.example.Interface" and
1068
 
    "net.example.AlternateInterface", the latter of which will have
1069
 
    its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1070
 
    "true", unless "deprecate" is passed with a False value.
1071
 
    
1072
 
    This works for methods and signals, and also for D-Bus properties
1073
 
    (from DBusObjectWithProperties) and interfaces (from the
1074
 
    dbus_interface_annotations decorator).
1075
 
    """
1076
 
    def wrapper(cls):
1077
 
        for orig_interface_name, alt_interface_name in (
1078
 
            alt_interface_names.items()):
1079
 
            attr = {}
1080
 
            interface_names = set()
1081
 
            # Go though all attributes of the class
1082
 
            for attrname, attribute in inspect.getmembers(cls):
1083
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1084
 
                # with the wrong interface name
1085
 
                if (not hasattr(attribute, "_dbus_interface")
1086
 
                    or not attribute._dbus_interface
1087
 
                    .startswith(orig_interface_name)):
1088
 
                    continue
1089
 
                # Create an alternate D-Bus interface name based on
1090
 
                # the current name
1091
 
                alt_interface = (attribute._dbus_interface
1092
 
                                 .replace(orig_interface_name,
1093
 
                                          alt_interface_name))
1094
 
                interface_names.add(alt_interface)
1095
 
                # Is this a D-Bus signal?
1096
 
                if getattr(attribute, "_dbus_is_signal", False):
1097
 
                    # Extract the original non-method undecorated
1098
 
                    # function by black magic
1099
 
                    nonmethod_func = (dict(
1100
 
                            zip(attribute.func_code.co_freevars,
1101
 
                                attribute.__closure__))["func"]
1102
 
                                      .cell_contents)
1103
 
                    # Create a new, but exactly alike, function
1104
 
                    # object, and decorate it to be a new D-Bus signal
1105
 
                    # with the alternate D-Bus interface name
1106
 
                    new_function = (dbus.service.signal
1107
 
                                    (alt_interface,
1108
 
                                     attribute._dbus_signature)
1109
 
                                    (types.FunctionType(
1110
 
                                nonmethod_func.func_code,
1111
 
                                nonmethod_func.func_globals,
1112
 
                                nonmethod_func.func_name,
1113
 
                                nonmethod_func.func_defaults,
1114
 
                                nonmethod_func.func_closure)))
1115
 
                    # Copy annotations, if any
1116
 
                    try:
1117
 
                        new_function._dbus_annotations = (
1118
 
                            dict(attribute._dbus_annotations))
1119
 
                    except AttributeError:
1120
 
                        pass
1121
 
                    # Define a creator of a function to call both the
1122
 
                    # original and alternate functions, so both the
1123
 
                    # original and alternate signals gets sent when
1124
 
                    # the function is called
1125
 
                    def fixscope(func1, func2):
1126
 
                        """This function is a scope container to pass
1127
 
                        func1 and func2 to the "call_both" function
1128
 
                        outside of its arguments"""
1129
 
                        def call_both(*args, **kwargs):
1130
 
                            """This function will emit two D-Bus
1131
 
                            signals by calling func1 and func2"""
1132
 
                            func1(*args, **kwargs)
1133
 
                            func2(*args, **kwargs)
1134
 
                        return call_both
1135
 
                    # Create the "call_both" function and add it to
1136
 
                    # the class
1137
 
                    attr[attrname] = fixscope(attribute, new_function)
1138
 
                # Is this a D-Bus method?
1139
 
                elif getattr(attribute, "_dbus_is_method", False):
1140
 
                    # Create a new, but exactly alike, function
1141
 
                    # object.  Decorate it to be a new D-Bus method
1142
 
                    # with the alternate D-Bus interface name.  Add it
1143
 
                    # to the class.
1144
 
                    attr[attrname] = (dbus.service.method
1145
 
                                      (alt_interface,
1146
 
                                       attribute._dbus_in_signature,
1147
 
                                       attribute._dbus_out_signature)
1148
 
                                      (types.FunctionType
1149
 
                                       (attribute.func_code,
1150
 
                                        attribute.func_globals,
1151
 
                                        attribute.func_name,
1152
 
                                        attribute.func_defaults,
1153
 
                                        attribute.func_closure)))
1154
 
                    # Copy annotations, if any
1155
 
                    try:
1156
 
                        attr[attrname]._dbus_annotations = (
1157
 
                            dict(attribute._dbus_annotations))
1158
 
                    except AttributeError:
1159
 
                        pass
1160
 
                # Is this a D-Bus property?
1161
 
                elif getattr(attribute, "_dbus_is_property", False):
1162
 
                    # Create a new, but exactly alike, function
1163
 
                    # object, and decorate it to be a new D-Bus
1164
 
                    # property with the alternate D-Bus interface
1165
 
                    # name.  Add it to the class.
1166
 
                    attr[attrname] = (dbus_service_property
1167
 
                                      (alt_interface,
1168
 
                                       attribute._dbus_signature,
1169
 
                                       attribute._dbus_access,
1170
 
                                       attribute
1171
 
                                       ._dbus_get_args_options
1172
 
                                       ["byte_arrays"])
1173
 
                                      (types.FunctionType
1174
 
                                       (attribute.func_code,
1175
 
                                        attribute.func_globals,
1176
 
                                        attribute.func_name,
1177
 
                                        attribute.func_defaults,
1178
 
                                        attribute.func_closure)))
1179
 
                    # Copy annotations, if any
1180
 
                    try:
1181
 
                        attr[attrname]._dbus_annotations = (
1182
 
                            dict(attribute._dbus_annotations))
1183
 
                    except AttributeError:
1184
 
                        pass
1185
 
                # Is this a D-Bus interface?
1186
 
                elif getattr(attribute, "_dbus_is_interface", False):
1187
 
                    # Create a new, but exactly alike, function
1188
 
                    # object.  Decorate it to be a new D-Bus interface
1189
 
                    # with the alternate D-Bus interface name.  Add it
1190
 
                    # to the class.
1191
 
                    attr[attrname] = (dbus_interface_annotations
1192
 
                                      (alt_interface)
1193
 
                                      (types.FunctionType
1194
 
                                       (attribute.func_code,
1195
 
                                        attribute.func_globals,
1196
 
                                        attribute.func_name,
1197
 
                                        attribute.func_defaults,
1198
 
                                        attribute.func_closure)))
1199
 
            if deprecate:
1200
 
                # Deprecate all alternate interfaces
1201
 
                iname="_AlternateDBusNames_interface_annotation{}"
1202
 
                for interface_name in interface_names:
1203
 
                    @dbus_interface_annotations(interface_name)
1204
 
                    def func(self):
1205
 
                        return { "org.freedesktop.DBus.Deprecated":
1206
 
                                     "true" }
1207
 
                    # Find an unused name
1208
 
                    for aname in (iname.format(i)
1209
 
                                  for i in itertools.count()):
1210
 
                        if aname not in attr:
1211
 
                            attr[aname] = func
1212
 
                            break
1213
 
            if interface_names:
1214
 
                # Replace the class with a new subclass of it with
1215
 
                # methods, signals, etc. as created above.
1216
 
                cls = type(b"{}Alternate".format(cls.__name__),
1217
 
                           (cls,), attr)
1218
 
        return cls
1219
 
    return wrapper
1220
 
 
1221
 
 
1222
 
@alternate_dbus_interfaces({"se.recompile.Mandos":
1223
 
                                "se.bsnet.fukt.Mandos"})
1224
713
class ClientDBus(Client, DBusObjectWithProperties):
1225
714
    """A Client class using D-Bus
1226
715
    
1232
721
    runtime_expansions = (Client.runtime_expansions
1233
722
                          + ("dbus_object_path",))
1234
723
    
1235
 
    _interface = "se.recompile.Mandos.Client"
1236
 
    
1237
724
    # dbus.service.Object doesn't use super(), so we can't either.
1238
725
    
1239
726
    def __init__(self, bus = None, *args, **kwargs):
 
727
        self._approvals_pending = 0
1240
728
        self.bus = bus
1241
729
        Client.__init__(self, *args, **kwargs)
1242
730
        # Only now, when this client is initialized, can it show up on
1243
731
        # the D-Bus
1244
 
        client_object_name = str(self.name).translate(
 
732
        client_object_name = unicode(self.name).translate(
1245
733
            {ord("."): ord("_"),
1246
734
             ord("-"): ord("_")})
1247
735
        self.dbus_object_path = (dbus.ObjectPath
1248
736
                                 ("/clients/" + client_object_name))
1249
737
        DBusObjectWithProperties.__init__(self, self.bus,
1250
738
                                          self.dbus_object_path)
1251
 
    
1252
 
    def notifychangeproperty(transform_func,
1253
 
                             dbus_name, type_func=lambda x: x,
1254
 
                             variant_level=1, invalidate_only=False,
1255
 
                             _interface=_interface):
1256
 
        """ Modify a variable so that it's a property which announces
1257
 
        its changes to DBus.
1258
 
        
1259
 
        transform_fun: Function that takes a value and a variant_level
1260
 
                       and transforms it to a D-Bus type.
1261
 
        dbus_name: D-Bus name of the variable
1262
 
        type_func: Function that transform the value before sending it
1263
 
                   to the D-Bus.  Default: no transform
1264
 
        variant_level: D-Bus variant level.  Default: 1
1265
 
        """
1266
 
        attrname = "_{}".format(dbus_name)
1267
 
        def setter(self, value):
1268
 
            if hasattr(self, "dbus_object_path"):
1269
 
                if (not hasattr(self, attrname) or
1270
 
                    type_func(getattr(self, attrname, None))
1271
 
                    != type_func(value)):
1272
 
                    if invalidate_only:
1273
 
                        self.PropertiesChanged(_interface,
1274
 
                                               dbus.Dictionary(),
1275
 
                                               dbus.Array
1276
 
                                               ((dbus_name,)))
1277
 
                    else:
1278
 
                        dbus_value = transform_func(type_func(value),
1279
 
                                                    variant_level
1280
 
                                                    =variant_level)
1281
 
                        self.PropertyChanged(dbus.String(dbus_name),
1282
 
                                             dbus_value)
1283
 
                        self.PropertiesChanged(_interface,
1284
 
                                               dbus.Dictionary({
1285
 
                                    dbus.String(dbus_name):
1286
 
                                        dbus_value }), dbus.Array())
1287
 
            setattr(self, attrname, value)
1288
 
        
1289
 
        return property(lambda self: getattr(self, attrname), setter)
1290
 
    
1291
 
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1292
 
    approvals_pending = notifychangeproperty(dbus.Boolean,
1293
 
                                             "ApprovalPending",
1294
 
                                             type_func = bool)
1295
 
    enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1296
 
    last_enabled = notifychangeproperty(datetime_to_dbus,
1297
 
                                        "LastEnabled")
1298
 
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1299
 
                                   type_func = lambda checker:
1300
 
                                       checker is not None)
1301
 
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1302
 
                                           "LastCheckedOK")
1303
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1304
 
                                               "LastCheckerStatus")
1305
 
    last_approval_request = notifychangeproperty(
1306
 
        datetime_to_dbus, "LastApprovalRequest")
1307
 
    approved_by_default = notifychangeproperty(dbus.Boolean,
1308
 
                                               "ApprovedByDefault")
1309
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1310
 
                                          "ApprovalDelay",
1311
 
                                          type_func =
1312
 
                                          lambda td: td.total_seconds()
1313
 
                                          * 1000)
1314
 
    approval_duration = notifychangeproperty(
1315
 
        dbus.UInt64, "ApprovalDuration",
1316
 
        type_func = lambda td: td.total_seconds() * 1000)
1317
 
    host = notifychangeproperty(dbus.String, "Host")
1318
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1319
 
                                   type_func = lambda td:
1320
 
                                       td.total_seconds() * 1000)
1321
 
    extended_timeout = notifychangeproperty(
1322
 
        dbus.UInt64, "ExtendedTimeout",
1323
 
        type_func = lambda td: td.total_seconds() * 1000)
1324
 
    interval = notifychangeproperty(dbus.UInt64,
1325
 
                                    "Interval",
1326
 
                                    type_func =
1327
 
                                    lambda td: td.total_seconds()
1328
 
                                    * 1000)
1329
 
    checker_command = notifychangeproperty(dbus.String, "Checker")
1330
 
    secret = notifychangeproperty(dbus.ByteArray, "Secret",
1331
 
                                  invalidate_only=True)
1332
 
    
1333
 
    del notifychangeproperty
 
739
        
 
740
    def _get_approvals_pending(self):
 
741
        return self._approvals_pending
 
742
    def _set_approvals_pending(self, value):
 
743
        old_value = self._approvals_pending
 
744
        self._approvals_pending = value
 
745
        bval = bool(value)
 
746
        if (hasattr(self, "dbus_object_path")
 
747
            and bval is not bool(old_value)):
 
748
            dbus_bool = dbus.Boolean(bval, variant_level=1)
 
749
            self.PropertyChanged(dbus.String("ApprovalPending"),
 
750
                                 dbus_bool)
 
751
 
 
752
    approvals_pending = property(_get_approvals_pending,
 
753
                                 _set_approvals_pending)
 
754
    del _get_approvals_pending, _set_approvals_pending
 
755
    
 
756
    @staticmethod
 
757
    def _datetime_to_dbus(dt, variant_level=0):
 
758
        """Convert a UTC datetime.datetime() to a D-Bus type."""
 
759
        return dbus.String(dt.isoformat(),
 
760
                           variant_level=variant_level)
 
761
    
 
762
    def enable(self):
 
763
        oldstate = getattr(self, "enabled", False)
 
764
        r = Client.enable(self)
 
765
        if oldstate != self.enabled:
 
766
            # Emit D-Bus signals
 
767
            self.PropertyChanged(dbus.String("Enabled"),
 
768
                                 dbus.Boolean(True, variant_level=1))
 
769
            self.PropertyChanged(
 
770
                dbus.String("LastEnabled"),
 
771
                self._datetime_to_dbus(self.last_enabled,
 
772
                                       variant_level=1))
 
773
        return r
 
774
    
 
775
    def disable(self, quiet = False):
 
776
        oldstate = getattr(self, "enabled", False)
 
777
        r = Client.disable(self, quiet=quiet)
 
778
        if not quiet and oldstate != self.enabled:
 
779
            # Emit D-Bus signal
 
780
            self.PropertyChanged(dbus.String("Enabled"),
 
781
                                 dbus.Boolean(False, variant_level=1))
 
782
        return r
1334
783
    
1335
784
    def __del__(self, *args, **kwargs):
1336
785
        try:
1345
794
                         *args, **kwargs):
1346
795
        self.checker_callback_tag = None
1347
796
        self.checker = None
 
797
        # Emit D-Bus signal
 
798
        self.PropertyChanged(dbus.String("CheckerRunning"),
 
799
                             dbus.Boolean(False, variant_level=1))
1348
800
        if os.WIFEXITED(condition):
1349
801
            exitstatus = os.WEXITSTATUS(condition)
1350
802
            # Emit D-Bus signal
1360
812
        return Client.checker_callback(self, pid, condition, command,
1361
813
                                       *args, **kwargs)
1362
814
    
 
815
    def checked_ok(self, *args, **kwargs):
 
816
        r = Client.checked_ok(self, *args, **kwargs)
 
817
        # Emit D-Bus signal
 
818
        self.PropertyChanged(
 
819
            dbus.String("LastCheckedOK"),
 
820
            (self._datetime_to_dbus(self.last_checked_ok,
 
821
                                    variant_level=1)))
 
822
        return r
 
823
    
 
824
    def need_approval(self, *args, **kwargs):
 
825
        r = Client.need_approval(self, *args, **kwargs)
 
826
        # Emit D-Bus signal
 
827
        self.PropertyChanged(
 
828
            dbus.String("LastApprovalRequest"),
 
829
            (self._datetime_to_dbus(self.last_approval_request,
 
830
                                    variant_level=1)))
 
831
        return r
 
832
    
1363
833
    def start_checker(self, *args, **kwargs):
1364
 
        old_checker_pid = getattr(self.checker, "pid", None)
 
834
        old_checker = self.checker
 
835
        if self.checker is not None:
 
836
            old_checker_pid = self.checker.pid
 
837
        else:
 
838
            old_checker_pid = None
1365
839
        r = Client.start_checker(self, *args, **kwargs)
1366
840
        # Only if new checker process was started
1367
841
        if (self.checker is not None
1368
842
            and old_checker_pid != self.checker.pid):
1369
843
            # Emit D-Bus signal
1370
844
            self.CheckerStarted(self.current_checker_command)
 
845
            self.PropertyChanged(
 
846
                dbus.String("CheckerRunning"),
 
847
                dbus.Boolean(True, variant_level=1))
1371
848
        return r
1372
849
    
 
850
    def stop_checker(self, *args, **kwargs):
 
851
        old_checker = getattr(self, "checker", None)
 
852
        r = Client.stop_checker(self, *args, **kwargs)
 
853
        if (old_checker is not None
 
854
            and getattr(self, "checker", None) is None):
 
855
            self.PropertyChanged(dbus.String("CheckerRunning"),
 
856
                                 dbus.Boolean(False, variant_level=1))
 
857
        return r
 
858
 
1373
859
    def _reset_approved(self):
1374
 
        self.approved = None
 
860
        self._approved = None
1375
861
        return False
1376
862
    
1377
863
    def approve(self, value=True):
1378
 
        self.approved = value
1379
 
        gobject.timeout_add(int(self.approval_duration.total_seconds()
1380
 
                                * 1000), self._reset_approved)
1381
864
        self.send_changedstate()
 
865
        self._approved = value
 
866
        gobject.timeout_add(self._timedelta_to_milliseconds
 
867
                            (self.approval_duration),
 
868
                            self._reset_approved)
 
869
    
1382
870
    
1383
871
    ## D-Bus methods, signals & properties
1384
 
    
1385
 
    ## Interfaces
 
872
    _interface = "se.bsnet.fukt.Mandos.Client"
1386
873
    
1387
874
    ## Signals
1388
875
    
1399
886
        pass
1400
887
    
1401
888
    # PropertyChanged - signal
1402
 
    @dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1403
889
    @dbus.service.signal(_interface, signature="sv")
1404
890
    def PropertyChanged(self, property, value):
1405
891
        "D-Bus signal"
1436
922
    # CheckedOK - method
1437
923
    @dbus.service.method(_interface)
1438
924
    def CheckedOK(self):
1439
 
        self.checked_ok()
 
925
        return self.checked_ok()
1440
926
    
1441
927
    # Enable - method
1442
928
    @dbus.service.method(_interface)
1475
961
        if value is None:       # get
1476
962
            return dbus.Boolean(self.approved_by_default)
1477
963
        self.approved_by_default = bool(value)
 
964
        # Emit D-Bus signal
 
965
        self.PropertyChanged(dbus.String("ApprovedByDefault"),
 
966
                             dbus.Boolean(value, variant_level=1))
1478
967
    
1479
968
    # ApprovalDelay - property
1480
969
    @dbus_service_property(_interface, signature="t",
1481
970
                           access="readwrite")
1482
971
    def ApprovalDelay_dbus_property(self, value=None):
1483
972
        if value is None:       # get
1484
 
            return dbus.UInt64(self.approval_delay.total_seconds()
1485
 
                               * 1000)
 
973
            return dbus.UInt64(self.approval_delay_milliseconds())
1486
974
        self.approval_delay = datetime.timedelta(0, 0, 0, value)
 
975
        # Emit D-Bus signal
 
976
        self.PropertyChanged(dbus.String("ApprovalDelay"),
 
977
                             dbus.UInt64(value, variant_level=1))
1487
978
    
1488
979
    # ApprovalDuration - property
1489
980
    @dbus_service_property(_interface, signature="t",
1490
981
                           access="readwrite")
1491
982
    def ApprovalDuration_dbus_property(self, value=None):
1492
983
        if value is None:       # get
1493
 
            return dbus.UInt64(self.approval_duration.total_seconds()
1494
 
                               * 1000)
 
984
            return dbus.UInt64(self._timedelta_to_milliseconds(
 
985
                    self.approval_duration))
1495
986
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
 
987
        # Emit D-Bus signal
 
988
        self.PropertyChanged(dbus.String("ApprovalDuration"),
 
989
                             dbus.UInt64(value, variant_level=1))
1496
990
    
1497
991
    # Name - property
1498
992
    @dbus_service_property(_interface, signature="s", access="read")
1510
1004
    def Host_dbus_property(self, value=None):
1511
1005
        if value is None:       # get
1512
1006
            return dbus.String(self.host)
1513
 
        self.host = str(value)
 
1007
        self.host = value
 
1008
        # Emit D-Bus signal
 
1009
        self.PropertyChanged(dbus.String("Host"),
 
1010
                             dbus.String(value, variant_level=1))
1514
1011
    
1515
1012
    # Created - property
1516
1013
    @dbus_service_property(_interface, signature="s", access="read")
1517
1014
    def Created_dbus_property(self):
1518
 
        return datetime_to_dbus(self.created)
 
1015
        return dbus.String(self._datetime_to_dbus(self.created))
1519
1016
    
1520
1017
    # LastEnabled - property
1521
1018
    @dbus_service_property(_interface, signature="s", access="read")
1522
1019
    def LastEnabled_dbus_property(self):
1523
 
        return datetime_to_dbus(self.last_enabled)
 
1020
        if self.last_enabled is None:
 
1021
            return dbus.String("")
 
1022
        return dbus.String(self._datetime_to_dbus(self.last_enabled))
1524
1023
    
1525
1024
    # Enabled - property
1526
1025
    @dbus_service_property(_interface, signature="b",
1540
1039
        if value is not None:
1541
1040
            self.checked_ok()
1542
1041
            return
1543
 
        return datetime_to_dbus(self.last_checked_ok)
1544
 
    
1545
 
    # LastCheckerStatus - property
1546
 
    @dbus_service_property(_interface, signature="n",
1547
 
                           access="read")
1548
 
    def LastCheckerStatus_dbus_property(self):
1549
 
        return dbus.Int16(self.last_checker_status)
1550
 
    
1551
 
    # Expires - property
1552
 
    @dbus_service_property(_interface, signature="s", access="read")
1553
 
    def Expires_dbus_property(self):
1554
 
        return datetime_to_dbus(self.expires)
 
1042
        if self.last_checked_ok is None:
 
1043
            return dbus.String("")
 
1044
        return dbus.String(self._datetime_to_dbus(self
 
1045
                                                  .last_checked_ok))
1555
1046
    
1556
1047
    # LastApprovalRequest - property
1557
1048
    @dbus_service_property(_interface, signature="s", access="read")
1558
1049
    def LastApprovalRequest_dbus_property(self):
1559
 
        return datetime_to_dbus(self.last_approval_request)
 
1050
        if self.last_approval_request is None:
 
1051
            return dbus.String("")
 
1052
        return dbus.String(self.
 
1053
                           _datetime_to_dbus(self
 
1054
                                             .last_approval_request))
1560
1055
    
1561
1056
    # Timeout - property
1562
1057
    @dbus_service_property(_interface, signature="t",
1563
1058
                           access="readwrite")
1564
1059
    def Timeout_dbus_property(self, value=None):
1565
1060
        if value is None:       # get
1566
 
            return dbus.UInt64(self.timeout.total_seconds() * 1000)
1567
 
        old_timeout = self.timeout
 
1061
            return dbus.UInt64(self.timeout_milliseconds())
1568
1062
        self.timeout = datetime.timedelta(0, 0, 0, value)
1569
 
        # Reschedule disabling
1570
 
        if self.enabled:
1571
 
            now = datetime.datetime.utcnow()
1572
 
            self.expires += self.timeout - old_timeout
1573
 
            if self.expires <= now:
1574
 
                # The timeout has passed
1575
 
                self.disable()
1576
 
            else:
1577
 
                if (getattr(self, "disable_initiator_tag", None)
1578
 
                    is None):
1579
 
                    return
1580
 
                gobject.source_remove(self.disable_initiator_tag)
1581
 
                self.disable_initiator_tag = (
1582
 
                    gobject.timeout_add(
1583
 
                        int((self.expires - now).total_seconds()
1584
 
                            * 1000), self.disable))
1585
 
    
1586
 
    # ExtendedTimeout - property
1587
 
    @dbus_service_property(_interface, signature="t",
1588
 
                           access="readwrite")
1589
 
    def ExtendedTimeout_dbus_property(self, value=None):
1590
 
        if value is None:       # get
1591
 
            return dbus.UInt64(self.extended_timeout.total_seconds()
1592
 
                               * 1000)
1593
 
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
 
1063
        # Emit D-Bus signal
 
1064
        self.PropertyChanged(dbus.String("Timeout"),
 
1065
                             dbus.UInt64(value, variant_level=1))
 
1066
        if getattr(self, "disable_initiator_tag", None) is None:
 
1067
            return
 
1068
        # Reschedule timeout
 
1069
        gobject.source_remove(self.disable_initiator_tag)
 
1070
        self.disable_initiator_tag = None
 
1071
        time_to_die = (self.
 
1072
                       _timedelta_to_milliseconds((self
 
1073
                                                   .last_checked_ok
 
1074
                                                   + self.timeout)
 
1075
                                                  - datetime.datetime
 
1076
                                                  .utcnow()))
 
1077
        if time_to_die <= 0:
 
1078
            # The timeout has passed
 
1079
            self.disable()
 
1080
        else:
 
1081
            self.disable_initiator_tag = (gobject.timeout_add
 
1082
                                          (time_to_die, self.disable))
1594
1083
    
1595
1084
    # Interval - property
1596
1085
    @dbus_service_property(_interface, signature="t",
1597
1086
                           access="readwrite")
1598
1087
    def Interval_dbus_property(self, value=None):
1599
1088
        if value is None:       # get
1600
 
            return dbus.UInt64(self.interval.total_seconds() * 1000)
 
1089
            return dbus.UInt64(self.interval_milliseconds())
1601
1090
        self.interval = datetime.timedelta(0, 0, 0, value)
 
1091
        # Emit D-Bus signal
 
1092
        self.PropertyChanged(dbus.String("Interval"),
 
1093
                             dbus.UInt64(value, variant_level=1))
1602
1094
        if getattr(self, "checker_initiator_tag", None) is None:
1603
1095
            return
1604
 
        if self.enabled:
1605
 
            # Reschedule checker run
1606
 
            gobject.source_remove(self.checker_initiator_tag)
1607
 
            self.checker_initiator_tag = (gobject.timeout_add
1608
 
                                          (value, self.start_checker))
1609
 
            self.start_checker()    # Start one now, too
1610
 
    
 
1096
        # Reschedule checker run
 
1097
        gobject.source_remove(self.checker_initiator_tag)
 
1098
        self.checker_initiator_tag = (gobject.timeout_add
 
1099
                                      (value, self.start_checker))
 
1100
        self.start_checker()    # Start one now, too
 
1101
 
1611
1102
    # Checker - property
1612
1103
    @dbus_service_property(_interface, signature="s",
1613
1104
                           access="readwrite")
1614
1105
    def Checker_dbus_property(self, value=None):
1615
1106
        if value is None:       # get
1616
1107
            return dbus.String(self.checker_command)
1617
 
        self.checker_command = str(value)
 
1108
        self.checker_command = value
 
1109
        # Emit D-Bus signal
 
1110
        self.PropertyChanged(dbus.String("Checker"),
 
1111
                             dbus.String(self.checker_command,
 
1112
                                         variant_level=1))
1618
1113
    
1619
1114
    # CheckerRunning - property
1620
1115
    @dbus_service_property(_interface, signature="b",
1636
1131
    @dbus_service_property(_interface, signature="ay",
1637
1132
                           access="write", byte_arrays=True)
1638
1133
    def Secret_dbus_property(self, value):
1639
 
        self.secret = bytes(value)
 
1134
        self.secret = str(value)
1640
1135
    
1641
1136
    del _interface
1642
1137
 
1647
1142
        self._pipe.send(('init', fpr, address))
1648
1143
        if not self._pipe.recv():
1649
1144
            raise KeyError()
1650
 
    
 
1145
 
1651
1146
    def __getattribute__(self, name):
1652
 
        if name == '_pipe':
 
1147
        if(name == '_pipe'):
1653
1148
            return super(ProxyClient, self).__getattribute__(name)
1654
1149
        self._pipe.send(('getattr', name))
1655
1150
        data = self._pipe.recv()
1660
1155
                self._pipe.send(('funcall', name, args, kwargs))
1661
1156
                return self._pipe.recv()[1]
1662
1157
            return func
1663
 
    
 
1158
 
1664
1159
    def __setattr__(self, name, value):
1665
 
        if name == '_pipe':
 
1160
        if(name == '_pipe'):
1666
1161
            return super(ProxyClient, self).__setattr__(name, value)
1667
1162
        self._pipe.send(('setattr', name, value))
1668
1163
 
1676
1171
    def handle(self):
1677
1172
        with contextlib.closing(self.server.child_pipe) as child_pipe:
1678
1173
            logger.info("TCP connection from: %s",
1679
 
                        str(self.client_address))
 
1174
                        unicode(self.client_address))
1680
1175
            logger.debug("Pipe FD: %d",
1681
1176
                         self.server.child_pipe.fileno())
1682
 
            
 
1177
 
1683
1178
            session = (gnutls.connection
1684
1179
                       .ClientSession(self.request,
1685
1180
                                      gnutls.connection
1686
1181
                                      .X509Credentials()))
1687
 
            
 
1182
 
1688
1183
            # Note: gnutls.connection.X509Credentials is really a
1689
1184
            # generic GnuTLS certificate credentials object so long as
1690
1185
            # no X.509 keys are added to it.  Therefore, we can use it
1691
1186
            # here despite using OpenPGP certificates.
1692
 
            
 
1187
 
1693
1188
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1694
1189
            #                      "+AES-256-CBC", "+SHA1",
1695
1190
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1701
1196
            (gnutls.library.functions
1702
1197
             .gnutls_priority_set_direct(session._c_object,
1703
1198
                                         priority, None))
1704
 
            
 
1199
 
1705
1200
            # Start communication using the Mandos protocol
1706
1201
            # Get protocol number
1707
1202
            line = self.request.makefile().readline()
1708
1203
            logger.debug("Protocol version: %r", line)
1709
1204
            try:
1710
1205
                if int(line.strip().split()[0]) > 1:
1711
 
                    raise RuntimeError(line)
1712
 
            except (ValueError, IndexError, RuntimeError) as error:
 
1206
                    raise RuntimeError
 
1207
            except (ValueError, IndexError, RuntimeError), error:
1713
1208
                logger.error("Unknown protocol version: %s", error)
1714
1209
                return
1715
 
            
 
1210
 
1716
1211
            # Start GnuTLS connection
1717
1212
            try:
1718
1213
                session.handshake()
1719
 
            except gnutls.errors.GNUTLSError as error:
 
1214
            except gnutls.errors.GNUTLSError, error:
1720
1215
                logger.warning("Handshake failed: %s", error)
1721
1216
                # Do not run session.bye() here: the session is not
1722
1217
                # established.  Just abandon the request.
1723
1218
                return
1724
1219
            logger.debug("Handshake succeeded")
1725
 
            
 
1220
 
1726
1221
            approval_required = False
1727
1222
            try:
1728
1223
                try:
1729
1224
                    fpr = self.fingerprint(self.peer_certificate
1730
1225
                                           (session))
1731
 
                except (TypeError,
1732
 
                        gnutls.errors.GNUTLSError) as error:
 
1226
                except (TypeError, gnutls.errors.GNUTLSError), error:
1733
1227
                    logger.warning("Bad certificate: %s", error)
1734
1228
                    return
1735
1229
                logger.debug("Fingerprint: %s", fpr)
1736
 
                
 
1230
 
1737
1231
                try:
1738
1232
                    client = ProxyClient(child_pipe, fpr,
1739
1233
                                         self.client_address)
1747
1241
                
1748
1242
                while True:
1749
1243
                    if not client.enabled:
1750
 
                        logger.info("Client %s is disabled",
 
1244
                        logger.warning("Client %s is disabled",
1751
1245
                                       client.name)
1752
1246
                        if self.server.use_dbus:
1753
1247
                            # Emit D-Bus signal
1754
 
                            client.Rejected("Disabled")
 
1248
                            client.Rejected("Disabled")                    
1755
1249
                        return
1756
1250
                    
1757
 
                    if client.approved or not client.approval_delay:
 
1251
                    if client._approved or not client.approval_delay:
1758
1252
                        #We are approved or approval is disabled
1759
1253
                        break
1760
 
                    elif client.approved is None:
 
1254
                    elif client._approved is None:
1761
1255
                        logger.info("Client %s needs approval",
1762
1256
                                    client.name)
1763
1257
                        if self.server.use_dbus:
1764
1258
                            # Emit D-Bus signal
1765
1259
                            client.NeedApproval(
1766
 
                                client.approval_delay.total_seconds()
1767
 
                                * 1000, client.approved_by_default)
 
1260
                                client.approval_delay_milliseconds(),
 
1261
                                client.approved_by_default)
1768
1262
                    else:
1769
1263
                        logger.warning("Client %s was not approved",
1770
1264
                                       client.name)
1774
1268
                        return
1775
1269
                    
1776
1270
                    #wait until timeout or approved
 
1271
                    #x = float(client._timedelta_to_milliseconds(delay))
1777
1272
                    time = datetime.datetime.now()
1778
1273
                    client.changedstate.acquire()
1779
 
                    client.changedstate.wait(delay.total_seconds())
 
1274
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1780
1275
                    client.changedstate.release()
1781
1276
                    time2 = datetime.datetime.now()
1782
1277
                    if (time2 - time) >= delay:
1797
1292
                while sent_size < len(client.secret):
1798
1293
                    try:
1799
1294
                        sent = session.send(client.secret[sent_size:])
1800
 
                    except gnutls.errors.GNUTLSError as error:
1801
 
                        logger.warning("gnutls send failed",
1802
 
                                       exc_info=error)
 
1295
                    except (gnutls.errors.GNUTLSError), error:
 
1296
                        logger.warning("gnutls send failed")
1803
1297
                        return
1804
1298
                    logger.debug("Sent: %d, remaining: %d",
1805
1299
                                 sent, len(client.secret)
1806
1300
                                 - (sent_size + sent))
1807
1301
                    sent_size += sent
1808
 
                
 
1302
 
1809
1303
                logger.info("Sending secret to %s", client.name)
1810
 
                # bump the timeout using extended_timeout
1811
 
                client.bump_timeout(client.extended_timeout)
 
1304
                # bump the timeout as if seen
 
1305
                client.checked_ok()
1812
1306
                if self.server.use_dbus:
1813
1307
                    # Emit D-Bus signal
1814
1308
                    client.GotSecret()
1818
1312
                    client.approvals_pending -= 1
1819
1313
                try:
1820
1314
                    session.bye()
1821
 
                except gnutls.errors.GNUTLSError as error:
1822
 
                    logger.warning("GnuTLS bye failed",
1823
 
                                   exc_info=error)
 
1315
                except (gnutls.errors.GNUTLSError), error:
 
1316
                    logger.warning("GnuTLS bye failed")
1824
1317
    
1825
1318
    @staticmethod
1826
1319
    def peer_certificate(session):
1882
1375
        # Convert the buffer to a Python bytestring
1883
1376
        fpr = ctypes.string_at(buf, buf_len.value)
1884
1377
        # Convert the bytestring to hexadecimal notation
1885
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1378
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1886
1379
        return hex_fpr
1887
1380
 
1888
1381
 
1891
1384
    def sub_process_main(self, request, address):
1892
1385
        try:
1893
1386
            self.finish_request(request, address)
1894
 
        except Exception:
 
1387
        except:
1895
1388
            self.handle_error(request, address)
1896
1389
        self.close_request(request)
1897
 
    
 
1390
            
1898
1391
    def process_request(self, request, address):
1899
1392
        """Start a new process to process the request."""
1900
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1901
 
                                       args = (request, address))
1902
 
        proc.start()
1903
 
        return proc
1904
 
 
 
1393
        multiprocessing.Process(target = self.sub_process_main,
 
1394
                                args = (request, address)).start()
1905
1395
 
1906
1396
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1907
1397
    """ adds a pipe to the MixIn """
1911
1401
        This function creates a new pipe in self.pipe
1912
1402
        """
1913
1403
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1914
 
        
1915
 
        proc = MultiprocessingMixIn.process_request(self, request,
1916
 
                                                    client_address)
 
1404
 
 
1405
        super(MultiprocessingMixInWithPipe,
 
1406
              self).process_request(request, client_address)
1917
1407
        self.child_pipe.close()
1918
 
        self.add_pipe(parent_pipe, proc)
1919
 
    
1920
 
    def add_pipe(self, parent_pipe, proc):
 
1408
        self.add_pipe(parent_pipe)
 
1409
 
 
1410
    def add_pipe(self, parent_pipe):
1921
1411
        """Dummy function; override as necessary"""
1922
 
        raise NotImplementedError()
1923
 
 
 
1412
        raise NotImplementedError
1924
1413
 
1925
1414
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1926
1415
                     socketserver.TCPServer, object):
1932
1421
        use_ipv6:       Boolean; to use IPv6 or not
1933
1422
    """
1934
1423
    def __init__(self, server_address, RequestHandlerClass,
1935
 
                 interface=None, use_ipv6=True, socketfd=None):
1936
 
        """If socketfd is set, use that file descriptor instead of
1937
 
        creating a new one with socket.socket().
1938
 
        """
 
1424
                 interface=None, use_ipv6=True):
1939
1425
        self.interface = interface
1940
1426
        if use_ipv6:
1941
1427
            self.address_family = socket.AF_INET6
1942
 
        if socketfd is not None:
1943
 
            # Save the file descriptor
1944
 
            self.socketfd = socketfd
1945
 
            # Save the original socket.socket() function
1946
 
            self.socket_socket = socket.socket
1947
 
            # To implement --socket, we monkey patch socket.socket.
1948
 
            # 
1949
 
            # (When socketserver.TCPServer is a new-style class, we
1950
 
            # could make self.socket into a property instead of monkey
1951
 
            # patching socket.socket.)
1952
 
            # 
1953
 
            # Create a one-time-only replacement for socket.socket()
1954
 
            @functools.wraps(socket.socket)
1955
 
            def socket_wrapper(*args, **kwargs):
1956
 
                # Restore original function so subsequent calls are
1957
 
                # not affected.
1958
 
                socket.socket = self.socket_socket
1959
 
                del self.socket_socket
1960
 
                # This time only, return a new socket object from the
1961
 
                # saved file descriptor.
1962
 
                return socket.fromfd(self.socketfd, *args, **kwargs)
1963
 
            # Replace socket.socket() function with wrapper
1964
 
            socket.socket = socket_wrapper
1965
 
        # The socketserver.TCPServer.__init__ will call
1966
 
        # socket.socket(), which might be our replacement,
1967
 
        # socket_wrapper(), if socketfd was set.
1968
1428
        socketserver.TCPServer.__init__(self, server_address,
1969
1429
                                        RequestHandlerClass)
1970
 
    
1971
1430
    def server_bind(self):
1972
1431
        """This overrides the normal server_bind() function
1973
1432
        to bind to an interface if one was specified, and also NOT to
1981
1440
                try:
1982
1441
                    self.socket.setsockopt(socket.SOL_SOCKET,
1983
1442
                                           SO_BINDTODEVICE,
1984
 
                                           (self.interface + "\0")
1985
 
                                           .encode("utf-8"))
1986
 
                except socket.error as error:
1987
 
                    if error.errno == errno.EPERM:
1988
 
                        logger.error("No permission to bind to"
1989
 
                                     " interface %s", self.interface)
1990
 
                    elif error.errno == errno.ENOPROTOOPT:
 
1443
                                           str(self.interface
 
1444
                                               + '\0'))
 
1445
                except socket.error, error:
 
1446
                    if error[0] == errno.EPERM:
 
1447
                        logger.error("No permission to"
 
1448
                                     " bind to interface %s",
 
1449
                                     self.interface)
 
1450
                    elif error[0] == errno.ENOPROTOOPT:
1991
1451
                        logger.error("SO_BINDTODEVICE not available;"
1992
1452
                                     " cannot bind to interface %s",
1993
1453
                                     self.interface)
1994
 
                    elif error.errno == errno.ENODEV:
1995
 
                        logger.error("Interface %s does not exist,"
1996
 
                                     " cannot bind", self.interface)
1997
1454
                    else:
1998
1455
                        raise
1999
1456
        # Only bind(2) the socket if we really need to.
2002
1459
                if self.address_family == socket.AF_INET6:
2003
1460
                    any_address = "::" # in6addr_any
2004
1461
                else:
2005
 
                    any_address = "0.0.0.0" # INADDR_ANY
 
1462
                    any_address = socket.INADDR_ANY
2006
1463
                self.server_address = (any_address,
2007
1464
                                       self.server_address[1])
2008
1465
            elif not self.server_address[1]:
2029
1486
    """
2030
1487
    def __init__(self, server_address, RequestHandlerClass,
2031
1488
                 interface=None, use_ipv6=True, clients=None,
2032
 
                 gnutls_priority=None, use_dbus=True, socketfd=None):
 
1489
                 gnutls_priority=None, use_dbus=True):
2033
1490
        self.enabled = False
2034
1491
        self.clients = clients
2035
1492
        if self.clients is None:
2036
 
            self.clients = {}
 
1493
            self.clients = set()
2037
1494
        self.use_dbus = use_dbus
2038
1495
        self.gnutls_priority = gnutls_priority
2039
1496
        IPv6_TCPServer.__init__(self, server_address,
2040
1497
                                RequestHandlerClass,
2041
1498
                                interface = interface,
2042
 
                                use_ipv6 = use_ipv6,
2043
 
                                socketfd = socketfd)
 
1499
                                use_ipv6 = use_ipv6)
2044
1500
    def server_activate(self):
2045
1501
        if self.enabled:
2046
1502
            return socketserver.TCPServer.server_activate(self)
2047
 
    
2048
1503
    def enable(self):
2049
1504
        self.enabled = True
2050
 
    
2051
 
    def add_pipe(self, parent_pipe, proc):
 
1505
    def add_pipe(self, parent_pipe):
2052
1506
        # Call "handle_ipc" for both data and EOF events
2053
1507
        gobject.io_add_watch(parent_pipe.fileno(),
2054
1508
                             gobject.IO_IN | gobject.IO_HUP,
2055
1509
                             functools.partial(self.handle_ipc,
2056
 
                                               parent_pipe =
2057
 
                                               parent_pipe,
2058
 
                                               proc = proc))
2059
 
    
 
1510
                                               parent_pipe = parent_pipe))
 
1511
        
2060
1512
    def handle_ipc(self, source, condition, parent_pipe=None,
2061
 
                   proc = None, client_object=None):
2062
 
        # error, or the other end of multiprocessing.Pipe has closed
2063
 
        if condition & (gobject.IO_ERR | gobject.IO_HUP):
2064
 
            # Wait for other process to exit
2065
 
            proc.join()
 
1513
                   client_object=None):
 
1514
        condition_names = {
 
1515
            gobject.IO_IN: "IN",   # There is data to read.
 
1516
            gobject.IO_OUT: "OUT", # Data can be written (without
 
1517
                                    # blocking).
 
1518
            gobject.IO_PRI: "PRI", # There is urgent data to read.
 
1519
            gobject.IO_ERR: "ERR", # Error condition.
 
1520
            gobject.IO_HUP: "HUP"  # Hung up (the connection has been
 
1521
                                    # broken, usually for pipes and
 
1522
                                    # sockets).
 
1523
            }
 
1524
        conditions_string = ' | '.join(name
 
1525
                                       for cond, name in
 
1526
                                       condition_names.iteritems()
 
1527
                                       if cond & condition)
 
1528
        # error or the other end of multiprocessing.Pipe has closed
 
1529
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2066
1530
            return False
2067
1531
        
2068
1532
        # Read a request from the child
2073
1537
            fpr = request[1]
2074
1538
            address = request[2]
2075
1539
            
2076
 
            for c in self.clients.itervalues():
 
1540
            for c in self.clients:
2077
1541
                if c.fingerprint == fpr:
2078
1542
                    client = c
2079
1543
                    break
2080
1544
            else:
2081
 
                logger.info("Client not found for fingerprint: %s, ad"
2082
 
                            "dress: %s", fpr, address)
 
1545
                logger.warning("Client not found for fingerprint: %s, ad"
 
1546
                               "dress: %s", fpr, address)
2083
1547
                if self.use_dbus:
2084
1548
                    # Emit D-Bus signal
2085
 
                    mandos_dbus_service.ClientNotFound(fpr,
2086
 
                                                       address[0])
 
1549
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2087
1550
                parent_pipe.send(False)
2088
1551
                return False
2089
1552
            
2090
1553
            gobject.io_add_watch(parent_pipe.fileno(),
2091
1554
                                 gobject.IO_IN | gobject.IO_HUP,
2092
1555
                                 functools.partial(self.handle_ipc,
2093
 
                                                   parent_pipe =
2094
 
                                                   parent_pipe,
2095
 
                                                   proc = proc,
2096
 
                                                   client_object =
2097
 
                                                   client))
 
1556
                                                   parent_pipe = parent_pipe,
 
1557
                                                   client_object = client))
2098
1558
            parent_pipe.send(True)
2099
 
            # remove the old hook in favor of the new above hook on
2100
 
            # same fileno
 
1559
            # remove the old hook in favor of the new above hook on same fileno
2101
1560
            return False
2102
1561
        if command == 'funcall':
2103
1562
            funcname = request[1]
2104
1563
            args = request[2]
2105
1564
            kwargs = request[3]
2106
1565
            
2107
 
            parent_pipe.send(('data', getattr(client_object,
2108
 
                                              funcname)(*args,
2109
 
                                                         **kwargs)))
2110
 
        
 
1566
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1567
 
2111
1568
        if command == 'getattr':
2112
1569
            attrname = request[1]
2113
1570
            if callable(client_object.__getattribute__(attrname)):
2114
1571
                parent_pipe.send(('function',))
2115
1572
            else:
2116
 
                parent_pipe.send(('data', client_object
2117
 
                                  .__getattribute__(attrname)))
 
1573
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2118
1574
        
2119
1575
        if command == 'setattr':
2120
1576
            attrname = request[1]
2121
1577
            value = request[2]
2122
1578
            setattr(client_object, attrname, value)
2123
 
        
 
1579
 
2124
1580
        return True
2125
1581
 
2126
1582
 
2127
 
def rfc3339_duration_to_delta(duration):
2128
 
    """Parse an RFC 3339 "duration" and return a datetime.timedelta
2129
 
    
2130
 
    >>> rfc3339_duration_to_delta("P7D")
2131
 
    datetime.timedelta(7)
2132
 
    >>> rfc3339_duration_to_delta("PT60S")
2133
 
    datetime.timedelta(0, 60)
2134
 
    >>> rfc3339_duration_to_delta("PT60M")
2135
 
    datetime.timedelta(0, 3600)
2136
 
    >>> rfc3339_duration_to_delta("PT24H")
2137
 
    datetime.timedelta(1)
2138
 
    >>> rfc3339_duration_to_delta("P1W")
2139
 
    datetime.timedelta(7)
2140
 
    >>> rfc3339_duration_to_delta("PT5M30S")
2141
 
    datetime.timedelta(0, 330)
2142
 
    >>> rfc3339_duration_to_delta("P1DT3M20S")
2143
 
    datetime.timedelta(1, 200)
2144
 
    """
2145
 
    
2146
 
    # Parsing an RFC 3339 duration with regular expressions is not
2147
 
    # possible - there would have to be multiple places for the same
2148
 
    # values, like seconds.  The current code, while more esoteric, is
2149
 
    # cleaner without depending on a parsing library.  If Python had a
2150
 
    # built-in library for parsing we would use it, but we'd like to
2151
 
    # avoid excessive use of external libraries.
2152
 
    
2153
 
    # New type for defining tokens, syntax, and semantics all-in-one
2154
 
    Token = collections.namedtuple("Token",
2155
 
                                   ("regexp", # To match token; if
2156
 
                                              # "value" is not None,
2157
 
                                              # must have a "group"
2158
 
                                              # containing digits
2159
 
                                    "value",  # datetime.timedelta or
2160
 
                                              # None
2161
 
                                    "followers")) # Tokens valid after
2162
 
                                                  # this token
2163
 
    # RFC 3339 "duration" tokens, syntax, and semantics; taken from
2164
 
    # the "duration" ABNF definition in RFC 3339, Appendix A.
2165
 
    token_end = Token(re.compile(r"$"), None, frozenset())
2166
 
    token_second = Token(re.compile(r"(\d+)S"),
2167
 
                         datetime.timedelta(seconds=1),
2168
 
                         frozenset((token_end,)))
2169
 
    token_minute = Token(re.compile(r"(\d+)M"),
2170
 
                         datetime.timedelta(minutes=1),
2171
 
                         frozenset((token_second, token_end)))
2172
 
    token_hour = Token(re.compile(r"(\d+)H"),
2173
 
                       datetime.timedelta(hours=1),
2174
 
                       frozenset((token_minute, token_end)))
2175
 
    token_time = Token(re.compile(r"T"),
2176
 
                       None,
2177
 
                       frozenset((token_hour, token_minute,
2178
 
                                  token_second)))
2179
 
    token_day = Token(re.compile(r"(\d+)D"),
2180
 
                      datetime.timedelta(days=1),
2181
 
                      frozenset((token_time, token_end)))
2182
 
    token_month = Token(re.compile(r"(\d+)M"),
2183
 
                        datetime.timedelta(weeks=4),
2184
 
                        frozenset((token_day, token_end)))
2185
 
    token_year = Token(re.compile(r"(\d+)Y"),
2186
 
                       datetime.timedelta(weeks=52),
2187
 
                       frozenset((token_month, token_end)))
2188
 
    token_week = Token(re.compile(r"(\d+)W"),
2189
 
                       datetime.timedelta(weeks=1),
2190
 
                       frozenset((token_end,)))
2191
 
    token_duration = Token(re.compile(r"P"), None,
2192
 
                           frozenset((token_year, token_month,
2193
 
                                      token_day, token_time,
2194
 
                                      token_week)))
2195
 
    # Define starting values
2196
 
    value = datetime.timedelta() # Value so far
2197
 
    found_token = None
2198
 
    followers = frozenset((token_duration,)) # Following valid tokens
2199
 
    s = duration                # String left to parse
2200
 
    # Loop until end token is found
2201
 
    while found_token is not token_end:
2202
 
        # Search for any currently valid tokens
2203
 
        for token in followers:
2204
 
            match = token.regexp.match(s)
2205
 
            if match is not None:
2206
 
                # Token found
2207
 
                if token.value is not None:
2208
 
                    # Value found, parse digits
2209
 
                    factor = int(match.group(1), 10)
2210
 
                    # Add to value so far
2211
 
                    value += factor * token.value
2212
 
                # Strip token from string
2213
 
                s = token.regexp.sub("", s, 1)
2214
 
                # Go to found token
2215
 
                found_token = token
2216
 
                # Set valid next tokens
2217
 
                followers = found_token.followers
2218
 
                break
2219
 
        else:
2220
 
            # No currently valid tokens were found
2221
 
            raise ValueError("Invalid RFC 3339 duration")
2222
 
    # End token found
2223
 
    return value
2224
 
 
2225
 
 
2226
1583
def string_to_delta(interval):
2227
1584
    """Parse a string and return a datetime.timedelta
2228
1585
    
2239
1596
    >>> string_to_delta('5m 30s')
2240
1597
    datetime.timedelta(0, 330)
2241
1598
    """
2242
 
    
2243
 
    try:
2244
 
        return rfc3339_duration_to_delta(interval)
2245
 
    except ValueError:
2246
 
        pass
2247
 
    
2248
1599
    timevalue = datetime.timedelta(0)
2249
1600
    for s in interval.split():
2250
1601
        try:
2251
 
            suffix = s[-1]
 
1602
            suffix = unicode(s[-1])
2252
1603
            value = int(s[:-1])
2253
1604
            if suffix == "d":
2254
1605
                delta = datetime.timedelta(value)
2261
1612
            elif suffix == "w":
2262
1613
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2263
1614
            else:
2264
 
                raise ValueError("Unknown suffix {!r}"
2265
 
                                 .format(suffix))
2266
 
        except IndexError as e:
 
1615
                raise ValueError("Unknown suffix %r" % suffix)
 
1616
        except (ValueError, IndexError), e:
2267
1617
            raise ValueError(*(e.args))
2268
1618
        timevalue += delta
2269
1619
    return timevalue
2270
1620
 
2271
1621
 
 
1622
def if_nametoindex(interface):
 
1623
    """Call the C function if_nametoindex(), or equivalent
 
1624
    
 
1625
    Note: This function cannot accept a unicode string."""
 
1626
    global if_nametoindex
 
1627
    try:
 
1628
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1629
                          (ctypes.util.find_library("c"))
 
1630
                          .if_nametoindex)
 
1631
    except (OSError, AttributeError):
 
1632
        logger.warning("Doing if_nametoindex the hard way")
 
1633
        def if_nametoindex(interface):
 
1634
            "Get an interface index the hard way, i.e. using fcntl()"
 
1635
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1636
            with contextlib.closing(socket.socket()) as s:
 
1637
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1638
                                    struct.pack(str("16s16x"),
 
1639
                                                interface))
 
1640
            interface_index = struct.unpack(str("I"),
 
1641
                                            ifreq[16:20])[0]
 
1642
            return interface_index
 
1643
    return if_nametoindex(interface)
 
1644
 
 
1645
 
2272
1646
def daemon(nochdir = False, noclose = False):
2273
1647
    """See daemon(3).  Standard BSD Unix function.
2274
1648
    
2282
1656
        sys.exit()
2283
1657
    if not noclose:
2284
1658
        # Close all standard open file descriptors
2285
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1659
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2286
1660
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2287
 
            raise OSError(errno.ENODEV, "{} not a character device"
2288
 
                          .format(os.devnull))
 
1661
            raise OSError(errno.ENODEV,
 
1662
                          "%s not a character device"
 
1663
                          % os.path.devnull)
2289
1664
        os.dup2(null, sys.stdin.fileno())
2290
1665
        os.dup2(null, sys.stdout.fileno())
2291
1666
        os.dup2(null, sys.stderr.fileno())
2300
1675
    
2301
1676
    parser = argparse.ArgumentParser()
2302
1677
    parser.add_argument("-v", "--version", action="version",
2303
 
                        version = "%(prog)s {}".format(version),
 
1678
                        version = "%%(prog)s %s" % version,
2304
1679
                        help="show version number and exit")
2305
1680
    parser.add_argument("-i", "--interface", metavar="IF",
2306
1681
                        help="Bind to interface IF")
2312
1687
                        help="Run self-test")
2313
1688
    parser.add_argument("--debug", action="store_true",
2314
1689
                        help="Debug mode; run in foreground and log"
2315
 
                        " to terminal", default=None)
 
1690
                        " to terminal")
2316
1691
    parser.add_argument("--debuglevel", metavar="LEVEL",
2317
1692
                        help="Debug level for stdout output")
2318
1693
    parser.add_argument("--priority", help="GnuTLS"
2325
1700
                        " files")
2326
1701
    parser.add_argument("--no-dbus", action="store_false",
2327
1702
                        dest="use_dbus", help="Do not provide D-Bus"
2328
 
                        " system bus interface", default=None)
 
1703
                        " system bus interface")
2329
1704
    parser.add_argument("--no-ipv6", action="store_false",
2330
 
                        dest="use_ipv6", help="Do not use IPv6",
2331
 
                        default=None)
2332
 
    parser.add_argument("--no-restore", action="store_false",
2333
 
                        dest="restore", help="Do not restore stored"
2334
 
                        " state", default=None)
2335
 
    parser.add_argument("--socket", type=int,
2336
 
                        help="Specify a file descriptor to a network"
2337
 
                        " socket to use instead of creating one")
2338
 
    parser.add_argument("--statedir", metavar="DIR",
2339
 
                        help="Directory to save/restore state in")
2340
 
    parser.add_argument("--foreground", action="store_true",
2341
 
                        help="Run in foreground", default=None)
2342
 
    parser.add_argument("--no-zeroconf", action="store_false",
2343
 
                        dest="zeroconf", help="Do not use Zeroconf",
2344
 
                        default=None)
2345
 
    
 
1705
                        dest="use_ipv6", help="Do not use IPv6")
2346
1706
    options = parser.parse_args()
2347
1707
    
2348
1708
    if options.check:
2349
1709
        import doctest
2350
 
        fail_count, test_count = doctest.testmod()
2351
 
        sys.exit(os.EX_OK if fail_count == 0 else 1)
 
1710
        doctest.testmod()
 
1711
        sys.exit()
2352
1712
    
2353
1713
    # Default values for config file for server-global settings
2354
1714
    server_defaults = { "interface": "",
2356
1716
                        "port": "",
2357
1717
                        "debug": "False",
2358
1718
                        "priority":
2359
 
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2360
 
                        ":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
 
1719
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2361
1720
                        "servicename": "Mandos",
2362
1721
                        "use_dbus": "True",
2363
1722
                        "use_ipv6": "True",
2364
1723
                        "debuglevel": "",
2365
 
                        "restore": "True",
2366
 
                        "socket": "",
2367
 
                        "statedir": "/var/lib/mandos",
2368
 
                        "foreground": "False",
2369
 
                        "zeroconf": "True",
2370
1724
                        }
2371
1725
    
2372
1726
    # Parse config file for server-global settings
2377
1731
    # Convert the SafeConfigParser object to a dict
2378
1732
    server_settings = server_config.defaults()
2379
1733
    # Use the appropriate methods on the non-string config options
2380
 
    for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
 
1734
    for option in ("debug", "use_dbus", "use_ipv6"):
2381
1735
        server_settings[option] = server_config.getboolean("DEFAULT",
2382
1736
                                                           option)
2383
1737
    if server_settings["port"]:
2384
1738
        server_settings["port"] = server_config.getint("DEFAULT",
2385
1739
                                                       "port")
2386
 
    if server_settings["socket"]:
2387
 
        server_settings["socket"] = server_config.getint("DEFAULT",
2388
 
                                                         "socket")
2389
 
        # Later, stdin will, and stdout and stderr might, be dup'ed
2390
 
        # over with an opened os.devnull.  But we don't want this to
2391
 
        # happen with a supplied network socket.
2392
 
        if 0 <= server_settings["socket"] <= 2:
2393
 
            server_settings["socket"] = os.dup(server_settings
2394
 
                                               ["socket"])
2395
1740
    del server_config
2396
1741
    
2397
1742
    # Override the settings from the config file with command line
2398
1743
    # options, if set.
2399
1744
    for option in ("interface", "address", "port", "debug",
2400
1745
                   "priority", "servicename", "configdir",
2401
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2402
 
                   "statedir", "socket", "foreground", "zeroconf"):
 
1746
                   "use_dbus", "use_ipv6", "debuglevel"):
2403
1747
        value = getattr(options, option)
2404
1748
        if value is not None:
2405
1749
            server_settings[option] = value
2406
1750
    del options
2407
1751
    # Force all strings to be unicode
2408
1752
    for option in server_settings.keys():
2409
 
        if isinstance(server_settings[option], bytes):
2410
 
            server_settings[option] = (server_settings[option]
2411
 
                                       .decode("utf-8"))
2412
 
    # Force all boolean options to be boolean
2413
 
    for option in ("debug", "use_dbus", "use_ipv6", "restore",
2414
 
                   "foreground", "zeroconf"):
2415
 
        server_settings[option] = bool(server_settings[option])
2416
 
    # Debug implies foreground
2417
 
    if server_settings["debug"]:
2418
 
        server_settings["foreground"] = True
 
1753
        if type(server_settings[option]) is str:
 
1754
            server_settings[option] = unicode(server_settings[option])
2419
1755
    # Now we have our good server settings in "server_settings"
2420
1756
    
2421
1757
    ##################################################################
2422
1758
    
2423
 
    if (not server_settings["zeroconf"] and
2424
 
        not (server_settings["port"]
2425
 
             or server_settings["socket"] != "")):
2426
 
            parser.error("Needs port or socket to work without"
2427
 
                         " Zeroconf")
2428
 
    
2429
1759
    # For convenience
2430
1760
    debug = server_settings["debug"]
2431
1761
    debuglevel = server_settings["debuglevel"]
2432
1762
    use_dbus = server_settings["use_dbus"]
2433
1763
    use_ipv6 = server_settings["use_ipv6"]
2434
 
    stored_state_path = os.path.join(server_settings["statedir"],
2435
 
                                     stored_state_file)
2436
 
    foreground = server_settings["foreground"]
2437
 
    zeroconf = server_settings["zeroconf"]
2438
 
    
2439
 
    if debug:
2440
 
        initlogger(debug, logging.DEBUG)
2441
 
    else:
2442
 
        if not debuglevel:
2443
 
            initlogger(debug)
2444
 
        else:
2445
 
            level = getattr(logging, debuglevel.upper())
2446
 
            initlogger(debug, level)
2447
 
    
 
1764
 
2448
1765
    if server_settings["servicename"] != "Mandos":
2449
1766
        syslogger.setFormatter(logging.Formatter
2450
 
                               ('Mandos ({}) [%(process)d]:'
2451
 
                                ' %(levelname)s: %(message)s'
2452
 
                                .format(server_settings
2453
 
                                        ["servicename"])))
 
1767
                               ('Mandos (%s) [%%(process)d]:'
 
1768
                                ' %%(levelname)s: %%(message)s'
 
1769
                                % server_settings["servicename"]))
2454
1770
    
2455
1771
    # Parse config file with clients
2456
 
    client_config = configparser.SafeConfigParser(Client
2457
 
                                                  .client_defaults)
 
1772
    client_defaults = { "timeout": "1h",
 
1773
                        "interval": "5m",
 
1774
                        "checker": "fping -q -- %%(host)s",
 
1775
                        "host": "",
 
1776
                        "approval_delay": "0s",
 
1777
                        "approval_duration": "1s",
 
1778
                        }
 
1779
    client_config = configparser.SafeConfigParser(client_defaults)
2458
1780
    client_config.read(os.path.join(server_settings["configdir"],
2459
1781
                                    "clients.conf"))
2460
1782
    
2461
1783
    global mandos_dbus_service
2462
1784
    mandos_dbus_service = None
2463
1785
    
2464
 
    socketfd = None
2465
 
    if server_settings["socket"] != "":
2466
 
        socketfd = server_settings["socket"]
2467
1786
    tcp_server = MandosServer((server_settings["address"],
2468
1787
                               server_settings["port"]),
2469
1788
                              ClientHandler,
2472
1791
                              use_ipv6=use_ipv6,
2473
1792
                              gnutls_priority=
2474
1793
                              server_settings["priority"],
2475
 
                              use_dbus=use_dbus,
2476
 
                              socketfd=socketfd)
2477
 
    if not foreground:
2478
 
        pidfilename = "/run/mandos.pid"
2479
 
        if not os.path.isdir("/run/."):
2480
 
            pidfilename = "/var/run/mandos.pid"
2481
 
        pidfile = None
 
1794
                              use_dbus=use_dbus)
 
1795
    if not debug:
 
1796
        pidfilename = "/var/run/mandos.pid"
2482
1797
        try:
2483
1798
            pidfile = open(pidfilename, "w")
2484
 
        except IOError as e:
2485
 
            logger.error("Could not open file %r", pidfilename,
2486
 
                         exc_info=e)
 
1799
        except IOError:
 
1800
            logger.error("Could not open file %r", pidfilename)
2487
1801
    
2488
 
    for name in ("_mandos", "mandos", "nobody"):
 
1802
    try:
 
1803
        uid = pwd.getpwnam("_mandos").pw_uid
 
1804
        gid = pwd.getpwnam("_mandos").pw_gid
 
1805
    except KeyError:
2489
1806
        try:
2490
 
            uid = pwd.getpwnam(name).pw_uid
2491
 
            gid = pwd.getpwnam(name).pw_gid
2492
 
            break
 
1807
            uid = pwd.getpwnam("mandos").pw_uid
 
1808
            gid = pwd.getpwnam("mandos").pw_gid
2493
1809
        except KeyError:
2494
 
            continue
2495
 
    else:
2496
 
        uid = 65534
2497
 
        gid = 65534
 
1810
            try:
 
1811
                uid = pwd.getpwnam("nobody").pw_uid
 
1812
                gid = pwd.getpwnam("nobody").pw_gid
 
1813
            except KeyError:
 
1814
                uid = 65534
 
1815
                gid = 65534
2498
1816
    try:
2499
1817
        os.setgid(gid)
2500
1818
        os.setuid(uid)
2501
 
    except OSError as error:
2502
 
        if error.errno != errno.EPERM:
2503
 
            raise
 
1819
    except OSError, error:
 
1820
        if error[0] != errno.EPERM:
 
1821
            raise error
2504
1822
    
 
1823
    if not debug and not debuglevel:
 
1824
        syslogger.setLevel(logging.WARNING)
 
1825
        console.setLevel(logging.WARNING)
 
1826
    if debuglevel:
 
1827
        level = getattr(logging, debuglevel.upper())
 
1828
        syslogger.setLevel(level)
 
1829
        console.setLevel(level)
 
1830
 
2505
1831
    if debug:
2506
1832
        # Enable all possible GnuTLS debugging
2507
1833
        
2517
1843
         .gnutls_global_set_log_function(debug_gnutls))
2518
1844
        
2519
1845
        # Redirect stdin so all checkers get /dev/null
2520
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1846
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2521
1847
        os.dup2(null, sys.stdin.fileno())
2522
1848
        if null > 2:
2523
1849
            os.close(null)
 
1850
    else:
 
1851
        # No console logging
 
1852
        logger.removeHandler(console)
2524
1853
    
2525
1854
    # Need to fork before connecting to D-Bus
2526
 
    if not foreground:
 
1855
    if not debug:
2527
1856
        # Close all input and output, do double fork, etc.
2528
1857
        daemon()
2529
1858
    
2530
 
    # multiprocessing will use threads, so before we use gobject we
2531
 
    # need to inform gobject that threads will be used.
2532
 
    gobject.threads_init()
2533
 
    
2534
1859
    global main_loop
2535
1860
    # From the Avahi example code
2536
 
    DBusGMainLoop(set_as_default=True)
 
1861
    DBusGMainLoop(set_as_default=True )
2537
1862
    main_loop = gobject.MainLoop()
2538
1863
    bus = dbus.SystemBus()
2539
1864
    # End of Avahi example code
2540
1865
    if use_dbus:
2541
1866
        try:
2542
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1867
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2543
1868
                                            bus, do_not_queue=True)
2544
 
            old_bus_name = (dbus.service.BusName
2545
 
                            ("se.bsnet.fukt.Mandos", bus,
2546
 
                             do_not_queue=True))
2547
 
        except dbus.exceptions.NameExistsException as e:
2548
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
1869
        except dbus.exceptions.NameExistsException, e:
 
1870
            logger.error(unicode(e) + ", disabling D-Bus")
2549
1871
            use_dbus = False
2550
1872
            server_settings["use_dbus"] = False
2551
1873
            tcp_server.use_dbus = False
2552
 
    if zeroconf:
2553
 
        protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2554
 
        service = AvahiServiceToSyslog(name =
2555
 
                                       server_settings["servicename"],
2556
 
                                       servicetype = "_mandos._tcp",
2557
 
                                       protocol = protocol, bus = bus)
2558
 
        if server_settings["interface"]:
2559
 
            service.interface = (if_nametoindex
2560
 
                                 (server_settings["interface"]
2561
 
                                  .encode("utf-8")))
 
1874
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
 
1875
    service = AvahiService(name = server_settings["servicename"],
 
1876
                           servicetype = "_mandos._tcp",
 
1877
                           protocol = protocol, bus = bus)
 
1878
    if server_settings["interface"]:
 
1879
        service.interface = (if_nametoindex
 
1880
                             (str(server_settings["interface"])))
2562
1881
    
2563
1882
    global multiprocessing_manager
2564
1883
    multiprocessing_manager = multiprocessing.Manager()
2566
1885
    client_class = Client
2567
1886
    if use_dbus:
2568
1887
        client_class = functools.partial(ClientDBus, bus = bus)
2569
 
    
2570
 
    client_settings = Client.config_parser(client_config)
2571
 
    old_client_settings = {}
2572
 
    clients_data = {}
2573
 
    
2574
 
    # This is used to redirect stdout and stderr for checker processes
2575
 
    global wnull
2576
 
    wnull = open(os.devnull, "w") # A writable /dev/null
2577
 
    # Only used if server is running in foreground but not in debug
2578
 
    # mode
2579
 
    if debug or not foreground:
2580
 
        wnull.close()
2581
 
    
2582
 
    # Get client data and settings from last running state.
2583
 
    if server_settings["restore"]:
2584
 
        try:
2585
 
            with open(stored_state_path, "rb") as stored_state:
2586
 
                clients_data, old_client_settings = (pickle.load
2587
 
                                                     (stored_state))
2588
 
            os.remove(stored_state_path)
2589
 
        except IOError as e:
2590
 
            if e.errno == errno.ENOENT:
2591
 
                logger.warning("Could not load persistent state: {}"
2592
 
                                .format(os.strerror(e.errno)))
2593
 
            else:
2594
 
                logger.critical("Could not load persistent state:",
2595
 
                                exc_info=e)
2596
 
                raise
2597
 
        except EOFError as e:
2598
 
            logger.warning("Could not load persistent state: "
2599
 
                           "EOFError:", exc_info=e)
2600
 
    
2601
 
    with PGPEngine() as pgp:
2602
 
        for client_name, client in clients_data.items():
2603
 
            # Skip removed clients
2604
 
            if client_name not in client_settings:
2605
 
                continue
2606
 
            
2607
 
            # Decide which value to use after restoring saved state.
2608
 
            # We have three different values: Old config file,
2609
 
            # new config file, and saved state.
2610
 
            # New config value takes precedence if it differs from old
2611
 
            # config value, otherwise use saved state.
2612
 
            for name, value in client_settings[client_name].items():
2613
 
                try:
2614
 
                    # For each value in new config, check if it
2615
 
                    # differs from the old config value (Except for
2616
 
                    # the "secret" attribute)
2617
 
                    if (name != "secret" and
2618
 
                        value != old_client_settings[client_name]
2619
 
                        [name]):
2620
 
                        client[name] = value
2621
 
                except KeyError:
2622
 
                    pass
2623
 
            
2624
 
            # Clients who has passed its expire date can still be
2625
 
            # enabled if its last checker was successful.  Clients
2626
 
            # whose checker succeeded before we stored its state is
2627
 
            # assumed to have successfully run all checkers during
2628
 
            # downtime.
2629
 
            if client["enabled"]:
2630
 
                if datetime.datetime.utcnow() >= client["expires"]:
2631
 
                    if not client["last_checked_ok"]:
2632
 
                        logger.warning(
2633
 
                            "disabling client {} - Client never "
2634
 
                            "performed a successful checker"
2635
 
                            .format(client_name))
2636
 
                        client["enabled"] = False
2637
 
                    elif client["last_checker_status"] != 0:
2638
 
                        logger.warning(
2639
 
                            "disabling client {} - Client last"
2640
 
                            " checker failed with error code {}"
2641
 
                            .format(client_name,
2642
 
                                    client["last_checker_status"]))
2643
 
                        client["enabled"] = False
2644
 
                    else:
2645
 
                        client["expires"] = (datetime.datetime
2646
 
                                             .utcnow()
2647
 
                                             + client["timeout"])
2648
 
                        logger.debug("Last checker succeeded,"
2649
 
                                     " keeping {} enabled"
2650
 
                                     .format(client_name))
 
1888
    def client_config_items(config, section):
 
1889
        special_settings = {
 
1890
            "approved_by_default":
 
1891
                lambda: config.getboolean(section,
 
1892
                                          "approved_by_default"),
 
1893
            }
 
1894
        for name, value in config.items(section):
2651
1895
            try:
2652
 
                client["secret"] = (
2653
 
                    pgp.decrypt(client["encrypted_secret"],
2654
 
                                client_settings[client_name]
2655
 
                                ["secret"]))
2656
 
            except PGPError:
2657
 
                # If decryption fails, we use secret from new settings
2658
 
                logger.debug("Failed to decrypt {} old secret"
2659
 
                             .format(client_name))
2660
 
                client["secret"] = (
2661
 
                    client_settings[client_name]["secret"])
2662
 
    
2663
 
    # Add/remove clients based on new changes made to config
2664
 
    for client_name in (set(old_client_settings)
2665
 
                        - set(client_settings)):
2666
 
        del clients_data[client_name]
2667
 
    for client_name in (set(client_settings)
2668
 
                        - set(old_client_settings)):
2669
 
        clients_data[client_name] = client_settings[client_name]
2670
 
    
2671
 
    # Create all client objects
2672
 
    for client_name, client in clients_data.items():
2673
 
        tcp_server.clients[client_name] = client_class(
2674
 
            name = client_name, settings = client,
2675
 
            server_settings = server_settings)
2676
 
    
 
1896
                yield (name, special_settings[name]())
 
1897
            except KeyError:
 
1898
                yield (name, value)
 
1899
    
 
1900
    tcp_server.clients.update(set(
 
1901
            client_class(name = section,
 
1902
                         config= dict(client_config_items(
 
1903
                        client_config, section)))
 
1904
            for section in client_config.sections()))
2677
1905
    if not tcp_server.clients:
2678
1906
        logger.warning("No clients defined")
2679
 
    
2680
 
    if not foreground:
2681
 
        if pidfile is not None:
2682
 
            try:
2683
 
                with pidfile:
2684
 
                    pid = os.getpid()
2685
 
                    pidfile.write("{}\n".format(pid).encode("utf-8"))
2686
 
            except IOError:
2687
 
                logger.error("Could not write to file %r with PID %d",
2688
 
                             pidfilename, pid)
2689
 
        del pidfile
 
1907
        
 
1908
    if not debug:
 
1909
        try:
 
1910
            with pidfile:
 
1911
                pid = os.getpid()
 
1912
                pidfile.write(str(pid) + "\n".encode("utf-8"))
 
1913
            del pidfile
 
1914
        except IOError:
 
1915
            logger.error("Could not write to file %r with PID %d",
 
1916
                         pidfilename, pid)
 
1917
        except NameError:
 
1918
            # "pidfile" was never created
 
1919
            pass
2690
1920
        del pidfilename
2691
 
    
 
1921
        
 
1922
        signal.signal(signal.SIGINT, signal.SIG_IGN)
 
1923
 
2692
1924
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2693
1925
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2694
1926
    
2695
1927
    if use_dbus:
2696
 
        @alternate_dbus_interfaces({"se.recompile.Mandos":
2697
 
                                        "se.bsnet.fukt.Mandos"})
2698
 
        class MandosDBusService(DBusObjectWithProperties):
 
1928
        class MandosDBusService(dbus.service.Object):
2699
1929
            """A D-Bus proxy object"""
2700
1930
            def __init__(self):
2701
1931
                dbus.service.Object.__init__(self, bus, "/")
2702
 
            _interface = "se.recompile.Mandos"
2703
 
            
2704
 
            @dbus_interface_annotations(_interface)
2705
 
            def _foo(self):
2706
 
                return { "org.freedesktop.DBus.Property"
2707
 
                         ".EmitsChangedSignal":
2708
 
                             "false"}
 
1932
            _interface = "se.bsnet.fukt.Mandos"
2709
1933
            
2710
1934
            @dbus.service.signal(_interface, signature="o")
2711
1935
            def ClientAdded(self, objpath):
2726
1950
            def GetAllClients(self):
2727
1951
                "D-Bus method"
2728
1952
                return dbus.Array(c.dbus_object_path
2729
 
                                  for c in
2730
 
                                  tcp_server.clients.itervalues())
 
1953
                                  for c in tcp_server.clients)
2731
1954
            
2732
1955
            @dbus.service.method(_interface,
2733
1956
                                 out_signature="a{oa{sv}}")
2734
1957
            def GetAllClientsWithProperties(self):
2735
1958
                "D-Bus method"
2736
1959
                return dbus.Dictionary(
2737
 
                    { c.dbus_object_path: c.GetAll("")
2738
 
                      for c in tcp_server.clients.itervalues() },
 
1960
                    ((c.dbus_object_path, c.GetAll(""))
 
1961
                     for c in tcp_server.clients),
2739
1962
                    signature="oa{sv}")
2740
1963
            
2741
1964
            @dbus.service.method(_interface, in_signature="o")
2742
1965
            def RemoveClient(self, object_path):
2743
1966
                "D-Bus method"
2744
 
                for c in tcp_server.clients.itervalues():
 
1967
                for c in tcp_server.clients:
2745
1968
                    if c.dbus_object_path == object_path:
2746
 
                        del tcp_server.clients[c.name]
 
1969
                        tcp_server.clients.remove(c)
2747
1970
                        c.remove_from_connection()
2748
1971
                        # Don't signal anything except ClientRemoved
2749
1972
                        c.disable(quiet=True)
2758
1981
    
2759
1982
    def cleanup():
2760
1983
        "Cleanup function; run on exit"
2761
 
        if zeroconf:
2762
 
            service.cleanup()
2763
 
        
2764
 
        multiprocessing.active_children()
2765
 
        wnull.close()
2766
 
        if not (tcp_server.clients or client_settings):
2767
 
            return
2768
 
        
2769
 
        # Store client before exiting. Secrets are encrypted with key
2770
 
        # based on what config file has. If config file is
2771
 
        # removed/edited, old secret will thus be unrecovable.
2772
 
        clients = {}
2773
 
        with PGPEngine() as pgp:
2774
 
            for client in tcp_server.clients.itervalues():
2775
 
                key = client_settings[client.name]["secret"]
2776
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2777
 
                                                      key)
2778
 
                client_dict = {}
2779
 
                
2780
 
                # A list of attributes that can not be pickled
2781
 
                # + secret.
2782
 
                exclude = { "bus", "changedstate", "secret",
2783
 
                            "checker", "server_settings" }
2784
 
                for name, typ in (inspect.getmembers
2785
 
                                  (dbus.service.Object)):
2786
 
                    exclude.add(name)
2787
 
                
2788
 
                client_dict["encrypted_secret"] = (client
2789
 
                                                   .encrypted_secret)
2790
 
                for attr in client.client_structure:
2791
 
                    if attr not in exclude:
2792
 
                        client_dict[attr] = getattr(client, attr)
2793
 
                
2794
 
                clients[client.name] = client_dict
2795
 
                del client_settings[client.name]["secret"]
2796
 
        
2797
 
        try:
2798
 
            with (tempfile.NamedTemporaryFile
2799
 
                  (mode='wb', suffix=".pickle", prefix='clients-',
2800
 
                   dir=os.path.dirname(stored_state_path),
2801
 
                   delete=False)) as stored_state:
2802
 
                pickle.dump((clients, client_settings), stored_state)
2803
 
                tempname=stored_state.name
2804
 
            os.rename(tempname, stored_state_path)
2805
 
        except (IOError, OSError) as e:
2806
 
            if not debug:
2807
 
                try:
2808
 
                    os.remove(tempname)
2809
 
                except NameError:
2810
 
                    pass
2811
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2812
 
                logger.warning("Could not save persistent state: {}"
2813
 
                               .format(os.strerror(e.errno)))
2814
 
            else:
2815
 
                logger.warning("Could not save persistent state:",
2816
 
                               exc_info=e)
2817
 
                raise
2818
 
        
2819
 
        # Delete all clients, and settings from config
 
1984
        service.cleanup()
 
1985
        
2820
1986
        while tcp_server.clients:
2821
 
            name, client = tcp_server.clients.popitem()
 
1987
            client = tcp_server.clients.pop()
2822
1988
            if use_dbus:
2823
1989
                client.remove_from_connection()
 
1990
            client.disable_hook = None
2824
1991
            # Don't signal anything except ClientRemoved
2825
1992
            client.disable(quiet=True)
2826
1993
            if use_dbus:
2827
1994
                # Emit D-Bus signal
2828
 
                mandos_dbus_service.ClientRemoved(client
2829
 
                                                  .dbus_object_path,
 
1995
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2830
1996
                                                  client.name)
2831
 
        client_settings.clear()
2832
1997
    
2833
1998
    atexit.register(cleanup)
2834
1999
    
2835
 
    for client in tcp_server.clients.itervalues():
 
2000
    for client in tcp_server.clients:
2836
2001
        if use_dbus:
2837
2002
            # Emit D-Bus signal
2838
2003
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2839
 
        # Need to initiate checking of clients
2840
 
        if client.enabled:
2841
 
            client.init_checker()
 
2004
        client.enable()
2842
2005
    
2843
2006
    tcp_server.enable()
2844
2007
    tcp_server.server_activate()
2845
2008
    
2846
2009
    # Find out what port we got
2847
 
    if zeroconf:
2848
 
        service.port = tcp_server.socket.getsockname()[1]
 
2010
    service.port = tcp_server.socket.getsockname()[1]
2849
2011
    if use_ipv6:
2850
2012
        logger.info("Now listening on address %r, port %d,"
2851
 
                    " flowinfo %d, scope_id %d",
2852
 
                    *tcp_server.socket.getsockname())
 
2013
                    " flowinfo %d, scope_id %d"
 
2014
                    % tcp_server.socket.getsockname())
2853
2015
    else:                       # IPv4
2854
 
        logger.info("Now listening on address %r, port %d",
2855
 
                    *tcp_server.socket.getsockname())
 
2016
        logger.info("Now listening on address %r, port %d"
 
2017
                    % tcp_server.socket.getsockname())
2856
2018
    
2857
2019
    #service.interface = tcp_server.socket.getsockname()[3]
2858
2020
    
2859
2021
    try:
2860
 
        if zeroconf:
2861
 
            # From the Avahi example code
2862
 
            try:
2863
 
                service.activate()
2864
 
            except dbus.exceptions.DBusException as error:
2865
 
                logger.critical("D-Bus Exception", exc_info=error)
2866
 
                cleanup()
2867
 
                sys.exit(1)
2868
 
            # End of Avahi example code
 
2022
        # From the Avahi example code
 
2023
        try:
 
2024
            service.activate()
 
2025
        except dbus.exceptions.DBusException, error:
 
2026
            logger.critical("DBusException: %s", error)
 
2027
            cleanup()
 
2028
            sys.exit(1)
 
2029
        # End of Avahi example code
2869
2030
        
2870
2031
        gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2871
2032
                             lambda *args, **kwargs:
2874
2035
        
2875
2036
        logger.debug("Starting main loop")
2876
2037
        main_loop.run()
2877
 
    except AvahiError as error:
2878
 
        logger.critical("Avahi Error", exc_info=error)
 
2038
    except AvahiError, error:
 
2039
        logger.critical("AvahiError: %s", error)
2879
2040
        cleanup()
2880
2041
        sys.exit(1)
2881
2042
    except KeyboardInterrupt: