/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2012-01-15 21:36:39 UTC
  • mfrom: (237.4.28 release)
  • Revision ID: teddy@recompile.se-20120115213639-5wb1k1yjg6eji8lf
Merge from release branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2011 Teddy Hogeborn
15
 
# Copyright © 2008-2011 Björn Påhlsson
 
14
# Copyright © 2008-2012 Teddy Hogeborn
 
15
# Copyright © 2008-2012 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
 
66
import binascii
 
67
import tempfile
66
68
 
67
69
import dbus
68
70
import dbus.service
73
75
import ctypes.util
74
76
import xml.dom.minidom
75
77
import inspect
 
78
import GnuPGInterface
76
79
 
77
80
try:
78
81
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
82
85
    except ImportError:
83
86
        SO_BINDTODEVICE = None
84
87
 
85
 
 
86
 
version = "1.3.1"
87
 
 
88
 
#logger = logging.getLogger('mandos')
89
 
logger = logging.Logger('mandos')
 
88
version = "1.5.3"
 
89
stored_state_file = "clients.pickle"
 
90
 
 
91
logger = logging.getLogger()
90
92
syslogger = (logging.handlers.SysLogHandler
91
93
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
92
94
              address = str("/dev/log")))
93
 
syslogger.setFormatter(logging.Formatter
94
 
                       ('Mandos [%(process)d]: %(levelname)s:'
95
 
                        ' %(message)s'))
96
 
logger.addHandler(syslogger)
97
 
 
98
 
console = logging.StreamHandler()
99
 
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
 
                                       ' %(levelname)s:'
101
 
                                       ' %(message)s'))
102
 
logger.addHandler(console)
 
95
 
 
96
try:
 
97
    if_nametoindex = (ctypes.cdll.LoadLibrary
 
98
                      (ctypes.util.find_library("c"))
 
99
                      .if_nametoindex)
 
100
except (OSError, AttributeError):
 
101
    def if_nametoindex(interface):
 
102
        "Get an interface index the hard way, i.e. using fcntl()"
 
103
        SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
 
104
        with contextlib.closing(socket.socket()) as s:
 
105
            ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
 
106
                                struct.pack(str("16s16x"),
 
107
                                            interface))
 
108
        interface_index = struct.unpack(str("I"),
 
109
                                        ifreq[16:20])[0]
 
110
        return interface_index
 
111
 
 
112
 
 
113
def initlogger(debug, level=logging.WARNING):
 
114
    """init logger and add loglevel"""
 
115
    
 
116
    syslogger.setFormatter(logging.Formatter
 
117
                           ('Mandos [%(process)d]: %(levelname)s:'
 
118
                            ' %(message)s'))
 
119
    logger.addHandler(syslogger)
 
120
    
 
121
    if debug:
 
122
        console = logging.StreamHandler()
 
123
        console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
 
124
                                               ' [%(process)d]:'
 
125
                                               ' %(levelname)s:'
 
126
                                               ' %(message)s'))
 
127
        logger.addHandler(console)
 
128
    logger.setLevel(level)
 
129
 
 
130
 
 
131
class PGPError(Exception):
 
132
    """Exception if encryption/decryption fails"""
 
133
    pass
 
134
 
 
135
 
 
136
class PGPEngine(object):
 
137
    """A simple class for OpenPGP symmetric encryption & decryption"""
 
138
    def __init__(self):
 
139
        self.gnupg = GnuPGInterface.GnuPG()
 
140
        self.tempdir = tempfile.mkdtemp(prefix="mandos-")
 
141
        self.gnupg = GnuPGInterface.GnuPG()
 
142
        self.gnupg.options.meta_interactive = False
 
143
        self.gnupg.options.homedir = self.tempdir
 
144
        self.gnupg.options.extra_args.extend(['--force-mdc',
 
145
                                              '--quiet',
 
146
                                              '--no-use-agent'])
 
147
    
 
148
    def __enter__(self):
 
149
        return self
 
150
    
 
151
    def __exit__ (self, exc_type, exc_value, traceback):
 
152
        self._cleanup()
 
153
        return False
 
154
    
 
155
    def __del__(self):
 
156
        self._cleanup()
 
157
    
 
158
    def _cleanup(self):
 
159
        if self.tempdir is not None:
 
160
            # Delete contents of tempdir
 
161
            for root, dirs, files in os.walk(self.tempdir,
 
162
                                             topdown = False):
 
163
                for filename in files:
 
164
                    os.remove(os.path.join(root, filename))
 
165
                for dirname in dirs:
 
166
                    os.rmdir(os.path.join(root, dirname))
 
167
            # Remove tempdir
 
168
            os.rmdir(self.tempdir)
 
169
            self.tempdir = None
 
170
    
 
171
    def password_encode(self, password):
 
172
        # Passphrase can not be empty and can not contain newlines or
 
173
        # NUL bytes.  So we prefix it and hex encode it.
 
174
        return b"mandos" + binascii.hexlify(password)
 
175
    
 
176
    def encrypt(self, data, password):
 
177
        self.gnupg.passphrase = self.password_encode(password)
 
178
        with open(os.devnull) as devnull:
 
179
            try:
 
180
                proc = self.gnupg.run(['--symmetric'],
 
181
                                      create_fhs=['stdin', 'stdout'],
 
182
                                      attach_fhs={'stderr': devnull})
 
183
                with contextlib.closing(proc.handles['stdin']) as f:
 
184
                    f.write(data)
 
185
                with contextlib.closing(proc.handles['stdout']) as f:
 
186
                    ciphertext = f.read()
 
187
                proc.wait()
 
188
            except IOError as e:
 
189
                raise PGPError(e)
 
190
        self.gnupg.passphrase = None
 
191
        return ciphertext
 
192
    
 
193
    def decrypt(self, data, password):
 
194
        self.gnupg.passphrase = self.password_encode(password)
 
195
        with open(os.devnull) as devnull:
 
196
            try:
 
197
                proc = self.gnupg.run(['--decrypt'],
 
198
                                      create_fhs=['stdin', 'stdout'],
 
199
                                      attach_fhs={'stderr': devnull})
 
200
                with contextlib.closing(proc.handles['stdin'] ) as f:
 
201
                    f.write(data)
 
202
                with contextlib.closing(proc.handles['stdout']) as f:
 
203
                    decrypted_plaintext = f.read()
 
204
                proc.wait()
 
205
            except IOError as e:
 
206
                raise PGPError(e)
 
207
        self.gnupg.passphrase = None
 
208
        return decrypted_plaintext
 
209
 
 
210
 
103
211
 
104
212
class AvahiError(Exception):
105
213
    def __init__(self, value, *args, **kwargs):
160
268
                            " after %i retries, exiting.",
161
269
                            self.rename_count)
162
270
            raise AvahiServiceError("Too many renames")
163
 
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
 
271
        self.name = unicode(self.server
 
272
                            .GetAlternativeServiceName(self.name))
164
273
        logger.info("Changing Zeroconf service name to %r ...",
165
274
                    self.name)
166
 
        syslogger.setFormatter(logging.Formatter
167
 
                               ('Mandos (%s) [%%(process)d]:'
168
 
                                ' %%(levelname)s: %%(message)s'
169
 
                                % self.name))
170
275
        self.remove()
171
276
        try:
172
277
            self.add()
192
297
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
193
298
        self.entry_group_state_changed_match = (
194
299
            self.group.connect_to_signal(
195
 
                'StateChanged', self .entry_group_state_changed))
 
300
                'StateChanged', self.entry_group_state_changed))
196
301
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
197
302
                     self.name, self.type)
198
303
        self.group.AddService(
224
329
            try:
225
330
                self.group.Free()
226
331
            except (dbus.exceptions.UnknownMethodException,
227
 
                    dbus.exceptions.DBusException) as e:
 
332
                    dbus.exceptions.DBusException):
