/mandos/trunk

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

« back to all changes in this revision

Viewing changes to mandos

  • Committer: Teddy Hogeborn
  • Date: 2011-02-27 17:26:35 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110227172635-hw1sire7k3vuo1co
Update copyright year to "2011" wherever appropriate.

Show diffs side-by-side

added added

removed removed

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