/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-03-01 20:35:04 UTC
  • mfrom: (469.1.1 mandos-local)
  • Revision ID: teddy@fukt.bsnet.se-20110301203504-2sp5wiq74jz1rl80
* plugins.d/password-prompt.c: Some white space fixes.  Break some
                               long lines.  Add more debug output.

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