/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-09-26 19:36:18 UTC
  • mfrom: (24.1.184 mandos)
  • Revision ID: teddy@fukt.bsnet.se-20110926193618-vtj5c9hena1maixx
Merge from Björn

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 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,
62
62
import functools
63
63
import cPickle as pickle
64
64
import multiprocessing
65
 
import types
66
 
import binascii
67
 
import tempfile
68
 
import itertools
69
65
 
70
66
import dbus
71
67
import dbus.service
76
72
import ctypes.util
77
73
import xml.dom.minidom
78
74
import inspect
79
 
import GnuPGInterface
80
75
 
81
76
try:
82
77
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
81
    except ImportError:
87
82
        SO_BINDTODEVICE = None
88
83
 
89
 
version = "1.5.3"
90
 
stored_state_file = "clients.pickle"
91
 
 
92
 
logger = logging.getLogger()
 
84
 
 
85
version = "1.3.1"
 
86
 
 
87
#logger = logging.getLogger('mandos')
 
88
logger = logging.Logger('mandos')
93
89
syslogger = (logging.handlers.SysLogHandler
94
90
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
91
              address = str("/dev/log")))
96
 
 
97
 
try:
98
 
    if_nametoindex = (ctypes.cdll.LoadLibrary
99
 
                      (ctypes.util.find_library("c"))
100
 
                      .if_nametoindex)
101
 
except (OSError, AttributeError):
102
 
    def if_nametoindex(interface):
103
 
        "Get an interface index the hard way, i.e. using fcntl()"
104
 
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
105
 
        with contextlib.closing(socket.socket()) as s:
106
 
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
 
                                struct.pack(str("16s16x"),
108
 
                                            interface))
109
 
        interface_index = struct.unpack(str("I"),
110
 
                                        ifreq[16:20])[0]
111
 
        return interface_index
112
 
 
113
 
 
114
 
def initlogger(debug, level=logging.WARNING):
115
 
    """init logger and add loglevel"""
116
 
    
117
 
    syslogger.setFormatter(logging.Formatter
118
 
                           ('Mandos [%(process)d]: %(levelname)s:'
119
 
                            ' %(message)s'))
120
 
    logger.addHandler(syslogger)
121
 
    
122
 
    if debug:
123
 
        console = logging.StreamHandler()
124
 
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
 
                                               ' [%(process)d]:'
126
 
                                               ' %(levelname)s:'
127
 
                                               ' %(message)s'))
128
 
        logger.addHandler(console)
129
 
    logger.setLevel(level)
130
 
 
131
 
 
132
 
class PGPError(Exception):
133
 
    """Exception if encryption/decryption fails"""
134
 
    pass
135
 
 
136
 
 
137
 
class PGPEngine(object):
138
 
    """A simple class for OpenPGP symmetric encryption & decryption"""
139
 
    def __init__(self):
140
 
        self.gnupg = GnuPGInterface.GnuPG()
141
 
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
 
        self.gnupg = GnuPGInterface.GnuPG()
143
 
        self.gnupg.options.meta_interactive = False
144
 
        self.gnupg.options.homedir = self.tempdir
145
 
        self.gnupg.options.extra_args.extend(['--force-mdc',
146
 
                                              '--quiet',
147
 
                                              '--no-use-agent'])
148
 
    
149
 
    def __enter__(self):
150
 
        return self
151
 
    
152
 
    def __exit__ (self, exc_type, exc_value, traceback):
153
 
        self._cleanup()
154
 
        return False
155
 
    
156
 
    def __del__(self):
157
 
        self._cleanup()
158
 
    
159
 
    def _cleanup(self):
160
 
        if self.tempdir is not None:
161
 
            # Delete contents of tempdir
162
 
            for root, dirs, files in os.walk(self.tempdir,
163
 
                                             topdown = False):
164
 
                for filename in files:
165
 
                    os.remove(os.path.join(root, filename))
166
 
                for dirname in dirs:
167
 
                    os.rmdir(os.path.join(root, dirname))
168
 
            # Remove tempdir
169
 
            os.rmdir(self.tempdir)
170
 
            self.tempdir = None
171
 
    
172
 
    def password_encode(self, password):
173
 
        # Passphrase can not be empty and can not contain newlines or
174
 
        # NUL bytes.  So we prefix it and hex encode it.
175
 
        return b"mandos" + binascii.hexlify(password)
176
 
    
177
 
    def encrypt(self, data, password):
178
 
        self.gnupg.passphrase = self.password_encode(password)
179
 
        with open(os.devnull, "w") as devnull:
180
 
            try:
181
 
                proc = self.gnupg.run(['--symmetric'],
182
 
                                      create_fhs=['stdin', 'stdout'],
183
 
                                      attach_fhs={'stderr': devnull})
184
 
                with contextlib.closing(proc.handles['stdin']) as f:
185
 
                    f.write(data)
186
 
                with contextlib.closing(proc.handles['stdout']) as f:
187
 
                    ciphertext = f.read()
188
 
                proc.wait()
189
 
            except IOError as e:
190
 
                raise PGPError(e)
191
 
        self.gnupg.passphrase = None
192
 
        return ciphertext
193
 
    
194
 
    def decrypt(self, data, password):
195
 
        self.gnupg.passphrase = self.password_encode(password)
196
 
        with open(os.devnull, "w") as devnull:
197
 
            try:
198
 
                proc = self.gnupg.run(['--decrypt'],
199
 
                                      create_fhs=['stdin', 'stdout'],
200
 
                                      attach_fhs={'stderr': devnull})
201
 
                with contextlib.closing(proc.handles['stdin']) as f:
202
 
                    f.write(data)
203
 
                with contextlib.closing(proc.handles['stdout']) as f:
204
 
                    decrypted_plaintext = f.read()
205
 
                proc.wait()
206
 
            except IOError as e:
207
 
                raise PGPError(e)
208
 
        self.gnupg.passphrase = None
209
 
        return decrypted_plaintext
210
 
 
 
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)
211
102
 
212
103
class AvahiError(Exception):
213
104
    def __init__(self, value, *args, **kwargs):
243
134
    server: D-Bus Server
244
135
    bus: dbus.SystemBus()
245
136
    """
246
 
    
247
137
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
138
                 servicetype = None, port = None, TXT = None,
249
139
                 domain = "", host = "", max_renames = 32768,
262
152
        self.server = None
263
153
        self.bus = bus
264
154
        self.entry_group_state_changed_match = None
265
 
    
266
155
    def rename(self):
267
156
        """Derived from the Avahi example code"""
268
157
        if self.rename_count >= self.max_renames:
270
159
                            " after %i retries, exiting.",
271
160
                            self.rename_count)
272
161
            raise AvahiServiceError("Too many renames")
273
 
        self.name = unicode(self.server
274
 
                            .GetAlternativeServiceName(self.name))
 
162
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
275
163
        logger.info("Changing Zeroconf service name to %r ...",
276
164
                    self.name)
 
165
        syslogger.setFormatter(logging.Formatter
 
166
                               ('Mandos (%s) [%%(process)d]:'
 
167
                                ' %%(levelname)s: %%(message)s'
 
168
                                % self.name))
277
169
        self.remove()
278
170
        try:
279
171
            self.add()
280
172
        except dbus.exceptions.DBusException as error:
281
 
            logger.critical("D-Bus Exception", exc_info=error)
 
173
            logger.critical("DBusException: %s", error)
282
174
            self.cleanup()
283
175
            os._exit(1)
284
176
        self.rename_count += 1
285
 
    
286
177
    def remove(self):
287
178
        """Derived from the Avahi example code"""
288
179
        if self.entry_group_state_changed_match is not None:
290
181
            self.entry_group_state_changed_match = None
291
182
        if self.group is not None:
292
183
            self.group.Reset()
293
 
    
294
184
    def add(self):
295
185
        """Derived from the Avahi example code"""
296
186
        self.remove()
301
191
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
302
192
        self.entry_group_state_changed_match = (
303
193
            self.group.connect_to_signal(
304
 
                'StateChanged', self.entry_group_state_changed))
 
194
                'StateChanged', self .entry_group_state_changed))
305
195
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
306
196
                     self.name, self.type)
307
197
        self.group.AddService(
313
203
            dbus.UInt16(self.port),
314
204
            avahi.string_array_to_txt_array(self.TXT))
315
205
        self.group.Commit()
316
 
    
317
206
    def entry_group_state_changed(self, state, error):
318
207
        """Derived from the Avahi example code"""
319
208
        logger.debug("Avahi entry group state change: %i", state)
326
215
        elif state == avahi.ENTRY_GROUP_FAILURE:
327
216
            logger.critical("Avahi: Error in group state changed %s",
328
217
                            unicode(error))
329
 
            raise AvahiGroupError("State changed: {0!s}"
330
 
                                  .format(error))
331
 
    
 
218
            raise AvahiGroupError("State changed: %s"
 
219
                                  % unicode(error))
332
220
    def cleanup(self):
333
221
        """Derived from the Avahi example code"""
334
222
        if self.group is not None:
335
223
            try:
336
224
                self.group.Free()
337
225
            except (dbus.exceptions.UnknownMethodException,
338
 
                    dbus.exceptions.DBusException):
 
226
                    dbus.exceptions.DBusException) as e:
339
227
                pass
340
228
            self.group = None
341
229
        self.remove()
342
 
    
343
230
    def server_state_changed(self, state, error=None):
344
231
        """Derived from the Avahi example code"""
345
232
        logger.debug("Avahi server state change: %i", state)
364
251
                logger.debug("Unknown state: %r", state)
365
252
            else:
366
253
                logger.debug("Unknown state: %r: %r", state, error)
367
 
    
368
254
    def activate(self):
369
255
        """Derived from the Avahi example code"""
370
256
        if self.server is None:
377
263
                                 self.server_state_changed)
378
264
        self.server_state_changed(self.server.GetState())
379
265
 
380
 
class AvahiServiceToSyslog(AvahiService):
381
 
    def rename(self):
382
 
        """Add the new name to the syslog messages"""
383
 
        ret = AvahiService.rename(self)
384
 
        syslogger.setFormatter(logging.Formatter
385
 
                               ('Mandos ({0}) [%(process)d]:'
386
 
                                ' %(levelname)s: %(message)s'
387
 
                                .format(self.name)))
388
 
        return ret
389
266
 
390
 
def timedelta_to_milliseconds(td):
 
267
def _timedelta_to_milliseconds(td):
391
268
    "Convert a datetime.timedelta() to milliseconds"
392
269
    return ((td.days * 24 * 60 * 60 * 1000)
393
270
            + (td.seconds * 1000)
394
271
            + (td.microseconds // 1000))
395
 
 
 
272
        
396
273
class Client(object):
397
274
    """A representation of a client host served by this server.
398
275
    
399
276
    Attributes:
400
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
277
    _approved:   bool(); 'None' if not yet approved/disapproved
401
278
    approval_delay: datetime.timedelta(); Time to wait for approval
402
279
    approval_duration: datetime.timedelta(); Duration of one approval
403
280
    checker:    subprocess.Popen(); a running checker process used
410
287
                     instance %(name)s can be used in the command.
411
288
    checker_initiator_tag: a gobject event source tag, or None
412
289
    created:    datetime.datetime(); (UTC) object creation
413
 
    client_structure: Object describing what attributes a client has
