/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

Change "fukt.bsnet.se" to "recompile.se" throughout.

* README: - '' -
* debian/control: - '' -
* debian/copyright: - '' -
* debian/mandos-client.README.Debian: - '' - and some rewriting.
* debian/mandos.README.Debian: - '' -
* debian/watch: Change "fukt.bsnet.se" to "recompile.se".
* init.d-mandos: - '' -
* intro.xml: - '' -
* mandos: - '' -
* mandos-clients.conf.xml: - '' -
* mandos-ctl: - '' -
* mandos-ctl.xml: - '' -
* mandos-keygen: - '' -
* mandos-keygen.xml: - '' -
* mandos-monitor: - '' -
* mandos-monitor.xml: - '' -
* mandos.conf.xml: - '' -
* mandos.lsm: - '' -
* mandos.xml: - '' -
* plugin-runner.c: - '' -
* plugin-runner.xml: - '' -
* plugins.d/askpass-fifo.c: - '' -
* plugins.d/askpass-fifo.xml: - '' -
* plugins.d/mandos-client.c: - '' -
* plugins.d/mandos-client.xml: - '' -
* plugins.d/password-prompt.c: - '' -
* plugins.d/password-prompt.xml: - '' -
* plugins.d/plymouth.c: - '' -
* plugins.d/plymouth.xml: - '' -
* plugins.d/splashy.c: - '' -
* plugins.d/splashy.xml: - '' -
* plugins.d/usplash.c: - '' -
* plugins.d/usplash.xml: - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
11
11
# "AvahiService" class, and some lines in "main".
12
12
13
13
# Everything else is
14
 
# Copyright © 2008-2012 Teddy Hogeborn
15
 
# Copyright © 2008-2012 Björn Påhlsson
 
14
# Copyright © 2008-2011 Teddy Hogeborn
 
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
63
63
import cPickle as pickle
64
64
import multiprocessing
65
65
import types
66
 
import binascii
67
 
import tempfile
68
66
 
69
67
import dbus
70
68
import dbus.service
75
73
import ctypes.util
76
74
import xml.dom.minidom
77
75
import inspect
78
 
import GnuPGInterface
79
76
 
80
77
try:
81
78
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
85
82
    except ImportError:
86
83
        SO_BINDTODEVICE = None
87
84
 
88
 
version = "1.4.1"
89
 
stored_state_file = "clients.pickle"
90
 
 
91
 
logger = logging.getLogger()
 
85
 
 
86
version = "1.3.1"
 
87
 
 
88
#logger = logging.getLogger('mandos')
 
89
logger = logging.Logger('mandos')
92
90
syslogger = (logging.handlers.SysLogHandler
93
91
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
92
              address = str("/dev/log")))
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
 
 
 
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)
211
103
 
212
104
class AvahiError(Exception):
213
105
    def __init__(self, value, *args, **kwargs):
268
160
                            " after %i retries, exiting.",
269
161
                            self.rename_count)
270
162
            raise AvahiServiceError("Too many renames")
271
 
        self.name = unicode(self.server
272
 
                            .GetAlternativeServiceName(self.name))
 
163
        self.name = unicode(self.server.GetAlternativeServiceName(self.name))
273
164
        logger.info("Changing Zeroconf service name to %r ...",
274
165
                    self.name)
 
166
        syslogger.setFormatter(logging.Formatter
 
167
                               ('Mandos (%s) [%%(process)d]:'
 
168
                                ' %%(levelname)s: %%(message)s'
 
169
                                % self.name))
275
170
        self.remove()
276
171
        try:
277
172
            self.add()
297
192
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
298
193
        self.entry_group_state_changed_match = (
299
194
            self.group.connect_to_signal(
300
 
                'StateChanged', self.entry_group_state_changed))
 
195
                'StateChanged', self .entry_group_state_changed))
301
196
        logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
302
197
                     self.name, self.type)
303
198
        self.group.AddService(
329
224
            try:
330
225
                self.group.Free()
331
226
            except (dbus.exceptions.UnknownMethodException,
332
 
                    dbus.exceptions.DBusException):
 
227
                    dbus.exceptions.DBusException) as e:
333
228
                pass
334
229
            self.group = None
335
230
        self.remove()
369
264
                                 self.server_state_changed)
370
265
        self.server_state_changed(self.server.GetState())
371
266
 
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
381
267
 
382
 
def timedelta_to_milliseconds(td):
 
268
def _timedelta_to_milliseconds(td):
383
269
    "Convert a datetime.timedelta() to milliseconds"
