/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: 2009-02-07 04:50:39 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090207045039-xkr6b80vtqwqrq8l
* Makefile (install-client-nokey): Move "initramfs-tools-script" from
                                   "/scripts/local-top/mandos" to
                                   "/scripts/init-premount/mandos".
  (uninstall-client): - '' -
* debian/mandos-client.dirs: - '' -
* initramfs-tools-script (PREREQ): Added "udev".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
57
57
import logging.handlers
58
58
import pwd
59
59
from contextlib import closing
60
 
import struct
61
 
import fcntl
62
60
 
63
61
import dbus
64
62
import dbus.service
68
66
import ctypes
69
67
import ctypes.util
70
68
 
71
 
try:
72
 
    SO_BINDTODEVICE = socket.SO_BINDTODEVICE
73
 
except AttributeError:
74
 
    try:
75
 
        from IN import SO_BINDTODEVICE
76
 
    except ImportError:
77
 
        # From /usr/include/asm/socket.h
78
 
        SO_BINDTODEVICE = 25
79
 
 
80
 
 
81
 
version = "1.0.8"
82
 
 
83
 
logger = logging.Logger(u'mandos')
 
69
version = "1.0.5"
 
70
 
 
71
logger = logging.Logger('mandos')
84
72
syslogger = (logging.handlers.SysLogHandler
85
73
             (facility = logging.handlers.SysLogHandler.LOG_DAEMON,
86
74
              address = "/dev/log"))
87
75
syslogger.setFormatter(logging.Formatter
88
 
                       (u'Mandos [%(process)d]: %(levelname)s:'
89
 
                        u' %(message)s'))
 
76
                       ('Mandos [%(process)d]: %(levelname)s:'
 
77
                        ' %(message)s'))
90
78
logger.addHandler(syslogger)
91
79
 
92
80
console = logging.StreamHandler()
93
 
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
94
 
                                       u' %(levelname)s:'
95
 
                                       u' %(message)s'))
 
81
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
 
82
                                       ' %(levelname)s: %(message)s'))
96
83
logger.addHandler(console)
97
84
 
98
85
class AvahiError(Exception):
111
98
 
112
99
class AvahiService(object):
113
100
    """An Avahi (Zeroconf) service.
114
 
    
115
101
    Attributes:
116
102
    interface: integer; avahi.IF_UNSPEC or an interface index.
117
103
               Used to optionally bind to the specified interface.
118
 
    name: string; Example: u'Mandos'
119
 
    type: string; Example: u'_mandos._tcp'.
 
104
    name: string; Example: 'Mandos'
 
105
    type: string; Example: '_mandos._tcp'.
120
106
                  See <http://www.dns-sd.org/ServiceTypes.html>
121
107
    port: integer; what port to announce
122
108
    TXT: list of strings; TXT record for the service
128
114
    """
129
115
    def __init__(self, interface = avahi.IF_UNSPEC, name = None,
130
116
                 servicetype = None, port = None, TXT = None,
131
 
                 domain = u"", host = u"", max_renames = 32768,
132
 
                 protocol = avahi.PROTO_UNSPEC):
 
117
                 domain = "", host = "", max_renames = 32768):
133
118
        self.interface = interface
134
119
        self.name = name
135
120
        self.type = servicetype
139
124
        self.host = host
140
125
        self.rename_count = 0
141
126
        self.max_renames = max_renames
142
 
        self.protocol = protocol
143
127
    def rename(self):
144
128
        """Derived from the Avahi example code"""
145
129
        if self.rename_count >= self.max_renames:
149
133
            raise AvahiServiceError(u"Too many renames")
150
134
        self.name = server.GetAlternativeServiceName(self.name)
151
135
        logger.info(u"Changing Zeroconf service name to %r ...",
152
 
                    self.name)
 
136
                    str(self.name))
153
137
        syslogger.setFormatter(logging.Formatter
154
 
                               (u'Mandos (%s) [%%(process)d]:'
155
 
                                u' %%(levelname)s: %%(message)s'
156
 
                                % self.name))
 
138
                               ('Mandos (%s): %%(levelname)s:'
 
139
                                ' %%(message)s' % self.name))
157
140
        self.remove()
158
141
        self.add()
159
142
        self.rename_count += 1
175
158
                     service.name, service.type)