228
333
                pass
229
334
            self.group = None
230
335
        self.remove()
264
369
                                 self.server_state_changed)
265
370
        self.server_state_changed(self.server.GetState())
266
371
 
 
372
class AvahiServiceToSyslog(AvahiService):
 
373
    def rename(self):
 
374
        """Add the new name to the syslog messages"""
 
375
        ret = AvahiService.rename(self)
 
376
        syslogger.setFormatter(logging.Formatter
 
377
                               ('Mandos (%s) [%%(process)d]:'
 
378
                                ' %%(levelname)s: %%(message)s'
 
379
                                % self.name))
 
380
        return ret
267
381
 
268
 
def _timedelta_to_milliseconds(td):
 
382
def timedelta_to_milliseconds(td):
269
383
    "Convert a datetime.timedelta() to milliseconds"
270
384
    return ((td.days * 24 * 60 * 60 * 1000)
271
385
            + (td.seconds * 1000)
275
389
    """A representation of a client host served by this server.
276
390
    
277
391
    Attributes:
278
 
    _approved:   bool(); 'None' if not yet approved/disapproved
 
392
    approved:   bool(); 'None' if not yet approved/disapproved
279
393
    approval_delay: datetime.timedelta(); Time to wait for approval
280
394
    approval_duration: datetime.timedelta(); Duration of one approval
281
395
    checker:    subprocess.Popen(); a running checker process used
288
402
                     instance %(name)s can be used in the command.
289
403
    checker_initiator_tag: a gobject event source tag, or None
290
404
    created:    datetime.datetime(); (UTC) object creation
 
405
    client_structure: Object describing what attributes a client has
 
406
                      and is used for storing the client at exit
291
407
    current_checker_command: string; current running checker_command
292
 
    disable_hook:  If set, called by disable() as disable_hook(self)
293
408
    disable_initiator_tag: a gobject event source tag, or None
294
409
    enabled:    bool()
295
410
    fingerprint: string (40 or 32 hexadecimal digits); used to
298
413
    interval:   datetime.timedelta(); How often to start a new checker
299
414
    last_approval_request: datetime.datetime(); (UTC) or None
300
415
    last_checked_ok: datetime.datetime(); (UTC) or None
301
 
    last_enabled: datetime.datetime(); (UTC)
 
416
    last_checker_status: integer between 0 and 255 reflecting exit
 
417
                         status of last checker. -1 reflects crashed
 
418
                         checker, -2 means no checker completed yet.
 
419
    last_enabled: datetime.datetime(); (UTC) or None
302
420
    name:       string; from the config file, used in log messages and
303
421
                        D-Bus identifiers
304
422
    secret:     bytestring; sent verbatim (over TLS) to client
305
423
    timeout:    datetime.timedelta(); How long from last_checked_ok
306
424
                                      until this client is disabled
307
 
    extended_timeout:   extra long timeout when password has been sent
 
425
    extended_timeout:   extra long timeout when secret has been sent
308
426
    runtime_expansions: Allowed attributes for runtime expansion.
309
427
    expires:    datetime.datetime(); time (UTC) when a client will be
310
428
                disabled, or None
314
432
                          "created", "enabled", "fingerprint",
315
433
                          "host", "interval", "last_checked_ok",
316
434
                          "last_enabled", "name", "timeout")
 
435
    client_defaults = { "timeout": "5m",
 
436
                        "extended_timeout": "15m",
 
437
                        "interval": "2m",
 
438
                        "checker": "fping -q -- %%(host)s",
 
439
                        "host": "",
 
440
                        "approval_delay": "0s",
 
441
                        "approval_duration": "1s",
 
442
                        "approved_by_default": "True",
 
443
                        "enabled": "True",
 
444
                        }
317
445
    
318
446
    def timeout_milliseconds(self):
319
447
        "Return the 'timeout' attribute in milliseconds"
320
 
        return _timedelta_to_milliseconds(self.timeout)
 
448
        return timedelta_to_milliseconds(self.timeout)
321
449
    
322
450
    def extended_timeout_milliseconds(self):
323
451
        "Return the 'extended_timeout' attribute in milliseconds"
324
 
        return _timedelta_to_milliseconds(self.extended_timeout)    
 
452
        return timedelta_to_milliseconds(self.extended_timeout)
325
453
    
326
454
    def interval_milliseconds(self):
327
455
        "Return the 'interval' attribute in milliseconds"
328
 
        return _timedelta_to_milliseconds(self.interval)
 
456
        return timedelta_to_milliseconds(self.interval)
329
457
    
330
458
    def approval_delay_milliseconds(self):
331
 
        return _timedelta_to_milliseconds(self.approval_delay)
332
 
    
333
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
459
        return timedelta_to_milliseconds(self.approval_delay)
 
460
 
 
461
    @staticmethod
 
462
    def config_parser(config):
 
463
        """Construct a new dict of client settings of this form:
 
464
        { client_name: {setting_name: value, ...}, ...}
 
465
        with exceptions for any special settings as defined above.
 
466
        NOTE: Must be a pure function. Must return the same result
 
467
        value given the same arguments.
 
468
        """
 
469
        settings = {}
 
470
        for client_name in config.sections():
 
471
            section = dict(config.items(client_name))
 
472
            client = settings[client_name] = {}
 
473
            
 
474
            client["host"] = section["host"]
 
475
            # Reformat values from string types to Python types
 
476
            client["approved_by_default"] = config.getboolean(
 
477
                client_name, "approved_by_default")
 
478
            client["enabled"] = config.getboolean(client_name,
 
479
                                                  "enabled")
 
480
            
 
481
            client["fingerprint"] = (section["fingerprint"].upper()
 
482
                                     .replace(" ", ""))
 
483
            if "secret" in section:
 
484
                client["secret"] = section["secret"].decode("base64")
 
485
            elif "secfile" in section:
 
486
                with open(os.path.expanduser(os.path.expandvars
 
487
                                             (section["secfile"])),
 
488
                          "rb") as secfile:
 
489
                    client["secret"] = secfile.read()
 
490
            else:
 
491
                raise TypeError("No secret or secfile for section %s"
 
492
                                % section)
 
493
            client["timeout"] = string_to_delta(section["timeout"])
 
494
            client["extended_timeout"] = string_to_delta(
 
495
                section["extended_timeout"])
 
496
            client["interval"] = string_to_delta(section["interval"])
 
497
            client["approval_delay"] = string_to_delta(
 
498
                section["approval_delay"])
 
499
            client["approval_duration"] = string_to_delta(
 
500
                section["approval_duration"])
 
501
            client["checker_command"] = section["checker"]
 
502
            client["last_approval_request"] = None
 
503
            client["last_checked_ok"] = None
 
504
            client["last_checker_status"] = -2
 
505
        
 
506
        return settings
 
507
        
 
508
        
 
509
    def __init__(self, settings, name = None):
334
510
        """Note: the 'checker' key in 'config' sets the
335
511
        'checker_command' attribute and *not* the 'checker'
336
512
        attribute."""
337
513
        self.name = name
338
 
        if config is None:
339
 
            config = {}
 
514
        # adding all client settings
 
515
        for setting, value in settings.iteritems():
 
516
            setattr(self, setting, value)
 
517
        
 
518
        if self.enabled:
 
519
            if not hasattr(self, "last_enabled"):
 
520
                self.last_enabled = datetime.datetime.utcnow()
 
521
            if not hasattr(self, "expires"):
 
522
                self.expires = (datetime.datetime.utcnow()
 
523
                                + self.timeout)
 
524
        else:
 
525
            self.last_enabled = None
 
526
            self.expires = None
 
527
       
340
528
        logger.debug("Creating client %r", self.name)
341
529
        # Uppercase and remove spaces from fingerprint for later
342
530
        # comparison purposes with return value from the fingerprint()
343
531
        # function
344
 
        self.fingerprint = (config["fingerprint"].upper()
345
 
                            .replace(" ", ""))
346
532
        logger.debug("  Fingerprint: %s", self.fingerprint)
347
 
        if "secret" in config:
348
 
            self.secret = config["secret"].decode("base64")
349
 
        elif "secfile" in config:
350
 
            with open(os.path.expanduser(os.path.expandvars
351
 
                                         (config["secfile"])),
352
 
                      "rb") as secfile:
353
 
                self.secret = secfile.read()
354
 
        else:
355
 
            raise TypeError("No secret or secfile for client %s"
356
 
                            % self.name)
357
 
        self.host = config.get("host", "")
358
 
        self.created = datetime.datetime.utcnow()
359
 
        self.enabled = False
360
 
        self.last_approval_request = None
361
 
        self.last_enabled = None
362
 
        self.last_checked_ok = None
363
 
        self.timeout = string_to_delta(config["timeout"])
364
 
        self.extended_timeout = string_to_delta(config["extended_timeout"])
365
 
        self.interval = string_to_delta(config["interval"])
366
 
        self.disable_hook = disable_hook
 
533
        self.created = settings.get("created",
 
534
                                    datetime.datetime.utcnow())
 
535
 
 
536
        # attributes specific for this server instance
367
537
        self.checker = None
368
538
        self.checker_initiator_tag = None
369
539
        self.disable_initiator_tag = None
370
 
        self.expires = None
371
540
        self.checker_callback_tag = None
372
 
        self.checker_command = config["checker"]
373
541
        self.current_checker_command = None
374
 
        self.last_connect = None
375
 
        self._approved = None
376
 
        self.approved_by_default = config.get("approved_by_default",
377
 
                                              True)
 
542
        self.approved = None
378
543
        self.approvals_pending = 0
379
 
        self.approval_delay = string_to_delta(
380
 
            config["approval_delay"])
381
 
        self.approval_duration = string_to_delta(
382
 
            config["approval_duration"])
383
 
        self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
 
544
        self.changedstate = (multiprocessing_manager
 
545
                             .Condition(multiprocessing_manager
 
546
                                        .Lock()))
 
547
        self.client_structure = [attr for attr in
 
548
                                 self.__dict__.iterkeys()
 
549
                                 if not attr.startswith("_")]
 
550
        self.client_structure.append("client_structure")
 
551
        
 
552
        for name, t in inspect.getmembers(type(self),
 
553
                                          lambda obj:
 
554
                                              isinstance(obj,
 
555
                                                         property)):
 
556
            if not name.startswith("_"):
 
557
                self.client_structure.append(name)
384
558
    
 
559
    # Send notice to process children that client state has changed
385
560
    def send_changedstate(self):
386
 
        self.changedstate.acquire()
387
 
        self.changedstate.notify_all()
388
 
        self.changedstate.release()
389
 
        
 
561
        with self.changedstate:
 
562
            self.changedstate.notify_all()
 
563
    
390
564
    def enable(self):
391
565
        """Start this client's checker and timeout hooks"""
392
566
        if getattr(self, "enabled", False):
393
567
            # Already enabled
394
568
            return
395
569
        self.send_changedstate()
396
 
        # Schedule a new checker to be started an 'interval' from now,
397
 
        # and every interval from then on.
398
 
        self.checker_initiator_tag = (gobject.timeout_add
399
 
                                      (self.interval_milliseconds(),
400
 
                                       self.start_checker))
401
 
        # Schedule a disable() when 'timeout' has passed
402
570
        self.expires = datetime.datetime.utcnow() + self.timeout
403
 
        self.disable_initiator_tag = (gobject.timeout_add
404
 
                                   (self.timeout_milliseconds(),
405
 
                                    self.disable))
406
571
        self.enabled = True
407
572
        self.last_enabled = datetime.datetime.utcnow()
408
 
        # Also start a new checker *right now*.
409
 
        self.start_checker()
 
573
        self.init_checker()
410
574
    
411
575
    def disable(self, quiet=True):
412
576
        """Disable this client."""
424
588
            gobject.source_remove(self.checker_initiator_tag)
425
589
            self.checker_initiator_tag = None
426
590
        self.stop_checker()
427
 
        if self.disable_hook:
428
 
            self.disable_hook(self)
429
591
        self.enabled = False
430
592
        # Do not run this again if called by a gobject.timeout_add
431
593
        return False
432
594
    
433
595
    def __del__(self):
434
 
        self.disable_hook = None
435
596
        self.disable()
436
597
    
 
598
    def init_checker(self):
 
599
        # Schedule a new checker to be started an 'interval' from now,
 
600
        # and every interval from then on.
 
601
        self.checker_initiator_tag = (gobject.timeout_add
 
602
                                      (self.interval_milliseconds(),
 
603
                                       self.start_checker))
 
604
        # Schedule a disable() when 'timeout' has passed
 
605
        self.disable_initiator_tag = (gobject.timeout_add
 
606
                                   (self.timeout_milliseconds(),
 
607
                                    self.disable))
 
608
        # Also start a new checker *right now*.
 
609
        self.start_checker()
 
610
    
437
611
    def checker_callback(self, pid, condition, command):
438
612
        """The checker has completed, so take appropriate actions."""
439
613
        self.checker_callback_tag = None
440
614
        self.checker = None
441
615
        if os.WIFEXITED(condition):
442
 
            exitstatus = os.WEXITSTATUS(condition)
443
 
            if exitstatus == 0:
 
616
            self.last_checker_status = os.WEXITSTATUS(condition)
 
617
            if self.last_checker_status == 0:
444
618
                logger.info("Checker for %(name)s succeeded",
445
619
                            vars(self))
446
620
                self.checked_ok()
448
622
                logger.info("Checker for %(name)s failed",
449
623
                            vars(self))
450
624
        else:
 
625
            self.last_checker_status = -1
451
626
            logger.warning("Checker for %(name)s crashed?",
452
627
                           vars(self))
453
628
    
454
 
    def checked_ok(self, timeout=None):
455
 
        """Bump up the timeout for this client.
456
 
        
457
 
        This should only be called when the client has been seen,
458
 
        alive and well.
459
 
        """
 
629
    def checked_ok(self):
 
630
        """Assert that the client has been seen, alive and well."""
 
631
        self.last_checked_ok = datetime.datetime.utcnow()
 
632
        self.last_checker_status = 0
 
633
        self.bump_timeout()
 
634
    
 
635
    def bump_timeout(self, timeout=None):
 
636
        """Bump up the timeout for this client."""
460
637
        if timeout is None:
461
638
            timeout = self.timeout
462
 
        self.last_checked_ok = datetime.datetime.utcnow()
463
 
        gobject.source_remove(self.disable_initiator_tag)
464
 
        self.expires = datetime.datetime.utcnow() + timeout
465
 
        self.disable_initiator_tag = (gobject.timeout_add
466
 
                                      (_timedelta_to_milliseconds(timeout),
467
 
                                       self.disable))
 
639
        if self.disable_initiator_tag is not None:
 
640
            gobject.source_remove(self.disable_initiator_tag)
 
641
        if getattr(self, "enabled", False):
 
642
            self.disable_initiator_tag = (gobject.timeout_add
 
643
                                          (timedelta_to_milliseconds
 
644
                                           (timeout), self.disable))
 
645
            self.expires = datetime.datetime.utcnow() + timeout
468
646
    
469
647
    def need_approval(self):
470
648
        self.last_approval_request = datetime.datetime.utcnow()
629
807
        """
630
808
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
631
809
                for cls in self.__class__.__mro__
632
 
                for name, prop in inspect.getmembers(cls, self._is_dbus_property))
 
810
                for name, prop in
 
811
                inspect.getmembers(cls, self._is_dbus_property))
633
812
    
634
813
    def _get_dbus_property(self, interface_name, property_name):
635
814
        """Returns a bound method if one exists which is a D-Bus
636
815
        property with the specified name and interface.
637
816
        """
638
817
        for cls in  self.__class__.__mro__:
639
 
            for name, value in inspect.getmembers(cls, self._is_dbus_property):
640
 
                if value._dbus_name == property_name and value._dbus_interface == interface_name:
 
818
            for name, value in (inspect.getmembers
 
819
                                (cls, self._is_dbus_property)):
 
820
                if (value._dbus_name == property_name
 
821
                    and value._dbus_interface == interface_name):
641
822
                    return value.__get__(self)
642
823
        
643
824
        # No such property
670
851
            # signatures other than "ay".
671
852
            if prop._dbus_signature != "ay":
672
853
                raise ValueError
673
 
            value = dbus.ByteArray(''.join(unichr(byte)
674
 
                                           for byte in value))
 
854
            value = dbus.ByteArray(b''.join(chr(byte)
 
855
                                            for byte in value))
675
856
        prop(value)
676
857
    
677
858
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
682
863
        
683
864
        Note: Will not include properties with access="write".
684
865
        """
685
 
        all = {}
 
866
        properties = {}
686
867
        for name, prop in self._get_all_dbus_properties():
687
868
            if (interface_name
688
869
                and interface_name != prop._dbus_interface):
693
874
                continue
694
875
            value = prop()
695
876
            if not hasattr(value, "variant_level"):
696
 
                all[name] = value
 
877
                properties[name] = value
697
878
                continue
698
 
            all[name] = type(value)(value, variant_level=
699
 
                                    value.variant_level+1)
700
 
        return dbus.Dictionary(all, signature="sv")
 
879
            properties[name] = type(value)(value, variant_level=
 
880
                                           value.variant_level+1)
 
881
        return dbus.Dictionary(properties, signature="sv")
701
882
    
702
883
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
703
884
                         out_signature="s",
754
935
    return dbus.String(dt.isoformat(),
755
936
                       variant_level=variant_level)
756
937
 
757
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties.__metaclass__):
 