384
270
    return ((td.days * 24 * 60 * 60 * 1000)
385
271
            + (td.seconds * 1000)
389
275
    """A representation of a client host served by this server.
390
276
    
391
277
    Attributes:
392
 
    approved:   bool(); 'None' if not yet approved/disapproved
 
278
    _approved:   bool(); 'None' if not yet approved/disapproved
393
279
    approval_delay: datetime.timedelta(); Time to wait for approval
394
280
    approval_duration: datetime.timedelta(); Duration of one approval
395
281
    checker:    subprocess.Popen(); a running checker process used
402
288
                     instance %(name)s can be used in the command.
403
289
    checker_initiator_tag: a gobject event source tag, or None
404
290
    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
407
291
    current_checker_command: string; current running checker_command
 
292
    disable_hook:  If set, called by disable() as disable_hook(self)
408
293
    disable_initiator_tag: a gobject event source tag, or None
409
294
    enabled:    bool()
410
295
    fingerprint: string (40 or 32 hexadecimal digits); used to
413
298
    interval:   datetime.timedelta(); How often to start a new checker
414
299
    last_approval_request: datetime.datetime(); (UTC) or None
415
300
    last_checked_ok: datetime.datetime(); (UTC) or None
416
 
    last_checker_status: integer between 0 and 255 reflecting exit
417
 
                         status of last checker. -1 reflects crashed
418
 
                         checker, or None.
419
 
    last_enabled: datetime.datetime(); (UTC) or None
 
301
    last_enabled: datetime.datetime(); (UTC)
420
302
    name:       string; from the config file, used in log messages and
421
303
                        D-Bus identifiers
422
304
    secret:     bytestring; sent verbatim (over TLS) to client
432
314
                          "created", "enabled", "fingerprint",
433
315
                          "host", "interval", "last_checked_ok",
434
316
                          "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
 
                        }
445
317
    
446
318
    def timeout_milliseconds(self):
447
319
        "Return the 'timeout' attribute in milliseconds"
448
 
        return timedelta_to_milliseconds(self.timeout)
 
320
        return _timedelta_to_milliseconds(self.timeout)
449
321
    
450
322
    def extended_timeout_milliseconds(self):
451
323
        "Return the 'extended_timeout' attribute in milliseconds"
452
 
        return timedelta_to_milliseconds(self.extended_timeout)
 
324
        return _timedelta_to_milliseconds(self.extended_timeout)    
453
325
    
454
326
    def interval_milliseconds(self):
455
327
        "Return the 'interval' attribute in milliseconds"
456
 
        return timedelta_to_milliseconds(self.interval)
 
328
        return _timedelta_to_milliseconds(self.interval)
457
329
    
458
330
    def approval_delay_milliseconds(self):
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"] = None
505
 
        
506
 
        return settings
507
 
        
508
 
        
509
 
    def __init__(self, settings, name = None):
 
331
        return _timedelta_to_milliseconds(self.approval_delay)
 
332
    
 
333
    def __init__(self, name = None, disable_hook=None, config=None):
510
334
        """Note: the 'checker' key in 'config' sets the
511
335
        'checker_command' attribute and *not* the 'checker'
512
336
        attribute."""
513
337
        self.name = name
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
 
       
 
338
        if config is None:
 
339
            config = {}
528
340
        logger.debug("Creating client %r", self.name)
529
341
        # Uppercase and remove spaces from fingerprint for later
530
342
        # comparison purposes with return value from the fingerprint()
531
343
        # function
 
344
        self.fingerprint = (config["fingerprint"].upper()
 
345
                            .replace(" ", ""))
532
346
        logger.debug("  Fingerprint: %s", self.fingerprint)
533
 
        self.created = settings.get("created",
534
 
                                    datetime.datetime.utcnow())
535
 
 
536
 
        # attributes specific for this server instance
 
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
537
367
        self.checker = None
538
368
        self.checker_initiator_tag = None
539
369
        self.disable_initiator_tag = None
 
370
        self.expires = None
540
371
        self.checker_callback_tag = None
 
372
        self.checker_command = config["checker"]
541
373
        self.current_checker_command = None
542
 
        self.approved = None
 
374
        self.last_connect = None
 
375
        self._approved = None
 
376
        self.approved_by_default = config.get("approved_by_default",
 
377
                                              True)
543
378
        self.approvals_pending = 0
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)
 
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())
558
384
    
559
 
    # Send notice to process children that client state has changed
560
385
    def send_changedstate(self):
561
 
        with self.changedstate:
562
 
            self.changedstate.notify_all()
563
 
    
 
386
        self.changedstate.acquire()
 
387
        self.changedstate.notify_all()
 
388
        self.changedstate.release()
 
389
        
564
390
    def enable(self):
565
391
        """Start this client's checker and timeout hooks"""
566
392
        if getattr(self, "enabled", False):
567
393
            # Already enabled
568
394
            return
569
395
        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
570
402
        self.expires = datetime.datetime.utcnow() + self.timeout
 
403
        self.disable_initiator_tag = (gobject.timeout_add
 
404
                                   (self.timeout_milliseconds(),
 
405
                                    self.disable))
571
406
        self.enabled = True
572
407
        self.last_enabled = datetime.datetime.utcnow()
573
 
        self.init_checker()
 
408
        # Also start a new checker *right now*.
 
409
        self.start_checker()
574
410
    
575
411
    def disable(self, quiet=True):
576
412
        """Disable this client."""
588
424
            gobject.source_remove(self.checker_initiator_tag)
589
425
            self.checker_initiator_tag = None
590
426
        self.stop_checker()
 
427
        if self.disable_hook:
 
428
            self.disable_hook(self)
591
429
        self.enabled = False
592
430
        # Do not run this again if called by a gobject.timeout_add
593
431
        return False
594
432
    
595
433
    def __del__(self):
 
434
        self.disable_hook = None
596
435
        self.disable()
597
436
    
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
 
    
611
437
    def checker_callback(self, pid, condition, command):
612
438
        """The checker has completed, so take appropriate actions."""
613
439
        self.checker_callback_tag = None
614
440
        self.checker = None
615
441
        if os.WIFEXITED(condition):
616
 
            self.last_checker_status = os.WEXITSTATUS(condition)
617
 
            if self.last_checker_status == 0:
 
442
            exitstatus = os.WEXITSTATUS(condition)
 
443
            if exitstatus == 0:
618
444
                logger.info("Checker for %(name)s succeeded",
619
445
                            vars(self))
620
446
                self.checked_ok()
622
448
                logger.info("Checker for %(name)s failed",
623
449
                            vars(self))
624
450
        else:
625
 
            self.last_checker_status = -1
626
451
            logger.warning("Checker for %(name)s crashed?",
627
452
                           vars(self))
628
453
    
635
460
        if timeout is None:
636
461
            timeout = self.timeout
637
462
        self.last_checked_ok = datetime.datetime.utcnow()
638
 
        if self.disable_initiator_tag is not None:
639
 
            gobject.source_remove(self.disable_initiator_tag)
640
 
        if getattr(self, "enabled", False):
641
 
            self.disable_initiator_tag = (gobject.timeout_add
642
 
                                          (timedelta_to_milliseconds
643
 
                                           (timeout), self.disable))
644
 
            self.expires = datetime.datetime.utcnow() + timeout
 
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))
645
468
    
646
469
    def need_approval(self):
647
470
        self.last_approval_request = datetime.datetime.utcnow()