176
159
        group.AddService(
177
160
                self.interface,         # interface
178
 
                self.protocol,          # protocol
 
161
                avahi.PROTO_INET6,      # protocol
179
162
                dbus.UInt32(0),         # flags
180
163
                self.name, self.type,
181
164
                self.domain, self.host,
193
176
    return dbus.String(dt.isoformat(), variant_level=variant_level)
194
177
 
195
178
 
196
 
class Client(object):
 
179
class Client(dbus.service.Object):
197
180
    """A representation of a client host served by this server.
198
 
    
199
181
    Attributes:
200
182
    name:       string; from the config file, used in log messages and
201
183
                        D-Bus identifiers
221
203
                     client lives.  %() expansions are done at
222
204
                     runtime with vars(self) as dict, so that for
223
205
                     instance %(name)s can be used in the command.
224
 
    current_checker_command: string; current running checker_command
 
206
    use_dbus: bool(); Whether to provide D-Bus interface and signals
 
207
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
225
208
    """
226
 
    
227
 
    @staticmethod
228
 
    def _datetime_to_milliseconds(dt):
229
 
        "Convert a datetime.datetime() to milliseconds"
230
 
        return ((dt.days * 24 * 60 * 60 * 1000)
231
 
                + (dt.seconds * 1000)
232
 
                + (dt.microseconds // 1000))
233
 
    
234
209
    def timeout_milliseconds(self):
235
210
        "Return the 'timeout' attribute in milliseconds"
236
 
        return self._datetime_to_milliseconds(self.timeout)
 
211
        return ((self.timeout.days * 24 * 60 * 60 * 1000)
 
212
                + (self.timeout.seconds * 1000)
 
213
                + (self.timeout.microseconds // 1000))
237
214
    
238
215
    def interval_milliseconds(self):
239
216
        "Return the 'interval' attribute in milliseconds"
240
 
        return self._datetime_to_milliseconds(self.interval)
 
217
        return ((self.interval.days * 24 * 60 * 60 * 1000)
 
218
                + (self.interval.seconds * 1000)
 
219
                + (self.interval.microseconds // 1000))
241
220
    
242
 
    def __init__(self, name = None, disable_hook=None, config=None):
 
221
    def __init__(self, name = None, disable_hook=None, config=None,
 
222
                 use_dbus=True):
243
223
        """Note: the 'checker' key in 'config' sets the
244
224
        'checker_command' attribute and *not* the 'checker'
245
225
        attribute."""
247
227
        if config is None:
248
228
            config = {}
249
229
        logger.debug(u"Creating client %r", self.name)
 
230
        self.use_dbus = False   # During __init__
250
231
        # Uppercase and remove spaces from fingerprint for later
251
232
        # comparison purposes with return value from the fingerprint()
252
233
        # function
253
 
        self.fingerprint = (config[u"fingerprint"].upper()
 
234
        self.fingerprint = (config["fingerprint"].upper()
254
235
                            .replace(u" ", u""))
255
236
        logger.debug(u"  Fingerprint: %s", self.fingerprint)
256
 
        if u"secret" in config:
257
 
            self.secret = config[u"secret"].decode(u"base64")
258
 
        elif u"secfile" in config:
 
237
        if "secret" in config:
 
238
            self.secret = config["secret"].decode(u"base64")
 
239
        elif "secfile" in config:
259
240
            with closing(open(os.path.expanduser
260
241
                              (os.path.expandvars
261
 
                               (config[u"secfile"])))) as secfile:
 
242
                               (config["secfile"])))) as secfile:
262
243
                self.secret = secfile.read()
263
244
        else:
264
245
            raise TypeError(u"No secret or secfile for client %s"
265
246
                            % self.name)
266
 
        self.host = config.get(u"host", u"")
 
247
        self.host = config.get("host", "")
267
248
        self.created = datetime.datetime.utcnow()
268
249
        self.enabled = False
269
250
        self.last_enabled = None
270
251
        self.last_checked_ok = None
271
 
        self.timeout = string_to_delta(config[u"timeout"])
272
 
        self.interval = string_to_delta(config[u"interval"])
 
252
        self.timeout = string_to_delta(config["timeout"])
 
253
        self.interval = string_to_delta(config["interval"])
273
254
        self.disable_hook = disable_hook
274
255
        self.checker = None
275
256
        self.checker_initiator_tag = None
276
257
        self.disable_initiator_tag = None
277
258
        self.checker_callback_tag = None
278
 
        self.checker_command = config[u"checker"]
279
 
        self.current_checker_command = None
 
259
        self.checker_command = config["checker"]
280
260
        self.last_connect = None
 
261
        # Only now, when this client is initialized, can it show up on
 
262
        # the D-Bus
 
263
        self.use_dbus = use_dbus
 
264
        if self.use_dbus:
 
265
            self.dbus_object_path = (dbus.ObjectPath
 
266
                                     ("/clients/"
 
267
                                      + self.name.replace(".", "_")))
 
268
            dbus.service.Object.__init__(self, bus,
 
269
                                         self.dbus_object_path)
281
270
    
282
271
    def enable(self):
283
272
        """Start this client's checker and timeout hooks"""
294
283
                                   (self.timeout_milliseconds(),
295
284
                                    self.disable))
296
285
        self.enabled = True
 
286
        if self.use_dbus:
 
287
            # Emit D-Bus signals
 
288
            self.PropertyChanged(dbus.String(u"enabled"),
 
289
                                 dbus.Boolean(True, variant_level=1))
 
290
            self.PropertyChanged(dbus.String(u"last_enabled"),
 
291
                                 (_datetime_to_dbus(self.last_enabled,
 
292
                                                    variant_level=1)))
297
293
    
298
294
    def disable(self):
299
295
        """Disable this client."""
300
296
        if not getattr(self, "enabled", False):
301
297
            return False
302
298
        logger.info(u"Disabling client %s", self.name)
303
 
        if getattr(self, u"disable_initiator_tag", False):
 
299
        if getattr(self, "disable_initiator_tag", False):
304
300
            gobject.source_remove(self.disable_initiator_tag)
305
301
            self.disable_initiator_tag = None
306
 
        if getattr(self, u"checker_initiator_tag", False):
 
302
        if getattr(self, "checker_initiator_tag", False):
307
303
            gobject.source_remove(self.checker_initiator_tag)
308
304
            self.checker_initiator_tag = None
309
305
        self.stop_checker()
310
306
        if self.disable_hook:
311
307
            self.disable_hook(self)
312
308
        self.enabled = False
 
309
        if self.use_dbus:
 
310
            # Emit D-Bus signal
 
311
            self.PropertyChanged(dbus.String(u"enabled"),
 
312
                                 dbus.Boolean(False, variant_level=1))
313
313
        # Do not run this again if called by a gobject.timeout_add
314
314
        return False
315
315
    
321
321
        """The checker has completed, so take appropriate actions."""
322
322
        self.checker_callback_tag = None
323
323
        self.checker = None
 
324
        if self.use_dbus:
 
325
            # Emit D-Bus signal
 
326
            self.PropertyChanged(dbus.String(u"checker_running"),
 
327
                                 dbus.Boolean(False, variant_level=1))
324
328
        if os.WIFEXITED(condition):
325
329
            exitstatus = os.WEXITSTATUS(condition)
326
330
            if exitstatus == 0:
330
334
            else:
331
335
                logger.info(u"Checker for %(name)s failed",
332
336
                            vars(self))
 
337
            if self.use_dbus:
 
338
                # Emit D-Bus signal
 
339
                self.CheckerCompleted(dbus.Int16(exitstatus),
 
340
                                      dbus.Int64(condition),
 
341
                                      dbus.String(command))
333
342
        else:
334
343
            logger.warning(u"Checker for %(name)s crashed?",
335
344
                           vars(self))
 
345
            if self.use_dbus:
 
346
                # Emit D-Bus signal
 
347
                self.CheckerCompleted(dbus.Int16(-1),
 
348
                                      dbus.Int64(condition),
 
349
                                      dbus.String(command))
336
350
    
337
351
    def checked_ok(self):
338
352
        """Bump up the timeout for this client.
339
 
        
340
353
        This should only be called when the client has been seen,
341
354
        alive and well.
342
355
        """
345
358
        self.disable_initiator_tag = (gobject.timeout_add
346
359
                                      (self.timeout_milliseconds(),
347
360
                                       self.disable))
 
361
        if self.use_dbus:
 
362
            # Emit D-Bus signal
 
363
            self.PropertyChanged(
 
364
                dbus.String(u"last_checked_ok"),
 
365
                (_datetime_to_dbus(self.last_checked_ok,
 
366
                                   variant_level=1)))
348
367
    
349
368
    def start_checker(self):
350
369
        """Start a new checker subprocess if one is not running.
351
 
        
352
370
        If a checker already exists, leave it running and do
353
371
        nothing."""
354
372
        # The reason for not killing a running checker is that if we
359
377
        # checkers alone, the checker would have to take more time
360
378
        # than 'timeout' for the client to be declared invalid, which
361
379
        # is as it should be.
362
 
        
363
 
        # If a checker exists, make sure it is not a zombie
364
 
        if self.checker is not None:
365
 
            pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
366
 
            if pid:
367
 
                logger.warning(u"Checker was a zombie")
368
 
                gobject.source_remove(self.checker_callback_tag)
369
 
                self.checker_callback(pid, status,
370
 
                                      self.current_checker_command)
371
 
        # Start a new checker if needed
372
380
        if self.checker is None:
373
381
            try:
374
382
                # In case checker_command has exactly one % operator
375
383
                command = self.checker_command % self.host
376
384
            except TypeError:
377
385
                # Escape attributes for the shell
378
 
                escaped_attrs = dict((key,
379
 
                                      re.escape(unicode(str(val),
380
 
                                                        errors=
381
 
                                                        u'replace')))
 
386
                escaped_attrs = dict((key, re.escape(str(val)))
382
387
                                     for key, val in
383
388
                                     vars(self).iteritems())
384
389
                try:
387
392
                    logger.error(u'Could not format string "%s":'
388
393
                                 u' %s', self.checker_command, error)
389
394
                    return True # Try again later
390
 
            self.current_checker_command = command
391
395
            try:
392
396
                logger.info(u"Starting checker %r for %s",
393
397
                            command, self.name)
397
401
                # always replaced by /dev/null.)
398
402
                self.checker = subprocess.Popen(command,
399
403
                                                close_fds=True,
400
 
                                                shell=True, cwd=u"/")
 
404
                                                shell=True, cwd="/")
 
405
                if self.use_dbus:
 
406
                    # Emit D-Bus signal
 
407
                    self.CheckerStarted(command)
 
408
                    self.PropertyChanged(
 
409
                        dbus.String("checker_running"),
 
410
                        dbus.Boolean(True, variant_level=1))
401
411
                self.checker_callback_tag = (gobject.child_watch_add
402
412
                                             (self.checker.pid,
403
413
                                              self.checker_callback,
404
414
                                              data=command))
405
 
                # The checker may have completed before the gobject
406
 
                # watch was added.  Check for this.
407
 
                pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
408
 
                if pid:
409
 
                    gobject.source_remove(self.checker_callback_tag)
410
 
                    self.checker_callback(pid, status, command)
411
415
            except OSError, error:
412
416
                logger.error(u"Failed to start subprocess: %s",
413
417
                             error)
419
423
        if self.checker_callback_tag:
420
424
            gobject.source_remove(self.checker_callback_tag)
421
425
            self.checker_callback_tag = None
422
 
        if getattr(self, u"checker", None) is None:
 
426
        if getattr(self, "checker", None) is None:
423
427
            return
424
428
        logger.debug(u"Stopping checker for %(name)s", vars(self))
425
429
        try:
431
435
            if error.errno != errno.ESRCH: # No such process
432
436
                raise
433
437
        self.checker = None
 
438
        if self.use_dbus:
 
439
            self.PropertyChanged(dbus.String(u"checker_running"),
 
440
                                 dbus.Boolean(False, variant_level=1))
434
441
    
435
442
    def still_valid(self):
436
443
        """Has the timeout not yet passed for this client?"""
437
 
        if not getattr(self, u"enabled", False):
 
444
        if not getattr(self, "enabled", False):
438
445
            return False
439
446
        now = datetime.datetime.utcnow()
440
447
        if self.last_checked_ok is None:
441
448
            return now < (self.created + self.timeout)
442
449
        else:
443
450
            return now < (self.last_checked_ok + self.timeout)
444
 
 
445
 
 
446
 
class ClientDBus(Client, dbus.service.Object):
447
 
    """A Client class using D-Bus
448
 
    
449
 
    Attributes:
450
 
    dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
451
 
    """
452
 
    # dbus.service.Object doesn't use super(), so we can't either.
453
 
    
454
 
    def __init__(self, *args, **kwargs):
455
 
        Client.__init__(self, *args, **kwargs)
456
 
        # Only now, when this client is initialized, can it show up on
457
 
        # the D-Bus
458
 
        self.dbus_object_path = (dbus.ObjectPath
459
 
                                 (u"/clients/"
460
 
                                  + self.name.replace(u".", u"_")))
461
 
        dbus.service.Object.__init__(self, bus,
462
 
                                     self.dbus_object_path)
463
 
    def enable(self):
464
 
        oldstate = getattr(self, u"enabled", False)
465
 
        r = Client.enable(self)
466
 
        if oldstate != self.enabled:
467
 
            # Emit D-Bus signals
468
 
            self.PropertyChanged(dbus.String(u"enabled"),
469
 
                                 dbus.Boolean(True, variant_level=1))
470
 
            self.PropertyChanged(dbus.String(u"last_enabled"),
471
 
                                 (_datetime_to_dbus(self.last_enabled,
472
 
                                                    variant_level=1)))
473
 
        return r
474
 
    
475
 
    def disable(self, signal = True):
476
 
        oldstate = getattr(self, u"enabled", False)
477
 
        r = Client.disable(self)
478
 
        if signal and oldstate != self.enabled:
479
 
            # Emit D-Bus signal
480
 
            self.PropertyChanged(dbus.String(u"enabled"),
481
 
                                 dbus.Boolean(False, variant_level=1))
482
 
        return r
483
 
    
484
 
    def __del__(self, *args, **kwargs):
485
 
        try:
486
 
            self.remove_from_connection()
487
 
        except LookupError:
488
 
            pass
489
 
        if hasattr(dbus.service.Object, u"__del__"):
490
 
            dbus.service.Object.__del__(self, *args, **kwargs)
491
 
        Client.__del__(self, *args, **kwargs)
492
 
    
493
 
    def checker_callback(self, pid, condition, command,
494
 
                         *args, **kwargs):
495
 
        self.checker_callback_tag = None
496
 
        self.checker = None
497
 
        # Emit D-Bus signal
498
 
        self.PropertyChanged(dbus.String(u"checker_running"),
499
 
                             dbus.Boolean(False, variant_level=1))
500
 
        if os.WIFEXITED(condition):
501
 
            exitstatus = os.WEXITSTATUS(condition)
502
 
            # Emit D-Bus signal
503
 
            self.CheckerCompleted(dbus.Int16(exitstatus),
504
 
                                  dbus.Int64(condition),
505
 
                                  dbus.String(command))
506
 
        else:
507
 
            # Emit D-Bus signal
508
 
            self.CheckerCompleted(dbus.Int16(-1),
509
 
                                  dbus.Int64(condition),
510
 
                                  dbus.String(command))
511
 
        
512
 
        return Client.checker_callback(self, pid, condition, command,
513
 
                                       *args, **kwargs)
514
 
    
515
 
    def checked_ok(self, *args, **kwargs):
516
 
        r = Client.checked_ok(self, *args, **kwargs)
517
 
        # Emit D-Bus signal
518
 
        self.PropertyChanged(
519
 
            dbus.String(u"last_checked_ok"),
520
 
            (_datetime_to_dbus(self.last_checked_ok,
521
 
                               variant_level=1)))
522
 
        return r
523
 
    
524
 
    def start_checker(self, *args, **kwargs):
525
 
        old_checker = self.checker
526
 
        if self.checker is not None:
527
 
            old_checker_pid = self.checker.pid
528
 
        else:
529
 
            old_checker_pid = None
530
 
        r = Client.start_checker(self, *args, **kwargs)
531
 
        # Only if new checker process was started
532
 
        if (self.checker is not None
533
 
            and old_checker_pid != self.checker.pid):
534
 
            # Emit D-Bus signal
535
 
            self.CheckerStarted(self.current_checker_command)
536
 
            self.PropertyChanged(
537
 
                dbus.String(u"checker_running"),
538
 
                dbus.Boolean(True, variant_level=1))
539
 
        return r
540
 
    
541
 
    def stop_checker(self, *args, **kwargs):
542
 
        old_checker = getattr(self, u"checker", None)
543
 
        r = Client.stop_checker(self, *args, **kwargs)
544
 
        if (old_checker is not None
545
 
            and getattr(self, u"checker", None) is None):
546
 
            self.PropertyChanged(dbus.String(u"checker_running"),
547
 
                                 dbus.Boolean(False, variant_level=1))
548
 
        return r
549
451
    
550
452
    ## D-Bus methods & signals
551
453
    _interface = u"se.bsnet.fukt.Mandos.Client"
552
454
    
553
455
    # CheckedOK - method
554
 
    @dbus.service.method(_interface)
555
 
    def CheckedOK(self):
556
 
        return self.checked_ok()
 
456
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
457
    CheckedOK.__name__ = "CheckedOK"
557
458
    
558
459
    # CheckerCompleted - signal
559
 
    @dbus.service.signal(_interface, signature=u"nxs")
 
460
    @dbus.service.signal(_interface, signature="nxs")
560
461
    def CheckerCompleted(self, exitcode, waitstatus, command):
561
462
        "D-Bus signal"
562
463
        pass
563
464
    
564
465
    # CheckerStarted - signal
565
 
    @dbus.service.signal(_interface, signature=u"s")
 
466
    @dbus.service.signal(_interface, signature="s")
566
467
    def CheckerStarted(self, command):
567
468
        "D-Bus signal"
568
469
        pass
569
470
    
570
471
    # GetAllProperties - method
571
 
    @dbus.service.method(_interface, out_signature=u"a{sv}")
 
472
    @dbus.service.method(_interface, out_signature="a{sv}")
572
473
    def GetAllProperties(self):
573
474
        "D-Bus method"
574
475
        return dbus.Dictionary({
575
 
                dbus.String(u"name"):
 
476
                dbus.String("name"):
576
477
                    dbus.String(self.name, variant_level=1),
577
 
                dbus.String(u"fingerprint"):
 
478
                dbus.String("fingerprint"):
578
479
                    dbus.String(self.fingerprint, variant_level=1),
579
 
                dbus.String(u"host"):
 
480
                dbus.String("host"):
580
481
                    dbus.String(self.host, variant_level=1),
581
 
                dbus.String(u"created"):
 
482
                dbus.String("created"):
582
483
                    _datetime_to_dbus(self.created, variant_level=1),
583
 
                dbus.String(u"last_enabled"):
 
484
                dbus.String("last_enabled"):
584
485
                    (_datetime_to_dbus(self.last_enabled,
585
486
                                       variant_level=1)
586
487
                     if self.last_enabled is not None
587
488
                     else dbus.Boolean(False, variant_level=1)),
588
 
                dbus.String(u"enabled"):
 
489
                dbus.String("enabled"):
589
490
                    dbus.Boolean(self.enabled, variant_level=1),
590
 
                dbus.String(u"last_checked_ok"):
 
491
                dbus.String("last_checked_ok"):
591
492
                    (_datetime_to_dbus(self.last_checked_ok,
592
493
                                       variant_level=1)
593
494
                     if self.last_checked_ok is not None
594
495
                     else dbus.Boolean (False, variant_level=1)),
595
 
                dbus.String(u"timeout"):
 
496
                dbus.String("timeout"):
596
497
                    dbus.UInt64(self.timeout_milliseconds(),
597
498
                                variant_level=1),
598
 
                dbus.String(u"interval"):
 
499
                dbus.String("interval"):
599
500
                    dbus.UInt64(self.interval_milliseconds(),
600
501
                                variant_level=1),
601
 
                dbus.String(u"checker"):
 
502
                dbus.String("checker"):
602
503
                    dbus.String(self.checker_command,
603
504
                                variant_level=1),
604
 
                dbus.String(u"checker_running"):
 
505
                dbus.String("checker_running"):
605
506
                    dbus.Boolean(self.checker is not None,
606
507
                                 variant_level=1),
607
 
                dbus.String(u"object_path"):
 
508
                dbus.String("object_path"):
608
509
                    dbus.ObjectPath(self.dbus_object_path,
609
510
                                    variant_level=1)
610
 
                }, signature=u"sv")
 
511
                }, signature="sv")
611
512
    
612
513
    # IsStillValid - method
613
 
    @dbus.service.method(_interface, out_signature=u"b")
614
 
    def IsStillValid(self):
615
 
        return self.still_valid()
 
514
    IsStillValid = (dbus.service.method(_interface, out_signature="b")
 
515
                    (still_valid))
 
516
    IsStillValid.__name__ = "IsStillValid"
616
517
    
617
518
    # PropertyChanged - signal
618
 
    @dbus.service.signal(_interface, signature=u"sv")
 
519
    @dbus.service.signal(_interface, signature="sv")
619
520
    def PropertyChanged(self, property, value):
620
521
        "D-Bus signal"
621
522
        pass
622
523
    
623
 
    # ReceivedSecret - signal
624
 
    @dbus.service.signal(_interface)
625
 
    def ReceivedSecret(self):
626
 
        "D-Bus signal"
627
 
        pass
628
 
    
629
 
    # Rejected - signal
630
 
    @dbus.service.signal(_interface)
631
 
    def Rejected(self):
632
 
        "D-Bus signal"
633
 
        pass
634
 
    
635
524
    # SetChecker - method
636
 
    @dbus.service.method(_interface, in_signature=u"s")
 
525
    @dbus.service.method(_interface, in_signature="s")
637
526
    def SetChecker(self, checker):
638
527
        "D-Bus setter method"
639
528
        self.checker_command = checker
643
532
                                         variant_level=1))
