/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-14 18:07:05 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090214180705-vu6b7j4i2v2hibgg
Use "getconf" to get correct LFS compile and link flags.

* Makefile (GPGME_CFLAGS): Added output of "getconf LFS_CFLAGS".
  (GPGME_LIBS): Added output of "getconf LFS_LIBS" and
                "getconf LFS_LDFLAGS".
* plugins.d/mandos-client.c: Only define "_LARGEFILE_SOURCE" and
                             "_FILE_OFFSET_BITS" if they are not
                             already defined.

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