806
629
        """
807
630
        return ((prop.__get__(self)._dbus_name, prop.__get__(self))
808
631
                for cls in self.__class__.__mro__
809
 
                for name, prop in
810
 
                inspect.getmembers(cls, self._is_dbus_property))
 
632
                for name, prop in inspect.getmembers(cls, self._is_dbus_property))
811
633
    
812
634
    def _get_dbus_property(self, interface_name, property_name):
813
635
        """Returns a bound method if one exists which is a D-Bus
814
636
        property with the specified name and interface.
815
637
        """
816
638
        for cls in  self.__class__.__mro__:
817
 
            for name, value in (inspect.getmembers
818
 
                                (cls, self._is_dbus_property)):
819
 
                if (value._dbus_name == property_name
820
 
                    and value._dbus_interface == interface_name):
 
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:
821
641
                    return value.__get__(self)
822
642
        
823
643
        # No such property
850
670
            # signatures other than "ay".
851
671
            if prop._dbus_signature != "ay":
852
672
                raise ValueError
853
 
            value = dbus.ByteArray(b''.join(chr(byte)
854
 
                                            for byte in value))
 
673
            value = dbus.ByteArray(''.join(unichr(byte)
 
674
                                           for byte in value))
855
675
        prop(value)
856
676
    
857
677
    @dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
862
682
        
863
683
        Note: Will not include properties with access="write".
864
684
        """
865
 
        properties = {}
 
685
        all = {}
866
686
        for name, prop in self._get_all_dbus_properties():
867
687
            if (interface_name
868
688
                and interface_name != prop._dbus_interface):
873
693
                continue
874
694
            value = prop()
875
695
            if not hasattr(value, "variant_level"):
876
 
                properties[name] = value
 
696
                all[name] = value
877
697
                continue
878
 
            properties[name] = type(value)(value, variant_level=
879
 
                                           value.variant_level+1)
880
 
        return dbus.Dictionary(properties, signature="sv")
 
698
            all[name] = type(value)(value, variant_level=
 
699
                                    value.variant_level+1)
 
700
        return dbus.Dictionary(all, signature="sv")
881
701
    
882
702
    @dbus.service.method(dbus.INTROSPECTABLE_IFACE,
883
703
                         out_signature="s",
934
754
    return dbus.String(dt.isoformat(),
935
755
                       variant_level=variant_level)
936
756
 
937
 
 
938
 
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
939
 
                                  .__metaclass__):
 
757
class AlternateDBusNamesMetaclass(DBusObjectWithProperties.__metaclass__):
940
758
    """Applied to an empty subclass of a D-Bus object, this metaclass
941
759
    will add additional D-Bus attributes matching a certain pattern.
942
760
    """
1032
850
                                        attribute.func_closure)))
1033
851
        return type.__new__(mcs, name, bases, attr)
1034
852
 
1035
 
 
1036
853
class ClientDBus(Client, DBusObjectWithProperties):
1037
854
    """A Client class using D-Bus
1038
855
    
1047
864
    # dbus.service.Object doesn't use super(), so we can't either.
1048
865
    
1049
866
    def __init__(self, bus = None, *args, **kwargs):
 
867
        self._approvals_pending = 0
1050
868
        self.bus = bus
1051
869
        Client.__init__(self, *args, **kwargs)
1052
 
        self._approvals_pending = 0
1053
 
        
1054
 
        self._approvals_pending = 0
1055
870
        # Only now, when this client is initialized, can it show up on
1056
871
        # the D-Bus
1057
872
        client_object_name = unicode(self.name).translate(
1067
882
                             variant_level=1):
1068
883
        """ Modify a variable so that it's a property which announces
1069
884
        its changes to DBus.
1070
 
        
1071
 
        transform_fun: Function that takes a value and a variant_level
1072
 
                       and transforms it to a D-Bus type.
 
885
 
 
886
        transform_fun: Function that takes a value and transforms it
 
887
                       to a D-Bus type.
1073
888
        dbus_name: D-Bus name of the variable
1074
889
        type_func: Function that transform the value before sending it
1075
890
                   to the D-Bus.  Default: no transform
1076
891
        variant_level: D-Bus variant level.  Default: 1