414
 
                      and is used for storing the client at exit
415
290
    current_checker_command: string; current running checker_command
 
291
    disable_hook:  If set, called by disable() as disable_hook(self)
416
292
    disable_initiator_tag: a gobject event source tag, or None
417
293
    enabled:    bool()
418
294
    fingerprint: string (40 or 32 hexadecimal digits); used to
421
297
    interval:   datetime.timedelta(); How often to start a new checker
422
298
    last_approval_request: datetime.datetime(); (UTC) or None
423
299
    last_checked_ok: datetime.datetime(); (UTC) or None
424
 
    last_checker_status: integer between 0 and 255 reflecting exit
425
 
                         status of last checker. -1 reflects crashed
426
 
                         checker, -2 means no checker completed yet.
427
 
    last_enabled: datetime.datetime(); (UTC) or None
 
300
    last_enabled: datetime.datetime(); (UTC)
428
301
    name:       string; from the config file, used in log messages and
429
302
                        D-Bus identifiers
430
303
    secret:     bytestring; sent verbatim (over TLS) to client
431
304
    timeout:    datetime.timedelta(); How long from last_checked_ok
432
305
                                      until this client is disabled
433
 
    extended_timeout:   extra long timeout when secret has been sent
 
306
    extended_timeout:   extra long timeout when password has been sent
434
307
    runtime_expansions: Allowed attributes for runtime expansion.
435
308
    expires:    datetime.datetime(); time (UTC) when a client will be
436
309
                disabled, or None
440
313
                          "created", "enabled", "fingerprint",
441
314
                          "host", "interval", "last_checked_ok",
442
315
                          "last_enabled", "name", "timeout")
443
 
    client_defaults = { "timeout": "5m",
444
 
                        "extended_timeout": "15m",
445
 
                        "interval": "2m",
446
 
                        "checker": "fping -q -- %%(host)s",
447
 
                        "host": "",
448
 
                        "approval_delay": "0s",
449
 
                        "approval_duration": "1s",
450
 
                        "approved_by_default": "True",
451
 
                        "enabled": "True",
452
 
                        }
453
 
    
 
316
        
454
317
    def timeout_milliseconds(self):
455
318
        "Return the 'timeout' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.timeout)
457
 
    
 
319
        return _timedelta_to_milliseconds(self.timeout)
 
320
 
458
321
    def extended_timeout_milliseconds(self):
459
322
        "Return the 'extended_timeout' attribute in milliseconds"
460
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
323
        return _timedelta_to_milliseconds(self.extended_timeout)    
461
324
    
462
325
    def interval_milliseconds(self):
463
326
        "Return the 'interval' attribute in milliseconds"
464
 
        return timedelta_to_milliseconds(self.interval)
465
 
    
 
327
        return _timedelta_to_milliseconds(self.interval)
 
328
 
466
329
    def approval_delay_milliseconds(self):
467
 
        return timedelta_to_milliseconds(self.approval_delay)
468
 
    
469
 
    @staticmethod
470
 
    def config_parser(config):
471
 
        """Construct a new dict of client settings of this form:
472
 
        { client_name: {setting_name: value, ...}, ...}
473
 
        with exceptions for any special settings as defined above.
474
 
        NOTE: Must be a pure function. Must return the same result
475
 
        value given the same arguments.
476
 
        """
477
 
        settings = {}
478
 
        for client_name in config.sections():
479
 
            section = dict(config.items(client_name))
480
 
            client = settings[client_name] = {}
481
 
            
482
 
            client["host"] = section["host"]
483
 
            # Reformat values from string types to Python types
484
 
            client["approved_by_default"] = config.getboolean(
485
 
                client_name, "approved_by_default")
486
 
            client["enabled"] = config.getboolean(client_name,
487
 
                                                  "enabled")
488
 
            
489
 
            client["fingerprint"] = (section["fingerprint"].upper()
490
 
                                     .replace(" ", ""))
491
 
            if "secret" in section:
492
 
                client["secret"] = section["secret"].decode("base64")
493
 
            elif "secfile" in section:
494
 
                with open(os.path.expanduser(os.path.expandvars
495
 
                                             (section["secfile"])),
496
 
                          "rb") as secfile:
497
 
                    client["secret"] = secfile.read()
498
 
            else:
499
 
                raise TypeError("No secret or secfile for section {0}"
500
 
                                .format(section))
501
 
            client["timeout"] = string_to_delta(section["timeout"])
502
 
            client["extended_timeout"] = string_to_delta(
503
 
                section["extended_timeout"])
504
 
            client["interval"] = string_to_delta(section["interval"])
505
 
            client["approval_delay"] = string_to_delta(
506
 
                section["approval_delay"])
507
 
            client["approval_duration"] = string_to_delta(
508
 
                section["approval_duration"])
509
 
            client["checker_command"] = section["checker"]
510
 
            client["last_approval_request"] = None
511
 
            client["last_checked_ok"] = None
512
 
            client["last_checker_status"] = -2
513
 
        
514
 
        return settings
515
 
    
516
 
    def __init__(self, settings, name = None):
 
330
        return _timedelta_to_milliseconds(self.approval_delay)
 
331
    
 
332
    def __init__(self, name = None, disable_hook=None, config=None):
 
333
        """Note: the 'checker' key in 'config' sets the
 
334
        'checker_command' attribute and *not* the 'checker'
 
335
        attribute."""
517
336
        self.name = name
518
 
        # adding all client settings
519
 
        for setting, value in settings.iteritems():
520
 
            setattr(self, setting, value)
521
 
        
522
 
        if self.enabled:
523
 
            if not hasattr(self, "last_enabled"):
524
 
                self.last_enabled = datetime.datetime.utcnow()
525
 
            if not hasattr(self, "expires"):
526
 
                self.expires = (datetime.datetime.utcnow()
527
 
                                + self.timeout)
528
 
        else:
529
 
            self.last_enabled = None
530
 
            self.expires = None
531
 
        
 
337
        if config is None:
 
338
            config = {}
532
339
        logger.debug("Creating client %r", self.name)
533
340
        # Uppercase and remove spaces from fingerprint for later
534
341
        # comparison purposes with return value from the fingerprint()
535
342
        # function
 
343
        self.fingerprint = (config["fingerprint"].upper()
 
344
                            .replace(" ", ""))
536
345
        logger.debug("  Fingerprint: %s", self.fingerprint)
537
 
        self.created = settings.get("created",
538
 
                                    datetime.datetime.utcnow())
539
 
        
540
 
        # attributes specific for this server instance
 
346
        if "secret" in config:
 
347
            self.secret = config["secret"].decode("base64")
 
348
        elif "secfile" in config:
 
349
            with open(os.path.expanduser(os.path.expandvars
 
350
                                         (config["secfile"])),
 
351
                      "rb") as secfile:
 
352
                self.secret = secfile.read()
 
353
        else:
 
354
            raise TypeError("No secret or secfile for client %s"
 
355
                            % self.name)
 
356
        self.host = config.get("host", "")
 
357
        self.created = datetime.datetime.utcnow()
 
358
        self.enabled = False
 
359
        self.last_approval_request = None
 
360
        self.last_enabled = None
 
361
        self.last_checked_ok = None
 
362
        self.timeout = string_to_delta(config["timeout"])
 
363
        self.extended_timeout = string_to_delta(config["extended_timeout"])
 
364
        self.interval = string_to_delta(config["interval"])
 
365
        self.disable_hook = disable_hook
541
366
        self.checker = None
542
367
        self.checker_initiator_tag = None
543
368
        self.disable_initiator_tag = None
 
369
        self.expires = None
544
370
        self.checker_callback_tag = None
 
371
        self.checker_command = config["checker"]
545
372
        self.current_checker_command = None
546
 
        self.approved = None
 
373
        self.last_connect = None
 
374
        self._approved = None
 
375
        self.approved_by_default = config.get("approved_by_default",
 
376
                                              True)
547
377
        self.approvals_pending = 0
548
 
        self.changedstate = (multiprocessing_manager
549
 
                             .Condition(multiprocessing_manager
550
 
                                        .Lock()))
551
 
        self.client_structure = [attr for attr in
552
 
                                 self.__dict__.iterkeys()
553
 
                                 if not attr.startswith("_")]
554
 
        self.client_structure.append("client_structure")
555
 
        
556
 
        for name, t in inspect.getmembers(type(self),
557
 
                                          lambda obj:
558
 
                                              isinstance(obj,
559
 
                                                         property)):
560
 
            if not name.startswith("_"):
561
 
                self.client_structure.append(name)
 
378
        self.approval_delay = string_to_delta(
 
379
            config["approval_delay"])
 
380
        self.approval_duration = string_to_delta(
 
381
            config["approval_duration"])
 
382
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
562
383
    
563
 
    # Send notice to process children that client state has changed
564
384
    def send_changedstate(self):
565
 
        with self.changedstate:
566
 
            self.changedstate.notify_all()
567
 
    
 
385
        self.changedstate.acquire()
 
386
        self.changedstate.notify_all()
 
387
        self.changedstate.release()
 
388
        
568
389
    def enable(self):
569
390
        """Start this client's checker and timeout hooks"""
570
391
        if getattr(self, "enabled", False):
571
392
            # Already enabled
572
393
            return
573
394
        self.send_changedstate()
 
395
        # Schedule a new checker to be started an 'interval' from now,
 
396
        # and every interval from then on.
 
397
        self.checker_initiator_tag = (gobject.timeout_add
 
398
                                      (self.interval_milliseconds(),
 
399
                                       self.start_checker))
 
400
        # Schedule a disable() when 'timeout' has passed
574
401
        self.expires = datetime.datetime.utcnow() + self.timeout
 
402
        self.disable_initiator_tag = (gobject.timeout_add
 
403
                                   (self.timeout_milliseconds(),
 
404
                                    self.disable))
575
405
        self.enabled = True
576
406
        self.last_enabled = datetime.datetime.utcnow()
577
 
        self.init_checker()
 
407
        # Also start a new checker *right now*.
 
408
        self.start_checker()
578
409
    
579
410
    def disable(self, quiet=True):
580
411
        """Disable this client."""
592
423
            gobject.source_remove(self.checker_initiator_tag)
593
424
            self.checker_initiator_tag = None
594
425
        self.stop_checker()
 
426
        if self.disable_hook:
 
427
            self.disable_hook(self)
595
428
        self.enabled = False
596
429
        # Do not run this again if called by a gobject.timeout_add
597
430
        return False
598
431
    
599
432
    def __del__(self):
 
433
        self.disable_hook = None
600
434
        self.disable()
601
435
    
602
 
    def init_checker(self):
603
 
        # Schedule a new checker to be started an 'interval' from now,
604
 
        # and every interval from then on.
605
 
        self.checker_initiator_tag = (gobject.timeout_add
606
 
                                      (self.interval_milliseconds(),
607
 
                                       self.start_checker))
608
 
        # Schedule a disable() when 'timeout' has passed
609
 
        self.disable_initiator_tag = (gobject.timeout_add
610
 
                                   (self.timeout_milliseconds(),
611
 
                                    self.disable))
612
 
        # Also start a new checker *right now*.
613
 
        self.start_checker()
614
 
    
615
436
    def checker_callback(self, pid, condition, command):
616
437
        """The checker has completed, so take appropriate actions."""