938
 
 
939
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
 
940
                                  .__metaclass__):
758
941
    """Applied to an empty subclass of a D-Bus object, this metaclass
759
942
    will add additional D-Bus attributes matching a certain pattern.
760
943
    """
850
1033
                                        attribute.func_closure)))
851
1034
        return type.__new__(mcs, name, bases, attr)
852
1035
 
 
1036
 
853
1037
class ClientDBus(Client, DBusObjectWithProperties):
854
1038
    """A Client class using D-Bus
855
1039
    
864
1048
    # dbus.service.Object doesn't use super(), so we can't either.
865
1049
    
866
1050
    def __init__(self, bus = None, *args, **kwargs):
867
 
        self._approvals_pending = 0
868
1051
        self.bus = bus
869
1052
        Client.__init__(self, *args, **kwargs)
870
1053
        # Only now, when this client is initialized, can it show up on
882
1065
                             variant_level=1):
883
1066
        """ Modify a variable so that it's a property which announces
884
1067
        its changes to DBus.
885
 
 
886
 
        transform_fun: Function that takes a value and transforms it
887
 
                       to a D-Bus type.
 
1068
        
 
1069
        transform_fun: Function that takes a value and a variant_level
 
1070
                       and transforms it to a D-Bus type.
888
1071
        dbus_name: D-Bus name of the variable
