/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

Merge from release branch.

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