617
438
        self.checker_callback_tag = None
618
439
        self.checker = None
619
440
        if os.WIFEXITED(condition):
620
 
            self.last_checker_status = os.WEXITSTATUS(condition)
621
 
            if self.last_checker_status == 0:
 
441
            exitstatus = os.WEXITSTATUS(condition)
 
442
            if exitstatus == 0:
622
443
                logger.info("Checker for %(name)s succeeded",
623
444
                            vars(self))
624
445
                self.checked_ok()
626
447
                logger.info("Checker for %(name)s failed",
627
448
                            vars(self))
628
449
        else:
629
 
            self.last_checker_status = -1
630
450
            logger.warning("Checker for %(name)s crashed?",
631
451
                           vars(self))
632
452
    
633
 
    def checked_ok(self):
634
 
        """Assert that the client has been seen, alive and well."""
635
 
        self.last_checked_ok = datetime.datetime.utcnow()
636
 
        self.last_checker_status = 0
637
 
        self.bump_timeout()
638
 
    
639
 
    def bump_timeout(self, timeout=None):
640
 
        """Bump up the timeout for this client."""
 
453
    def checked_ok(self, timeout=None):
 
454
        """Bump up the timeout for this client.
 
455
        
 
456
        This should only be called when the client has been seen,
 
457
        alive and well.
 
458
        """
641
459
        if timeout is None:
642
460
            timeout = self.timeout
643
 
        if self.disable_initiator_tag is not None:
644
 
            gobject.source_remove(self.disable_initiator_tag)
645
 
        if getattr(self, "enabled", False):
646
 
            self.disable_initiator_tag = (gobject.timeout_add
647
 
                                          (timedelta_to_milliseconds
648
 
                                           (timeout), self.disable))
649
 
            self.expires = datetime.datetime.utcnow() + timeout
 
461
        self.last_checked_ok = datetime.datetime.utcnow()
 
462
        gobject.source_remove(self.disable_initiator_tag)
 
463
        self.expires = datetime.datetime.utcnow() + timeout
 
464
        self.disable_initiator_tag = (gobject.timeout_add
 
465
                                      (_timedelta_to_milliseconds(timeout),
 
466
                                       self.disable))
650
467
    
651
468
    def need_approval(self):
652
469
        self.last_approval_request = datetime.datetime.utcnow()
692
509
                                       'replace')))
693
510
                    for attr in
694
511
                    self.runtime_expansions)
695
 
                
 
512
 
696
513
                try:
697
514
                    command = self.checker_command % escaped_attrs
698
515
                except TypeError as error:
699
 
                    logger.error('Could not format string "%s"',
700
 
                                 self.checker_command, exc_info=error)
 
516
                    logger.error('Could not format string "%s":'
 
517
                                 ' %s', self.checker_command, error)
701
518
                    return True # Try again later
702
519
            self.current_checker_command = command
703
520
            try:
721
538
                    gobject.source_remove(self.checker_callback_tag)
722
539
                    self.checker_callback(pid, status, command)
723
540
            except OSError as error:
724
 
                logger.error("Failed to start subprocess",
725
 
                             exc_info=error)
 
541
                logger.error("Failed to start subprocess: %s",
 
542
                             error)
726
543
        # Re-run this periodically if run by gobject.timeout_add
727
544
        return True
728
545
    
735
552
            return
736
553
        logger.debug("Stopping checker for %(name)s", vars(self))
737
554
        try:
738
 
            self.checker.terminate()
 
555
            os.kill(self.checker.pid, signal.SIGTERM)
739
556
            #time.sleep(0.5)
740
557
            #if self.checker.poll() is None:
741
 
            #    self.checker.kill()
 
558
            #    os.kill(self.checker.pid, signal.SIGKILL)
742
559
        except OSError as error:
743
560
            if error.errno != errno.ESRCH: # No such process
744
561
                raise
745
562
        self.checker = None
746
563
 
747
 
 
748
564
def dbus_service_property(dbus_interface, signature="v",
749
565
                          access="readwrite", byte_arrays=False):
750
566
    """Decorators for marking methods of a DBusObjectWithProperties to
761
577
    # "Set" method, so we fail early here:
762
578
    if byte_arrays and signature != "ay":
763
579
        raise ValueError("Byte arrays not supported for non-'ay'"
764
 
                         " signature {0!r}".format(signature))
 
580
                         " signature %r" % signature)
765
581
    def decorator(func):
766
582
        func._dbus_is_property = True
767
583
        func._dbus_interface = dbus_interface
775
591
    return decorator
776
592
 
777
593
 
778
 
def dbus_interface_annotations(dbus_interface):
779
 
    """Decorator for marking functions returning interface annotations
780
 
    
781
 
    Usage:
782
 
    
783
 
    @dbus_interface_annotations("org.example.Interface")
784
 
    def _foo(self):  # Function name does not matter
785
 
        return {"org.freedesktop.DBus.Deprecated": "true",
786
 
                "org.freedesktop.DBus.Property.EmitsChangedSignal":
787
 
                    "false"}
788
 
    """
789
 
    def decorator(func):
790
 
        func._dbus_is_interface = True
791
 
        func._dbus_interface = dbus_interface
792
 
        func._dbus_name = dbus_interface
793
 
        return func
794
 
    return decorator
795
 
 
796
 
 
797
 
def dbus_annotations(annotations):
798
 
    """Decorator to annotate D-Bus methods, signals or properties
799
 
    Usage:
800
 
    
801
 
    @dbus_service_property("org.example.Interface", signature="b",
802
 
                           access="r")
803
 
    @dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
804
 
                        "org.freedesktop.DBus.Property."
805
 
                        "EmitsChangedSignal": "false"})
806
 
    def Property_dbus_property(self):
807
 
        return dbus.Boolean(False)
808
 
    """
809
 
    def decorator(func):
810
 
        func._dbus_annotations = annotations
811
 
        return func
812
 
    return decorator
813
 
 
814
 
 
815
594
class DBusPropertyException(dbus.exceptions.DBusException):
816
595
    """A base class for D-Bus property-related exceptions
817
596
    """
833
612
 
834
613
class DBusObjectWithProperties(dbus.service.Object):
835
614
    """A D-Bus object with properties.
836
 
    
 
615
 
837
616
    Classes inheriting from this can use the dbus_service_property
838
617
    decorator to expose methods as D-Bus properties.  It exposes the
839
618
    standard Get(), Set(), and GetAll() methods on the D-Bus.
840
619
    """
841
620
    
842
621
    @staticmethod
843
 
    def _is_dbus_thing(thing):
844
 
        """Returns a function testing if an attribute is a D-Bus thing
845
 
        
846
 
        If called like _is_dbus_thing("method") it returns a function
847
 
        suitable for use as predicate to inspect.getmembers().
848
 
        """
849
 
        return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
850
 
                                   False)
 
622
    def _is_dbus_property(obj):
 
623
        return getattr(obj, "_dbus_is_property", False)
851
624
    
852
 
    def _get_all_dbus_things(self, thing):
 
625
    def _get_all_dbus_properties(self):
853
626
        """Returns a generator of (name, attribute) pairs
854
627
        """
855
 
        return ((getattr(athing.__get__(self), "_dbus_name",
856
 
                         name),
857
 
                 athing.__get__(self))
858
 
                for cls in self.__class__.__mro__
859
 
                for name, athing in
860
 
                inspect.getmembers(cls,
861
 
                                   self._is_dbus_thing(thing)))
 
628
        return ((prop._dbus_name, prop)
 
629
                for name, prop in
 
630
                inspect.getmembers(self, self._is_dbus_property))
862
631
    
863
632
    def _get_dbus_property(self, interface_name, property_name):
864
633
        """Returns a bound method if one exists which is a D-Bus
865
634
        property with the specified name and interface.
866
635
        """
867
 
        for cls in  self.__class__.__mro__:
868
 
            for name, value in (inspect.getmembers
869
 
                                (cls,
870
 
                                 self._is_dbus_thing("property"))):
871
 
                if (value._dbus_name == property_name
872
 
                    and value._dbus_interface == interface_name):
873
 
                    return value.__get__(self)
874
 
        
 
636
        for name in (property_name,
 
637
                     property_name + "_dbus_property"):
 
638
            prop = getattr(self, name, None)
 
639
            if (prop is None
 
640
                or not self._is_dbus_property(prop)
 
641
                or prop._dbus_name != property_name
 
642
                or (interface_name and prop._dbus_interface
 
643
                    and interface_name != prop._dbus_interface)):
 
644
                continue
 
645
            return prop
875
646
        # No such property
876
647
        raise DBusPropertyNotFound(self.dbus_object_path + ":"
877
648
                                   + interface_name + "."
902
673
            # signatures other than "ay".
903
674
            if prop._dbus_signature != "ay":
904
675
                raise ValueError
905
 
            value = dbus.ByteArray(b''.join(chr(byte)
906
 
                                            for byte in value))
 
676
            value = dbus.ByteArray(''.join(unichr(byte)
 
677
                                           for byte in value))
907
678
        prop(value)
908
679
    
909
680
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
911
682
    def GetAll(self, interface_name):
912
683
        """Standard D-Bus property GetAll() method, see D-Bus
913
684
        standard.
914
 
        
 
685
 
915
686
        Note: Will not include properties with access="write".
916
687
        """
917
 
        properties = {}
918
 
        for name, prop in self._get_all_dbus_things("property"):
 
688
        all = {}
 
689
        for name, prop in self._get_all_dbus_properties():
919
690
            if (interface_name
920
691
                and interface_name != prop._dbus_interface):
921
692
                # Interface non-empty but did not match
925
696
                continue
926
697
            value = prop()
927
698
            if not hasattr(value, "variant_level"):
928
 
                properties[name] = value
 
699
                all[name] = value
929
700
                continue
930
 
            properties[name] = type(value)(value, variant_level=
931
 
                                           value.variant_level+1)
932
 
        return dbus.Dictionary(properties, signature="sv")
 
701
            all[name] = type(value)(value, variant_level=
 
702
                                    value.variant_level+1)
 
703
        return dbus.Dictionary(all, signature="sv")
933
704
    
934
705
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
935
706
                         out_signature="s",
936
707
                         path_keyword='object_path',
937
708
                         connection_keyword='connection')
938
709
    def Introspect(self, object_path, connection):
939
 
        """Overloading of standard D-Bus method.
940
 
        
941
 
        Inserts property tags and interface annotation tags.
 
710
        """Standard D-Bus method, overloaded to insert property tags.
942
711
        """
943
712
        xmlstring = dbus.service.Object.Introspect(self, object_path,
944
713
                                                   connection)
951
720
                e.setAttribute("access", prop._dbus_access)
952
721
                return e
953
722
            for if_tag in document.getElementsByTagName("interface"):
954
 
                # Add property tags
955
723
                for tag in (make_tag(document, name, prop)
956
724
                            for name, prop
957
 
                            in self._get_all_dbus_things("property")
 
725
                            in self._get_all_dbus_properties()
958
726
                            if prop._dbus_interface
959
727
                            == if_tag.getAttribute("name")):
960
728
                    if_tag.appendChild(tag)
961
 
                # Add annotation tags
962
 
                for typ in ("method", "signal", "property"):
963
 
                    for tag in if_tag.getElementsByTagName(typ):
964
 
                        annots = dict()
