/mandos/release

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-03-08 19:12:56 UTC
  • mfrom: (237.7.20 trunk)
  • Revision ID: teddy@fukt.bsnet.se-20110308191256-mjcukty9on3z0yhd
MergeĀ fromĀ trunk.

Show diffs side-by-side

added added

removed removed

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