644
533
    
645
534
    # SetHost - method
646
 
    @dbus.service.method(_interface, in_signature=u"s")
 
535
    @dbus.service.method(_interface, in_signature="s")
647
536
    def SetHost(self, host):
648
537
        "D-Bus setter method"
649
538
        self.host = host
652
541
                             dbus.String(self.host, variant_level=1))
653
542
    
654
543
    # SetInterval - method
655
 
    @dbus.service.method(_interface, in_signature=u"t")
 
544
    @dbus.service.method(_interface, in_signature="t")
656
545
    def SetInterval(self, milliseconds):
657
546
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
658
547
        # Emit D-Bus signal
661
550
                                          variant_level=1)))
662
551
    
663
552
    # SetSecret - method
664
 
    @dbus.service.method(_interface, in_signature=u"ay",
 
553
    @dbus.service.method(_interface, in_signature="ay",
665
554
                         byte_arrays=True)
666
555
    def SetSecret(self, secret):
667
556
        "D-Bus setter method"
668
557
        self.secret = str(secret)
669
558
    
670
559
    # SetTimeout - method
671
 
    @dbus.service.method(_interface, in_signature=u"t")
 
560
    @dbus.service.method(_interface, in_signature="t")
672
561
    def SetTimeout(self, milliseconds):
673
562
        self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
674
563
        # Emit D-Bus signal
677
566
                                          variant_level=1)))
