/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

working new feature: network-hooks - Enables user-scripts to take up
                     interfaces during bootup

Show diffs side-by-side

added added

removed removed

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