965
 
                        for name, prop in (self.
966
 
                                           _get_all_dbus_things(typ)):
967
 
                            if (name == tag.getAttribute("name")
968
 
                                and prop._dbus_interface
969
 
                                == if_tag.getAttribute("name")):
970
 
                                annots.update(getattr
971
 
                                              (prop,
972
 
                                               "_dbus_annotations",
973
 
                                               {}))
974
 
                        for name, value in annots.iteritems():
975
 
                            ann_tag = document.createElement(
976
 
                                "annotation")
977
 
                            ann_tag.setAttribute("name", name)
978
 
                            ann_tag.setAttribute("value", value)
979
 
                            tag.appendChild(ann_tag)
980
 
                # Add interface annotation tags
981
 
                for annotation, value in dict(
982
 
                    itertools.chain(
983
 
                        *(annotations().iteritems()
984
 
                          for name, annotations in
985
 
                          self._get_all_dbus_things("interface")
986
 
                          if name == if_tag.getAttribute("name")
987
 
                          ))).iteritems():
988
 
                    ann_tag = document.createElement("annotation")
989
 
                    ann_tag.setAttribute("name", annotation)
990
 
                    ann_tag.setAttribute("value", value)
991
 
                    if_tag.appendChild(ann_tag)
992
729
                # Add the names to the return values for the
993
730
                # "org.freedesktop.DBus.Properties" methods
994
731
                if (if_tag.getAttribute("name")
1009
746
        except (AttributeError, xml.dom.DOMException,
1010
747
                xml.parsers.expat.ExpatError) as error:
1011
748
            logger.error("Failed to override Introspection method",
1012
 
                         exc_info=error)
 
749
                         error)
1013
750
        return xmlstring
1014
751
 
1015
752
 
1020
757
    return dbus.String(dt.isoformat(),
1021
758
                       variant_level=variant_level)
1022
759
 
1023
 
 
1024
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1025
 
                                  .__metaclass__):
1026
 
    """Applied to an empty subclass of a D-Bus object, this metaclass
1027
 
    will add additional D-Bus attributes matching a certain pattern.
1028
 
    """
1029
 
    def __new__(mcs, name, bases, attr):
1030
 
        # Go through all the base classes which could have D-Bus
1031
 
        # methods, signals, or properties in them
1032
 
        old_interface_names = []
1033
 
        for base in (b for b in bases
1034
 
                     if issubclass(b, dbus.service.Object)):
1035
 
            # Go though all attributes of the base class
1036
 
            for attrname, attribute in inspect.getmembers(base):
1037
 
                # Ignore non-D-Bus attributes, and D-Bus attributes
1038
 
                # with the wrong interface name
1039
 
                if (not hasattr(attribute, "_dbus_interface")
1040
 
                    or not attribute._dbus_interface
1041
 
                    .startswith("se.recompile.Mandos")):
1042
 
                    continue
1043
 
                # Create an alternate D-Bus interface name based on
1044
 
                # the current name
1045
 
                alt_interface = (attribute._dbus_interface
1046
 
                                 .replace("se.recompile.Mandos",
1047
 
                                          "se.bsnet.fukt.Mandos"))
1048
 
                if alt_interface != attribute._dbus_interface:
1049
 
                    old_interface_names.append(alt_interface)
1050
 
                # Is this a D-Bus signal?
1051
 
                if getattr(attribute, "_dbus_is_signal", False):
1052
 
                    # Extract the original non-method function by
1053
 
                    # black magic
1054
 
                    nonmethod_func = (dict(
1055
 
                            zip(attribute.func_code.co_freevars,
1056
 
                                attribute.__closure__))["func"]
1057
 
                                      .cell_contents)
1058
 
                    # Create a new, but exactly alike, function
1059
 
                    # object, and decorate it to be a new D-Bus signal
1060
 
                    # with the alternate D-Bus interface name
1061
 
                    new_function = (dbus.service.signal
1062
 
                                    (alt_interface,
1063
 
                                     attribute._dbus_signature)
1064
 
                                    (types.FunctionType(
1065
 
                                nonmethod_func.func_code,
1066
 
                                nonmethod_func.func_globals,
1067
 
                                nonmethod_func.func_name,
1068
 
                                nonmethod_func.func_defaults,
1069
 
                                nonmethod_func.func_closure)))
1070
 
                    # Copy annotations, if any
1071
 
                    try:
1072
 
                        new_function._dbus_annotations = (
1073
 
                            dict(attribute._dbus_annotations))
1074
 
                    except AttributeError:
1075
 
                        pass
1076
 
                    # Define a creator of a function to call both the
1077
 
                    # old and new functions, so both the old and new
1078
 
                    # signals gets sent when the function is called
1079
 
                    def fixscope(func1, func2):
1080
 
                        """This function is a scope container to pass
1081
 
                        func1 and func2 to the "call_both" function
1082
 
                        outside of its arguments"""
1083
 
                        def call_both(*args, **kwargs):
1084
 
                            """This function will emit two D-Bus
1085
 
                            signals by calling func1 and func2"""
1086
 
                            func1(*args, **kwargs)
1087
 
                            func2(*args, **kwargs)
1088
 
                        return call_both
1089
 
                    # Create the "call_both" function and add it to
1090
 
                    # the class
1091
 
                    attr[attrname] = fixscope(attribute,
1092
 
                                              new_function)
1093
 
                # Is this a D-Bus method?
1094
 
                elif getattr(attribute, "_dbus_is_method", False):
1095
 
                    # Create a new, but exactly alike, function
1096
 
                    # object.  Decorate it to be a new D-Bus method
1097
 
                    # with the alternate D-Bus interface name.  Add it
1098
 
                    # to the class.
1099
 
                    attr[attrname] = (dbus.service.method
1100
 
                                      (alt_interface,
1101
 
                                       attribute._dbus_in_signature,
1102
 
                                       attribute._dbus_out_signature)
1103
 
                                      (types.FunctionType
1104
 
                                       (attribute.func_code,
1105
 
                                        attribute.func_globals,
1106
 
                                        attribute.func_name,
1107
 
                                        attribute.func_defaults,
1108
 
                                        attribute.func_closure)))
1109
 
                    # Copy annotations, if any
1110
 
                    try:
1111
 
                        attr[attrname]._dbus_annotations = (
1112
 
                            dict(attribute._dbus_annotations))
1113
 
                    except AttributeError:
1114
 
                        pass
1115
 
                # Is this a D-Bus property?
1116
 
                elif getattr(attribute, "_dbus_is_property", False):
1117
 
                    # Create a new, but exactly alike, function
1118
 
                    # object, and decorate it to be a new D-Bus
1119
 
                    # property with the alternate D-Bus interface
1120
 
                    # name.  Add it to the class.
1121
 
                    attr[attrname] = (dbus_service_property
1122
 
                                      (alt_interface,
1123
 
                                       attribute._dbus_signature,
1124
 
                                       attribute._dbus_access,
1125
 
                                       attribute
1126
 
                                       ._dbus_get_args_options
1127
 
                                       ["byte_arrays"])
1128
 
                                      (types.FunctionType
1129
 
                                       (attribute.func_code,
1130
 
                                        attribute.func_globals,
1131
 
                                        attribute.func_name,
1132
 
                                        attribute.func_defaults,
1133
 
                                        attribute.func_closure)))
1134
 
                    # Copy annotations, if any
1135
 
                    try:
1136
 
                        attr[attrname]._dbus_annotations = (
1137
 
                            dict(attribute._dbus_annotations))
1138
 
                    except AttributeError:
1139
 
                        pass
1140
 
                # Is this a D-Bus interface?
1141
 
                elif getattr(attribute, "_dbus_is_interface", False):
1142
 
                    # Create a new, but exactly alike, function
1143
 
                    # object.  Decorate it to be a new D-Bus interface
1144
 
                    # with the alternate D-Bus interface name.  Add it
1145
 
                    # to the class.
1146
 
                    attr[attrname] = (dbus_interface_annotations
1147
 
                                      (alt_interface)
1148
 
                                      (types.FunctionType
1149
 
                                       (attribute.func_code,
1150
 
                                        attribute.func_globals,
1151
 
                                        attribute.func_name,
1152
 
                                        attribute.func_defaults,
1153
 
                                        attribute.func_closure)))
1154
 
        # Deprecate all old interfaces
1155
 
        iname="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1156
 
        for old_interface_name in old_interface_names:
1157
 
            @dbus_interface_annotations(old_interface_name)
1158
 
            def func(self):
1159
 
                return { "org.freedesktop.DBus.Deprecated": "true" }
1160
 
            # Find an unused name
1161
 
            for aname in (iname.format(i) for i in itertools.count()):
1162
 
                if aname not in attr:
1163
 
                    attr[aname] = func
1164
 
                    break
1165
 
        return type.__new__(mcs, name, bases, attr)
1166
 
 
1167
 
 
1168
760
class ClientDBus(Client, DBusObjectWithProperties):
1169
761
    """A Client class using D-Bus
1170
762
    
1179
771
    # dbus.service.Object doesn't use super(), so we can't either.
1180
772
    
1181
773
    def __init__(self, bus = None, *args, **kwargs):
 
774
        self._approvals_pending = 0
1182
775
        self.bus = bus
1183
776
        Client.__init__(self, *args, **kwargs)
1184
777
        # Only now, when this client is initialized, can it show up on
1190
783
                                 ("/clients/" + client_object_name))
1191
784
        DBusObjectWithProperties.__init__(self, self.bus,
1192
785
                                          self.dbus_object_path)
1193
 
    
 
786
        
1194
787
    def notifychangeproperty(transform_func,
1195
788
                             dbus_name, type_func=lambda x: x,
1196
789
                             variant_level=1):
1197
 
        """ Modify a variable so that it's a property which announces
1198
 
        its changes to DBus.
1199
 
        
1200
 
        transform_fun: Function that takes a value and a variant_level
1201
 
                       and transforms it to a D-Bus type.
1202
 
        dbus_name: D-Bus name of the variable
 
790
        """ Modify a variable so that its a property that announce its
 
791
        changes to DBus.
 
792
        transform_fun: Function that takes a value and transform it to
 
793
                       DBus type.
 
794
        dbus_name: DBus name of the variable
1203
795
        type_func: Function that transform the value before sending it
1204
 
                   to the D-Bus.  Default: no transform
1205
 
        variant_level: D-Bus variant level.  Default: 1
 
796
                   to DBus
 
797
        variant_level: DBus variant level. default: 1
1206
798
        """
1207
 
        attrname = "_{0}".format(dbus_name)
 
799
        real_value = [None,]
1208
800
        def setter(self, value):
 
801
            old_value = real_value[0]
 
802
            real_value[0] = value
1209
803
            if hasattr(self, "dbus_object_path"):
1210
 
                if (not hasattr(self, attrname) or
1211
 
                    type_func(getattr(self, attrname, None))
1212
 
                    != type_func(value)):
1213
 
                    dbus_value = transform_func(type_func(value),
1214
 
                                                variant_level
1215
 
                                                =variant_level)
 
804
                if type_func(old_value) != type_func(real_value[0]):
 
805
                    dbus_value = transform_func(type_func(real_value[0]),
 
806
                                                variant_level)
1216
807
                    self.PropertyChanged(dbus.String(dbus_name),
1217
808
                                         dbus_value)