678
567
    
679
568
    # Enable - method
680
 
    @dbus.service.method(_interface)
681
 
    def Enable(self):
682
 
        "D-Bus method"
683
 
        self.enable()
 
569
    Enable = dbus.service.method(_interface)(enable)
 
570
    Enable.__name__ = "Enable"
684
571
    
685
572
    # StartChecker - method
686
573
    @dbus.service.method(_interface)
695
582
        self.disable()
696
583
    
697
584
    # StopChecker - method
698
 
    @dbus.service.method(_interface)
699
 
    def StopChecker(self):
700
 
        self.stop_checker()
 
585
    StopChecker = dbus.service.method(_interface)(stop_checker)
 
586
    StopChecker.__name__ = "StopChecker"
701
587
    
702
588
    del _interface
703
589
 
704
590
 
705
 
class ClientHandler(SocketServer.BaseRequestHandler, object):
706
 
    """A class to handle client connections.
707
 
    
708
 
    Instantiated once for each connection to handle it.
 
591
def peer_certificate(session):
 
592
    "Return the peer's OpenPGP certificate as a bytestring"
 
593
    # If not an OpenPGP certificate...
 
594
    if (gnutls.library.functions
 
595
        .gnutls_certificate_type_get(session._c_object)
 
596
        != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
 
597
        # ...do the normal thing
 
598
        return session.peer_certificate
 
599
    list_size = ctypes.c_uint(1)
 
600
    cert_list = (gnutls.library.functions
 
601
                 .gnutls_certificate_get_peers
 
602
                 (session._c_object, ctypes.byref(list_size)))
 
603
    if not bool(cert_list) and list_size.value != 0:
 
604
        raise gnutls.errors.GNUTLSError("error getting peer"
 
605
                                        " certificate")
 
606
    if list_size.value == 0:
 
607
        return None
 
608
    cert = cert_list[0]
 
609
    return ctypes.string_at(cert.data, cert.size)
 
610
 
 
611
 
 
612
def fingerprint(openpgp):
 
613
    "Convert an OpenPGP bytestring to a hexdigit fingerprint string"
 
614
    # New GnuTLS "datum" with the OpenPGP public key
 
615
    datum = (gnutls.library.types
 
616
             .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
 
617
                                         ctypes.POINTER
 
618
                                         (ctypes.c_ubyte)),
 
619
                             ctypes.c_uint(len(openpgp))))
 
620
    # New empty GnuTLS certificate
 
621
    crt = gnutls.library.types.gnutls_openpgp_crt_t()
 
622
    (gnutls.library.functions
 
623
     .gnutls_openpgp_crt_init(ctypes.byref(crt)))
 
624
    # Import the OpenPGP public key into the certificate
 
625
    (gnutls.library.functions
 
626
     .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
 
627
                                gnutls.library.constants
 
628
                                .GNUTLS_OPENPGP_FMT_RAW))
 
629
    # Verify the self signature in the key
 
630
    crtverify = ctypes.c_uint()
 
631
    (gnutls.library.functions
 
632
     .gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
 
633
    if crtverify.value != 0:
 
634
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
635
        raise gnutls.errors.CertificateSecurityError("Verify failed")
 
636
    # New buffer for the fingerprint
 
637
    buf = ctypes.create_string_buffer(20)
 
638
    buf_len = ctypes.c_size_t()
 
639
    # Get the fingerprint from the certificate into the buffer
 
640
    (gnutls.library.functions
 
641
     .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
 
642
                                         ctypes.byref(buf_len)))
 
643
    # Deinit the certificate
 
644
    gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
 
645
    # Convert the buffer to a Python bytestring
 
646
    fpr = ctypes.string_at(buf, buf_len.value)
 
647
    # Convert the bytestring to hexadecimal notation
 
648
    hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
 
649
    return hex_fpr
 
650
 
 
651
 
 
652
class TCP_handler(SocketServer.BaseRequestHandler, object):
 
653
    """A TCP request handler class.
 
654
    Instantiated by IPv6_TCPServer for each request to handle it.
709
655
    Note: This will run in its own forked process."""
710
656
    
711
657
    def handle(self):
712
658
        logger.info(u"TCP connection from: %s",
713
659
                    unicode(self.client_address))
714
 
        logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
715
 
        # Open IPC pipe to parent process
716
 
        with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
717
 
            session = (gnutls.connection
718
 
                       .ClientSession(self.request,
719
 
                                      gnutls.connection
720
 
                                      .X509Credentials()))
721
 
            
722
 
            line = self.request.makefile().readline()
723
 
            logger.debug(u"Protocol version: %r", line)
724
 
            try:
725
 
                if int(line.strip().split()[0]) > 1:
726
 
                    raise RuntimeError
727
 
            except (ValueError, IndexError, RuntimeError), error:
728
 
                logger.error(u"Unknown protocol version: %s", error)
729
 
                return
730
 
            
731
 
            # Note: gnutls.connection.X509Credentials is really a
732
 
            # generic GnuTLS certificate credentials object so long as
733
 
            # no X.509 keys are added to it.  Therefore, we can use it
734
 
            # here despite using OpenPGP certificates.
735
 
            
736
 
            #priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
737
 
            #                      u"+AES-256-CBC", u"+SHA1",
738
 
            #                      u"+COMP-NULL", u"+CTYPE-OPENPGP",
739
 
            #                      u"+DHE-DSS"))
740
 
            # Use a fallback default, since this MUST be set.
741
 
            priority = self.server.gnutls_priority
742
 
            if priority is None:
743
 
                priority = u"NORMAL"
744
 
            (gnutls.library.functions
745
 
             .gnutls_priority_set_direct(session._c_object,
746
 
                                         priority, None))
747
 
            
748
 
            try:
749
 
                session.handshake()
750
 
            except gnutls.errors.GNUTLSError, error:
751
 
                logger.warning(u"Handshake failed: %s", error)
752
 
                # Do not run session.bye() here: the session is not
753
 
                # established.  Just abandon the request.
754
 
                return
755
 
            logger.debug(u"Handshake succeeded")
756
 
            try:
757
 
                fpr = self.fingerprint(self.peer_certificate(session))
758
 
            except (TypeError, gnutls.errors.GNUTLSError), error:
759
 
                logger.warning(u"Bad certificate: %s", error)
760
 
                session.bye()
761
 
                return
762
 
            logger.debug(u"Fingerprint: %s", fpr)
763
 
            
764
 
            for c in self.server.clients:
765
 
                if c.fingerprint == fpr:
766
 
                    client = c
767
 
                    break
768
 
            else:
769
 
                ipc.write(u"NOTFOUND %s\n" % fpr)
770
 
                session.bye()
771
 
                return
772
 
            # Have to check if client.still_valid(), since it is
773
 
            # possible that the client timed out while establishing
774
 
            # the GnuTLS session.
775
 
            if not client.still_valid():
776
 
                ipc.write(u"INVALID %s\n" % client.name)
777
 
                session.bye()
778
 
                return
779
 
            ipc.write(u"SENDING %s\n" % client.name)
780
 
            sent_size = 0
781
 
            while sent_size < len(client.secret):
782
 
                sent = session.send(client.secret[sent_size:])
783
 
                logger.debug(u"Sent: %d, remaining: %d",
784
 
                             sent, len(client.secret)
785
 
                             - (sent_size + sent))
786
 
                sent_size += sent
787
 
            session.bye()
788
 
    
789
 
    @staticmethod
790
 
    def peer_certificate(session):
791
 
        "Return the peer's OpenPGP certificate as a bytestring"
792
 
        # If not an OpenPGP certificate...
793
 
        if (gnutls.library.functions
794
 
            .gnutls_certificate_type_get(session._c_object)
795
 
            != gnutls.library.constants.GNUTLS_CRT_OPENPGP):
796
 
            # ...do the normal thing
797
 
            return session.peer_certificate
798
 
        list_size = ctypes.c_uint(1)
799
 
        cert_list = (gnutls.library.functions
800
 
                     .gnutls_certificate_get_peers
801
 
                     (session._c_object, ctypes.byref(list_size)))
802
 
        if not bool(cert_list) and list_size.value != 0:
803
 
            raise gnutls.errors.GNUTLSError(u"error getting peer"
804
 
                                            u" certificate")
805
 
        if list_size.value == 0:
806
 
            return None
807
 
        cert = cert_list[0]
808
 
        return ctypes.string_at(cert.data, cert.size)
809
 
    
810
 
    @staticmethod
811
 
    def fingerprint(openpgp):
812
 
        "Convert an OpenPGP bytestring to a hexdigit fingerprint"
813
 
        # New GnuTLS "datum" with the OpenPGP public key
814
 
        datum = (gnutls.library.types
815
 
                 .gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
816
 
                                             ctypes.POINTER
817
 
                                             (ctypes.c_ubyte)),
818
 
                                 ctypes.c_uint(len(openpgp))))
819
 
        # New empty GnuTLS certificate
820
 
        crt = gnutls.library.types.gnutls_openpgp_crt_t()
821
 
        (gnutls.library.functions
822
 
         .gnutls_openpgp_crt_init(ctypes.byref(crt)))
823
 
        # Import the OpenPGP public key into the certificate
824
 
        (gnutls.library.functions
825
 
         .gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
826
 
                                    gnutls.library.constants
827
 
                                    .GNUTLS_OPENPGP_FMT_RAW))
828
 
        # Verify the self signature in the key
829
 
        crtverify = ctypes.c_uint()
830
 
        (gnutls.library.functions
831
 
         .gnutls_openpgp_crt_verify_self(crt, 0,
832
 
                                         ctypes.byref(crtverify)))
833
 
        if crtverify.value != 0:
834
 
            gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
835
 
            raise (gnutls.errors.CertificateSecurityError
836
 
                   (u"Verify failed"))
837
 
        # New buffer for the fingerprint
838
 
        buf = ctypes.create_string_buffer(20)
839
 
        buf_len = ctypes.c_size_t()
840
 
        # Get the fingerprint from the certificate into the buffer
841
 
        (gnutls.library.functions
842
 
         .gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
843
 
                                             ctypes.byref(buf_len)))
844
 
        # Deinit the certificate
845
 
        gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
846
 
        # Convert the buffer to a Python bytestring
847
 
        fpr = ctypes.string_at(buf, buf_len.value)
848
 
        # Convert the bytestring to hexadecimal notation
849
 
        hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
850
 
        return hex_fpr
851
 
 
852
 
 
853
 
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
854
 
    """Like SocketServer.ForkingMixIn, but also pass a pipe.