1077
892
        """
1078
 
        attrname = "_{0}".format(dbus_name)
 
893
        real_value = [None,]
1079
894
        def setter(self, value):
 
895
            old_value = real_value[0]
 
896
            real_value[0] = value
1080
897
            if hasattr(self, "dbus_object_path"):
1081
 
                if (not hasattr(self, attrname) or
1082
 
                    type_func(getattr(self, attrname, None))
1083
 
                    != type_func(value)):
1084
 
                    dbus_value = transform_func(type_func(value),
1085
 
                                                variant_level
1086
 
                                                =variant_level)
 
898
                if type_func(old_value) != type_func(real_value[0]):
 
899
                    dbus_value = transform_func(type_func(real_value[0]),
 
900
                                                variant_level)
1087
901
                    self.PropertyChanged(dbus.String(dbus_name),
1088
902
                                         dbus_value)
1089
 
            setattr(self, attrname, value)
1090
903
        
1091
 
        return property(lambda self: getattr(self, attrname), setter)
 
904
        return property(lambda self: real_value[0], setter)
1092
905
    
1093
906
    
1094
907
    expires = notifychangeproperty(datetime_to_dbus, "Expires")
1099
912
    last_enabled = notifychangeproperty(datetime_to_dbus,
1100
913
                                        "LastEnabled")
1101
914
    checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1102
 
                                   type_func = lambda checker:
1103
 
                                       checker is not None)
 
915
                                   type_func = lambda checker: checker is not None)
1104
916
    last_checked_ok = notifychangeproperty(datetime_to_dbus,
1105
917
                                           "LastCheckedOK")
1106
 
    last_approval_request = notifychangeproperty(
1107
 
        datetime_to_dbus, "LastApprovalRequest")
 
918
    last_approval_request = notifychangeproperty(datetime_to_dbus,
 
919
                                                 "LastApprovalRequest")
1108
920
    approved_by_default = notifychangeproperty(dbus.Boolean,
1109
921
                                               "ApprovedByDefault")
1110
 
    approval_delay = notifychangeproperty(dbus.UInt64,
1111
 
                                          "ApprovalDelay",
1112
 
                                          type_func =
1113
 
                                          timedelta_to_milliseconds)
1114
 
    approval_duration = notifychangeproperty(
1115
 
        dbus.UInt64, "ApprovalDuration",
1116
 
        type_func = timedelta_to_milliseconds)
 
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)
1117
926
    host = notifychangeproperty(dbus.String, "Host")
1118
 
    timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1119
 
                                   type_func =
1120
 
                                   timedelta_to_milliseconds)
1121
 
    extended_timeout = notifychangeproperty(
1122
 
        dbus.UInt64, "ExtendedTimeout",
1123
 
        type_func = timedelta_to_milliseconds)
1124
 
    interval = notifychangeproperty(dbus.UInt64,
1125
 
                                    "Interval",
1126
 
                                    type_func =
1127
 
                                    timedelta_to_milliseconds)
 
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)
1128
933
    checker_command = notifychangeproperty(dbus.String, "Checker")
1129
934
    
1130
935
    del notifychangeproperty
1172
977
        return r
1173
978
    
1174
979
    def _reset_approved(self):
1175
 
        self.approved = None
 
980
        self._approved = None
1176
981
        return False
1177
982
    
1178
983
    def approve(self, value=True):
1179
984
        self.send_changedstate()
1180
 
        self.approved = value
1181
 
        gobject.timeout_add(timedelta_to_milliseconds
 
985
        self._approved = value
 
986
        gobject.timeout_add(_timedelta_to_milliseconds
1182
987
                            (self.approval_duration),
1183
988
                            self._reset_approved)
1184
989
    
1227
1032
        "D-Bus signal"
1228
1033
        return self.need_approval()
1229
1034
    
1230
 
    # NeRwequest - signal
1231
 
    @dbus.service.signal(_interface, signature="s")
1232
 
    def NewRequest(self, ip):
1233
 
        """D-Bus signal
1234
 
        Is sent after a client request a password.
1235
 
        """
1236
 
        pass
1237
 
    
1238
1035
    ## Methods
1239
1036
    
1240
1037
    # Approve - method
1298
1095
                           access="readwrite")
1299
1096
    def ApprovalDuration_dbus_property(self, value=None):
1300
1097
        if value is None:       # get
1301
 
            return dbus.UInt64(timedelta_to_milliseconds(
 
1098
            return dbus.UInt64(_timedelta_to_milliseconds(
1302
1099
                    self.approval_duration))
1303
1100
        self.approval_duration = datetime.timedelta(0, 0, 0, value)
1304
1101
    
1318
1115
    def Host_dbus_property(self, value=None):
1319
1116
        if value is None:       # get
1320
1117
            return dbus.String(self.host)
1321
 
        self.host = unicode(value)
 
1118
        self.host = value
1322
1119
    
1323
1120
    # Created - property
1324
1121
    @dbus_service_property(_interface, signature="s", access="read")
1325
1122
    def Created_dbus_property(self):
1326
 
        return datetime_to_dbus(self.created)
 
1123
        return dbus.String(datetime_to_dbus(self.created))
1327
1124
    
1328
1125
    # LastEnabled - property
1329
1126
    @dbus_service_property(_interface, signature="s", access="read")
1367
1164
        if value is None:       # get
1368
1165
            return dbus.UInt64(self.timeout_milliseconds())
1369
1166
        self.timeout = datetime.timedelta(0, 0, 0, value)
 
1167
        if getattr(self, "disable_initiator_tag", None) is None:
 
1168
            return
1370
1169
        # Reschedule timeout
1371
 
        if self.enabled:
1372
 
            now = datetime.datetime.utcnow()
1373
 
            time_to_die = timedelta_to_milliseconds(
1374
 
                (self.last_checked_ok + self.timeout) - now)
1375
 
            if time_to_die <= 0:
1376
 
                # The timeout has passed
1377
 
                self.disable()
1378
 
            else:
1379
 
                self.expires = (now +
1380
 
                                datetime.timedelta(milliseconds =
1381
 
                                                   time_to_die))
1382
 
                if (getattr(self, "disable_initiator_tag", None)
1383
 
                    is None):
1384
 
                    return
1385
 
                gobject.source_remove(self.disable_initiator_tag)
1386
 
                self.disable_initiator_tag = (gobject.timeout_add
1387
 
                                              (time_to_die,
1388
 
                                               self.disable))
 
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))
1389
1187
    
1390
1188
    # ExtendedTimeout - property
1391
1189
    @dbus_service_property(_interface, signature="t",
1404
1202
        self.interval = datetime.timedelta(0, 0, 0, value)
1405
1203
        if getattr(self, "checker_initiator_tag", None) is None:
1406
1204
            return
1407
 
        if self.enabled:
1408
 
            # Reschedule checker run
1409
 
            gobject.source_remove(self.checker_initiator_tag)
1410
 
            self.checker_initiator_tag = (gobject.timeout_add
1411
 
                                          (value, self.start_checker))
1412
 
            self.start_checker()    # Start one now, too
 
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
1413
1210
    
1414
1211
    # Checker - property
1415
1212
    @dbus_service_property(_interface, signature="s",
1417
1214
    def Checker_dbus_property(self, value=None):
1418
1215
        if value is None:       # get
1419
1216
            return dbus.String(self.checker_command)
1420
 
        self.checker_command = unicode(value)
 
1217
        self.checker_command = value
1421
1218
    
1422
1219
    # CheckerRunning - property
1423
1220
    @dbus_service_property(_interface, signature="b",
1452
1249
            raise KeyError()
1453
1250
    
1454
1251
    def __getattribute__(self, name):
1455
 
        if name == '_pipe':
 
1252
        if(name == '_pipe'):
1456
1253
            return super(ProxyClient, self).__getattribute__(name)
1457
1254
        self._pipe.send(('getattr', name))
1458
1255
        data = self._pipe.recv()
1465
1262
            return func
1466
1263
    
1467
1264
    def __setattr__(self, name, value):
1468
 
        if name == '_pipe':
 
1265
        if(name == '_pipe'):
1469
1266
            return super(ProxyClient, self).__setattr__(name, value)
1470
1267
        self._pipe.send(('setattr', name, value))
1471
1268
 
1472
 
 
1473
1269
class ClientDBusTransitional(ClientDBus):
1474
1270
    __metaclass__ = AlternateDBusNamesMetaclass
1475
1271
 
1476
 
 
1477
1272
class ClientHandler(socketserver.BaseRequestHandler, object):
1478
1273
    """A class to handle client connections.