889
1072
        type_func: Function that transform the value before sending it
890
1073
                   to the D-Bus.  Default: no transform
891
1074
        variant_level: D-Bus variant level.  Default: 1
892
1075
        """
893
 
        real_value = [None,]
 
1076
        attrname = "_{0}".format(dbus_name)
894
1077
        def setter(self, value):
895
 
            old_value = real_value[0]
896
 
            real_value[0] = value
897
1078
            if hasattr(self, "dbus_object_path"):
898
 
                if type_func(old_value) != type_func(real_value[0]):
899
 
                    dbus_value = transform_func(type_func(real_value[0]),
900
 
                                                variant_level)
 
1079
                if (not hasattr(self, attrname) or
 
1080
                    type_func(getattr(self, attrname, None))
 
1081
                    != type_func(value)):
 
1082
                    dbus_value = transform_func(type_func(value),
 
1083
                                                variant_level
 
1084
                                                =variant_level)
901
1085
                    self.PropertyChanged(dbus.String(dbus_name),
902
1086
                                         dbus_value)
 
1087
            setattr(self, attrname, value)
903
1088
        
904
 
        return property(lambda self: real_value[0], setter)
 
1089
        return property(lambda self: getattr(self, attrname), setter)
905
1090
    
906
1091
    
907
1092
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
912
1097
    last_enabled = notifychangeproperty(datetime_to_dbus,
913
1098
                                        "LastEnabled")
914
1099
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
915
 
                                   type_func = lambda checker: checker is not None)
 
1100
                                   type_func = lambda checker:
 
1101
                                       checker is not None)
916
1102
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
917
1103
                                           "LastCheckedOK")
918
 
    last_approval_request = notifychangeproperty(datetime_to_dbus,
919
 
                                                 "LastApprovalRequest")
 
1104
    last_checker_status = notifychangeproperty(dbus.Int16,
 
1105
                                               "LastCheckerStatus")
 
1106
    last_approval_request = notifychangeproperty(
 
1107
        datetime_to_dbus, "LastApprovalRequest")
920
1108
    approved_by_default = notifychangeproperty(dbus.Boolean,
921
1109
                                               "ApprovedByDefault")
922
 
    approval_delay = notifychangeproperty(dbus.UInt16, "ApprovalDelay",
923
 
                                          type_func = _timedelta_to_milliseconds)
924
 
    approval_duration = notifychangeproperty(dbus.UInt16, "ApprovalDuration",
925
 
                                             type_func = _timedelta_to_milliseconds)
 
1110
    approval_delay = notifychangeproperty(dbus.UInt64,
 
1111
                                          "ApprovalDelay",
 
1112
                                          type_func =
 
1113
                                          timedelta_to_milliseconds)
 
1114
    approval_duration = notifychangeproperty(
 
1115
        dbus.UInt64, "ApprovalDuration",
 
1116
        type_func = timedelta_to_milliseconds)
926
1117
    host = notifychangeproperty(dbus.String, "Host")
927
 
    timeout = notifychangeproperty(dbus.UInt16, "Timeout",
928
 
                                   type_func = _timedelta_to_milliseconds)
929
 
    extended_timeout = notifychangeproperty(dbus.UInt16, "ExtendedTimeout",
930
 
                                            type_func = _timedelta_to_milliseconds)
931
 
    interval = notifychangeproperty(dbus.UInt16, "Interval",
932
 
                                    type_func = _timedelta_to_milliseconds)
 
1118
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
 
1119
                                   type_func =
 
1120
                                   timedelta_to_milliseconds)
 
1121
    extended_timeout = notifychangeproperty(
 
1122
        dbus.UInt64, "ExtendedTimeout",
 
1123
        type_func = timedelta_to_milliseconds)
 
1124
    interval = notifychangeproperty(dbus.UInt64,
 
1125
                                    "Interval",
 
1126
                                    type_func =
 
1127
                                    timedelta_to_milliseconds)
933
1128
    checker_command = notifychangeproperty(dbus.String, "Checker")
934
1129
    
935
1130
    del notifychangeproperty
977
1172
        return r
978
1173
    
979
1174
    def _reset_approved(self):
980
 
        self._approved = None
 
1175
        self.approved = None
981
1176
        return False
982
1177
    
983
1178
    def approve(self, value=True):
984
1179
        self.send_changedstate()
985
 
        self._approved = value
986
 
        gobject.timeout_add(_timedelta_to_milliseconds
 
1180
        self.approved = value
 
1181
        gobject.timeout_add(timedelta_to_milliseconds
987
1182
                            (self.approval_duration),
988
1183
                            self._reset_approved)
989
1184
    
1095
1290
                           access="readwrite")
1096
1291
    def ApprovalDuration_dbus_property(self, value=None):
1097
1292
        if value is None:       # get
1098
 
            return dbus.UInt64(_timedelta_to_milliseconds(
 
1293
            return dbus.UInt64(timedelta_to_milliseconds(
1099
1294
                    self.approval_duration))
1100
1295
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1101
1296
    
1115
1310
    def Host_dbus_property(self, value=None):
1116
1311
        if value is None:       # get
1117
1312
            return dbus.String(self.host)
1118
 
        self.host = value
 
1313
        self.host = unicode(value)
1119
1314
    
1120
1315
    # Created - property
1121
1316
    @dbus_service_property(_interface, signature="s", access="read")
1122
1317
    def Created_dbus_property(self):
1123
 
        return dbus.String(datetime_to_dbus(self.created))
 
1318
        return datetime_to_dbus(self.created)
1124
1319
    
1125
1320
    # LastEnabled - property
1126
1321
    @dbus_service_property(_interface, signature="s", access="read")
1147
1342
            return
1148
1343
        return datetime_to_dbus(self.last_checked_ok)
1149
1344
    
 
1345
    # LastCheckerStatus - property
 
1346
    @dbus_service_property(_interface, signature="n",
 
1347
                           access="read")
 
1348
    def LastCheckerStatus_dbus_property(self):
 
1349
        return dbus.Int16(self.last_checker_status)
 
1350
    
1150
1351
    # Expires - property
1151
1352
    @dbus_service_property(_interface, signature="s", access="read")
1152
1353
    def Expires_dbus_property(self):
1164
1365
        if value is None:       # get
1165
1366
            return dbus.UInt64(self.timeout_milliseconds())
1166
1367
        self.timeout = datetime.timedelta(0, 0, 0, value)
1167
 
        if getattr(self, "disable_initiator_tag", None) is None:
1168
 
            return
1169
1368
        # Reschedule timeout
1170
 
        gobject.source_remove(self.disable_initiator_tag)
1171
 
        self.disable_initiator_tag = None
1172
 
        self.expires = None
1173
 
        time_to_die = (self.
1174
 
                       _timedelta_to_milliseconds((self
1175
 
                                                   .last_checked_ok
1176
 
                                                   + self.timeout)
1177
 
                                                  - datetime.datetime
1178
 
                                                  .utcnow()))
1179
 
        if time_to_die <= 0:
1180
 
            # The timeout has passed
1181
 
            self.disable()
1182
 
        else:
1183
 
            self.expires = (datetime.datetime.utcnow()
1184
 
                            + datetime.timedelta(milliseconds = time_to_die))
1185
 
            self.disable_initiator_tag = (gobject.timeout_add
1186
 
                                          (time_to_die, self.disable))
 
1369
        if self.enabled:
 
1370
            now = datetime.datetime.utcnow()
 
1371
            time_to_die = timedelta_to_milliseconds(
 
1372
                (self.last_checked_ok + self.timeout) - now)
 
1373
            if time_to_die <= 0:
 
1374
                # The timeout has passed
 
1375
                self.disable()
 
1376
            else:
 
1377
                self.expires = (now +
 
1378
                                datetime.timedelta(milliseconds =
 
1379
                                                   time_to_die))
 
1380
                if (getattr(self, "disable_initiator_tag", None)
 
1381
                    is None):
 
1382
                    return
 
1383
                gobject.source_remove(self.disable_initiator_tag)
 
1384
                self.disable_initiator_tag = (gobject.timeout_add
 
1385
                                              (time_to_die,
 
1386
                                               self.disable))
1187
1387
    
1188
1388
    # ExtendedTimeout - property
1189
1389
    @dbus_service_property(_interface, signature="t",
1202
1402
        self.interval = datetime.timedelta(0, 0, 0, value)
1203
1403
        if getattr(self, "checker_initiator_tag", None) is None:
1204
1404
            return
1205
 
        # Reschedule checker run
1206
 
        gobject.source_remove(self.checker_initiator_tag)
1207
 
        self.checker_initiator_tag = (gobject.timeout_add
1208
 
                                      (value, self.start_checker))
1209
 
        self.start_checker()    # Start one now, too
 
1405
        if self.enabled:
 
1406
            # Reschedule checker run
 
1407
            gobject.source_remove(self.checker_initiator_tag)
 
1408
            self.checker_initiator_tag = (gobject.timeout_add
 
1409
                                          (value, self.start_checker))
 
1410
            self.start_checker()    # Start one now, too
1210
1411
    
1211
1412
    # Checker - property
1212
1413
    @dbus_service_property(_interface, signature="s",
1214
1415
    def Checker_dbus_property(self, value=None):
1215
1416
        if value is None:       # get
1216
1417
            return dbus.String(self.checker_command)
1217
 
        self.checker_command = value
 
1418
        self.checker_command = unicode(value)
1218
1419
    
1219
1420
    # CheckerRunning - property
1220
1421
    @dbus_service_property(_interface, signature="b",
1249
1450
            raise KeyError()
1250
1451
    
1251
1452
    def __getattribute__(self, name):
1252
 
        if(name == '_pipe'):
 
1453
        if name == '_pipe':
1253
1454
            return super(ProxyClient, self).__getattribute__(name)
1254
1455
        self._pipe.send(('getattr', name))
1255
1456
        data = self._pipe.recv()
1262
1463
            return func
1263
1464
    
1264
1465
    def __setattr__(self, name, value):
1265
 
        if(name == '_pipe'):
 
1466
        if name == '_pipe':
1266
1467
            return super(ProxyClient, self).__setattr__(name, value)
1267
1468
        self._pipe.send(('setattr', name, value))
1268
1469
 
 
1470
 
1269
1471
class ClientDBusTransitional(ClientDBus):
1270
1472
    __metaclass__ = AlternateDBusNamesMetaclass
1271
1473
 
 
1474
 
1272
1475
class ClientHandler(socketserver.BaseRequestHandler, object):
1273
1476
    """A class to handle client connections.