855
 
    
856
 
    Assumes a gobject.MainLoop event loop.
857
 
    """
858
 
    def process_request(self, request, client_address):
859
 
        """Overrides and wraps the original process_request().
860
 
        
861
 
        This function creates a new pipe in self.pipe 
862
 
        """
863
 
        self.pipe = os.pipe()
864
 
        super(ForkingMixInWithPipe,
865
 
              self).process_request(request, client_address)
866
 
        os.close(self.pipe[1])  # close write end
867
 
        # Call "handle_ipc" for both data and EOF events
868
 
        gobject.io_add_watch(self.pipe[0],
869
 
                             gobject.IO_IN | gobject.IO_HUP,
870
 
                             self.handle_ipc)
871
 
    def handle_ipc(source, condition):
872
 
        """Dummy function; override as necessary"""
873
 
        os.close(source)
874
 
        return False
875
 
 
876
 
 
877
 
class IPv6_TCPServer(ForkingMixInWithPipe,
 
660
        session = (gnutls.connection
 
661
                   .ClientSession(self.request,
 
662
                                  gnutls.connection
 
663
                                  .X509Credentials()))
 
664
        
 
665
        line = self.request.makefile().readline()
 
666
        logger.debug(u"Protocol version: %r", line)
 
667
        try:
 
668
            if int(line.strip().split()[0]) > 1:
 
669
                raise RuntimeError
 
670
        except (ValueError, IndexError, RuntimeError), error:
 
671
            logger.error(u"Unknown protocol version: %s", error)
 
672
            return
 
673
        
 
674
        # Note: gnutls.connection.X509Credentials is really a generic
 
675
        # GnuTLS certificate credentials object so long as no X.509
 
676
        # keys are added to it.  Therefore, we can use it here despite
 
677
        # using OpenPGP certificates.
 
678
        
 
679
        #priority = ':'.join(("NONE", "+VERS-TLS1.1", "+AES-256-CBC",
 
680
        #                     "+SHA1", "+COMP-NULL", "+CTYPE-OPENPGP",
 
681
        #                     "+DHE-DSS"))
 
682
        # Use a fallback default, since this MUST be set.
 
683
        priority = self.server.settings.get("priority", "NORMAL")
 
684
        (gnutls.library.functions
 
685
         .gnutls_priority_set_direct(session._c_object,
 
686
                                     priority, None))
 
687
        
 
688
        try:
 
689
            session.handshake()
 
690
        except gnutls.errors.GNUTLSError, error:
 
691
            logger.warning(u"Handshake failed: %s", error)
 
692
            # Do not run session.bye() here: the session is not
 
693
            # established.  Just abandon the request.
 
694
            return
 
695
        logger.debug(u"Handshake succeeded")
 
696
        try:
 
697
            fpr = fingerprint(peer_certificate(session))
 
698
        except (TypeError, gnutls.errors.GNUTLSError), error:
 
699
            logger.warning(u"Bad certificate: %s", error)
 
700
            session.bye()
 
701
            return
 
702
        logger.debug(u"Fingerprint: %s", fpr)
 
703
        
 
704
        for c in self.server.clients:
 
705
            if c.fingerprint == fpr:
 
706
                client = c
 
707
                break
 
708
        else:
 
709
            logger.warning(u"Client not found for fingerprint: %s",
 
710
                           fpr)
 
711
            session.bye()
 
712
            return
 
713
        # Have to check if client.still_valid(), since it is possible
 
714
        # that the client timed out while establishing the GnuTLS
 
715
        # session.
 
716
        if not client.still_valid():
 
717
            logger.warning(u"Client %(name)s is invalid",
 
718
                           vars(client))
 
719
            session.bye()
 
720
            return
 
721
        ## This won't work here, since we're in a fork.
 
722
        # client.checked_ok()
 
723
        sent_size = 0
 
724
        while sent_size < len(client.secret):
 
725
            sent = session.send(client.secret[sent_size:])
 
726
            logger.debug(u"Sent: %d, remaining: %d",
 
727
                         sent, len(client.secret)
 
728
                         - (sent_size + sent))
 
729
            sent_size += sent
 
730
        session.bye()
 
731
 
 
732
 
 
733
class IPv6_TCPServer(SocketServer.ForkingMixIn,
878
734
                     SocketServer.TCPServer, object):
879
 
    """IPv6-capable TCP server.  Accepts 'None' as address and/or port
880
 
    
 
735
    """IPv6 TCP server.  Accepts 'None' as address and/or port.
881
736
    Attributes:
 
737
        settings:       Server settings
 
738
        clients:        Set() of Client objects
882
739
        enabled:        Boolean; whether this server is activated yet
883
 
        interface:      None or a network interface name (string)
884
 
        use_ipv6:       Boolean; to use IPv6 or not
885
 
        ----
886
 
        clients:        Set() of Client objects
887
 
        gnutls_priority GnuTLS priority string
888
 
        use_dbus:       Boolean; to emit D-Bus signals or not
889
740
    """
890
 
    def __init__(self, server_address, RequestHandlerClass,
891
 
                 interface=None, use_ipv6=True, clients=None,
892
 
                 gnutls_priority=None, use_dbus=True):
 
741
    address_family = socket.AF_INET6
 
742
    def __init__(self, *args, **kwargs):
 
743
        if "settings" in kwargs:
 
744
            self.settings = kwargs["settings"]
 
745
            del kwargs["settings"]
 
746
        if "clients" in kwargs:
 
747
            self.clients = kwargs["clients"]
 
748
            del kwargs["clients"]
893
749
        self.enabled = False
894
 
        self.interface = interface
895
 
        if use_ipv6:
896
 
            self.address_family = socket.AF_INET6
897
 
        self.clients = clients
898
 
        self.use_dbus = use_dbus
899
 
        self.gnutls_priority = gnutls_priority
900
 
        SocketServer.TCPServer.__init__(self, server_address,
901
 
                                        RequestHandlerClass)
 