1218
 
            setattr(self, attrname, value)
1219
 
        
1220
 
        return property(lambda self: getattr(self, attrname), setter)
1221
 
    
 
809
 
 
810
        return property(lambda self: real_value[0], setter)
 
811
 
 
812
 
1222
813
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1223
814
    approvals_pending = notifychangeproperty(dbus.Boolean,
1224
815
                                             "ApprovalPending",
1227
818
    last_enabled = notifychangeproperty(datetime_to_dbus,
1228
819
                                        "LastEnabled")
1229
820
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1230
 
                                   type_func = lambda checker:
1231
 
                                       checker is not None)
 
821
                                   type_func = lambda checker: checker is not None)
1232
822
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1233
823
                                           "LastCheckedOK")
1234
 
    last_checker_status = notifychangeproperty(dbus.Int16,
1235
 
                                               "LastCheckerStatus")
1236
 
    last_approval_request = notifychangeproperty(
1237
 
        datetime_to_dbus, "LastApprovalRequest")
 
824
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
825
                                                 "LastApprovalRequest")
1238
826
    approved_by_default = notifychangeproperty(dbus.Boolean,
1239
827
                                               "ApprovedByDefault")
1240
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1241
 
                                          "ApprovalDelay",
1242
 
                                          type_func =
1243
 
                                          timedelta_to_milliseconds)
1244
 
    approval_duration = notifychangeproperty(
1245
 
        dbus.UInt64, "ApprovalDuration",
1246
 
        type_func = timedelta_to_milliseconds)
 
828
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
 
829
                                          type_func = _timedelta_to_milliseconds)
 
830
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
 
831
                                             type_func = _timedelta_to_milliseconds)
1247
832
    host = notifychangeproperty(dbus.String, "Host")
1248
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1249
 
                                   type_func =
1250
 
                                   timedelta_to_milliseconds)
1251
 
    extended_timeout = notifychangeproperty(
1252
 
        dbus.UInt64, "ExtendedTimeout",
1253
 
        type_func = timedelta_to_milliseconds)
1254
 
    interval = notifychangeproperty(dbus.UInt64,
1255
 
                                    "Interval",
1256
 
                                    type_func =
1257
 
                                    timedelta_to_milliseconds)
 
833
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
 
834
                                   type_func = _timedelta_to_milliseconds)
 
835
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
 
836
                                            type_func = _timedelta_to_milliseconds)
 
837
    interval = notifychangeproperty(dbus.UInt16, "Interval",
 
838
                                    type_func = _timedelta_to_milliseconds)
1258
839
    checker_command = notifychangeproperty(dbus.String, "Checker")
1259
840
    
1260
841
    del notifychangeproperty
1286
867
        
1287
868
        return Client.checker_callback(self, pid, condition, command,
1288
869
                                       *args, **kwargs)
1289
 
    
 
870
 
1290
871
    def start_checker(self, *args, **kwargs):
1291
872
        old_checker = self.checker
1292
873
        if self.checker is not None:
1302
883
        return r
1303
884
    
1304
885
    def _reset_approved(self):
1305
 
        self.approved = None
 
886
        self._approved = None
1306
887
        return False
1307
888
    
1308
889
    def approve(self, value=True):
1309
890
        self.send_changedstate()
1310
 
        self.approved = value
1311
 
        gobject.timeout_add(timedelta_to_milliseconds
 
891
        self._approved = value
 
892
        gobject.timeout_add(_timedelta_to_milliseconds
1312
893
                            (self.approval_duration),
1313
894
                            self._reset_approved)
1314
895
    
 
896
    
1315
897
    ## D-Bus methods, signals & properties
1316
 
    _interface = "se.recompile.Mandos.Client"
1317
 
    
1318
 
    ## Interfaces
1319
 
    
1320
 
    @dbus_interface_annotations(_interface)
1321
 
    def _foo(self):
1322
 
        return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
 
                     "false"}
 
898
    _interface = "se.bsnet.fukt.Mandos.Client"
1324
899
    
1325
900
    ## Signals
1326
901
    
1426
1001
                           access="readwrite")
1427
1002
    def ApprovalDuration_dbus_property(self, value=None):
1428
1003
        if value is None:       # get
1429
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1004
            return dbus.UInt64(_timedelta_to_milliseconds(
1430
1005
                    self.approval_duration))
1431
1006
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
1007
    
1446
1021
    def Host_dbus_property(self, value=None):
1447
1022
        if value is None:       # get
1448
1023
            return dbus.String(self.host)
1449
 
        self.host = unicode(value)
 
1024
        self.host = value
1450
1025
    
1451
1026
    # Created - property
1452
1027
    @dbus_service_property(_interface, signature="s", access="read")
1453
1028
    def Created_dbus_property(self):
1454
 
        return datetime_to_dbus(self.created)
 
1029
        return dbus.String(datetime_to_dbus(self.created))
1455
1030
    
1456
1031
    # LastEnabled - property
1457
1032
    @dbus_service_property(_interface, signature="s", access="read")
1478
1053
            return
1479
1054
        return datetime_to_dbus(self.last_checked_ok)
1480
1055
    
1481
 
    # LastCheckerStatus - property
1482
 
    @dbus_service_property(_interface, signature="n",
1483
 
                           access="read")
1484
 
    def LastCheckerStatus_dbus_property(self):
1485
 
        return dbus.Int16(self.last_checker_status)
1486
 
    
1487
1056
    # Expires - property
1488
1057
    @dbus_service_property(_interface, signature="s", access="read")
1489
1058
    def Expires_dbus_property(self):
1501
1070
        if value is None:       # get
1502
1071
            return dbus.UInt64(self.timeout_milliseconds())
1503
1072
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1073
        if getattr(self, "disable_initiator_tag", None) is None:
 
1074
            return
1504
1075
        # Reschedule timeout
1505
 
        if self.enabled:
1506
 
            now = datetime.datetime.utcnow()
1507
 
            time_to_die = timedelta_to_milliseconds(
1508
 
                (self.last_checked_ok + self.timeout) - now)
1509
 
            if time_to_die <= 0:
1510
 
                # The timeout has passed
1511
 
                self.disable()
1512
 
            else:
1513
 
                self.expires = (now +
1514
 
                                datetime.timedelta(milliseconds =
1515
 
                                                   time_to_die))
1516
 
                if (getattr(self, "disable_initiator_tag", None)
1517
 
                    is None):
1518
 
                    return
1519
 
                gobject.source_remove(self.disable_initiator_tag)
1520
 
                self.disable_initiator_tag = (gobject.timeout_add
1521
 
                                              (time_to_die,
1522
 
                                               self.disable))
1523
 
    
 
1076
        gobject.source_remove(self.disable_initiator_tag)
 
1077
        self.disable_initiator_tag = None
 
1078
        self.expires = None
 
1079
        time_to_die = (self.
 
1080
                       _timedelta_to_milliseconds((self
 
1081
                                                   .last_checked_ok
 
1082
                                                   + self.timeout)
 
1083
                                                  - datetime.datetime
 
1084
                                                  .utcnow()))
 
1085
        if time_to_die <= 0:
 
1086
            # The timeout has passed
 
1087
            self.disable()
 
1088
        else:
 
1089
            self.expires = (datetime.datetime.utcnow()
 
1090
                            + datetime.timedelta(milliseconds = time_to_die))
 
1091
            self.disable_initiator_tag = (gobject.timeout_add
 
1092
                                          (time_to_die, self.disable))
 
1093
 
1524
1094
    # ExtendedTimeout - property
1525
1095
    @dbus_service_property(_interface, signature="t",
1526
1096
                           access="readwrite")
1528
1098
        if value is None:       # get
1529
1099
            return dbus.UInt64(self.extended_timeout_milliseconds())
1530
1100
        self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1531
 
    
 
1101
 
1532
1102
    # Interval - property
1533
1103
    @dbus_service_property(_interface, signature="t",
1534
1104
                           access="readwrite")
1538
1108
        self.interval = datetime.timedelta(0, 0, 0, value)
1539
1109
        if getattr(self, "checker_initiator_tag", None) is None:
1540
1110
            return
1541
 
        if self.enabled:
1542
 
            # Reschedule checker run
1543
 
            gobject.source_remove(self.checker_initiator_tag)
1544
 
            self.checker_initiator_tag = (gobject.timeout_add
1545
 
                                          (value, self.start_checker))
1546
 
            self.start_checker()    # Start one now, too
1547
 
    
 
1111
        # Reschedule checker run
 
1112
        gobject.source_remove(self.checker_initiator_tag)
 
1113
        self.checker_initiator_tag = (gobject.timeout_add
 
1114
                                      (value, self.start_checker))
 
1115
        self.start_checker()    # Start one now, too
 
1116
 
1548
1117
    # Checker - property
1549
1118
    @dbus_service_property(_interface, signature="s",
1550
1119
                           access="readwrite")
1551
1120
    def Checker_dbus_property(self, value=None):
1552
1121
        if value is None:       # get
1553
1122
            return dbus.String(self.checker_command)
1554
 
        self.checker_command = unicode(value)
 
1123
        self.checker_command = value
1555
1124
    
1556
1125
    # CheckerRunning - property