1274
1477
    
1353
1556
                                       client.name)
1354
1557
                        if self.server.use_dbus:
1355
1558
                            # Emit D-Bus signal
1356
 
                            client.Rejected("Disabled")                    
 
1559
                            client.Rejected("Disabled")
1357
1560
                        return
1358
1561
                    
1359
 
                    if client._approved or not client.approval_delay:
 
1562
                    if client.approved or not client.approval_delay:
1360
1563
                        #We are approved or approval is disabled
1361
1564
                        break
1362
 
                    elif client._approved is None:
 
1565
                    elif client.approved is None:
1363
1566
                        logger.info("Client %s needs approval",
1364
1567
                                    client.name)
1365
1568
                        if self.server.use_dbus:
1376
1579
                        return
1377
1580
                    
1378
1581
                    #wait until timeout or approved
1379
 
                    #x = float(client._timedelta_to_milliseconds(delay))
1380
1582
                    time = datetime.datetime.now()
1381
1583
                    client.changedstate.acquire()
1382
 
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
 
1584
                    (client.changedstate.wait
 
1585
                     (float(client.timedelta_to_milliseconds(delay)
 
1586
                            / 1000)))
1383
1587
                    client.changedstate.release()
1384
1588
                    time2 = datetime.datetime.now()
1385
1589
                    if (time2 - time) >= delay:
1409
1613
                    sent_size += sent
1410
1614
                
1411
1615
                logger.info("Sending secret to %s", client.name)
1412
 
                # bump the timeout as if seen
1413
 
                client.checked_ok(client.extended_timeout)
 
1616
                # bump the timeout using extended_timeout
 
1617
                client.bump_timeout(client.extended_timeout)