750
        super(IPv6_TCPServer, self).__init__(*args, **kwargs)
902
751
    def server_bind(self):
903
752
        """This overrides the normal server_bind() function
904
753
        to bind to an interface if one was specified, and also NOT to
905
754
        bind to an address or port if they were not specified."""
906
 
        if self.interface is not None:
 
755
        if self.settings["interface"]:
 
756
            # 25 is from /usr/include/asm-i486/socket.h
 
757
            SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
907
758
            try:
908
759
                self.socket.setsockopt(socket.SOL_SOCKET,
909
760
                                       SO_BINDTODEVICE,
910
 
                                       str(self.interface + u'\0'))
 
761
                                       self.settings["interface"])
911
762
            except socket.error, error:
912
763
                if error[0] == errno.EPERM:
913
764
                    logger.error(u"No permission to"
914
765
                                 u" bind to interface %s",
915
 
                                 self.interface)
 
766
                                 self.settings["interface"])
916
767
                else:
917
768
                    raise
918
769
        # Only bind(2) the socket if we really need to.
919
770
        if self.server_address[0] or self.server_address[1]:
920
771
            if not self.server_address[0]:
921
 
                if self.address_family == socket.AF_INET6:
922
 
                    any_address = u"::" # in6addr_any
923
 
                else:
924
 
                    any_address = socket.INADDR_ANY
925
 
                self.server_address = (any_address,
 
772
                in6addr_any = "::"
 
773
                self.server_address = (in6addr_any,
926
774
                                       self.server_address[1])
927
775
            elif not self.server_address[1]:
928
776
                self.server_address = (self.server_address[0],
929
777
                                       0)
930
 
#                 if self.interface:
 
778
#                 if self.settings["interface"]:
931
779
#                     self.server_address = (self.server_address[0],
932
780
#                                            0, # port
933
781
#                                            0, # flowinfo
934
782
#                                            if_nametoindex
935
 
#                                            (self.interface))
936
 
            return SocketServer.TCPServer.server_bind(self)
 
783
#                                            (self.settings
 
784
#                                             ["interface"]))
 
785
            return super(IPv6_TCPServer, self).server_bind()
937
786
    def server_activate(self):
938
787
        if self.enabled:
939
 
            return SocketServer.TCPServer.server_activate(self)
 
788
            return super(IPv6_TCPServer, self).server_activate()
940
789
    def enable(self):
941
790
        self.enabled = True
942
 
    def handle_ipc(self, source, condition, file_objects={}):
943
 
        condition_names = {
944
 
            gobject.IO_IN: u"IN",   # There is data to read.
945
 
            gobject.IO_OUT: u"OUT", # Data can be written (without
946
 
                                    # blocking).
947
 
            gobject.IO_PRI: u"PRI", # There is urgent data to read.
948
 
            gobject.IO_ERR: u"ERR", # Error condition.
949
 
            gobject.IO_HUP: u"HUP"  # Hung up (the connection has been
950
 
                                    # broken, usually for pipes and
951
 
                                    # sockets).
952
 
            }
953
 
        conditions_string = ' | '.join(name
954
 
                                       for cond, name in
955
 
                                       condition_names.iteritems()
956
 
                                       if cond & condition)
957
 
        logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
958
 
                     conditions_string)
959
 
        
960
 
        # Turn the pipe file descriptor into a Python file object
961
 
        if source not in file_objects:
962
 
            file_objects[source] = os.fdopen(source, u"r", 1)
963
 
        
964
 
        # Read a line from the file object
965
 
        cmdline = file_objects[source].readline()
966
 
        if not cmdline:             # Empty line means end of file
967
 
            # close the IPC pipe
968
 
            file_objects[source].close()
969
 
            del file_objects[source]
970
 
            
971
 
            # Stop calling this function
972
 
            return False
973
 
        
974
 
        logger.debug(u"IPC command: %r", cmdline)
975
 
        
976
 
        # Parse and act on command
977
 
        cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
978
 
        
979
 
        if cmd == u"NOTFOUND":
980
 
            logger.warning(u"Client not found for fingerprint: %s",
981
 
                           args)
982
 
            if self.use_dbus:
983
 
                # Emit D-Bus signal
984
 
                mandos_dbus_service.ClientNotFound(args)
985
 
        elif cmd == u"INVALID":
986
 
            for client in self.clients:
987
 
                if client.name == args:
988
 
                    logger.warning(u"Client %s is invalid", args)
989
 
                    if self.use_dbus:
990
 
                        # Emit D-Bus signal
991
 
                        client.Rejected()
992
 
                    break
993
 
            else:
994
 
                logger.error(u"Unknown client %s is invalid", args)
995
 
        elif cmd == u"SENDING":
996
 
            for client in self.clients:
997
 
                if client.name == args:
998
 
                    logger.info(u"Sending secret to %s", client.name)
999
 
                    client.checked_ok()
1000
 
                    if self.use_dbus:
1001
 
                        # Emit D-Bus signal
1002
 
                        client.ReceivedSecret()
1003
 
                    break
1004
 
            else:
1005
 
                logger.error(u"Sending secret to unknown client %s",
1006
 
                             args)
1007
 
        else:
1008
 
            logger.error(u"Unknown IPC command: %r", cmdline)
1009
 
        
1010
 
        # Keep calling this function
1011
 
        return True
1012
791
 
1013
792
 
1014
793
def string_to_delta(interval):
1015
794
    """Parse a string and return a datetime.timedelta
1016
795
    
1017
 
    >>> string_to_delta(u'7d')
 
796
    >>> string_to_delta('7d')
1018
797
    datetime.timedelta(7)
1019
 
    >>> string_to_delta(u'60s')
 
798
    >>> string_to_delta('60s')
1020
799
    datetime.timedelta(0, 60)
1021
 
    >>> string_to_delta(u'60m')
 
800
    >>> string_to_delta('60m')
1022
801
    datetime.timedelta(0, 3600)
1023
 
    >>> string_to_delta(u'24h')
 
802
    >>> string_to_delta('24h')
1024
803
    datetime.timedelta(1)
1025
804
    >>> string_to_delta(u'1w')
1026
805
    datetime.timedelta(7)
1027
 
    >>> string_to_delta(u'5m 30s')
 
806
    >>> string_to_delta('5m 30s')
1028
807
    datetime.timedelta(0, 330)
1029
808
    """
1030
809
    timevalue = datetime.timedelta(0)
1074
853
        raise AvahiGroupError(u"State changed: %s" % unicode(error))
1075
854
 
1076
855
def if_nametoindex(interface):
1077
 
    """Call the C function if_nametoindex(), or equivalent
1078
 
    
1079
 
    Note: This function cannot accept a unicode string."""
 
856
    """Call the C function if_nametoindex(), or equivalent"""
1080
857
    global if_nametoindex
1081
858
    try:
1082
859
        if_nametoindex = (ctypes.cdll.LoadLibrary
1083
 
                          (ctypes.util.find_library(u"c"))
 
860
                          (ctypes.util.find_library("c"))
1084
861
                          .if_nametoindex)
1085
862
    except (OSError, AttributeError):
1086
 
        logger.warning(u"Doing if_nametoindex the hard way")
 
863
        if "struct" not in sys.modules:
 
864
            import struct
 
865
        if "fcntl" not in sys.modules:
 
866
            import fcntl
1087
867
        def if_nametoindex(interface):
1088
868
            "Get an interface index the hard way, i.e. using fcntl()"
1089
869
            SIOCGIFINDEX = 0x8933  # From /usr/include/linux/sockios.h
1090
870
            with closing(socket.socket()) as s:
1091
871
                ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1092
 
                                    struct.pack(str(u"16s16x"),
1093
 
                                                interface))
1094
 
            interface_index = struct.unpack(str(u"I"),
1095
 
                                            ifreq[16:20])[0]
 
872
                                    struct.pack("16s16x", interface))
 
873
            interface_index = struct.unpack("I", ifreq[16:20])[0]
1096
874
            return interface_index
1097
875
    return if_nametoindex(interface)
1098
876
 
1099
877
 
1100
878
def daemon(nochdir = False, noclose = False):
1101
879
    """See daemon(3).  Standard BSD Unix function.
1102
 
    
1103
880
    This should really exist as os.daemon, but it doesn't (yet)."""
1104
881
    if os.fork():
1105
882
        sys.exit()
1106
883
    os.setsid()
1107
884
    if not nochdir:
1108
 
        os.chdir(u"/")
 
885
        os.chdir("/")
1109
886
    if os.fork():
1110
887
        sys.exit()
1111
888
    if not noclose:
1113
890
        null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1114
891
        if not stat.S_ISCHR(os.fstat(null).st_mode):
1115
892
            raise OSError(errno.ENODEV,
1116
 
                          u"/dev/null not a character device")
 
893
                          "/dev/null not a character device")
1117
894
        os.dup2(null, sys.stdin.fileno())