1557
1126
    @dbus_service_property(_interface, signature="b",
1584
1153
        self._pipe.send(('init', fpr, address))
1585
1154
        if not self._pipe.recv():
1586
1155
            raise KeyError()
1587
 
    
 
1156
 
1588
1157
    def __getattribute__(self, name):
1589
 
        if name == '_pipe':
 
1158
        if(name == '_pipe'):
1590
1159
            return super(ProxyClient, self).__getattribute__(name)
1591
1160
        self._pipe.send(('getattr', name))
1592
1161
        data = self._pipe.recv()
1597
1166
                self._pipe.send(('funcall', name, args, kwargs))
1598
1167
                return self._pipe.recv()[1]
1599
1168
            return func
1600
 
    
 
1169
 
1601
1170
    def __setattr__(self, name, value):
1602
 
        if name == '_pipe':
 
1171
        if(name == '_pipe'):
1603
1172
            return super(ProxyClient, self).__setattr__(name, value)
1604
1173
        self._pipe.send(('setattr', name, value))
1605
1174
 
1606
1175
 
1607
 
class ClientDBusTransitional(ClientDBus):
1608
 
    __metaclass__ = AlternateDBusNamesMetaclass
1609
 
 
1610
 
 
1611
1176
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1177
    """A class to handle client connections.
1613
1178
    
1620
1185
                        unicode(self.client_address))
1621
1186
            logger.debug("Pipe FD: %d",
1622
1187
                         self.server.child_pipe.fileno())
1623
 
            
 
1188
 
1624
1189
            session = (gnutls.connection
1625
1190
                       .ClientSession(self.request,
1626
1191
                                      gnutls.connection
1627
1192
                                      .X509Credentials()))
1628
 
            
 
1193
 
1629
1194
            # Note: gnutls.connection.X509Credentials is really a
1630
1195
            # generic GnuTLS certificate credentials object so long as
1631
1196
            # no X.509 keys are added to it.  Therefore, we can use it
1632
1197
            # here despite using OpenPGP certificates.
1633
 
            
 
1198
 
1634
1199
            #priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
1200
            #                      "+AES-256-CBC", "+SHA1",
1636
1201
            #                      "+COMP-NULL", "+CTYPE-OPENPGP",
1642
1207
            (gnutls.library.functions
1643
1208
             .gnutls_priority_set_direct(session._c_object,
1644
1209
                                         priority, None))
1645
 
            
 
1210
 
1646
1211
            # Start communication using the Mandos protocol
1647
1212
            # Get protocol number
1648
1213
            line = self.request.makefile().readline()
1653
1218
            except (ValueError, IndexError, RuntimeError) as error:
1654
1219
                logger.error("Unknown protocol version: %s", error)
1655
1220
                return
1656
 
            
 
1221
 
1657
1222
            # Start GnuTLS connection
1658
1223
            try:
1659
1224
                session.handshake()
1663
1228
                # established.  Just abandon the request.
1664
1229
                return
1665
1230
            logger.debug("Handshake succeeded")
1666
 
            
 
1231
 
1667
1232
            approval_required = False
1668
1233
            try:
1669
1234
                try:
1674
1239
                    logger.warning("Bad certificate: %s", error)
1675
1240
                    return
1676
1241
                logger.debug("Fingerprint: %s", fpr)
1677
 
                
 
1242
 
1678
1243
                try:
1679
1244
                    client = ProxyClient(child_pipe, fpr,
1680
1245
                                         self.client_address)
1692
1257
                                       client.name)
1693
1258
                        if self.server.use_dbus:
1694
1259
                            # Emit D-Bus signal
1695
 
                            client.Rejected("Disabled")
 
1260
                            client.Rejected("Disabled")                    
1696
1261
                        return
1697
1262
                    
1698
 
                    if client.approved or not client.approval_delay:
 
1263
                    if client._approved or not client.approval_delay:
1699
1264
                        #We are approved or approval is disabled
1700
1265
                        break
1701
 
                    elif client.approved is None:
 
1266
                    elif client._approved is None:
1702
1267
                        logger.info("Client %s needs approval",
1703
1268
                                    client.name)
1704
1269
                        if self.server.use_dbus:
1715
1280
                        return
1716
1281
                    
1717
1282
                    #wait until timeout or approved
 
1283
                    #x = float(client._timedelta_to_milliseconds(delay))
1718
1284
                    time = datetime.datetime.now()
1719
1285
                    client.changedstate.acquire()
1720
 
                    (client.changedstate.wait
1721
 
                     (float(client.timedelta_to_milliseconds(delay)
1722
 
                            / 1000)))
 
1286
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1723
1287
                    client.changedstate.release()
1724
1288
                    time2 = datetime.datetime.now()
1725
1289
                    if (time2 - time) >= delay:
1741
1305
                    try:
1742
1306
                        sent = session.send(client.secret[sent_size:])
1743
1307
                    except gnutls.errors.GNUTLSError as error:
1744
 
                        logger.warning("gnutls send failed",
1745
 
                                       exc_info=error)
 
1308
                        logger.warning("gnutls send failed")
1746
1309
                        return
1747
1310
                    logger.debug("Sent: %d, remaining: %d",
1748
1311
                                 sent, len(client.secret)
1749
1312
                                 - (sent_size + sent))
1750
1313
                    sent_size += sent
1751
 
                
 
1314
 
1752
1315
                logger.info("Sending secret to %s", client.name)
1753
 
                # bump the timeout using extended_timeout
1754
 
                client.bump_timeout(client.extended_timeout)
 
1316
                # bump the timeout as if seen
 
1317
                client.checked_ok(client.extended_timeout)
1755
1318
                if self.server.use_dbus:
1756
1319
                    # Emit D-Bus signal
1757
1320
                    client.GotSecret()
1762
1325
                try:
1763
1326
                    session.bye()
1764
1327
                except gnutls.errors.GNUTLSError as error:
1765
 
                    logger.warning("GnuTLS bye failed",
1766
 
                                   exc_info=error)
 
1328
                    logger.warning("GnuTLS bye failed")
1767
1329
    
1768
1330
    @staticmethod
1769
1331
    def peer_certificate(session):
1825
1387
        # Convert the buffer to a Python bytestring
1826
1388
        fpr = ctypes.string_at(buf, buf_len.value)
1827
1389
        # Convert the bytestring to hexadecimal notation
1828
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1390
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1829
1391
        return hex_fpr
1830
1392
 
1831
1393
 
1834
1396
    def sub_process_main(self, request, address):
1835
1397
        try:
1836
1398
            self.finish_request(request, address)
1837
 
        except Exception:
 
1399
        except:
1838
1400
            self.handle_error(request, address)
1839
1401
        self.close_request(request)
1840
 
    
 
1402
            
1841
1403
    def process_request(self, request, address):
1842
1404
        """Start a new process to process the request."""
1843
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1844
 
                                       args = (request,
1845
 
                                               address))
1846
 
        proc.start()
1847
 
        return proc
1848
 
 
 
1405
        multiprocessing.Process(target = self.sub_process_main,
 
1406
                                args = (request, address)).start()
1849
1407
 
1850
1408
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1851
1409
    """ adds a pipe to the MixIn """
1855
1413
        This function creates a new pipe in self.pipe
1856
1414
        """
1857
1415
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1858
 
        
1859
 
        proc = MultiprocessingMixIn.process_request(self, request,
1860
 
                                                    client_address)
 
1416
 
 
1417
        super(MultiprocessingMixInWithPipe,
 
1418
              self).process_request(request, client_address)
1861
1419
        self.child_pipe.close()
1862
 
        self.add_pipe(parent_pipe, proc)
1863
 
    
1864
 
    def add_pipe(self, parent_pipe, proc):
 
1420
        self.add_pipe(parent_pipe)
 
1421
 
 
1422
    def add_pipe(self, parent_pipe):
1865
1423
        """Dummy function; override as necessary"""
1866
1424
        raise NotImplementedError
1867
1425
 
1868
 
 
1869
1426
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1870
1427
                     socketserver.TCPServer, object):
1871
1428
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
1945
1502
        self.enabled = False
1946
1503
        self.clients = clients
1947
1504
        if self.clients is None:
1948
 
            self.clients = {}
 
1505
            self.clients = set()
1949
1506
        self.use_dbus = use_dbus
1950
1507
        self.gnutls_priority = gnutls_priority
1951
1508
        IPv6_TCPServer.__init__(self, server_address,
1955
1512
    def server_activate(self):
1956
1513
        if self.enabled:
1957
1514
            return socketserver.TCPServer.server_activate(self)
1958
 
    
1959
1515
    def enable(self):
1960
1516
        self.enabled = True
1961
 
    
1962
 
    def add_pipe(self, parent_pipe, proc):
 
1517
    def add_pipe(self, parent_pipe):
1963
1518
        # Call "handle_ipc" for both data and EOF events
1964
1519
        gobject.io_add_watch(parent_pipe.fileno(),
1965
1520
                             gobject.IO_IN | gobject.IO_HUP,
1966
1521
                             functools.partial(self.handle_ipc,
1967
 
                                               parent_pipe =
1968
 
                                               parent_pipe,
1969
 
                                               proc = proc))
1970
 
    
 
1522
                                               parent_pipe = parent_pipe))
 
1523
        
1971
1524
    def handle_ipc(self, source, condition, parent_pipe=None,
1972
 
                   proc = None, client_object=None):
 
1525
                   client_object=None):
1973
1526
        condition_names = {
1974
1527
            gobject.IO_IN: "IN",   # There is data to read.
1975
1528
            gobject.IO_OUT: "OUT", # Data can be written (without
1984
1537
                                       for cond, name in
1985
1538
                                       condition_names.iteritems()
1986
1539
                                       if cond & condition)
1987
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1540
        # error or the other end of multiprocessing.Pipe has closed
1988
1541
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1989
 
            # Wait for other process to exit
1990
 
            proc.join()
1991
1542
            return False
1992
1543
        
1993
1544
        # Read a request from the child
1998
1549
            fpr = request[1]
1999
1550
            address = request[2]
2000
1551
            
2001
 
            for c in self.clients.itervalues():
 
1552
            for c in self.clients:
2002
1553
                if c.fingerprint == fpr:
2003
1554
                    client = c
2004
1555
                    break
2007
1558
                            "dress: %s", fpr, address)
2008
1559
                if self.use_dbus:
2009
1560
                    # Emit D-Bus signal
2010
 
                    mandos_dbus_service.ClientNotFound(fpr,
2011
 
                                                       address[0])
 
1561
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
2012
1562
                parent_pipe.send(False)
2013
1563
                return False
2014
1564
            
2015
1565
            gobject.io_add_watch(parent_pipe.fileno(),
2016
1566
                                 gobject.IO_IN | gobject.IO_HUP,
2017
1567
                                 functools.partial(self.handle_ipc,
2018
 
                                                   parent_pipe =
2019
 
                                                   parent_pipe,
2020
 
                                                   proc = proc,
2021
 
                                                   client_object =
2022
 
                                                   client))
 
1568
                                                   parent_pipe = parent_pipe,
 
1569
                                                   client_object = client))
2023
1570
            parent_pipe.send(True)
2024
 
            # remove the old hook in favor of the new above hook on
2025
 
            # same fileno
 
1571
            # remove the old hook in favor of the new above hook on same fileno
2026
1572
            return False
2027
1573
        if command == 'funcall':
2028
1574
            funcname = request[1]
2029
1575
            args = request[2]
2030
1576
            kwargs = request[3]
2031
1577
            
2032
 
            parent_pipe.send(('data', getattr(client_object,
2033
 
                                              funcname)(*args,
2034
 
                                                         **kwargs)))
2035
 
        
 
1578
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1579
 
2036
1580
        if command == 'getattr':
2037
1581
            attrname = request[1]
2038
1582
            if callable(client_object.__getattribute__(attrname)):
2039
1583
                parent_pipe.send(('function',))
2040
1584
            else:
2041
 
                parent_pipe.send(('data', client_object
2042
 
                                  .__getattribute__(attrname)))
 
1585
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2043
1586
        
2044
1587
        if command == 'setattr':
2045
1588
            attrname = request[1]
2046
1589
            value = request[2]
2047
1590
            setattr(client_object, attrname, value)
2048
 
        
 
1591
 
2049
1592
        return True
2050
1593
 
2051
1594
 
2081
1624
            elif suffix == "w":
2082
1625
                delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2083
1626
            else:
2084
 
                raise ValueError("Unknown suffix {0!r}"
2085
 
                                 .format(suffix))
 
1627
                raise ValueError("Unknown suffix %r" % suffix)
2086
1628
        except (ValueError, IndexError) as e:
2087
1629
            raise ValueError(*(e.args))
2088
1630
        timevalue += delta
2089
1631
    return timevalue
2090
1632
 
2091
1633
 
 
1634
def if_nametoindex(interface):
 
1635
    """Call the C function if_nametoindex(), or equivalent
 
1636
    
 
1637
    Note: This function cannot accept a unicode string."""
 
1638
    global if_nametoindex
 
1639
    try:
 
1640
        if_nametoindex = (ctypes.cdll.LoadLibrary
 
1641
                          (ctypes.util.find_library("c"))
 
1642
                          .if_nametoindex)
 
1643
    except (OSError, AttributeError):
 
1644
        logger.warning("Doing if_nametoindex the hard way")
 
1645
        def if_nametoindex(interface):
 