1414
1618
                if self.server.use_dbus:
1415
1619
                    # Emit D-Bus signal
1416
1620
                    client.GotSecret()
1483
1687
        # Convert the buffer to a Python bytestring
1484
1688
        fpr = ctypes.string_at(buf, buf_len.value)
1485
1689
        # Convert the bytestring to hexadecimal notation
1486
 
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
 
1690
        hex_fpr = binascii.hexlify(fpr).upper()
1487
1691
        return hex_fpr
1488
1692
 
1489
1693
 
1492
1696
    def sub_process_main(self, request, address):
1493
1697
        try:
1494
1698
            self.finish_request(request, address)
1495
 
        except:
 
1699
        except Exception:
1496
1700
            self.handle_error(request, address)
1497
1701
        self.close_request(request)
1498
 
            
 
1702
    
1499
1703
    def process_request(self, request, address):
1500
1704
        """Start a new process to process the request."""
1501
 
        multiprocessing.Process(target = self.sub_process_main,
1502
 
                                args = (request, address)).start()
 
1705
        proc = multiprocessing.Process(target = self.sub_process_main,
 
1706
                                       args = (request,
 
1707
                                               address))
 
1708
        proc.start()
 
1709
        return proc
1503
1710
 
1504
1711
 
1505
1712
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1511
1718
        """
1512
1719
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1513
1720
        
1514
 
        super(MultiprocessingMixInWithPipe,
1515
 
              self).process_request(request, client_address)
 
1721
        proc = MultiprocessingMixIn.process_request(self, request,
 
1722
                                                    client_address)
1516
1723
        self.child_pipe.close()
1517
 
        self.add_pipe(parent_pipe)
 
1724
        self.add_pipe(parent_pipe, proc)
1518
1725
    
1519
 
    def add_pipe(self, parent_pipe):
 
1726
    def add_pipe(self, parent_pipe, proc):
1520
1727
        """Dummy function; override as necessary"""
1521
1728
        raise NotImplementedError
1522
1729
 
1600
1807
        self.enabled = False
1601
1808
        self.clients = clients
1602
1809
        if self.clients is None:
1603
 
            self.clients = set()
 
1810
            self.clients = {}
1604
1811
        self.use_dbus = use_dbus
1605
1812
        self.gnutls_priority = gnutls_priority
1606
1813
        IPv6_TCPServer.__init__(self, server_address,
1610
1817
    def server_activate(self):
1611
1818
        if self.enabled:
1612
1819
            return socketserver.TCPServer.server_activate(self)
 
1820
    
1613
1821
    def enable(self):
1614
1822
        self.enabled = True
1615
 
    def add_pipe(self, parent_pipe):
 
1823
    
 
1824
    def add_pipe(self, parent_pipe, proc):
1616
1825
        # Call "handle_ipc" for both data and EOF events
1617
1826
        gobject.io_add_watch(parent_pipe.fileno(),
1618
1827
                             gobject.IO_IN | gobject.IO_HUP,
1619
1828
                             functools.partial(self.handle_ipc,
1620
 
                                               parent_pipe = parent_pipe))
1621
 
        
 
1829
                                               parent_pipe =
 
1830
                                               parent_pipe,
 
1831
                                               proc = proc))
 
1832
    
1622
1833
    def handle_ipc(self, source, condition, parent_pipe=None,
1623
 
                   client_object=None):
 
1834
                   proc = None, client_object=None):
1624
1835
        condition_names = {
1625
1836
            gobject.IO_IN: "IN",   # There is data to read.
1626
1837
            gobject.IO_OUT: "OUT", # Data can be written (without
1635
1846
                                       for cond, name in
1636
1847
                                       condition_names.iteritems()
1637
1848
                                       if cond & condition)
1638
 
        # error or the other end of multiprocessing.Pipe has closed
 
1849
        # error, or the other end of multiprocessing.Pipe has closed
1639
1850
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
 
1851
            # Wait for other process to exit
 
1852
            proc.join()
1640
1853
            return False
1641
1854
        
1642
1855
        # Read a request from the child
1647
1860
            fpr = request[1]
1648
1861
            address = request[2]
1649
1862
            
1650
 
            for c in self.clients:
 
1863
            for c in self.clients.itervalues():
1651
1864
                if c.fingerprint == fpr:
1652
1865
                    client = c
1653
1866
                    break
1656
1869
                            "dress: %s", fpr, address)
1657
1870
                if self.use_dbus:
1658
1871
                    # Emit D-Bus signal
1659
 
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
 
1872
                    mandos_dbus_service.ClientNotFound(fpr,
 
1873
                                                       address[0])
1660
1874
                parent_pipe.send(False)
1661
1875
                return False
1662
1876
            
1663
1877
            gobject.io_add_watch(parent_pipe.fileno(),
1664
1878
                                 gobject.IO_IN | gobject.IO_HUP,
1665
1879
                                 functools.partial(self.handle_ipc,
1666
 
                                                   parent_pipe = parent_pipe,
1667
 
                                                   client_object = client))
 
1880
                                                   parent_pipe =
 
1881
                                                   parent_pipe,
 
1882
                                                   proc = proc,
 
1883
                                                   client_object =
 
1884
                                                   client))
1668
1885
            parent_pipe.send(True)
1669
 
            # remove the old hook in favor of the new above hook on same fileno
 
1886
            # remove the old hook in favor of the new above hook on
 
1887
            # same fileno
1670
1888
            return False
1671
1889
        if command == 'funcall':
1672
1890
            funcname = request[1]
1673
1891
            args = request[2]
1674
1892
            kwargs = request[3]
1675
1893
            
1676
 
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
 
1894
            parent_pipe.send(('data', getattr(client_object,
 
1895
                                              funcname)(*args,
 
1896
                                                         **kwargs)))
1677
1897
        
1678
1898
        if command == 'getattr':
1679
1899
            attrname = request[1]
1680
1900
            if callable(client_object.__getattribute__(attrname)):
1681
1901
                parent_pipe.send(('function',))
1682
1902
            else:
1683
 
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
 
1903
                parent_pipe.send(('data', client_object
 
1904
                                  .__getattribute__(attrname)))
1684
1905
        
1685
1906
        if command == 'setattr':
1686
1907
            attrname = request[1]
1729
1950
    return timevalue
1730
1951
 
1731
1952
 
1732
 
def if_nametoindex(interface):
1733
 
    """Call the C function if_nametoindex(), or equivalent
1734
 
    
1735
 
    Note: This function cannot accept a unicode string."""
1736
 
    global if_nametoindex
1737
 
    try:
1738
 
        if_nametoindex = (ctypes.cdll.LoadLibrary
1739
 
                          (ctypes.util.find_library("c"))
1740
 
                          .if_nametoindex)
1741
 
    except (OSError, AttributeError):
1742
 
        logger.warning("Doing if_nametoindex the hard way")
1743
 
        def if_nametoindex(interface):
1744
 
            "Get an interface index the hard way, i.e. using fcntl()"
1745
 
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1746
 
            with contextlib.closing(socket.socket()) as s:
1747
 
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1748
 
                                    struct.pack(str("16s16x"),
1749
 
                                                interface))
1750
 
            interface_index = struct.unpack(str("I"),
1751
 
                                            ifreq[16:20])[0]
1752
 
            return interface_index
1753
 
    return if_nametoindex(interface)
1754
 
 
1755
 
 
1756
1953
def daemon(nochdir = False, noclose = False):
1757
1954
    """See daemon(3).  Standard BSD Unix function.
1758
1955
    
1813
2010
                        " system bus interface")
1814
2011
    parser.add_argument("--no-ipv6", action="store_false",
1815
2012
                        dest="use_ipv6", help="Do not use IPv6")
 
2013
    parser.add_argument("--no-restore", action="store_false",
 
2014
                        dest="restore", help="Do not restore stored"
 
2015
                        " state")
 