1118
895
        os.dup2(null, sys.stdout.fileno())
1119
896
        os.dup2(null, sys.stderr.fileno())
1122
899
 
1123
900
 
1124
901
def main():
1125
 
    
1126
 
    ######################################################################
1127
 
    # Parsing of options, both command line and config file
1128
 
    
1129
902
    parser = optparse.OptionParser(version = "%%prog %s" % version)
1130
 
    parser.add_option("-i", u"--interface", type=u"string",
1131
 
                      metavar="IF", help=u"Bind to interface IF")
1132
 
    parser.add_option("-a", u"--address", type=u"string",
1133
 
                      help=u"Address to listen for requests on")
1134
 
    parser.add_option("-p", u"--port", type=u"int",
1135
 
                      help=u"Port number to receive requests on")
1136
 
    parser.add_option("--check", action=u"store_true",
1137
 
                      help=u"Run self-test")
1138
 
    parser.add_option("--debug", action=u"store_true",
1139
 
                      help=u"Debug mode; run in foreground and log to"
1140
 
                      u" terminal")
1141
 
    parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1142
 
                      u" priority string (see GnuTLS documentation)")
1143
 
    parser.add_option("--servicename", type=u"string",
1144
 
                      metavar=u"NAME", help=u"Zeroconf service name")
1145
 
    parser.add_option("--configdir", type=u"string",
1146
 
                      default=u"/etc/mandos", metavar=u"DIR",
1147
 
                      help=u"Directory to search for configuration"
1148
 
                      u" files")
1149
 
    parser.add_option("--no-dbus", action=u"store_false",
1150
 
                      dest=u"use_dbus", help=u"Do not provide D-Bus"
1151
 
                      u" system bus interface")
1152
 
    parser.add_option("--no-ipv6", action=u"store_false",
1153
 
                      dest=u"use_ipv6", help=u"Do not use IPv6")
 
903
    parser.add_option("-i", "--interface", type="string",
 
904
                      metavar="IF", help="Bind to interface IF")
 
905
    parser.add_option("-a", "--address", type="string",
 
906
                      help="Address to listen for requests on")
 
907
    parser.add_option("-p", "--port", type="int",
 
908
                      help="Port number to receive requests on")
 
909
    parser.add_option("--check", action="store_true",
 
910
                      help="Run self-test")
 
911
    parser.add_option("--debug", action="store_true",
 
912
                      help="Debug mode; run in foreground and log to"
 
913
                      " terminal")
 
914
    parser.add_option("--priority", type="string", help="GnuTLS"
 
915
                      " priority string (see GnuTLS documentation)")
 
916
    parser.add_option("--servicename", type="string", metavar="NAME",
 
917
                      help="Zeroconf service name")
 
918
    parser.add_option("--configdir", type="string",
 
919
                      default="/etc/mandos", metavar="DIR",
 
920
                      help="Directory to search for configuration"
 
921
                      " files")
 
922
    parser.add_option("--no-dbus", action="store_false",
 
923
                      dest="use_dbus",
 
924
                      help="Do not provide D-Bus system bus"
 
925
                      " interface")
1154
926
    options = parser.parse_args()[0]
1155
927
    
1156
928
    if options.check:
1159
931
        sys.exit()
1160
932
    
1161
933
    # Default values for config file for server-global settings
1162
 
    server_defaults = { u"interface": u"",
1163
 
                        u"address": u"",
1164
 
                        u"port": u"",
1165
 
                        u"debug": u"False",
1166
 
                        u"priority":
1167
 
                        u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1168
 
                        u"servicename": u"Mandos",
1169
 
                        u"use_dbus": u"True",
1170
 
                        u"use_ipv6": u"True",
 
934
    server_defaults = { "interface": "",
 
935
                        "address": "",
 
936
                        "port": "",
 
937
                        "debug": "False",
 
938
                        "priority":
 
939
                        "SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
 
940
                        "servicename": "Mandos",
 
941
                        "use_dbus": "True",
1171
942
                        }
1172
943
    
1173
944
    # Parse config file for server-global settings
1174
945
    server_config = ConfigParser.SafeConfigParser(server_defaults)
1175
946
    del server_defaults
1176
 
    server_config.read(os.path.join(options.configdir,
1177
 
                                    u"mandos.conf"))
 
947
    server_config.read(os.path.join(options.configdir, "mandos.conf"))
1178
948
    # Convert the SafeConfigParser object to a dict
1179
949
    server_settings = server_config.defaults()
1180
950
    # Use the appropriate methods on the non-string config options
1181
 
    for option in (u"debug", u"use_dbus", u"use_ipv6"):
1182
 
        server_settings[option] = server_config.getboolean(u"DEFAULT",
1183
 
                                                           option)
 
951
    server_settings["debug"] = server_config.getboolean("DEFAULT",
 
952
                                                        "debug")
 
953
    server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
 
954
                                                           "use_dbus")
1184
955
    if server_settings["port"]:
1185
 
        server_settings["port"] = server_config.getint(u"DEFAULT",
1186
 
                                                       u"port")
 
956
        server_settings["port"] = server_config.getint("DEFAULT",
 
957
                                                       "port")
1187
958
    del server_config
1188
959
    
1189
960
    # Override the settings from the config file with command line
1190
961
    # options, if set.
1191
 
    for option in (u"interface", u"address", u"port", u"debug",
1192
 
                   u"priority", u"servicename", u"configdir",
1193
 
                   u"use_dbus", u"use_ipv6"):
 
962
    for option in ("interface", "address", "port", "debug",
 
963
                   "priority", "servicename", "configdir",
 
964
                   "use_dbus"):
1194
965
        value = getattr(options, option)
1195
966
        if value is not None:
1196
967
            server_settings[option] = value
1197
968
    del options
1198
 
    # Force all strings to be unicode
1199
 
    for option in server_settings.keys():
1200
 
        if type(server_settings[option]) is str:
1201
 
            server_settings[option] = unicode(server_settings[option])
1202
969
    # Now we have our good server settings in "server_settings"
1203
970
    
1204
 
    ##################################################################
1205
 
    
1206
971
    # For convenience
1207
 
    debug = server_settings[u"debug"]
1208
 
    use_dbus = server_settings[u"use_dbus"]
1209
 
    use_ipv6 = server_settings[u"use_ipv6"]
 
972
    debug = server_settings["debug"]
 
973
    use_dbus = server_settings["use_dbus"]
1210
974
    
1211
975
    if not debug:
1212
976
        syslogger.setLevel(logging.WARNING)
1213
977
        console.setLevel(logging.WARNING)
1214
978
    
1215
 
    if server_settings[u"servicename"] != u"Mandos":
 
979
    if server_settings["servicename"] != "Mandos":
1216
980
        syslogger.setFormatter(logging.Formatter
1217
 
                               (u'Mandos (%s) [%%(process)d]:'
1218
 
                                u' %%(levelname)s: %%(message)s'
1219
 
                                % server_settings[u"servicename"]))
 
981
                               ('Mandos (%s): %%(levelname)s:'
 
982
                                ' %%(message)s'
 
983
                                % server_settings["servicename"]))
1220
984
    
1221
985
    # Parse config file with clients