1479
1274
    
1547
1342
                except KeyError:
1548
1343
                    return
1549
1344
                
1550
 
                if self.server.use_dbus:
1551
 
                    # Emit D-Bus signal
1552
 
                    client.NewRequest(str(self.client_address))
1553
 
                
1554
1345
                if client.approval_delay:
1555
1346
                    delay = client.approval_delay
1556
1347
                    client.approvals_pending += 1
1562
1353
                                       client.name)
1563
1354
                        if self.server.use_dbus:
1564
1355
                            # Emit D-Bus signal
1565
 
                            client.Rejected("Disabled")
 
1356
                            client.Rejected("Disabled")                    
1566
1357
                        return
1567
1358
                    
1568
 
                    if client.approved or not client.approval_delay:
 
1359
                    if client._approved or not client.approval_delay:
1569
1360
                        #We are approved or approval is disabled
1570
1361
                        break
1571
 
                    elif client.approved is None:
 
1362
                    elif client._approved is None:
1572
1363
                        logger.info("Client %s needs approval",
1573
1364
                                    client.name)
1574
1365
                        if self.server.use_dbus:
1585
1376
                        return
1586
1377
                    
1587
1378
                    #wait until timeout or approved
 
1379
                    #x = float(client._timedelta_to_milliseconds(delay))
1588
1380
                    time = datetime.datetime.now()
1589
1381
                    client.changedstate.acquire()
1590
 
                    (client.changedstate.wait
1591
 
                     (float(client.timedelta_to_milliseconds(delay)
1592
 
                            / 1000)))
 
1382
                    client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1593
1383
                    client.changedstate.release()
1594
1384
                    time2 = datetime.datetime.now()
1595
1385
                    if (time2 - time) >= delay:
1619
1409
                    sent_size += sent
1620
1410
                
1621
1411
                logger.info("Sending secret to %s", client.name)
1622
 
                # bump the timeout using extended_timeout
 
1412
                # bump the timeout as if seen
1623
1413
                client.checked_ok(client.extended_timeout)
1624
1414
                if self.server.use_dbus:
1625
1415
                    # Emit D-Bus signal
1693
1483
        # Convert the buffer to a Python bytestring
1694
1484
        fpr = ctypes.string_at(buf, buf_len.value)
1695
1485
        # Convert the bytestring to hexadecimal notation
1696
 
        hex_fpr = binascii.hexlify(fpr).upper()
 
1486
        hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1697
1487
        return hex_fpr
1698
1488
 
1699
1489
 
1702
1492
    def sub_process_main(self, request, address):
1703
1493
        try:
1704
1494
            self.finish_request(request, address)
1705
 
        except Exception:
 
1495
        except:
1706
1496
            self.handle_error(request, address)
1707
1497
        self.close_request(request)
1708
 
    
 
1498
            
1709
1499
    def process_request(self, request, address):
1710
1500
        """Start a new process to process the request."""
1711
 
        proc = multiprocessing.Process(target = self.sub_process_main,
1712
 
                                       args = (request,
1713
 
                                               address))
1714
 
        proc.start()
1715
 
        return proc
 
1501
        multiprocessing.Process(target = self.sub_process_main,
 
1502
                                args = (request, address)).start()
1716
1503
 
1717
1504
 