2016
    parser.add_argument("--statedir", metavar="DIR",
 
2017
                        help="Directory to save/restore state in")
 
2018
    
1816
2019
    options = parser.parse_args()
1817
2020
    
1818
2021
    if options.check:
1831
2034
                        "use_dbus": "True",
1832
2035
                        "use_ipv6": "True",
1833
2036
                        "debuglevel": "",
 
2037
                        "restore": "True",
 
2038
                        "statedir": "/var/lib/mandos"
1834
2039
                        }
1835
2040
    
1836
2041
    # Parse config file for server-global settings
1853
2058
    # options, if set.
1854
2059
    for option in ("interface", "address", "port", "debug",
1855
2060
                   "priority", "servicename", "configdir",
1856
 
                   "use_dbus", "use_ipv6", "debuglevel"):
 
2061
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
 
2062
                   "statedir"):
1857
2063
        value = getattr(options, option)
1858
2064
        if value is not None:
1859
2065
            server_settings[option] = value
1871
2077
    debuglevel = server_settings["debuglevel"]
1872
2078
    use_dbus = server_settings["use_dbus"]
1873
2079
    use_ipv6 = server_settings["use_ipv6"]
 
2080
    stored_state_path = os.path.join(server_settings["statedir"],
 
2081
                                     stored_state_file)
 
2082
    
 
2083
    if debug:
 
2084
        initlogger(debug, logging.DEBUG)
 
2085
    else:
 
2086
        if not debuglevel:
 
2087
            initlogger(debug)
 
2088
        else:
 
2089
            level = getattr(logging, debuglevel.upper())
 
2090
            initlogger(debug, level)
1874
2091
    
1875
2092
    if server_settings["servicename"] != "Mandos":
1876
2093
        syslogger.setFormatter(logging.Formatter
1879
2096
                                % server_settings["servicename"]))
1880
2097
    
1881
2098
    # Parse config file with clients
1882
 
    client_defaults = { "timeout": "5m",
1883
 
                        "extended_timeout": "15m",
1884
 
                        "interval": "2m",
1885
 
                        "checker": "fping -q -- %%(host)s",
1886
 
                        "host": "",
1887
 
                        "approval_delay": "0s",
1888
 
                        "approval_duration": "1s",
1889
 
                        }
1890
 
    client_config = configparser.SafeConfigParser(client_defaults)
 
2099
    client_config = configparser.SafeConfigParser(Client
 
2100
                                                  .client_defaults)
1891
2101
    client_config.read(os.path.join(server_settings["configdir"],
1892
2102
                                    "clients.conf"))
1893
2103
    
1931
2141
        if error[0] != errno.EPERM:
1932
2142
            raise error
1933
2143
    
1934
 
    if not debug and not debuglevel:
1935
 
        syslogger.setLevel(logging.WARNING)
1936
 
        console.setLevel(logging.WARNING)
1937
 
    if debuglevel:
1938
 
        level = getattr(logging, debuglevel.upper())
1939
 
        syslogger.setLevel(level)
1940
 
        console.setLevel(level)
1941
 
    
1942
2144
    if debug:
1943
2145
        # Enable all possible GnuTLS debugging
1944
2146
        
1958
2160
        os.dup2(null, sys.stdin.fileno())
1959
2161
        if null > 2:
1960
2162
            os.close(null)
1961
 
    else:
1962
 
        # No console logging
1963
 
        logger.removeHandler(console)
1964
2163
    
1965
2164
    # Need to fork before connecting to D-Bus
1966
2165
    if not debug:
1967
2166
        # Close all input and output, do double fork, etc.
1968
2167
        daemon()
1969
2168
    
 
2169
    gobject.threads_init()
 
2170
    
1970
2171
    global main_loop
1971
2172
    # From the Avahi example code
1972
2173
    DBusGMainLoop(set_as_default=True )
1977
2178
        try:
1978
2179
            bus_name = dbus.service.BusName("se.recompile.Mandos",
1979
2180
                                            bus, do_not_queue=True)
1980
 
            old_bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1981
 
                                                bus, do_not_queue=True)
 
2181
            old_bus_name = (dbus.service.BusName
 
2182
                            ("se.bsnet.fukt.Mandos", bus,
 
2183
                             do_not_queue=True))
1982
2184
        except dbus.exceptions.NameExistsException as e:
1983
2185
            logger.error(unicode(e) + ", disabling D-Bus")
1984
2186
            use_dbus = False
1985
2187
            server_settings["use_dbus"] = False
1986
2188
            tcp_server.use_dbus = False
1987
2189
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1988
 
    service = AvahiService(name = server_settings["servicename"],
1989
 
                           servicetype = "_mandos._tcp",
1990
 
                           protocol = protocol, bus = bus)
 
2190
    service = AvahiServiceToSyslog(name =
 
2191
                                   server_settings["servicename"],
 
2192
                                   servicetype = "_mandos._tcp",
 
2193
                                   protocol = protocol, bus = bus)
1991
2194
    if server_settings["interface"]:
1992
2195
        service.interface = (if_nametoindex
1993
2196
                             (str(server_settings["interface"])))
1997
2200
    
1998
2201
    client_class = Client
1999
2202
    if use_dbus:
2000
 
        client_class = functools.partial(ClientDBusTransitional, bus = bus)        
2001
 
    def client_config_items(config, section):
2002
 
        special_settings = {
2003
 
            "approved_by_default":
2004
 
                lambda: config.getboolean(section,
2005
 
                                          "approved_by_default"),
2006
 
            }
2007
 
        for name, value in config.items(section):
 
2203
        client_class = functools.partial(ClientDBusTransitional,
 
2204
                                         bus = bus)
 
2205
    
 
2206
    client_settings = Client.config_parser(client_config)
 
2207
    old_client_settings = {}
 
2208
    clients_data = {}
 
2209
    
 
2210
    # Get client data and settings from last running state.
 
2211
    if server_settings["restore"]:
 
2212
        try:
 
2213
            with open(stored_state_path, "rb") as stored_state:
 
2214
                clients_data, old_client_settings = (pickle.load
 
2215
                                                     (stored_state))
 
2216
            os.remove(stored_state_path)
 
2217
        except IOError as e:
 
2218
            logger.warning("Could not load persistent state: {0}"
 
2219
                           .format(e))
 
2220
            if e.errno != errno.ENOENT:
 
2221
                raise
 
2222
        except EOFError as e:
 
2223
            logger.warning("Could not load persistent state: "
 
2224
                           "EOFError: {0}".format(e))
 
2225
    
 
2226
    with PGPEngine() as pgp:
 
2227
        for client_name, client in clients_data.iteritems():
 
2228
            # Decide which value to use after restoring saved state.
 
2229
            # We have three different values: Old config file,
 
2230
            # new config file, and saved state.
 
2231
            # New config value takes precedence if it differs from old
 
2232
            # config value, otherwise use saved state.
 
2233
            for name, value in client_settings[client_name].items():
 
2234
                try:
 
2235
                    # For each value in new config, check if it
 
2236
                    # differs from the old config value (Except for
 
2237
                    # the "secret" attribute)
 
2238
                    if (name != "secret" and
 
2239
                        value != old_client_settings[client_name]
 
2240
                        [name]):
 
2241
                        client[name] = value
 
2242
                except KeyError:
 
2243
                    pass
 
2244
            
 
2245
            # Clients who has passed its expire date can still be
 
2246
            # enabled if its last checker was successful.  Clients
 
2247
            # whose checker succeeded before we stored its state is
 
2248
            # assumed to have successfully run all checkers during
 
2249
            # downtime.
 
2250
            if client["enabled"]:
 
2251
                if datetime.datetime.utcnow() >= client["expires"]:
 
2252
                    if not client["last_checked_ok"]:
 
2253
                        logger.warning(
 
2254
                            "disabling client {0} - Client never "
 
2255
                            "performed a successful checker"
 
2256
                            .format(client_name))
 
2257
                        client["enabled"] = False
 
2258
                    elif client["last_checker_status"] != 0:
 
2259
                        logger.warning(
 
2260
                            "disabling client {0} - Client "
 
2261
                            "last checker failed with error code {1}"
 
2262
                            .format(client_name,
 
2263
                                    client["last_checker_status"]))
 
2264
                        client["enabled"] = False
 
2265
                    else:
 
2266
                        client["expires"] = (datetime.datetime
 
2267
                                             .utcnow()
 
2268
                                             + client["timeout"])
 
2269
                        logger.debug("Last checker succeeded,"
 
2270
                                     " keeping {0} enabled"
 
2271
                                     .format(client_name))
2008
2272
            try:
2009
 
                yield (name, special_settings[name]())
2010
 
            except KeyError:
2011
 
                yield (name, value)
2012
 
    
2013
 
    tcp_server.clients.update(set(
2014
 
            client_class(name = section,
2015
 
                         config= dict(client_config_items(
2016
 
                        client_config, section)))
2017
 
            for section in client_config.sections()))
 
2273
                client["secret"] = (
 
2274
                    pgp.decrypt(client["encrypted_secret"],
 
2275
                                client_settings[client_name]
 
2276
                                ["secret"]))
 
2277
            except PGPError:
 
2278
                # If decryption fails, we use secret from new settings
 
2279
                logger.debug("Failed to decrypt {0} old secret"
 
2280
                             .format(client_name))
 
2281
                client["secret"] = (
 
2282
                    client_settings[client_name]["secret"])
 
2283
 
 
2284
    
 
2285
    # Add/remove clients based on new changes made to config
 
2286
    for client_name in (set(old_client_settings)
 
2287
                        - set(client_settings)):
 
2288
        del clients_data[client_name]
 
2289
    for client_name in (set(client_settings)
 
2290
                        - set(old_client_settings)):
 
2291
        clients_data[client_name] = client_settings[client_name]
 
2292
 
 
2293
    # Create all client objects
 
2294
    for client_name, client in clients_data.iteritems():
 
2295
        tcp_server.clients[client_name] = client_class(
 
2296
            name = client_name, settings = client)
 
2297
    
2018
2298
    if not tcp_server.clients:
2019
2299
        logger.warning("No clients defined")
2020
2300
        
2031
2311
            # "pidfile" was never created
2032
2312
            pass
2033
2313
        del pidfilename
2034
 
        
2035
2314
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2036
2315
    
2037
2316
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2063
2342
            def GetAllClients(self):
2064
2343
                "D-Bus method"
2065
2344
                return dbus.Array(c.dbus_object_path
2066
 
                                  for c in tcp_server.clients)
 
2345
                                  for c in
 
2346
                                  tcp_server.clients.itervalues())
2067
2347
            
2068
2348
            @dbus.service.method(_interface,
2069
2349
                                 out_signature="a{oa{sv}}")
2071
2351
                "D-Bus method"
2072
2352
                return dbus.Dictionary(
2073
2353
                    ((c.dbus_object_path, c.GetAll(""))
2074
 
                     for c in tcp_server.clients),
 
2354
                     for c in tcp_server.clients.itervalues()),
2075
2355
                    signature="oa{sv}")
2076
2356
            
2077
2357
            @dbus.service.method(_interface, in_signature="o")
2078
2358
            def RemoveClient(self, object_path):
2079
2359
                "D-Bus method"
2080
 
                for c in tcp_server.clients:
 
2360
                for c in tcp_server.clients.itervalues():
2081
2361
                    if c.dbus_object_path == object_path:
2082
 
                        tcp_server.clients.remove(c)
 
2362
                        del tcp_server.clients[c.name]
2083
2363
                        c.remove_from_connection()
2084
2364
                        # Don't signal anything except ClientRemoved
2085
2365
                        c.disable(quiet=True)
2098
2378
        "Cleanup function; run on exit"
2099
2379
        service.cleanup()
2100
2380
        
 
2381
        multiprocessing.active_children()
 
2382
        if not (tcp_server.clients or client_settings):
 
2383
            return
 
2384
        
 
2385
        # Store client before exiting. Secrets are encrypted with key
 
2386
        # based on what config file has. If config file is
 
2387
        # removed/edited, old secret will thus be unrecovable.
 
2388
        clients = {}
 
2389
        with PGPEngine() as pgp:
 
2390
            for client in tcp_server.clients.itervalues():
 
2391
                key = client_settings[client.name]["secret"]
 
2392
                client.encrypted_secret = pgp.encrypt(client.secret,
 
2393
                                                      key)
 
2394
                client_dict = {}
 
2395
                
 
2396
                # A list of attributes that can not be pickled
 
2397
                # + secret.
 
2398
                exclude = set(("bus", "changedstate", "secret",
 
2399
                               "checker"))
 
2400
                for name, typ in (inspect.getmembers
 
2401
                                  (dbus.service.Object)):
 
2402
                    exclude.add(name)
 
2403
                
 
2404
                client_dict["encrypted_secret"] = (client
 
2405
                                                   .encrypted_secret)
 
2406
                for attr in client.client_structure:
 
2407
                    if attr not in exclude:
 
2408
                        client_dict[attr] = getattr(client, attr)
 
2409
                
 
2410
                clients[client.name] = client_dict
 
2411
                del client_settings[client.name]["secret"]
 
2412
        
 
2413
        try:
 
2414
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
 
2415
                                                prefix="clients-",
 
2416
                                                dir=os.path.dirname
 
2417
                                                (stored_state_path))
 
2418
            with os.fdopen(tempfd, "wb") as stored_state:
 
2419
                pickle.dump((clients, client_settings), stored_state)
 
2420
            os.rename(tempname, stored_state_path)
 
2421
        except (IOError, OSError) as e:
 
2422
            logger.warning("Could not save persistent state: {0}"
 
2423
                           .format(e))
 
2424
            if not debug:
 
2425
                try:
 
2426
                    os.remove(tempname)
 
2427
                except NameError:
 
2428
                    pass
 
2429
            if e.errno not in set((errno.ENOENT, errno.EACCES,
 
2430
                                   errno.EEXIST)):
 
2431
                raise e
 
2432
        
 
2433
        # Delete all clients, and settings from config
2101
2434
        while tcp_server.clients:
2102
 
            client = tcp_server.clients.pop()
 
2435
            name, client = tcp_server.clients.popitem()
2103
2436
            if use_dbus:
2104
2437
                client.remove_from_connection()
2105
 
            client.disable_hook = None
2106
2438
            # Don't signal anything except ClientRemoved
2107
2439
            client.disable(quiet=True)
2108
2440
            if use_dbus:
2109
2441
                # Emit D-Bus signal
2110
 
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
 
2442
                mandos_dbus_service.ClientRemoved(client
 
2443
                                                  .dbus_object_path,
2111
2444
                                                  client.name)
 
2445
        client_settings.clear()
2112
2446
    
2113
2447
    atexit.register(cleanup)
2114
2448
    
2115
 
    for client in tcp_server.clients:
 
2449
    for client in tcp_server.clients.itervalues():
2116
2450
        if use_dbus:
2117
2451
            # Emit D-Bus signal
2118
2452
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2119
 
        client.enable()
 
2453
        # Need to initiate checking of clients
 
2454
        if client.enabled:
 
2455
            client.init_checker()
2120
2456
    
2121
2457
    tcp_server.enable()
2122
2458
    tcp_server.server_activate()
2162
2498
    # Must run before the D-Bus bus name gets deregistered
2163
2499
    cleanup()
2164
2500
 
2165
 
 
2166
2501
if __name__ == '__main__':
2167
2502
    main()