1222
 
    client_defaults = { u"timeout": u"1h",
1223
 
                        u"interval": u"5m",
1224
 
                        u"checker": u"fping -q -- %%(host)s",
1225
 
                        u"host": u"",
 
986
    client_defaults = { "timeout": "1h",
 
987
                        "interval": "5m",
 
988
                        "checker": "fping -q -- %%(host)s",
 
989
                        "host": "",
1226
990
                        }
1227
991
    client_config = ConfigParser.SafeConfigParser(client_defaults)
1228
 
    client_config.read(os.path.join(server_settings[u"configdir"],
1229
 
                                    u"clients.conf"))
1230
 
    
1231
 
    global mandos_dbus_service
1232
 
    mandos_dbus_service = None
 
992
    client_config.read(os.path.join(server_settings["configdir"],
 
993
                                    "clients.conf"))
1233
994
    
1234
995
    clients = Set()
1235
 
    tcp_server = IPv6_TCPServer((server_settings[u"address"],
1236
 
                                 server_settings[u"port"]),
1237
 
                                ClientHandler,
1238
 
                                interface=
1239
 
                                server_settings[u"interface"],
1240
 
                                use_ipv6=use_ipv6,
1241
 
                                clients=clients,
1242
 
                                gnutls_priority=
1243
 
                                server_settings[u"priority"],
1244
 
                                use_dbus=use_dbus)
1245
 
    pidfilename = u"/var/run/mandos.pid"
 
996
    tcp_server = IPv6_TCPServer((server_settings["address"],
 
997
                                 server_settings["port"]),
 
998
                                TCP_handler,
 
999
                                settings=server_settings,
 
1000
                                clients=clients)
 
1001
    pidfilename = "/var/run/mandos.pid"
1246
1002
    try:
1247
 
        pidfile = open(pidfilename, u"w")
 
1003
        pidfile = open(pidfilename, "w")
1248
1004
    except IOError:
1249
 
        logger.error(u"Could not open file %r", pidfilename)
 
1005
        logger.error("Could not open file %r", pidfilename)
1250
1006
    
1251
1007
    try:
1252
 
        uid = pwd.getpwnam(u"_mandos").pw_uid
1253
 
        gid = pwd.getpwnam(u"_mandos").pw_gid
 
1008
        uid = pwd.getpwnam("_mandos").pw_uid
 
1009
        gid = pwd.getpwnam("_mandos").pw_gid
1254
1010
    except KeyError:
1255
1011
        try:
1256
 
            uid = pwd.getpwnam(u"mandos").pw_uid
1257
 
            gid = pwd.getpwnam(u"mandos").pw_gid
 
1012
            uid = pwd.getpwnam("mandos").pw_uid
 
1013
            gid = pwd.getpwnam("mandos").pw_gid
1258
1014
        except KeyError:
1259
1015
            try:
1260
 
                uid = pwd.getpwnam(u"nobody").pw_uid
1261
 
                gid = pwd.getpwnam(u"nobody").pw_gid
 
1016
                uid = pwd.getpwnam("nobody").pw_uid
 
1017
                gid = pwd.getpwnam("nogroup").pw_gid
1262
1018
            except KeyError:
1263
1019
                uid = 65534
1264
1020
                gid = 65534
1277
1033
        
1278
1034
        @gnutls.library.types.gnutls_log_func
1279
1035
        def debug_gnutls(level, string):
1280
 
            logger.debug(u"GnuTLS: %s", string[:-1])
 
1036
            logger.debug("GnuTLS: %s", string[:-1])
1281
1037
        
1282
1038
        (gnutls.library.functions
1283
1039
         .gnutls_global_set_log_function(debug_gnutls))
1284
1040
    
1285
1041
    global service
1286
 
    protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1287
 
    service = AvahiService(name = server_settings[u"servicename"],
1288
 
                           servicetype = u"_mandos._tcp",
1289
 
                           protocol = protocol)
 
1042
    service = AvahiService(name = server_settings["servicename"],
 
1043
                           servicetype = "_mandos._tcp", )
1290
1044
    if server_settings["interface"]:
1291
1045
        service.interface = (if_nametoindex
1292
 
                             (str(server_settings[u"interface"])))
 
1046
                             (server_settings["interface"]))
1293
1047
    
1294
1048
    global main_loop
1295
1049
    global bus
1305
1059
    if use_dbus:
1306
1060
        bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1307
1061
    
1308
 
    client_class = Client
1309
 
    if use_dbus:
1310
 
        client_class = ClientDBus
1311
 
    clients.update(Set(
1312
 
            client_class(name = section,
1313
 
                         config= dict(client_config.items(section)))
1314
 
            for section in client_config.sections()))
 
1062
    clients.update(Set(Client(name = section,
 
1063
                              config
 
1064
                              = dict(client_config.items(section)),
 
1065
                              use_dbus = use_dbus)
 
1066
                       for section in client_config.sections()))
1315
1067
    if not clients:
1316
1068
        logger.warning(u"No clients defined")
1317
1069
    
1328
1080
        daemon()
1329
1081
    
1330
1082
    try:
1331
 
        with closing(pidfile):
1332
 
            pid = os.getpid()
1333
 
            pidfile.write(str(pid) + "\n")
 
1083
        pid = os.getpid()
 
1084
        pidfile.write(str(pid) + "\n")
 
1085
        pidfile.close()
1334
1086
        del pidfile
1335
1087
    except IOError:
1336
1088
        logger.error(u"Could not write to file %r with PID %d",
1362
1114
    signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1363
1115
    
1364
1116
    if use_dbus:
1365
 
        class MandosDBusService(dbus.service.Object):
 
1117
        class MandosServer(dbus.service.Object):
1366
1118
            """A D-Bus proxy object"""
1367
1119
            def __init__(self):
1368
 
                dbus.service.Object.__init__(self, bus, u"/")
 
1120
                dbus.service.Object.__init__(self, bus, "/")
1369
1121
            _interface = u"se.bsnet.fukt.Mandos"
1370
1122
            
1371
 
            @dbus.service.signal(_interface, signature=u"oa{sv}")
 
1123
            @dbus.service.signal(_interface, signature="oa{sv}")
1372
1124
            def ClientAdded(self, objpath, properties):
1373
1125
                "D-Bus signal"
1374
1126
                pass
1375
1127
            
1376
 
            @dbus.service.signal(_interface, signature=u"s")
1377
 
            def ClientNotFound(self, fingerprint):
1378
 
                "D-Bus signal"
1379
 
                pass
1380
 
            
1381
 
            @dbus.service.signal(_interface, signature=u"os")
 
1128
            @dbus.service.signal(_interface, signature="os")
1382
1129
            def ClientRemoved(self, objpath, name):
1383
1130
                "D-Bus signal"
1384
1131
                pass
1385
1132
            
1386
 
            @dbus.service.method(_interface, out_signature=u"ao")
 
1133
            @dbus.service.method(_interface, out_signature="ao")
1387
1134
            def GetAllClients(self):
1388
1135
                "D-Bus method"
1389
1136
                return dbus.Array(c.dbus_object_path for c in clients)
1390
1137
            
1391
 
            @dbus.service.method(_interface,
1392
 
                                 out_signature=u"a{oa{sv}}")
 
1138
            @dbus.service.method(_interface, out_signature="a{oa{sv}}")
1393
1139
            def GetAllClientsWithProperties(self):
1394
1140
                "D-Bus method"
1395
1141
                return dbus.Dictionary(
1396
1142
                    ((c.dbus_object_path, c.GetAllProperties())
1397
1143
                     for c in clients),
1398
 
                    signature=u"oa{sv}")
 
1144
                    signature="oa{sv}")
1399
1145
            
1400
 
            @dbus.service.method(_interface, in_signature=u"o")
 
1146
            @dbus.service.method(_interface, in_signature="o")
1401
1147
            def RemoveClient(self, object_path):
1402
1148
                "D-Bus method"
1403
1149
                for c in clients:
1404
1150
                    if c.dbus_object_path == object_path:
1405
1151
                        clients.remove(c)
1406
 
                        c.remove_from_connection()
1407
1152
                        # Don't signal anything except ClientRemoved
1408
 
                        c.disable(signal=False)
 
1153
                        c.use_dbus = False
 
1154
                        c.disable()
1409
1155
                        # Emit D-Bus signal
1410
1156
                        self.ClientRemoved(object_path, c.name)
1411
1157
                        return
1413
1159
            
1414
1160
            del _interface
1415
1161
        
1416
 
        mandos_dbus_service = MandosDBusService()
 
1162
        mandos_server = MandosServer()
1417
1163
    
1418
1164
    for client in clients:
1419
1165
        if use_dbus:
1420
1166
            # Emit D-Bus signal
1421
 
            mandos_dbus_service.ClientAdded(client.dbus_object_path,
1422
 
                                            client.GetAllProperties())
 
1167
            mandos_server.ClientAdded(client.dbus_object_path,
 
1168
                                      client.GetAllProperties())
1423
1169
        client.enable()
1424
1170
    
1425
1171
    tcp_server.enable()
1427
1173
    
1428
1174
    # Find out what port we got
1429
1175
    service.port = tcp_server.socket.getsockname()[1]
1430
 
    if use_ipv6:
1431
 
        logger.info(u"Now listening on address %r, port %d,"
1432
 
                    " flowinfo %d, scope_id %d"
1433
 
                    % tcp_server.socket.getsockname())
1434
 
    else:                       # IPv4
1435
 
        logger.info(u"Now listening on address %r, port %d"
1436
 
                    % tcp_server.socket.getsockname())
 
1176
    logger.info(u"Now listening on address %r, port %d, flowinfo %d,"
 
1177
                u" scope_id %d" % tcp_server.socket.getsockname())
1437
1178
    
1438
1179
    #service.interface = tcp_server.socket.getsockname()[3]
1439
1180
    
1440
1181
    try:
1441
1182
        # From the Avahi example code
1442
 
        server.connect_to_signal(u"StateChanged", server_state_changed)
 
1183
        server.connect_to_signal("StateChanged", server_state_changed)
1443
1184
        try:
1444
1185
            server_state_changed(server.GetState())
1445
1186
        except dbus.exceptions.DBusException, error:
1460
1201
    except KeyboardInterrupt:
1461
1202
        if debug:
1462
1203
            print >> sys.stderr
1463
 
        logger.debug(u"Server received KeyboardInterrupt")
1464
 
    logger.debug(u"Server exiting")
 
1204
        logger.debug("Server received KeyboardInterrupt")
 
1205
    logger.debug("Server exiting")
1465
1206
 
1466
1207
if __name__ == '__main__':
1467
1208
    main()