1718
1505
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1724
1511
        """
1725
1512
        parent_pipe, self.child_pipe = multiprocessing.Pipe()
1726
1513
        
1727
 
        proc = MultiprocessingMixIn.process_request(self, request,
1728
 
                                                    client_address)
 
1514
        super(MultiprocessingMixInWithPipe,
 
1515
              self).process_request(request, client_address)
1729
1516
        self.child_pipe.close()
1730
 
        self.add_pipe(parent_pipe, proc)
 
1517
        self.add_pipe(parent_pipe)
1731
1518
    
1732
 
    def add_pipe(self, parent_pipe, proc):
 
1519
    def add_pipe(self, parent_pipe):
1733
1520
        """Dummy function; override as necessary"""
1734
1521
        raise NotImplementedError
1735
1522
 
1813
1600
        self.enabled = False
1814
1601
        self.clients = clients
1815
1602
        if self.clients is None:
1816
 
            self.clients = {}
 
1603
            self.clients = set()
1817
1604
        self.use_dbus = use_dbus
1818
1605
        self.gnutls_priority = gnutls_priority
1819
1606
        IPv6_TCPServer.__init__(self, server_address,
1823
1610
    def server_activate(self):
1824
1611
        if self.enabled:
1825
1612
            return socketserver.TCPServer.server_activate(self)
1826
 
    
1827
1613
    def enable(self):
1828
1614
        self.enabled = True
1829
 
    
1830
 
    def add_pipe(self, parent_pipe, proc):
 
1615
    def add_pipe(self, parent_pipe):
1831
1616
        # Call "handle_ipc" for both data and EOF events
1832
1617
        gobject.io_add_watch(parent_pipe.fileno(),
1833
1618
                             gobject.IO_IN | gobject.IO_HUP,
1834
1619
                             functools.partial(self.handle_ipc,
1835
 
                                               parent_pipe =
1836
 
                                               parent_pipe,
1837
 
                                               proc = proc))
1838
 
    
 
1620
                                               parent_pipe = parent_pipe))
 
1621
        
1839
1622
    def handle_ipc(self, source, condition, parent_pipe=None,
1840
 
                   proc = None, client_object=None):
 
1623
                   client_object=None):
1841
1624
        condition_names = {
1842
1625
            gobject.IO_IN: "IN",   # There is data to read.
1843
1626
            gobject.IO_OUT: "OUT", # Data can be written (without
1852
1635
                                       for cond, name in
1853
1636
                                       condition_names.iteritems()
1854
1637
                                       if cond & condition)
1855
 
        # error, or the other end of multiprocessing.Pipe has closed
 
1638
        # error or the other end of multiprocessing.Pipe has closed
1856
1639
        if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1857
 
            # Wait for other process to exit
1858
 
            proc.join()
1859
1640
            return False
1860
1641
        
1861
1642
        # Read a request from the child
1866
1647
            fpr = request[1]
1867
1648
            address = request[2]
1868
1649
            
1869
 
            for c in self.clients.itervalues():
 
1650
            for c in self.clients:
1870
1651
                if c.fingerprint == fpr:
1871
1652
                    client = c
1872
1653
                    break
1875
1656
                            "dress: %s", fpr, address)
1876
1657
                if self.use_dbus:
1877
1658
                    # Emit D-Bus signal
1878
 
                    mandos_dbus_service.ClientNotFound(fpr,
1879
 
                                                       address[0])
 
1659
                    mandos_dbus_service.ClientNotFound(fpr, address[0])
1880
1660
                parent_pipe.send(False)
1881
1661
                return False
1882
1662
            
1883
1663
            gobject.io_add_watch(parent_pipe.fileno(),
1884
1664
                                 gobject.IO_IN | gobject.IO_HUP,
1885
1665
                                 functools.partial(self.handle_ipc,
1886
 
                                                   parent_pipe =
1887
 
                                                   parent_pipe,
1888
 
                                                   proc = proc,
1889
 
                                                   client_object =
1890
 
                                                   client))
 
1666
                                                   parent_pipe = parent_pipe,
 
1667
                                                   client_object = client))
1891
1668
            parent_pipe.send(True)
1892
 
            # remove the old hook in favor of the new above hook on
1893
 
            # same fileno
 
1669
            # remove the old hook in favor of the new above hook on same fileno
1894
1670
            return False
1895
1671
        if command == 'funcall':
1896
1672
            funcname = request[1]
1897
1673
            args = request[2]
1898
1674
            kwargs = request[3]
1899
1675
            
1900
 
            parent_pipe.send(('data', getattr(client_object,
1901
 
                                              funcname)(*args,
1902
 
                                                         **kwargs)))
 
1676
            parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1903
1677
        
1904
1678
        if command == 'getattr':
1905
1679
            attrname = request[1]
1906
1680
            if callable(client_object.__getattribute__(attrname)):
1907
1681
                parent_pipe.send(('function',))
1908
1682
            else:
1909
 
                parent_pipe.send(('data', client_object
1910
 
                                  .__getattribute__(attrname)))
 
1683
                parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1911
1684
        
1912
1685
        if command == 'setattr':
1913
1686
            attrname = request[1]
1956
1729
    return timevalue
1957
1730
 
1958
1731
 
 
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
 
1959
1756
def daemon(nochdir = False, noclose = False):
1960
1757
    """See daemon(3).  Standard BSD Unix function.
1961
1758
    
2016
1813
                        " system bus interface")
2017
1814
    parser.add_argument("--no-ipv6", action="store_false",
2018
1815
                        dest="use_ipv6", help="Do not use IPv6")
2019
 
    parser.add_argument("--no-restore", action="store_false",
2020
 
                        dest="restore", help="Do not restore stored"
2021
 
                        " state")
2022
 
    parser.add_argument("--statedir", metavar="DIR",
2023
 
                        help="Directory to save/restore state in")
2024
 
    
2025
1816
    options = parser.parse_args()
2026
1817
    
2027
1818
    if options.check:
2040
1831
                        "use_dbus": "True",
2041
1832
                        "use_ipv6": "True",
2042
1833
                        "debuglevel": "",
2043
 
                        "restore": "True",
2044
 
                        "statedir": "/var/lib/mandos"
2045
1834
                        }
2046
1835
    
2047
1836
    # Parse config file for server-global settings
2064
1853
    # options, if set.
2065
1854
    for option in ("interface", "address", "port", "debug",
2066
1855
                   "priority", "servicename", "configdir",
2067
 
                   "use_dbus", "use_ipv6", "debuglevel", "restore",
2068
 
                   "statedir"):
 
1856
                   "use_dbus", "use_ipv6", "debuglevel"):
2069
1857
        value = getattr(options, option)
2070
1858
        if value is not None:
2071
1859
            server_settings[option] = value
2083
1871
    debuglevel = server_settings["debuglevel"]
2084
1872
    use_dbus = server_settings["use_dbus"]
2085
1873
    use_ipv6 = server_settings["use_ipv6"]
2086
 
    stored_state_path = os.path.join(server_settings["statedir"],
2087
 
                                     stored_state_file)
2088
 
    
2089
 
    if debug:
2090
 
        initlogger(debug, logging.DEBUG)
2091
 
    else:
2092
 
        if not debuglevel:
2093
 
            initlogger(debug)
2094
 
        else:
2095
 
            level = getattr(logging, debuglevel.upper())
2096
 
            initlogger(debug, level)
2097
1874
    
2098
1875
    if server_settings["servicename"] != "Mandos":
2099
1876
        syslogger.setFormatter(logging.Formatter
2102
1879
                                % server_settings["servicename"]))
2103
1880
    
2104
1881
    # Parse config file with clients
2105
 
    client_config = configparser.SafeConfigParser(Client
2106
 
                                                  .client_defaults)
 
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)
2107
1891
    client_config.read(os.path.join(server_settings["configdir"],
2108
1892
                                    "clients.conf"))
2109
1893
    
2147
1931
        if error[0] != errno.EPERM:
2148
1932
            raise error
2149
1933
    
 
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
    
2150
1942
    if debug:
2151
1943
        # Enable all possible GnuTLS debugging
2152
1944
        
2166
1958
        os.dup2(null, sys.stdin.fileno())
2167
1959
        if null > 2:
2168
1960
            os.close(null)
 
1961
    else:
 
1962
        # No console logging
 
1963
        logger.removeHandler(console)
2169
1964
    
2170
1965
    # Need to fork before connecting to D-Bus
2171
1966
    if not debug:
2172
1967
        # Close all input and output, do double fork, etc.
2173
1968
        daemon()
2174
1969
    
2175
 
    gobject.threads_init()
2176
 
    
2177
1970
    global main_loop
2178
1971
    # From the Avahi example code
2179
1972
    DBusGMainLoop(set_as_default=True )
2184
1977
        try:
2185
1978
            bus_name = dbus.service.BusName("se.recompile.Mandos",
2186
1979
                                            bus, do_not_queue=True)
2187
 
            old_bus_name = (dbus.service.BusName
2188
 
                            ("se.bsnet.fukt.Mandos", bus,
2189
 
                             do_not_queue=True))
 
1980
            old_bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
 
1981
                                                bus, do_not_queue=True)
2190
1982
        except dbus.exceptions.NameExistsException as e:
2191
1983
            logger.error(unicode(e) + ", disabling D-Bus")
2192
1984
            use_dbus = False
2193
1985
            server_settings["use_dbus"] = False
2194
1986
            tcp_server.use_dbus = False
2195
1987
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2196
 
    service = AvahiServiceToSyslog(name =
2197
 
                                   server_settings["servicename"],
2198
 
                                   servicetype = "_mandos._tcp",
2199
 
                                   protocol = protocol, bus = bus)
 
1988
    service = AvahiService(name = server_settings["servicename"],
 
1989
                           servicetype = "_mandos._tcp",
 
1990
                           protocol = protocol, bus = bus)
2200
1991
    if server_settings["interface"]:
2201
1992
        service.interface = (if_nametoindex
2202
1993
                             (str(server_settings["interface"])))
2206
1997
    
2207
1998
    client_class = Client
2208
1999
    if use_dbus:
2209
 
        client_class = functools.partial(ClientDBusTransitional,
2210
 
                                         bus = bus)
2211
 
    
2212
 
    client_settings = Client.config_parser(client_config)
2213
 
    old_client_settings = {}
2214
 
    clients_data = {}
2215
 
    
2216
 
    # Get client data and settings from last running state.
2217
 
    if server_settings["restore"]:
2218
 
        try:
2219
 
            with open(stored_state_path, "rb") as stored_state:
2220
 
                clients_data, old_client_settings = (pickle.load
2221
 
                                                     (stored_state))
2222
 
            os.remove(stored_state_path)
2223
 
        except IOError as e:
2224
 
            logger.warning("Could not load persistent state: {0}"
2225
 
                           .format(e))
2226
 
            if e.errno != errno.ENOENT:
2227
 
                raise
2228
 
        except EOFError as e:
2229
 
            logger.warning("Could not load persistent state: "
2230
 
                           "EOFError: {0}".format(e))
2231
 
    
2232
 
    with PGPEngine() as pgp:
2233
 
        for client_name, client in clients_data.iteritems():
2234
 
            # Decide which value to use after restoring saved state.
2235
 
            # We have three different values: Old config file,
2236
 
            # new config file, and saved state.
2237
 
            # New config value takes precedence if it differs from old
2238
 
            # config value, otherwise use saved state.
2239
 
            for name, value in client_settings[client_name].items():
2240
 
                try:
2241
 
                    # For each value in new config, check if it
2242
 
                    # differs from the old config value (Except for
2243
 
                    # the "secret" attribute)
2244
 
                    if (name != "secret" and
2245
 
                        value != old_client_settings[client_name]
2246
 
                        [name]):
2247
 
                        client[name] = value
2248
 
                except KeyError:
2249
 
                    pass
2250
 
            
2251
 
            # Clients who has passed its expire date can still be
2252
 
            # enabled if its last checker was successful.  Clients
2253
 
            # whose checker failed before we stored its state is
2254
 
            # assumed to have failed all checkers during downtime.
2255
 
            if client["enabled"]:
2256
 
                if datetime.datetime.utcnow() >= client["expires"]:
2257
 
                    if not client["last_checked_ok"]:
2258
 
                        logger.warning(
2259
 
                            "disabling client {0} - Client never "
2260
 
                            "performed a successfull checker"
2261
 
                            .format(client["name"]))
2262
 
                        client["enabled"] = False
2263
 
                    elif client["last_checker_status"] != 0:
2264
 
                        logger.warning(
2265
 
                            "disabling client {0} - Client "
2266
 
                            "last checker failed with error code {1}"
2267
 
                            .format(client["name"],
2268
 
                                    client["last_checker_status"]))
2269
 
                        client["enabled"] = False
2270
 
                    else:
2271
 
                        client["expires"] = (datetime.datetime
2272
 
                                             .utcnow()
2273
 
                                             + client["timeout"])
2274
 
                        logger.debug("Last checker succeeded,"
2275
 
                                     " keeping {0} enabled"
2276
 
                                     .format(client["name"]))
 
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):
2277
2008
            try:
2278
 
                client["secret"] = (
2279
 
                    pgp.decrypt(client["encrypted_secret"],
2280
 
                                client_settings[client_name]
2281
 
                                ["secret"]))
2282
 
            except PGPError:
2283
 
                # If decryption fails, we use secret from new settings
2284
 
                logger.debug("Failed to decrypt {0} old secret"
2285
 
                             .format(client_name))
2286
 
                client["secret"] = (
2287
 
                    client_settings[client_name]["secret"])
2288
 
 
2289
 
    
2290
 
    # Add/remove clients based on new changes made to config
2291
 
    for client_name in (set(old_client_settings)
2292
 
                        - set(client_settings)):
2293
 
        del clients_data[client_name]
2294
 
    for client_name in (set(client_settings)
2295
 
                        - set(old_client_settings)):