1646
            "Get an interface index the hard way, i.e. using fcntl()"
 
1647
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
1648
            with contextlib.closing(socket.socket()) as s:
 
1649
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
1650
                                    struct.pack(str("16s16x"),
 
1651
                                                interface))
 
1652
            interface_index = struct.unpack(str("I"),
 
1653
                                            ifreq[16:20])[0]
 
1654
            return interface_index
 
1655
    return if_nametoindex(interface)
 
1656
 
 
1657
 
2092
1658
def daemon(nochdir = False, noclose = False):
2093
1659
    """See daemon(3).  Standard BSD Unix function.
2094
1660
    
2102
1668
        sys.exit()
2103
1669
    if not noclose:
2104
1670
        # Close all standard open file descriptors
2105
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1671
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2106
1672
        if not stat.S_ISCHR(os.fstat(null).st_mode):
2107
1673
            raise OSError(errno.ENODEV,
2108
 
                          "{0} not a character device"
2109
 
                          .format(os.devnull))
 
1674
                          "%s not a character device"
 
1675
                          % os.path.devnull)
2110
1676
        os.dup2(null, sys.stdin.fileno())
2111
1677
        os.dup2(null, sys.stdout.fileno())
2112
1678
        os.dup2(null, sys.stderr.fileno())
2121
1687
    
2122
1688
    parser = argparse.ArgumentParser()
2123
1689
    parser.add_argument("-v", "--version", action="version",
2124
 
                        version = "%(prog)s {0}".format(version),
 
1690
                        version = "%%(prog)s %s" % version,
2125
1691
                        help="show version number and exit")
2126
1692
    parser.add_argument("-i", "--interface", metavar="IF",
2127
1693
                        help="Bind to interface IF")
2149
1715
                        " system bus interface")
2150
1716
    parser.add_argument("--no-ipv6", action="store_false",
2151
1717
                        dest="use_ipv6", help="Do not use IPv6")
2152
 
    parser.add_argument("--no-restore", action="store_false",
2153
 
                        dest="restore", help="Do not restore stored"
2154
 
                        " state")
2155
 
    parser.add_argument("--statedir", metavar="DIR",
2156
 
                        help="Directory to save/restore state in")
2157
 
    
2158
1718
    options = parser.parse_args()
2159
1719
    
2160
1720
    if options.check:
2173
1733
                        "use_dbus": "True",
2174
1734
                        "use_ipv6": "True",
2175
1735
                        "debuglevel": "",
2176
 
                        "restore": "True",
2177
 
                        "statedir": "/var/lib/mandos"
2178
1736
                        }
2179
1737
    
2180
1738
    # Parse config file for server-global settings
2197
1755
    # options, if set.
2198
1756
    for option in ("interface", "address", "port", "debug",
2199
1757
                   "priority", "servicename", "configdir",
2200
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2201
 
                   "statedir"):
 
1758
                   "use_dbus", "use_ipv6", "debuglevel"):
2202
1759
        value = getattr(options, option)
2203
1760
        if value is not None:
2204
1761
            server_settings[option] = value
2216
1773
    debuglevel = server_settings["debuglevel"]
2217
1774
    use_dbus = server_settings["use_dbus"]
2218
1775
    use_ipv6 = server_settings["use_ipv6"]
2219
 
    stored_state_path = os.path.join(server_settings["statedir"],
2220
 
                                     stored_state_file)
2221
 
    
2222
 
    if debug:
2223
 
        initlogger(debug, logging.DEBUG)
2224
 
    else:
2225
 
        if not debuglevel:
2226
 
            initlogger(debug)
2227
 
        else:
2228
 
            level = getattr(logging, debuglevel.upper())
2229
 
            initlogger(debug, level)
2230
 
    
 
1776
 
2231
1777
    if server_settings["servicename"] != "Mandos":
2232
1778
        syslogger.setFormatter(logging.Formatter
2233
 
                               ('Mandos ({0}) [%(process)d]:'
2234
 
                                ' %(levelname)s: %(message)s'
2235
 
                                .format(server_settings
2236
 
                                        ["servicename"])))
 
1779
                               ('Mandos (%s) [%%(process)d]:'
 
1780
                                ' %%(levelname)s: %%(message)s'
 
1781
                                % server_settings["servicename"]))
2237
1782
    
2238
1783
    # Parse config file with clients
2239
 
    client_config = configparser.SafeConfigParser(Client
2240
 
                                                  .client_defaults)
 
1784
    client_defaults = { "timeout": "5m",
 
1785
                        "extended_timeout": "15m",
 
1786
                        "interval": "2m",
 
1787
                        "checker": "fping -q -- %%(host)s",
 
1788
                        "host": "",
 
1789
                        "approval_delay": "0s",
 
1790
                        "approval_duration": "1s",
 
1791
                        }
 
1792
    client_config = configparser.SafeConfigParser(client_defaults)
2241
1793
    client_config.read(os.path.join(server_settings["configdir"],
2242
1794
                                    "clients.conf"))
2243
1795
    
2257
1809
        pidfilename = "/var/run/mandos.pid"
2258
1810
        try:
2259
1811
            pidfile = open(pidfilename, "w")
2260
 
        except IOError as e:
2261
 
            logger.error("Could not open file %r", pidfilename,
2262
 
                         exc_info=e)
 
1812
        except IOError:
 
1813
            logger.error("Could not open file %r", pidfilename)
2263
1814
    
2264
 
    for name in ("_mandos", "mandos", "nobody"):
 
1815
    try:
 
1816
        uid = pwd.getpwnam("_mandos").pw_uid
 
1817
        gid = pwd.getpwnam("_mandos").pw_gid
 
1818
    except KeyError:
2265
1819
        try:
2266
 
            uid = pwd.getpwnam(name).pw_uid
2267
 
            gid = pwd.getpwnam(name).pw_gid
2268
 
            break
 
1820
            uid = pwd.getpwnam("mandos").pw_uid
 
1821
            gid = pwd.getpwnam("mandos").pw_gid
2269
1822
        except KeyError:
2270
 
            continue
2271
 
    else:
2272
 
        uid = 65534
2273
 
        gid = 65534
 
1823
            try:
 
1824
                uid = pwd.getpwnam("nobody").pw_uid
 
1825
                gid = pwd.getpwnam("nobody").pw_gid
 
1826
            except KeyError:
 
1827
                uid = 65534
 
1828
                gid = 65534
2274
1829
    try:
2275
1830
        os.setgid(gid)
2276
1831
        os.setuid(uid)
2278
1833
        if error[0] != errno.EPERM:
2279
1834
            raise error
2280
1835
    
 
1836
    if not debug and not debuglevel:
 
1837
        syslogger.setLevel(logging.WARNING)
 
1838
        console.setLevel(logging.WARNING)
 
1839
    if debuglevel:
 
1840
        level = getattr(logging, debuglevel.upper())
 
1841
        syslogger.setLevel(level)
 
1842
        console.setLevel(level)
 
1843
 
2281
1844
    if debug:
2282
1845
        # Enable all possible GnuTLS debugging
2283
1846
        
2293
1856
         .gnutls_global_set_log_function(debug_gnutls))
2294
1857
        
2295
1858
        # Redirect stdin so all checkers get /dev/null
2296
 
        null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
 
1859
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2297
1860
        os.dup2(null, sys.stdin.fileno())
2298
1861
        if null > 2:
2299
1862
            os.close(null)
 
1863
    else:
 
1864
        # No console logging
 
1865
        logger.removeHandler(console)
2300
1866
    
2301
1867
    # Need to fork before connecting to D-Bus
2302
1868
    if not debug:
2303
1869
        # Close all input and output, do double fork, etc.
2304
1870
        daemon()
2305
1871
    
2306
 
    gobject.threads_init()
2307
 
    
2308
1872
    global main_loop
2309
1873
    # From the Avahi example code
2310
 
    DBusGMainLoop(set_as_default=True)
 
1874
    DBusGMainLoop(set_as_default=True )
2311
1875
    main_loop = gobject.MainLoop()
2312
1876
    bus = dbus.SystemBus()
2313
1877
    # End of Avahi example code
2314
1878
    if use_dbus:
2315
1879
        try:
2316
 
            bus_name = dbus.service.BusName("se.recompile.Mandos",
 
1880
            bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
2317
1881
                                            bus, do_not_queue=True)
2318
 
            old_bus_name = (dbus.service.BusName
2319
 
                            ("se.bsnet.fukt.Mandos", bus,
2320
 
                             do_not_queue=True))
2321
1882
        except dbus.exceptions.NameExistsException as e:
2322
 
            logger.error("Disabling D-Bus:", exc_info=e)
 
1883
            logger.error(unicode(e) + ", disabling D-Bus")
2323
1884
            use_dbus = False
2324
1885
            server_settings["use_dbus"] = False
2325
1886
            tcp_server.use_dbus = False
2326
1887
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2327
 
    service = AvahiServiceToSyslog(name =
2328
 
                                   server_settings["servicename"],
2329
 
                                   servicetype = "_mandos._tcp",
2330
 
                                   protocol = protocol, bus = bus)
 
1888
    service = AvahiService(name = server_settings["servicename"],
 
1889
                           servicetype = "_mandos._tcp",
 
1890
                           protocol = protocol, bus = bus)
2331
1891
    if server_settings["interface"]:
2332
1892
        service.interface = (if_nametoindex
2333
1893
                             (str(server_settings["interface"])))
2337
1897
    
2338
1898
    client_class = Client
2339
1899
    if use_dbus:
2340
 
        client_class = functools.partial(ClientDBusTransitional,
2341
 
                                         bus = bus)
2342
 
    
2343
 
    client_settings = Client.config_parser(client_config)
2344
 
    old_client_settings = {}
2345
 
    clients_data = {}
2346
 
    
2347
 
    # Get client data and settings from last running state.
2348
 
    if server_settings["restore"]:
2349
 
        try:
2350
 
            with open(stored_state_path, "rb") as stored_state:
2351
 
                clients_data, old_client_settings = (pickle.load
2352
 
                                                     (stored_state))
2353
 
            os.remove(stored_state_path)
2354
 
        except IOError as e:
2355
 
            if e.errno == errno.ENOENT:
2356
 
                logger.warning("Could not load persistent state: {0}"
2357
 
                                .format(os.strerror(e.errno)))
2358
 
            else:
2359
 
                logger.critical("Could not load persistent state:",
2360
 
                                exc_info=e)
2361
 
                raise
2362
 
        except EOFError as e:
2363
 
            logger.warning("Could not load persistent state: "
2364
 
                           "EOFError:", exc_info=e)
2365
 
    
2366
 
    with PGPEngine() as pgp:
2367
 
        for client_name, client in clients_data.iteritems():
2368
 
            # Decide which value to use after restoring saved state.
2369
 
            # We have three different values: Old config file,
2370
 
            # new config file, and saved state.
2371
 
            # New config value takes precedence if it differs from old
2372
 
            # config value, otherwise use saved state.
2373
 
            for name, value in client_settings[client_name].items():
2374
 
                try:
2375
 
                    # For each value in new config, check if it
2376
 
                    # differs from the old config value (Except for
2377
 
                    # the "secret" attribute)
2378
 
                    if (name != "secret" and
2379
 
                        value != old_client_settings[client_name]
2380
 
                        [name]):
2381
 
                        client[name] = value
2382
 
                except KeyError:
2383
 
                    pass
2384
 
            
2385
 
            # Clients who has passed its expire date can still be
2386
 
            # enabled if its last checker was successful.  Clients
2387
 
            # whose checker succeeded before we stored its state is
2388
 
            # assumed to have successfully run all checkers during
2389
 
            # downtime.
2390
 
            if client["enabled"]:
2391
 
                if datetime.datetime.utcnow() >= client["expires"]:
2392
 
                    if not client["last_checked_ok"]:
2393
 
                        logger.warning(
2394
 
                            "disabling client {0} - Client never "
2395
 
                            "performed a successful checker"
2396
 
                            .format(client_name))
2397
 
                        client["enabled"] = False
2398
 
                    elif client["last_checker_status"] != 0:
2399
 
                        logger.warning(
2400
 
                            "disabling client {0} - Client "
2401
 
                            "last checker failed with error code {1}"
2402
 
                            .format(client_name,
2403
 
                                    client["last_checker_status"]))
2404
 
                        client["enabled"] = False
2405
 
                    else:
2406
 
                        client["expires"] = (datetime.datetime
2407
 
                                             .utcnow()
2408
 
                                             + client["timeout"])
2409
 
                        logger.debug("Last checker succeeded,"
2410
 
                                     " keeping {0} enabled"
2411
 
                                     .format(client_name))
 
1900
        client_class = functools.partial(ClientDBus, bus = bus)
 
1901
    def client_config_items(config, section):
 
1902
        special_settings = {
 
1903
            "approved_by_default":
 
1904
                lambda: config.getboolean(section,
 
1905
                                          "approved_by_default"),
 
1906
            }
 
1907
        for name, value in config.items(section):
2412
1908
            try:
2413
 
                client["secret"] = (
2414
 
                    pgp.decrypt(client["encrypted_secret"],
2415
 
                                client_settings[client_name]
2416
 
                                ["secret"]))
2417
 
            except PGPError:
2418
 
                # If decryption fails, we use secret from new settings
2419
 
                logger.debug("Failed to decrypt {0} old secret"
2420
 
                             .format(client_name))
2421
 
                client["secret"] = (
2422
 
                    client_settings[client_name]["secret"])
2423
 
    
2424
 
    # Add/remove clients based on new changes made to config
2425
 
    for client_name in (set(old_client_settings)
2426
 
                        - set(client_settings)):
2427
 
        del clients_data[client_name]
2428
 
    for client_name in (set(client_settings)
2429
 
                        - set(old_client_settings)):
2430
 
        clients_data[client_name] = client_settings[client_name]
2431
 
    
2432
 
    # Create all client objects
2433
 
    for client_name, client in clients_data.iteritems():
2434
 
        tcp_server.clients[client_name] = client_class(
2435
 
            name = client_name, settings = client)
2436
 
    
 
1909
                yield (name, special_settings[name]())
 
1910
            except KeyError:
 
1911
                yield (name, value)
 
1912
    
 
1913
    tcp_server.clients.update(set(
 
1914
            client_class(name = section,
 
1915
                         config= dict(client_config_items(
 
1916
                        client_config, section)))
 
1917
            for section in client_config.sections()))
2437
1918
    if not tcp_server.clients:
2438
1919
        logger.warning("No clients defined")
2439
 
    
 
1920
        
2440
1921
    if not debug:
2441
1922
        try:
2442
1923
            with pidfile:
2450
1931
            # "pidfile" was never created
2451
1932
            pass
2452
1933
        del pidfilename
 
1934
        
2453
1935
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2454
 
    
 
1936
 
2455
1937
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2456
1938
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2457
1939
    
2458
1940
    if use_dbus:
2459
 
        class MandosDBusService(DBusObjectWithProperties):
 
1941
        class MandosDBusService(dbus.service.Object):
2460
1942
            """A D-Bus proxy object"""
2461
1943
            def __init__(self):
2462
1944
                dbus.service.Object.__init__(self, bus, "/")
2463
 
            _interface = "se.recompile.Mandos"
2464
 
            
2465
 
            @dbus_interface_annotations(_interface)
2466
 
            def _foo(self):
2467
 
                return { "org.freedesktop.DBus.Property"
2468
 
                         ".EmitsChangedSignal":
2469
 
                             "false"}
 
1945
            _interface = "se.bsnet.fukt.Mandos"
2470
1946
            
2471
1947
            @dbus.service.signal(_interface, signature="o")
2472
1948
            def ClientAdded(self, objpath):
2487
1963
            def GetAllClients(self):
2488
1964
                "D-Bus method"
2489
1965
                return dbus.Array(c.dbus_object_path
2490
 
                                  for c in
2491
 
                                  tcp_server.clients.itervalues())
 
1966
                                  for c in tcp_server.clients)
2492
1967
            
2493
1968
            @dbus.service.method(_interface,
2494
1969
                                 out_signature="a{oa{sv}}")
2496
1971
                "D-Bus method"
2497
1972
                return dbus.Dictionary(
2498
1973
                    ((c.dbus_object_path, c.GetAll(""))
2499
 
                     for c in tcp_server.clients.itervalues()),
 
1974
                     for c in tcp_server.clients),
2500
1975
                    signature="oa{sv}")
2501
1976
            
2502
1977
            @dbus.service.method(_interface, in_signature="o")
2503
1978
            def RemoveClient(self, object_path):
2504
1979
                "D-Bus method"
2505
 
                for c in tcp_server.clients.itervalues():
 
1980
                for c in tcp_server.clients:
2506
1981
                    if c.dbus_object_path == object_path:
2507
 
                        del tcp_server.clients[c.name]
 
1982
                        tcp_server.clients.remove(c)
2508
1983
                        c.remove_from_connection()
2509
1984
                        # Don't signal anything except ClientRemoved
2510
1985
                        c.disable(quiet=True)
2515
1990
            
2516
1991
            del _interface
2517
1992
        
2518
 
        class MandosDBusServiceTransitional(MandosDBusService):
2519
 
            __metaclass__ = AlternateDBusNamesMetaclass
2520
 
        mandos_dbus_service = MandosDBusServiceTransitional()
 
1993
        mandos_dbus_service = MandosDBusService()
2521
1994
    
2522
1995
    def cleanup():
2523
1996
        "Cleanup function; run on exit"
2524
1997
        service.cleanup()
2525
1998
        
2526
 
        multiprocessing.active_children()
2527
 
        if not (tcp_server.clients or client_settings):
2528
 
            return
2529
 
        
2530
 
        # Store client before exiting. Secrets are encrypted with key
2531
 
        # based on what config file has. If config file is
2532
 
        # removed/edited, old secret will thus be unrecovable.
2533
 
        clients = {}
2534
 
        with PGPEngine() as pgp:
2535
 
            for client in tcp_server.clients.itervalues():
2536
 
                key = client_settings[client.name]["secret"]
2537
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2538
 
                                                      key)
2539
 
                client_dict = {}
2540
 
                
2541
 
                # A list of attributes that can not be pickled
2542
 
                # + secret.
2543
 
                exclude = set(("bus", "changedstate", "secret",
2544
 
                               "checker"))
2545
 
                for name, typ in (inspect.getmembers
2546
 
                                  (dbus.service.Object)):
2547
 
                    exclude.add(name)
2548
 
                
2549
 
                client_dict["encrypted_secret"] = (client
2550
 
                                                   .encrypted_secret)
2551
 
                for attr in client.client_structure:
2552
 
                    if attr not in exclude:
2553
 
                        client_dict[attr] = getattr(client, attr)
2554
 
                
2555
 
                clients[client.name] = client_dict
2556
 
                del client_settings[client.name]["secret"]
2557
 
        
2558
 
        try:
2559
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2560
 
                                                prefix="clients-",
2561
 
                                                dir=os.path.dirname
2562
 
                                                (stored_state_path))
2563
 
            with os.fdopen(tempfd, "wb") as stored_state:
2564
 
                pickle.dump((clients, client_settings), stored_state)
2565
 
            os.rename(tempname, stored_state_path)
2566
 
        except (IOError, OSError) as e:
2567
 
            if not debug:
2568
 
                try:
2569
 
                    os.remove(tempname)
2570
 
                except NameError:
2571
 
                    pass
2572
 
            if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2573
 
                logger.warning("Could not save persistent state: {0}"
2574
 
                               .format(os.strerror(e.errno)))
2575
 
            else:
2576
 
                logger.warning("Could not save persistent state:",
2577
 
                               exc_info=e)
2578
 
                raise e
2579
 
        
2580
 
        # Delete all clients, and settings from config
2581
1999
        while tcp_server.clients:
2582
 
            name, client = tcp_server.clients.popitem()
 
2000
            client = tcp_server.clients.pop()
2583
2001
            if use_dbus:
2584
2002
                client.remove_from_connection()
 
2003
            client.disable_hook = None
2585
2004
            # Don't signal anything except ClientRemoved
2586
2005
            client.disable(quiet=True)
2587
2006
            if use_dbus:
2588
2007
                # Emit D-Bus signal
2589
 
                mandos_dbus_service.ClientRemoved(client
2590
 
                                                  .dbus_object_path,
 
2008
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2591
2009
                                                  client.name)
2592
 
        client_settings.clear()
2593
2010
    
2594
2011
    atexit.register(cleanup)
2595
2012
    
2596
 
    for client in tcp_server.clients.itervalues():
 
2013
    for client in tcp_server.clients:
2597
2014
        if use_dbus:
2598
2015
            # Emit D-Bus signal
2599
2016
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2600
 
        # Need to initiate checking of clients
2601
 
        if client.enabled:
2602
 
            client.init_checker()
 
2017
        client.enable()
2603
2018
    
2604
2019
    tcp_server.enable()
2605
2020
    tcp_server.server_activate()
2608
2023
    service.port = tcp_server.socket.getsockname()[1]
2609
2024
    if use_ipv6:
2610
2025
        logger.info("Now listening on address %r, port %d,"
2611
 
                    " flowinfo %d, scope_id %d",
2612
 
                    *tcp_server.socket.getsockname())
 
2026
                    " flowinfo %d, scope_id %d"
 
2027
                    % tcp_server.socket.getsockname())
2613
2028
    else:                       # IPv4
2614
 
        logger.info("Now listening on address %r, port %d",
2615
 
                    *tcp_server.socket.getsockname())
 
2029
        logger.info("Now listening on address %r, port %d"
 
2030
                    % tcp_server.socket.getsockname())
2616
2031
    
2617
2032
    #service.interface = tcp_server.socket.getsockname()[3]
2618
2033
    
2621
2036
        try:
2622
2037
            service.activate()
2623
2038
        except dbus.exceptions.DBusException as error:
2624
 
            logger.critical("D-Bus Exception", exc_info=error)
 
2039
            logger.critical("DBusException: %s", error)
2625
2040
            cleanup()
2626
2041
            sys.exit(1)
2627
2042
        # End of Avahi example code
2634
2049
        logger.debug("Starting main loop")
2635
2050
        main_loop.run()
2636
2051
    except AvahiError as error:
2637
 
        logger.critical("Avahi Error", exc_info=error)
 
2052
        logger.critical("AvahiError: %s", error)
2638
2053
        cleanup()
2639
2054
        sys.exit(1)
2640
2055
    except KeyboardInterrupt: