/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: teddy at recompile
  • Date: 2011-12-31 13:25:58 UTC
  • mto: This revision was merged to the branch mainline in revision 541.
  • Revision ID: teddy@recompile.se-20111231132558-z0dh7qgofgctmgri
* network-hooks.s/bridge: Don't use interface names directly; search
                          for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/bridge.conf (PORTS): Removed.
  (PORT_ADDRESSES): New.
* network-hooks.s/wireless: Don't use interface names directly; search
                            for interface names using their address.
  (addrtoif): New function.
* network-hooks.s/wireless.conf: Specify address.

Show diffs side-by-side

added added

removed removed

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