2296
 
        clients_data[client_name] = client_settings[client_name]
2297
 
 
2298
 
    # Create clients all clients
2299
 
    for client_name, client in clients_data.iteritems():
2300
 
        tcp_server.clients[client_name] = client_class(
2301
 
            name = client_name, settings = client)
2302
 
    
 
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()))
2303
2018
    if not tcp_server.clients:
2304
2019
        logger.warning("No clients defined")
2305
2020
        
2316
2031
            # "pidfile" was never created
2317
2032
            pass
2318
2033
        del pidfilename
 
2034
        
2319
2035
        signal.signal(signal.SIGINT, signal.SIG_IGN)
2320
2036
    
2321
2037
    signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2347
2063
            def GetAllClients(self):
2348
2064
                "D-Bus method"
2349
2065
                return dbus.Array(c.dbus_object_path
2350
 
                                  for c in
2351
 
                                  tcp_server.clients.itervalues())
 
2066
                                  for c in tcp_server.clients)
2352
2067
            
2353
2068
            @dbus.service.method(_interface,
2354
2069
                                 out_signature="a{oa{sv}}")
2356
2071
                "D-Bus method"
2357
2072
                return dbus.Dictionary(
2358
2073
                    ((c.dbus_object_path, c.GetAll(""))
2359
 
                     for c in tcp_server.clients.itervalues()),
 
2074
                     for c in tcp_server.clients),
2360
2075
                    signature="oa{sv}")
2361
2076
            
2362
2077
            @dbus.service.method(_interface, in_signature="o")
2363
2078
            def RemoveClient(self, object_path):
2364
2079
                "D-Bus method"
2365
 
                for c in tcp_server.clients.itervalues():
 
2080
                for c in tcp_server.clients:
2366
2081
                    if c.dbus_object_path == object_path:
2367
 
                        del tcp_server.clients[c.name]
 
2082
                        tcp_server.clients.remove(c)
2368
2083
                        c.remove_from_connection()
2369
2084
                        # Don't signal anything except ClientRemoved
2370
2085
                        c.disable(quiet=True)
2383
2098
        "Cleanup function; run on exit"
2384
2099
        service.cleanup()
2385
2100
        
2386
 
        multiprocessing.active_children()
2387
 
        if not (tcp_server.clients or client_settings):
2388
 
            return
2389
 
        
2390
 
        # Store client before exiting. Secrets are encrypted with key
2391
 
        # based on what config file has. If config file is
2392
 
        # removed/edited, old secret will thus be unrecovable.
2393
 
        clients = {}
2394
 
        with PGPEngine() as pgp:
2395
 
            for client in tcp_server.clients.itervalues():
2396
 
                key = client_settings[client.name]["secret"]
2397
 
                client.encrypted_secret = pgp.encrypt(client.secret,
2398
 
                                                      key)
2399
 
                client_dict = {}
2400
 
                
2401
 
                # A list of attributes that can not be pickled
2402
 
                # + secret.
2403
 
                exclude = set(("bus", "changedstate", "secret",
2404
 
                               "checker"))
2405
 
                for name, typ in (inspect.getmembers
2406
 
                                  (dbus.service.Object)):
2407
 
                    exclude.add(name)
2408
 
                
2409
 
                client_dict["encrypted_secret"] = (client
2410
 
                                                   .encrypted_secret)
2411
 
                for attr in client.client_structure:
2412
 
                    if attr not in exclude:
2413
 
                        client_dict[attr] = getattr(client, attr)
2414
 
                
2415
 
                clients[client.name] = client_dict
2416
 
                del client_settings[client.name]["secret"]
2417
 
        
2418
 
        try:
2419
 
            tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2420
 
                                                prefix="clients-",
2421
 
                                                dir=os.path.dirname
2422
 
                                                (stored_state_path))
2423
 
            with os.fdopen(tempfd, "wb") as stored_state:
2424
 
                pickle.dump((clients, client_settings), stored_state)
2425
 
            os.rename(tempname, stored_state_path)
2426
 
        except (IOError, OSError) as e:
2427
 
            logger.warning("Could not save persistent state: {0}"
2428
 
                           .format(e))
2429
 
            if not debug:
2430
 
                try:
2431
 
                    os.remove(tempname)
2432
 
                except NameError:
2433
 
                    pass
2434
 
            if e.errno not in set((errno.ENOENT, errno.EACCES,
2435
 
                                   errno.EEXIST)):
2436
 
                raise e
2437
 
        
2438
 
        # Delete all clients, and settings from config
2439
2101
        while tcp_server.clients:
2440
 
            name, client = tcp_server.clients.popitem()
 
2102
            client = tcp_server.clients.pop()
2441
2103
            if use_dbus:
2442
2104
                client.remove_from_connection()
 
2105
            client.disable_hook = None
2443
2106
            # Don't signal anything except ClientRemoved
2444
2107
            client.disable(quiet=True)
2445
2108
            if use_dbus:
2446
2109
                # Emit D-Bus signal
2447
 
                mandos_dbus_service.ClientRemoved(client
2448
 
                                                  .dbus_object_path,
 
2110
                mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2449
2111
                                                  client.name)
2450
 
        client_settings.clear()
2451
2112
    
2452
2113
    atexit.register(cleanup)
2453
2114
    
2454
 
    for client in tcp_server.clients.itervalues():
 
2115
    for client in tcp_server.clients:
2455
2116
        if use_dbus:
2456
2117
            # Emit D-Bus signal
2457
2118
            mandos_dbus_service.ClientAdded(client.dbus_object_path)
2458
 
        # Need to initiate checking of clients
2459
 
        if client.enabled:
2460
 
            client.init_checker()
 
2119
        client.enable()
2461
2120
    
2462
2121
    tcp_server.enable()
2463
2122
    tcp_server.server_activate()
2503
2162
    # Must run before the D-Bus bus name gets deregistered
2504
2163
    cleanup()
2505
2164
 
 
2165
 
2506
2166
if __name__ == '__main__':
2507
2167
    main()