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
- browse files at revision 539
- compare with another revision
- download diff
- download tarball
- view history from revision 539
- Committer: teddy at recompile
- Date: 2011-12-27 14:15:40 UTC
- Revision ID: teddy@recompile.se-20111227141540-ajrabf33q59jfa7t
Reorder TODO entries
- files removed:
- bugs.xml
- debian/upstream
- plugin-helpers
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
try:
38
from future_builtins import *
39
except ImportError:
40
pass
41
42
try:
43
import SocketServer as socketserver
44
except ImportError:
45
import socketserver
37
import SocketServer as socketserver
46
38
import socket
47
39
import argparse
48
40
import datetime
49
41
import errno
50
try:
51
import ConfigParser as configparser
52
except ImportError:
53
import configparser
42
import gnutls.crypto
43
import gnutls.connection
44
import gnutls.errors
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
48
import ConfigParser as configparser
54
49
import sys
55
50
import re
56
51
import os
65
60
import struct
66
61
import fcntl
67
62
import functools
68
try:
69
import cPickle as pickle
70
except ImportError:
71
import pickle
63
import cPickle as pickle
72
64
import multiprocessing
73
65
import types
74
66
import binascii
75
67
import tempfile
76
import itertools
77
import collections
78
import codecs
79
68
80
69
import dbus
81
70
import dbus.service
82
from gi.repository import GLib
71
import gobject
72
import avahi
83
73
from dbus.mainloop.glib import DBusGMainLoop
84
74
import ctypes
85
75
import ctypes.util
86
76
import xml.dom.minidom
87
77
import inspect
78
import GnuPGInterface
88
79
89
80
try:
90
81
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
85
except ImportError:
95
86
SO_BINDTODEVICE = None
96
87
97
if sys.version_info.major == 2:
98
str = unicode
99
100
version = "1.7.7"
88
version = "1.4.1"
101
89
stored_state_file = "clients.pickle"
102
90
103
91
logger = logging.getLogger()
104
syslogger = None
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
105
95
106
96
try:
107
if_nametoindex = ctypes.cdll.LoadLibrary(
108
ctypes.util.find_library("c")).if_nametoindex
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
99
.if_nametoindex)
109
100
except (OSError, AttributeError):
110
111
101
def if_nametoindex(interface):
112
102
"Get an interface index the hard way, i.e. using fcntl()"
113
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
114
104
with contextlib.closing(socket.socket()) as s:
115
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
116
struct.pack(b"16s16x", interface))
117
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
107
interface))
108
interface_index = struct.unpack(str("I"),
109
ifreq[16:20])[0]
118
110
return interface_index
119
111
120
112
121
def copy_function(func):
122
"""Make a copy of a function"""
123
if sys.version_info.major == 2:
124
return types.FunctionType(func.func_code,
125
func.func_globals,
126
func.func_name,
127
func.func_defaults,
128
func.func_closure)
129
else:
130
return types.FunctionType(func.__code__,
131
func.__globals__,
132
func.__name__,
133
func.__defaults__,
134
func.__closure__)
135
136
137
113
def initlogger(debug, level=logging.WARNING):
138
114
"""init logger and add loglevel"""
139
115
140
global syslogger
141
syslogger = (logging.handlers.SysLogHandler(
142
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
143
address = "/dev/log"))
144
116
syslogger.setFormatter(logging.Formatter
145
117
('Mandos [%(process)d]: %(levelname)s:'
146
118
' %(message)s'))
163
135
164
136
class PGPEngine(object):
165
137
"""A simple class for OpenPGP symmetric encryption & decryption"""
166
167
138
def __init__(self):
139
self.gnupg = GnuPGInterface.GnuPG()
168
140
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
169
self.gpg = "gpg"
170
try:
171
output = subprocess.check_output(["gpgconf"])
172
for line in output.splitlines():
173
name, text, path = line.split(b":")
174
if name == "gpg":
175
self.gpg = path
176
break
177
except OSError as e:
178
if e.errno != errno.ENOENT:
179
raise
180
self.gnupgargs = ['--batch',
181
'--homedir', self.tempdir,
182
'--force-mdc',
183
'--quiet',
184
'--no-use-agent']
141
self.gnupg = GnuPGInterface.GnuPG()
142
self.gnupg.options.meta_interactive = False
143
self.gnupg.options.homedir = self.tempdir
144
self.gnupg.options.extra_args.extend(['--force-mdc',
145
'--quiet'])
185
146
186
147
def __enter__(self):
187
148
return self
188
149
189
def __exit__(self, exc_type, exc_value, traceback):
150
def __exit__ (self, exc_type, exc_value, traceback):
190
151
self._cleanup()
191
152
return False
192
153
209
170
def password_encode(self, password):
210
171
# Passphrase can not be empty and can not contain newlines or
211
172
# NUL bytes. So we prefix it and hex encode it.
212
encoded = b"mandos" + binascii.hexlify(password)
213
if len(encoded) > 2048:
214
# GnuPG can't handle long passwords, so encode differently
215
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
216
.replace(b"\n", b"\\n")
217
.replace(b"\0", b"\\x00"))
218
return encoded
173
return b"mandos" + binascii.hexlify(password)
219
174
220
175
def encrypt(self, data, password):
221
passphrase = self.password_encode(password)
222
with tempfile.NamedTemporaryFile(
223
dir=self.tempdir) as passfile:
224
passfile.write(passphrase)
225
passfile.flush()
226
proc = subprocess.Popen([self.gpg, '--symmetric',
227
'--passphrase-file',
228
passfile.name]
229
+ self.gnupgargs,
230
stdin = subprocess.PIPE,
231
stdout = subprocess.PIPE,
232
stderr = subprocess.PIPE)
233
ciphertext, err = proc.communicate(input = data)
234
if proc.returncode != 0:
235
raise PGPError(err)
176
self.gnupg.passphrase = self.password_encode(password)
177
with open(os.devnull) as devnull:
178
try:
179
proc = self.gnupg.run(['--symmetric'],
180
create_fhs=['stdin', 'stdout'],
181
attach_fhs={'stderr': devnull})
182
with contextlib.closing(proc.handles['stdin']) as f:
183
f.write(data)
184
with contextlib.closing(proc.handles['stdout']) as f:
185
ciphertext = f.read()
186
proc.wait()
187
except IOError as e:
188
raise PGPError(e)
189
self.gnupg.passphrase = None
236
190
return ciphertext
237
191
238
192
def decrypt(self, data, password):
239
passphrase = self.password_encode(password)
240
with tempfile.NamedTemporaryFile(
241
dir = self.tempdir) as passfile:
242
passfile.write(passphrase)
243
passfile.flush()
244
proc = subprocess.Popen([self.gpg, '--decrypt',
245
'--passphrase-file',
246
passfile.name]
247
+ self.gnupgargs,
248
stdin = subprocess.PIPE,
249
stdout = subprocess.PIPE,
250
stderr = subprocess.PIPE)
251
decrypted_plaintext, err = proc.communicate(input = data)
252
if proc.returncode != 0:
253
raise PGPError(err)
193
self.gnupg.passphrase = self.password_encode(password)
194
with open(os.devnull) as devnull:
195
try:
196
proc = self.gnupg.run(['--decrypt'],
197
create_fhs=['stdin', 'stdout'],
198
attach_fhs={'stderr': devnull})
199
with contextlib.closing(proc.handles['stdin'] ) as f:
200
f.write(data)
201
with contextlib.closing(proc.handles['stdout']) as f:
202
decrypted_plaintext = f.read()
203
proc.wait()
204
except IOError as e:
205
raise PGPError(e)
206
self.gnupg.passphrase = None
254
207
return decrypted_plaintext
255
208
256
# Pretend that we have an Avahi module
257
class Avahi(object):
258
"""This isn't so much a class as it is a module-like namespace.
259
It is instantiated once, and simulates having an Avahi module."""
260
IF_UNSPEC = -1 # avahi-common/address.h
261
PROTO_UNSPEC = -1 # avahi-common/address.h
262
PROTO_INET = 0 # avahi-common/address.h
263
PROTO_INET6 = 1 # avahi-common/address.h
264
DBUS_NAME = "org.freedesktop.Avahi"
265
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
266
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
267
DBUS_PATH_SERVER = "/"
268
def string_array_to_txt_array(self, t):
269
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
270
for s in t), signature="ay")
271
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
272
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
273
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
274
SERVER_INVALID = 0 # avahi-common/defs.h
275
SERVER_REGISTERING = 1 # avahi-common/defs.h
276
SERVER_RUNNING = 2 # avahi-common/defs.h
277
SERVER_COLLISION = 3 # avahi-common/defs.h
278
SERVER_FAILURE = 4 # avahi-common/defs.h
279
avahi = Avahi()
209
280
210
281
211
class AvahiError(Exception):
282
212
def __init__(self, value, *args, **kwargs):
283
213
self.value = value
284
return super(AvahiError, self).__init__(value, *args,
285
**kwargs)
286
214
super(AvahiError, self).__init__(value, *args, **kwargs)
215
def __unicode__(self):
216
return unicode(repr(self.value))
287
217
288
218
class AvahiServiceError(AvahiError):
289
219
pass
290
220
291
292
221
class AvahiGroupError(AvahiError):
293
222
pass
294
223
301
230
Used to optionally bind to the specified interface.
302
231
name: string; Example: 'Mandos'
303
232
type: string; Example: '_mandos._tcp'.
304
See <https://www.iana.org/assignments/service-names-port-numbers>
233
See <http://www.dns-sd.org/ServiceTypes.html>
305
234
port: integer; what port to announce
306
235
TXT: list of strings; TXT record for the service
307
236
domain: string; Domain to publish on, default to .local if empty.
313
242
server: D-Bus Server
314
243
bus: dbus.SystemBus()
315
244
"""
316
317
def __init__(self,
318
interface = avahi.IF_UNSPEC,
319
name = None,
320
servicetype = None,
321
port = None,
322
TXT = None,
323
domain = "",
324
host = "",
325
max_renames = 32768,
326
protocol = avahi.PROTO_UNSPEC,
327
bus = None):
245
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
246
servicetype = None, port = None, TXT = None,
247
domain = "", host = "", max_renames = 32768,
248
protocol = avahi.PROTO_UNSPEC, bus = None):
328
249
self.interface = interface
329
250
self.name = name
330
251
self.type = servicetype
339
260
self.server = None
340
261
self.bus = bus
341
262
self.entry_group_state_changed_match = None
342
343
def rename(self, remove=True):
263
def rename(self):
344
264
"""Derived from the Avahi example code"""
345
265
if self.rename_count >= self.max_renames:
346
266
logger.critical("No suitable Zeroconf service name found"
347
267
" after %i retries, exiting.",
348
268
self.rename_count)
349
269
raise AvahiServiceError("Too many renames")
350
self.name = str(
351
self.server.GetAlternativeServiceName(self.name))
352
self.rename_count += 1
270
self.name = unicode(self.server
271
.GetAlternativeServiceName(self.name))
353
272
logger.info("Changing Zeroconf service name to %r ...",
354
273
self.name)
355
if remove:
356
self.remove()
274
self.remove()
357
275
try:
358
276
self.add()
359
277
except dbus.exceptions.DBusException as error:
360
if (error.get_dbus_name()
361
== "org.freedesktop.Avahi.CollisionError"):
362
logger.info("Local Zeroconf service name collision.")
363
return self.rename(remove=False)
364
else:
365
logger.critical("D-Bus Exception", exc_info=error)
366
self.cleanup()
367
os._exit(1)
368
278
logger.critical("DBusException: %s", error)
279
self.cleanup()
280
os._exit(1)
281
self.rename_count += 1
369
282
def remove(self):
370
283
"""Derived from the Avahi example code"""
371
284
if self.entry_group_state_changed_match is not None:
373
286
self.entry_group_state_changed_match = None
374
287
if self.group is not None:
375
288
self.group.Reset()
376
377
289
def add(self):
378
290
"""Derived from the Avahi example code"""
379
291
self.remove()
396
308
dbus.UInt16(self.port),
397
309
avahi.string_array_to_txt_array(self.TXT))
398
310
self.group.Commit()
399
400
311
def entry_group_state_changed(self, state, error):
401
312
"""Derived from the Avahi example code"""
402
313
logger.debug("Avahi entry group state change: %i", state)
408
319
self.rename()
409
320
elif state == avahi.ENTRY_GROUP_FAILURE:
410
321
logger.critical("Avahi: Error in group state changed %s",
411
str(error))
412
raise AvahiGroupError("State changed: {!s}".format(error))
413
322
unicode(error))
323
raise AvahiGroupError("State changed: %s"
324
% unicode(error))
414
325
def cleanup(self):
415
326
"""Derived from the Avahi example code"""
416
327
if self.group is not None:
421
332
pass
422
333
self.group = None
423
334
self.remove()
424
425
335
def server_state_changed(self, state, error=None):
426
336
"""Derived from the Avahi example code"""
427
337
logger.debug("Avahi server state change: %i", state)
428
bad_states = {
429
avahi.SERVER_INVALID: "Zeroconf server invalid",
430
avahi.SERVER_REGISTERING: None,
431
avahi.SERVER_COLLISION: "Zeroconf server name collision",
432
avahi.SERVER_FAILURE: "Zeroconf server failure",
433
}
338
bad_states = { avahi.SERVER_INVALID:
339
"Zeroconf server invalid",
340
avahi.SERVER_REGISTERING: None,
341
avahi.SERVER_COLLISION:
342
"Zeroconf server name collision",
343
avahi.SERVER_FAILURE:
344
"Zeroconf server failure" }
434
345
if state in bad_states:
435
346
if bad_states[state] is not None:
436
347
if error is None:
439
350
logger.error(bad_states[state] + ": %r", error)
440
351
self.cleanup()
441
352
elif state == avahi.SERVER_RUNNING:
442
try:
443
self.add()
444
except dbus.exceptions.DBusException as error:
445
if (error.get_dbus_name()
446
== "org.freedesktop.Avahi.CollisionError"):
447
logger.info("Local Zeroconf service name"
448
" collision.")
449
return self.rename(remove=False)
450
else:
451
logger.critical("D-Bus Exception", exc_info=error)
452
self.cleanup()
453
os._exit(1)
353
self.add()
454
354
else:
455
355
if error is None:
456
356
logger.debug("Unknown state: %r", state)
457
357
else:
458
358
logger.debug("Unknown state: %r: %r", state, error)
459
460
359
def activate(self):
461
360
"""Derived from the Avahi example code"""
462
361
if self.server is None:
466
365
follow_name_owner_changes=True),
467
366
avahi.DBUS_INTERFACE_SERVER)
468
367
self.server.connect_to_signal("StateChanged",
469
self.server_state_changed)
368
self.server_state_changed)
470
369
self.server_state_changed(self.server.GetState())
471
370
472
473
371
class AvahiServiceToSyslog(AvahiService):
474
def rename(self, *args, **kwargs):
372
def rename(self):
475
373
"""Add the new name to the syslog messages"""
476
ret = AvahiService.rename(self, *args, **kwargs)
477
syslogger.setFormatter(logging.Formatter(
478
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
479
.format(self.name)))
374
ret = AvahiService.rename(self)
375
syslogger.setFormatter(logging.Formatter
376
('Mandos (%s) [%%(process)d]:'
377
' %%(levelname)s: %%(message)s'
378
% self.name))
480
379
return ret
481
380
482
# Pretend that we have a GnuTLS module
483
class GnuTLS(object):
484
"""This isn't so much a class as it is a module-like namespace.
485
It is instantiated once, and simulates having a GnuTLS module."""
486
487
_library = ctypes.cdll.LoadLibrary(
488
ctypes.util.find_library("gnutls"))
489
_need_version = b"3.3.0"
490
def __init__(self):
491
# Need to use class name "GnuTLS" here, since this method is
492
# called before the assignment to the "gnutls" global variable
493
# happens.
494
if GnuTLS.check_version(self._need_version) is None:
495
raise GnuTLS.Error("Needs GnuTLS {} or later"
496
.format(self._need_version))
497
498
# Unless otherwise indicated, the constants and types below are
499
# all from the gnutls/gnutls.h C header file.
500
501
# Constants
502
E_SUCCESS = 0
503
E_INTERRUPTED = -52
504
E_AGAIN = -28
505
CRT_OPENPGP = 2
506
CLIENT = 2
507
SHUT_RDWR = 0
508
CRD_CERTIFICATE = 1
509
E_NO_CERTIFICATE_FOUND = -49
510
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
511
512
# Types
513
class session_int(ctypes.Structure):
514
_fields_ = []
515
session_t = ctypes.POINTER(session_int)
516
class certificate_credentials_st(ctypes.Structure):
517
_fields_ = []
518
certificate_credentials_t = ctypes.POINTER(
519
certificate_credentials_st)
520
certificate_type_t = ctypes.c_int
521
class datum_t(ctypes.Structure):
522
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
523
('size', ctypes.c_uint)]
524
class openpgp_crt_int(ctypes.Structure):
525
_fields_ = []
526
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
527
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
528
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
529
credentials_type_t = ctypes.c_int
530
transport_ptr_t = ctypes.c_void_p
531
close_request_t = ctypes.c_int
532
533
# Exceptions
534
class Error(Exception):
535
# We need to use the class name "GnuTLS" here, since this
536
# exception might be raised from within GnuTLS.__init__,
537
# which is called before the assignment to the "gnutls"
538
# global variable has happened.
539
def __init__(self, message = None, code = None, args=()):
540
# Default usage is by a message string, but if a return
541
# code is passed, convert it to a string with
542
# gnutls.strerror()
543
self.code = code
544
if message is None and code is not None:
545
message = GnuTLS.strerror(code)
546
return super(GnuTLS.Error, self).__init__(
547
message, *args)
548
549
class CertificateSecurityError(Error):
550
pass
551
552
# Classes
553
class Credentials(object):
554
def __init__(self):
555
self._c_object = gnutls.certificate_credentials_t()
556
gnutls.certificate_allocate_credentials(
557
ctypes.byref(self._c_object))
558
self.type = gnutls.CRD_CERTIFICATE
559
560
def __del__(self):
561
gnutls.certificate_free_credentials(self._c_object)
562
563
class ClientSession(object):
564
def __init__(self, socket, credentials = None):
565
self._c_object = gnutls.session_t()
566
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
567
gnutls.set_default_priority(self._c_object)
568
gnutls.transport_set_ptr(self._c_object, socket.fileno())
569
gnutls.handshake_set_private_extensions(self._c_object,
570
True)
571
self.socket = socket
572
if credentials is None:
573
credentials = gnutls.Credentials()
574
gnutls.credentials_set(self._c_object, credentials.type,
575
ctypes.cast(credentials._c_object,
576
ctypes.c_void_p))
577
self.credentials = credentials
578
579
def __del__(self):
580
gnutls.deinit(self._c_object)
581
582
def handshake(self):
583
return gnutls.handshake(self._c_object)
584
585
def send(self, data):
586
data = bytes(data)
587
data_len = len(data)
588
while data_len > 0:
589
data_len -= gnutls.record_send(self._c_object,
590
data[-data_len:],
591
data_len)
592
593
def bye(self):
594
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
595
596
# Error handling functions
597
def _error_code(result):
598
"""A function to raise exceptions on errors, suitable
599
for the 'restype' attribute on ctypes functions"""
600
if result >= 0:
601
return result
602
if result == gnutls.E_NO_CERTIFICATE_FOUND:
603
raise gnutls.CertificateSecurityError(code = result)
604
raise gnutls.Error(code = result)
605
606
def _retry_on_error(result, func, arguments):
607
"""A function to retry on some errors, suitable
608
for the 'errcheck' attribute on ctypes functions"""
609
while result < 0:
610
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
611
return _error_code(result)
612
result = func(*arguments)
613
return result
614
615
# Unless otherwise indicated, the function declarations below are
616
# all from the gnutls/gnutls.h C header file.
617
618
# Functions
619
priority_set_direct = _library.gnutls_priority_set_direct
620
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
621
ctypes.POINTER(ctypes.c_char_p)]
622
priority_set_direct.restype = _error_code
623
624
init = _library.gnutls_init
625
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
626
init.restype = _error_code
627
628
set_default_priority = _library.gnutls_set_default_priority
629
set_default_priority.argtypes = [session_t]
630
set_default_priority.restype = _error_code
631
632
record_send = _library.gnutls_record_send
633
record_send.argtypes = [session_t, ctypes.c_void_p,
634
ctypes.c_size_t]
635
record_send.restype = ctypes.c_ssize_t
636
record_send.errcheck = _retry_on_error
637
638
certificate_allocate_credentials = (
639
_library.gnutls_certificate_allocate_credentials)
640
certificate_allocate_credentials.argtypes = [
641
ctypes.POINTER(certificate_credentials_t)]
642
certificate_allocate_credentials.restype = _error_code
643
644
certificate_free_credentials = (
645
_library.gnutls_certificate_free_credentials)
646
certificate_free_credentials.argtypes = [certificate_credentials_t]
647
certificate_free_credentials.restype = None
648
649
handshake_set_private_extensions = (
650
_library.gnutls_handshake_set_private_extensions)
651
handshake_set_private_extensions.argtypes = [session_t,
652
ctypes.c_int]
653
handshake_set_private_extensions.restype = None
654
655
credentials_set = _library.gnutls_credentials_set
656
credentials_set.argtypes = [session_t, credentials_type_t,
657
ctypes.c_void_p]
658
credentials_set.restype = _error_code
659
660
strerror = _library.gnutls_strerror
661
strerror.argtypes = [ctypes.c_int]
662
strerror.restype = ctypes.c_char_p
663
664
certificate_type_get = _library.gnutls_certificate_type_get
665
certificate_type_get.argtypes = [session_t]
666
certificate_type_get.restype = _error_code
667
668
certificate_get_peers = _library.gnutls_certificate_get_peers
669
certificate_get_peers.argtypes = [session_t,
670
ctypes.POINTER(ctypes.c_uint)]
671
certificate_get_peers.restype = ctypes.POINTER(datum_t)
672
673
global_set_log_level = _library.gnutls_global_set_log_level
674
global_set_log_level.argtypes = [ctypes.c_int]
675
global_set_log_level.restype = None
676
677
global_set_log_function = _library.gnutls_global_set_log_function
678
global_set_log_function.argtypes = [log_func]
679
global_set_log_function.restype = None
680
681
deinit = _library.gnutls_deinit
682
deinit.argtypes = [session_t]
683
deinit.restype = None
684
685
handshake = _library.gnutls_handshake
686
handshake.argtypes = [session_t]
687
handshake.restype = _error_code
688
handshake.errcheck = _retry_on_error
689
690
transport_set_ptr = _library.gnutls_transport_set_ptr
691
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
692
transport_set_ptr.restype = None
693
694
bye = _library.gnutls_bye
695
bye.argtypes = [session_t, close_request_t]
696
bye.restype = _error_code
697
bye.errcheck = _retry_on_error
698
699
check_version = _library.gnutls_check_version
700
check_version.argtypes = [ctypes.c_char_p]
701
check_version.restype = ctypes.c_char_p
702
703
# All the function declarations below are from gnutls/openpgp.h
704
705
openpgp_crt_init = _library.gnutls_openpgp_crt_init
706
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
707
openpgp_crt_init.restype = _error_code
708
709
openpgp_crt_import = _library.gnutls_openpgp_crt_import
710
openpgp_crt_import.argtypes = [openpgp_crt_t,
711
ctypes.POINTER(datum_t),
712
openpgp_crt_fmt_t]
713
openpgp_crt_import.restype = _error_code
714
715
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
716
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
717
ctypes.POINTER(ctypes.c_uint)]
718
openpgp_crt_verify_self.restype = _error_code
719
720
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
721
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
722
openpgp_crt_deinit.restype = None
723
724
openpgp_crt_get_fingerprint = (
725
_library.gnutls_openpgp_crt_get_fingerprint)
726
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
727
ctypes.c_void_p,
728
ctypes.POINTER(
729
ctypes.c_size_t)]
730
openpgp_crt_get_fingerprint.restype = _error_code
731
732
# Remove non-public functions
733
del _error_code, _retry_on_error
734
# Create the global "gnutls" object, simulating a module
735
gnutls = GnuTLS()
736
737
def call_pipe(connection, # : multiprocessing.Connection
738
func, *args, **kwargs):
739
"""This function is meant to be called by multiprocessing.Process
740
741
This function runs func(*args, **kwargs), and writes the resulting
742
return value on the provided multiprocessing.Connection.
743
"""
744
connection.send(func(*args, **kwargs))
745
connection.close()
746
381
def timedelta_to_milliseconds(td):
382
"Convert a datetime.timedelta() to milliseconds"
383
return ((td.days * 24 * 60 * 60 * 1000)
384
+ (td.seconds * 1000)
385
+ (td.microseconds // 1000))
386
747
387
class Client(object):
748
388
"""A representation of a client host served by this server.
749
389
754
394
checker: subprocess.Popen(); a running checker process used
755
395
to see if the client lives.
756
396
'None' if no process is running.
757
checker_callback_tag: a GLib event source tag, or None
397
checker_callback_tag: a gobject event source tag, or None
758
398
checker_command: string; External command which is run to check
759
399
if client lives. %() expansions are done at
760
400
runtime with vars(self) as dict, so that for
761
401
instance %(name)s can be used in the command.
762
checker_initiator_tag: a GLib event source tag, or None
402
checker_initiator_tag: a gobject event source tag, or None
763
403
created: datetime.datetime(); (UTC) object creation
764
404
client_structure: Object describing what attributes a client has
765
405
and is used for storing the client at exit
766
406
current_checker_command: string; current running checker_command
767
disable_initiator_tag: a GLib event source tag, or None
407
disable_initiator_tag: a gobject event source tag, or None
768
408
enabled: bool()
769
409
fingerprint: string (40 or 32 hexadecimal digits); used to
770
410
uniquely identify the client
774
414
last_checked_ok: datetime.datetime(); (UTC) or None
775
415
last_checker_status: integer between 0 and 255 reflecting exit
776
416
status of last checker. -1 reflects crashed
777
checker, -2 means no checker completed yet.
778
last_checker_signal: The signal which killed the last checker, if
779
last_checker_status is -1
417
checker, or None.
780
418
last_enabled: datetime.datetime(); (UTC) or None
781
419
name: string; from the config file, used in log messages and
782
420
D-Bus identifiers
783
421
secret: bytestring; sent verbatim (over TLS) to client
784
422
timeout: datetime.timedelta(); How long from last_checked_ok
785
423
until this client is disabled
786
extended_timeout: extra long timeout when secret has been sent
424
extended_timeout: extra long timeout when password has been sent
787
425
runtime_expansions: Allowed attributes for runtime expansion.
788
426
expires: datetime.datetime(); time (UTC) when a client will be
789
427
disabled, or None
790
server_settings: The server_settings dict from main()
791
428
"""
792
429
793
430
runtime_expansions = ("approval_delay", "approval_duration",
794
"created", "enabled", "expires",
795
"fingerprint", "host", "interval",
796
"last_approval_request", "last_checked_ok",
431
"created", "enabled", "fingerprint",
432
"host", "interval", "last_checked_ok",
797
433
"last_enabled", "name", "timeout")
798
client_defaults = {
799
"timeout": "PT5M",
800
"extended_timeout": "PT15M",
801
"interval": "PT2M",
802
"checker": "fping -q -- %%(host)s",
803
"host": "",
804
"approval_delay": "PT0S",
805
"approval_duration": "PT1S",
806
"approved_by_default": "True",
807
"enabled": "True",
808
}
809
434
client_defaults = { "timeout": "5m",
435
"extended_timeout": "15m",
436
"interval": "2m",
437
"checker": "fping -q -- %%(host)s",
438
"host": "",
439
"approval_delay": "0s",
440
"approval_duration": "1s",
441
"approved_by_default": "True",
442
"enabled": "True",
443
}
444
445
def timeout_milliseconds(self):
446
"Return the 'timeout' attribute in milliseconds"
447
return timedelta_to_milliseconds(self.timeout)
448
449
def extended_timeout_milliseconds(self):
450
"Return the 'extended_timeout' attribute in milliseconds"
451
return timedelta_to_milliseconds(self.extended_timeout)
452
453
def interval_milliseconds(self):
454
"Return the 'interval' attribute in milliseconds"
455
return timedelta_to_milliseconds(self.interval)
456
457
def approval_delay_milliseconds(self):
458
return timedelta_to_milliseconds(self.approval_delay)
459
810
460
@staticmethod
811
461
def config_parser(config):
812
"""Construct a new dict of client settings of this form:
462
""" Construct a new dict of client settings of this form:
813
463
{ client_name: {setting_name: value, ...}, ...}
814
with exceptions for any special settings as defined above.
815
NOTE: Must be a pure function. Must return the same result
816
value given the same arguments.
817
"""
464
with exceptions for any special settings as defined above"""
818
465
settings = {}
819
466
for client_name in config.sections():
820
467
section = dict(config.items(client_name))
824
471
# Reformat values from string types to Python types
825
472
client["approved_by_default"] = config.getboolean(
826
473
client_name, "approved_by_default")
827
client["enabled"] = config.getboolean(client_name,
828
"enabled")
474
client["enabled"] = config.getboolean(client_name, "enabled")
829
475
830
# Uppercase and remove spaces from fingerprint for later
831
# comparison purposes with return value from the
832
# fingerprint() function
833
476
client["fingerprint"] = (section["fingerprint"].upper()
834
477
.replace(" ", ""))
835
478
if "secret" in section:
836
client["secret"] = codecs.decode(section["secret"]
837
.encode("utf-8"),
838
"base64")
479
client["secret"] = section["secret"].decode("base64")
839
480
elif "secfile" in section:
840
481
with open(os.path.expanduser(os.path.expandvars
841
482
(section["secfile"])),
842
483
"rb") as secfile:
843
484
client["secret"] = secfile.read()
844
485
else:
845
raise TypeError("No secret or secfile for section {}"
846
.format(section))
486
raise TypeError("No secret or secfile for section %s"
487
% section)
847
488
client["timeout"] = string_to_delta(section["timeout"])
848
489
client["extended_timeout"] = string_to_delta(
849
490
section["extended_timeout"])
855
496
client["checker_command"] = section["checker"]
856
497
client["last_approval_request"] = None
857
498
client["last_checked_ok"] = None
858
client["last_checker_status"] = -2
859
499
client["last_checker_status"] = None
500
if client["enabled"]:
501
client["last_enabled"] = datetime.datetime.utcnow()
502
client["expires"] = (datetime.datetime.utcnow()
503
+ client["timeout"])
504
else:
505
client["last_enabled"] = None
506
client["expires"] = None
507
860
508
return settings
861
862
def __init__(self, settings, name = None, server_settings=None):
509
510
511
def __init__(self, settings, name = None):
512
"""Note: the 'checker' key in 'config' sets the
513
'checker_command' attribute and *not* the 'checker'
514
attribute."""
863
515
self.name = name
864
if server_settings is None:
865
server_settings = {}
866
self.server_settings = server_settings
867
516
# adding all client settings
868
for setting, value in settings.items():
517
for setting, value in settings.iteritems():
869
518
setattr(self, setting, value)
870
519
871
if self.enabled:
872
if not hasattr(self, "last_enabled"):
873
self.last_enabled = datetime.datetime.utcnow()
874
if not hasattr(self, "expires"):
875
self.expires = (datetime.datetime.utcnow()
876
+ self.timeout)
877
else:
878
self.last_enabled = None
879
self.expires = None
880
881
520
logger.debug("Creating client %r", self.name)
521
# Uppercase and remove spaces from fingerprint for later
522
# comparison purposes with return value from the fingerprint()
523
# function
882
524
logger.debug(" Fingerprint: %s", self.fingerprint)
883
self.created = settings.get("created",
884
datetime.datetime.utcnow())
885
525
self.created = settings.get("created", datetime.datetime.utcnow())
526
886
527
# attributes specific for this server instance
887
528
self.checker = None
888
529
self.checker_initiator_tag = None
891
532
self.current_checker_command = None
892
533
self.approved = None
893
534
self.approvals_pending = 0
894
self.changedstate = multiprocessing_manager.Condition(
895
multiprocessing_manager.Lock())
896
self.client_structure = [attr
897
for attr in self.__dict__.keys()
535
self.changedstate = (multiprocessing_manager
536
.Condition(multiprocessing_manager
537
.Lock()))
538
self.client_structure = [attr for attr in
539
self.__dict__.iterkeys()
898
540
if not attr.startswith("_")]
899
541
self.client_structure.append("client_structure")
900
542
901
for name, t in inspect.getmembers(
902
type(self), lambda obj: isinstance(obj, property)):
543
for name, t in inspect.getmembers(type(self),
544
lambda obj:
545
isinstance(obj,
546
property)):
903
547
if not name.startswith("_"):
904
548
self.client_structure.append(name)
905
549
913
557
if getattr(self, "enabled", False):
914
558
# Already enabled
915
559
return
560
self.send_changedstate()
916
561
self.expires = datetime.datetime.utcnow() + self.timeout
917
562
self.enabled = True
918
563
self.last_enabled = datetime.datetime.utcnow()
919
564
self.init_checker()
920
self.send_changedstate()
921
565
922
566
def disable(self, quiet=True):
923
567
"""Disable this client."""
924
568
if not getattr(self, "enabled", False):
925
569
return False
926
570
if not quiet:
571
self.send_changedstate()
572
if not quiet:
927
573
logger.info("Disabling client %s", self.name)
928
if getattr(self, "disable_initiator_tag", None) is not None:
929
GLib.source_remove(self.disable_initiator_tag)
574
if getattr(self, "disable_initiator_tag", False):
575
gobject.source_remove(self.disable_initiator_tag)
930
576
self.disable_initiator_tag = None
931
577
self.expires = None
932
if getattr(self, "checker_initiator_tag", None) is not None:
933
GLib.source_remove(self.checker_initiator_tag)
578
if getattr(self, "checker_initiator_tag", False):
579
gobject.source_remove(self.checker_initiator_tag)
934
580
self.checker_initiator_tag = None
935
581
self.stop_checker()
936
582
self.enabled = False
937
if not quiet:
938
self.send_changedstate()
939
# Do not run this again if called by a GLib.timeout_add
583
# Do not run this again if called by a gobject.timeout_add
940
584
return False
941
585
942
586
def __del__(self):
945
589
def init_checker(self):
946
590
# Schedule a new checker to be started an 'interval' from now,
947
591
# and every interval from then on.
948
if self.checker_initiator_tag is not None:
949
GLib.source_remove(self.checker_initiator_tag)
950
self.checker_initiator_tag = GLib.timeout_add(
951
int(self.interval.total_seconds() * 1000),
952
self.start_checker)
592
self.checker_initiator_tag = (gobject.timeout_add
593
(self.interval_milliseconds(),
594
self.start_checker))
953
595
# Schedule a disable() when 'timeout' has passed
954
if self.disable_initiator_tag is not None:
955
GLib.source_remove(self.disable_initiator_tag)
956
self.disable_initiator_tag = GLib.timeout_add(
957
int(self.timeout.total_seconds() * 1000), self.disable)
596
self.disable_initiator_tag = (gobject.timeout_add
597
(self.timeout_milliseconds(),
598
self.disable))
958
599
# Also start a new checker *right now*.
959
600
self.start_checker()
960
601
961
def checker_callback(self, source, condition, connection,
962
command):
602
def checker_callback(self, pid, condition, command):
963
603
"""The checker has completed, so take appropriate actions."""
964
604
self.checker_callback_tag = None
965
605
self.checker = None
966
# Read return code from connection (see call_pipe)
967
returncode = connection.recv()
968
connection.close()
969
970
if returncode >= 0:
971
self.last_checker_status = returncode
972
self.last_checker_signal = None
606
if os.WIFEXITED(condition):
607
self.last_checker_status = os.WEXITSTATUS(condition)
973
608
if self.last_checker_status == 0:
974
609
logger.info("Checker for %(name)s succeeded",
975
610
vars(self))
976
611
self.checked_ok()
977
612
else:
978
logger.info("Checker for %(name)s failed", vars(self))
613
logger.info("Checker for %(name)s failed",
614
vars(self))
979
615
else:
980
616
self.last_checker_status = -1
981
self.last_checker_signal = -returncode
982
617
logger.warning("Checker for %(name)s crashed?",
983
618
vars(self))
984
return False
985
986
def checked_ok(self):
987
"""Assert that the client has been seen, alive and well."""
988
self.last_checked_ok = datetime.datetime.utcnow()
989
self.last_checker_status = 0
990
self.last_checker_signal = None
991
self.bump_timeout()
992
993
def bump_timeout(self, timeout=None):
994
"""Bump up the timeout for this client."""
619
620
def checked_ok(self, timeout=None):
621
"""Bump up the timeout for this client.
622
623
This should only be called when the client has been seen,
624
alive and well.
625
"""
995
626
if timeout is None:
996
627
timeout = self.timeout
628
self.last_checked_ok = datetime.datetime.utcnow()
997
629
if self.disable_initiator_tag is not None:
998
GLib.source_remove(self.disable_initiator_tag)
999
self.disable_initiator_tag = None
630
gobject.source_remove(self.disable_initiator_tag)
1000
631
if getattr(self, "enabled", False):
1001
self.disable_initiator_tag = GLib.timeout_add(
1002
int(timeout.total_seconds() * 1000), self.disable)
632
self.disable_initiator_tag = (gobject.timeout_add
633
(timedelta_to_milliseconds
634
(timeout), self.disable))
1003
635
self.expires = datetime.datetime.utcnow() + timeout
1004
636
1005
637
def need_approval(self):
1011
643
If a checker already exists, leave it running and do
1012
644
nothing."""
1013
645
# The reason for not killing a running checker is that if we
1014
# did that, and if a checker (for some reason) started running
1015
# slowly and taking more than 'interval' time, then the client
1016
# would inevitably timeout, since no checker would get a
1017
# chance to run to completion. If we instead leave running
646
# did that, then if a checker (for some reason) started
647
# running slowly and taking more than 'interval' time, the
648
# client would inevitably timeout, since no checker would get
649
# a chance to run to completion. If we instead leave running
1018
650
# checkers alone, the checker would have to take more time
1019
651
# than 'timeout' for the client to be disabled, which is as it
1020
652
# should be.
1021
653
1022
if self.checker is not None and not self.checker.is_alive():
1023
logger.warning("Checker was not alive; joining")
1024
self.checker.join()
1025
self.checker = None
654
# If a checker exists, make sure it is not a zombie
655
try:
656
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
657
except (AttributeError, OSError) as error:
658
if (isinstance(error, OSError)
659
and error.errno != errno.ECHILD):
660
raise error
661
else:
662
if pid:
663
logger.warning("Checker was a zombie")
664
gobject.source_remove(self.checker_callback_tag)
665
self.checker_callback(pid, status,
666
self.current_checker_command)
1026
667
# Start a new checker if needed
1027
668
if self.checker is None:
1028
# Escape attributes for the shell
1029
escaped_attrs = {
1030
attr: re.escape(str(getattr(self, attr)))
1031
for attr in self.runtime_expansions }
1032
669
try:
1033
command = self.checker_command % escaped_attrs
1034
except TypeError as error:
1035
logger.error('Could not format string "%s"',
1036
self.checker_command,
1037
exc_info=error)
1038
return True # Try again later
670
# In case checker_command has exactly one % operator
671
command = self.checker_command % self.host
672
except TypeError:
673
# Escape attributes for the shell
674
escaped_attrs = dict(
675
(attr,
676
re.escape(unicode(str(getattr(self, attr, "")),
677
errors=
678
'replace')))
679
for attr in
680
self.runtime_expansions)
681
682
try:
683
command = self.checker_command % escaped_attrs
684
except TypeError as error:
685
logger.error('Could not format string "%s":'
686
' %s', self.checker_command, error)
687
return True # Try again later
1039
688
self.current_checker_command = command
1040
logger.info("Starting checker %r for %s", command,
1041
self.name)
1042
# We don't need to redirect stdout and stderr, since
1043
# in normal mode, that is already done by daemon(),
1044
# and in debug mode we don't want to. (Stdin is
1045
# always replaced by /dev/null.)
1046
# The exception is when not debugging but nevertheless
1047
# running in the foreground; use the previously
1048
# created wnull.
1049
popen_args = { "close_fds": True,
1050
"shell": True,
1051
"cwd": "/" }
1052
if (not self.server_settings["debug"]
1053
and self.server_settings["foreground"]):
1054
popen_args.update({"stdout": wnull,
1055
"stderr": wnull })
1056
pipe = multiprocessing.Pipe(duplex = False)
1057
self.checker = multiprocessing.Process(
1058
target = call_pipe,
1059
args = (pipe[1], subprocess.call, command),
1060
kwargs = popen_args)
1061
self.checker.start()
1062
self.checker_callback_tag = GLib.io_add_watch(
1063
pipe[0].fileno(), GLib.IO_IN,
1064
self.checker_callback, pipe[0], command)
1065
# Re-run this periodically if run by GLib.timeout_add
689
try:
690
logger.info("Starting checker %r for %s",
691
command, self.name)
692
# We don't need to redirect stdout and stderr, since
693
# in normal mode, that is already done by daemon(),
694
# and in debug mode we don't want to. (Stdin is
695
# always replaced by /dev/null.)
696
self.checker = subprocess.Popen(command,
697
close_fds=True,
698
shell=True, cwd="/")
699
self.checker_callback_tag = (gobject.child_watch_add
700
(self.checker.pid,
701
self.checker_callback,
702
data=command))
703
# The checker may have completed before the gobject
704
# watch was added. Check for this.
705
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
706
if pid:
707
gobject.source_remove(self.checker_callback_tag)
708
self.checker_callback(pid, status, command)
709
except OSError as error:
710
logger.error("Failed to start subprocess: %s",
711
error)
712
# Re-run this periodically if run by gobject.timeout_add
1066
713
return True
1067
714
1068
715
def stop_checker(self):
1069
716
"""Force the checker process, if any, to stop."""
1070
717
if self.checker_callback_tag:
1071
GLib.source_remove(self.checker_callback_tag)
718
gobject.source_remove(self.checker_callback_tag)
1072
719
self.checker_callback_tag = None
1073
720
if getattr(self, "checker", None) is None:
1074
721
return
1075
722
logger.debug("Stopping checker for %(name)s", vars(self))
1076
self.checker.terminate()
723
try:
724
os.kill(self.checker.pid, signal.SIGTERM)
725
#time.sleep(0.5)
726
#if self.checker.poll() is None:
727
# os.kill(self.checker.pid, signal.SIGKILL)
728
except OSError as error:
729
if error.errno != errno.ESRCH: # No such process
730
raise
1077
731
self.checker = None
1078
732
1079
733
1080
def dbus_service_property(dbus_interface,
1081
signature="v",
1082
access="readwrite",
1083
byte_arrays=False):
734
def dbus_service_property(dbus_interface, signature="v",
735
access="readwrite", byte_arrays=False):
1084
736
"""Decorators for marking methods of a DBusObjectWithProperties to
1085
737
become properties on the D-Bus.
1086
738
1095
747
# "Set" method, so we fail early here:
1096
748
if byte_arrays and signature != "ay":
1097
749
raise ValueError("Byte arrays not supported for non-'ay'"
1098
" signature {!r}".format(signature))
1099
750
" signature %r" % signature)
1100
751
def decorator(func):
1101
752
func._dbus_is_property = True
1102
753
func._dbus_interface = dbus_interface
1107
758
func._dbus_name = func._dbus_name[:-14]
1108
759
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1109
760
return func
1110
1111
return decorator
1112
1113
1114
def dbus_interface_annotations(dbus_interface):
1115
"""Decorator for marking functions returning interface annotations
1116
1117
Usage:
1118
1119
@dbus_interface_annotations("org.example.Interface")
1120
def _foo(self): # Function name does not matter
1121
return {"org.freedesktop.DBus.Deprecated": "true",
1122
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1123
"false"}
1124
"""
1125
1126
def decorator(func):
1127
func._dbus_is_interface = True
1128
func._dbus_interface = dbus_interface
1129
func._dbus_name = dbus_interface
1130
return func
1131
1132
return decorator
1133
1134
1135
def dbus_annotations(annotations):
1136
"""Decorator to annotate D-Bus methods, signals or properties
1137
Usage:
1138
1139
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1140
"org.freedesktop.DBus.Property."
1141
"EmitsChangedSignal": "false"})
1142
@dbus_service_property("org.example.Interface", signature="b",
1143
access="r")
1144
def Property_dbus_property(self):
1145
return dbus.Boolean(False)
1146
1147
See also the DBusObjectWithAnnotations class.
1148
"""
1149
1150
def decorator(func):
1151
func._dbus_annotations = annotations
1152
return func
1153
1154
761
return decorator
1155
762
1156
763
1157
764
class DBusPropertyException(dbus.exceptions.DBusException):
1158
765
"""A base class for D-Bus property-related exceptions
1159
766
"""
1160
pass
767
def __unicode__(self):
768
return unicode(str(self))
1161
769
1162
770
1163
771
class DBusPropertyAccessException(DBusPropertyException):
1172
780
pass
1173
781
1174
782
1175
class DBusObjectWithAnnotations(dbus.service.Object):
1176
"""A D-Bus object with annotations.
1177
1178
Classes inheriting from this can use the dbus_annotations
1179
decorator to add annotations to methods or signals.
1180
"""
1181
1182
@staticmethod
1183
def _is_dbus_thing(thing):
1184
"""Returns a function testing if an attribute is a D-Bus thing
1185
1186
If called like _is_dbus_thing("method") it returns a function
1187
suitable for use as predicate to inspect.getmembers().
1188
"""
1189
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1190
False)
1191
1192
def _get_all_dbus_things(self, thing):
1193
"""Returns a generator of (name, attribute) pairs
1194
"""
1195
return ((getattr(athing.__get__(self), "_dbus_name", name),
1196
athing.__get__(self))
1197
for cls in self.__class__.__mro__
1198
for name, athing in
1199
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1200
1201
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1202
out_signature = "s",
1203
path_keyword = 'object_path',
1204
connection_keyword = 'connection')
1205
def Introspect(self, object_path, connection):
1206
"""Overloading of standard D-Bus method.
1207
1208
Inserts annotation tags on methods and signals.
1209
"""
1210
xmlstring = dbus.service.Object.Introspect(self, object_path,
1211
connection)
1212
try:
1213
document = xml.dom.minidom.parseString(xmlstring)
1214
1215
for if_tag in document.getElementsByTagName("interface"):
1216
# Add annotation tags
1217
for typ in ("method", "signal"):
1218
for tag in if_tag.getElementsByTagName(typ):
1219
annots = dict()
1220
for name, prop in (self.
1221
_get_all_dbus_things(typ)):
1222
if (name == tag.getAttribute("name")
1223
and prop._dbus_interface
1224
== if_tag.getAttribute("name")):
1225
annots.update(getattr(
1226
prop, "_dbus_annotations", {}))
1227
for name, value in annots.items():
1228
ann_tag = document.createElement(
1229
"annotation")
1230
ann_tag.setAttribute("name", name)
1231
ann_tag.setAttribute("value", value)
1232
tag.appendChild(ann_tag)
1233
# Add interface annotation tags
1234
for annotation, value in dict(
1235
itertools.chain.from_iterable(
1236
annotations().items()
1237
for name, annotations
1238
in self._get_all_dbus_things("interface")
1239
if name == if_tag.getAttribute("name")
1240
)).items():
1241
ann_tag = document.createElement("annotation")
1242
ann_tag.setAttribute("name", annotation)
1243
ann_tag.setAttribute("value", value)
1244
if_tag.appendChild(ann_tag)
1245
# Fix argument name for the Introspect method itself
1246
if (if_tag.getAttribute("name")
1247
== dbus.INTROSPECTABLE_IFACE):
1248
for cn in if_tag.getElementsByTagName("method"):
1249
if cn.getAttribute("name") == "Introspect":
1250
for arg in cn.getElementsByTagName("arg"):
1251
if (arg.getAttribute("direction")
1252
== "out"):
1253
arg.setAttribute("name",
1254
"xml_data")
1255
xmlstring = document.toxml("utf-8")
1256
document.unlink()
1257
except (AttributeError, xml.dom.DOMException,
1258
xml.parsers.expat.ExpatError) as error:
1259
logger.error("Failed to override Introspection method",
1260
exc_info=error)
1261
return xmlstring
1262
1263
1264
class DBusObjectWithProperties(DBusObjectWithAnnotations):
783
class DBusObjectWithProperties(dbus.service.Object):
1265
784
"""A D-Bus object with properties.
1266
785
1267
786
Classes inheriting from this can use the dbus_service_property
1269
788
standard Get(), Set(), and GetAll() methods on the D-Bus.
1270
789
"""
1271
790
791
@staticmethod
792
def _is_dbus_property(obj):
793
return getattr(obj, "_dbus_is_property", False)
794
795
def _get_all_dbus_properties(self):
796
"""Returns a generator of (name, attribute) pairs
797
"""
798
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
799
for cls in self.__class__.__mro__
800
for name, prop in
801
inspect.getmembers(cls, self._is_dbus_property))
802
1272
803
def _get_dbus_property(self, interface_name, property_name):
1273
804
"""Returns a bound method if one exists which is a D-Bus
1274
805
property with the specified name and interface.
1275
806
"""
1276
for cls in self.__class__.__mro__:
1277
for name, value in inspect.getmembers(
1278
cls, self._is_dbus_thing("property")):
807
for cls in self.__class__.__mro__:
808
for name, value in (inspect.getmembers
809
(cls, self._is_dbus_property)):
1279
810
if (value._dbus_name == property_name
1280
811
and value._dbus_interface == interface_name):
1281
812
return value.__get__(self)
1282
813
1283
814
# No such property
1284
raise DBusPropertyNotFound("{}:{}.{}".format(
1285
self.dbus_object_path, interface_name, property_name))
1286
1287
@classmethod
1288
def _get_all_interface_names(cls):
1289
"""Get a sequence of all interfaces supported by an object"""
1290
return (name for name in set(getattr(getattr(x, attr),
1291
"_dbus_interface", None)
1292
for x in (inspect.getmro(cls))
1293
for attr in dir(x))
1294
if name is not None)
1295
1296
@dbus.service.method(dbus.PROPERTIES_IFACE,
1297
in_signature="ss",
815
raise DBusPropertyNotFound(self.dbus_object_path + ":"
816
+ interface_name + "."
817
+ property_name)
818
819
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1298
820
out_signature="v")
1299
821
def Get(self, interface_name, property_name):
1300
822
"""Standard D-Bus property Get() method, see D-Bus standard.
1318
840
# The byte_arrays option is not supported yet on
1319
841
# signatures other than "ay".
1320
842
if prop._dbus_signature != "ay":
1321
raise ValueError("Byte arrays not supported for non-"
1322
"'ay' signature {!r}"
1323
.format(prop._dbus_signature))
1324
value = dbus.ByteArray(b''.join(chr(byte)
1325
for byte in value))
843
raise ValueError
844
value = dbus.ByteArray(''.join(unichr(byte)
845
for byte in value))
1326
846
prop(value)
1327
847
1328
@dbus.service.method(dbus.PROPERTIES_IFACE,
1329
in_signature="s",
848
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1330
849
out_signature="a{sv}")
1331
850
def GetAll(self, interface_name):
1332
851
"""Standard D-Bus property GetAll() method, see D-Bus
1335
854
Note: Will not include properties with access="write".
1336
855
"""
1337
856
properties = {}
1338
for name, prop in self._get_all_dbus_things("property"):
857
for name, prop in self._get_all_dbus_properties():
1339
858
if (interface_name
1340
859
and interface_name != prop._dbus_interface):
1341
860
# Interface non-empty but did not match
1347
866
if not hasattr(value, "variant_level"):
1348
867
properties[name] = value
1349
868
continue
1350
properties[name] = type(value)(
1351
value, variant_level = value.variant_level + 1)
869
properties[name] = type(value)(value, variant_level=
870
value.variant_level+1)
1352
871
return dbus.Dictionary(properties, signature="sv")
1353
872
1354
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1355
def PropertiesChanged(self, interface_name, changed_properties,
1356
invalidated_properties):
1357
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
1358
standard.
1359
"""
1360
pass
1361
1362
873
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1363
874
out_signature="s",
1364
875
path_keyword='object_path',
1365
876
connection_keyword='connection')
1366
877
def Introspect(self, object_path, connection):
1367
"""Overloading of standard D-Bus method.
1368
1369
Inserts property tags and interface annotation tags.
878
"""Standard D-Bus method, overloaded to insert property tags.
1370
879
"""
1371
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1372
object_path,
1373
connection)
880
xmlstring = dbus.service.Object.Introspect(self, object_path,
881
connection)
1374
882
try:
1375
883
document = xml.dom.minidom.parseString(xmlstring)
1376
1377
884
def make_tag(document, name, prop):
1378
885
e = document.createElement("property")
1379
886
e.setAttribute("name", name)
1380
887
e.setAttribute("type", prop._dbus_signature)
1381
888
e.setAttribute("access", prop._dbus_access)
1382
889
return e
1383
1384
890
for if_tag in document.getElementsByTagName("interface"):
1385
# Add property tags
1386
891
for tag in (make_tag(document, name, prop)
1387
892
for name, prop
1388
in self._get_all_dbus_things("property")
893
in self._get_all_dbus_properties()
1389
894
if prop._dbus_interface
1390
895
== if_tag.getAttribute("name")):
1391
896
if_tag.appendChild(tag)
1392
# Add annotation tags for properties
1393
for tag in if_tag.getElementsByTagName("property"):
1394
annots = dict()
1395
for name, prop in self._get_all_dbus_things(
1396
"property"):
1397
if (name == tag.getAttribute("name")
1398
and prop._dbus_interface
1399
== if_tag.getAttribute("name")):
1400
annots.update(getattr(
1401
prop, "_dbus_annotations", {}))
1402
for name, value in annots.items():
1403
ann_tag = document.createElement(
1404
"annotation")
1405
ann_tag.setAttribute("name", name)
1406
ann_tag.setAttribute("value", value)
1407
tag.appendChild(ann_tag)
1408
897
# Add the names to the return values for the
1409
898
# "org.freedesktop.DBus.Properties" methods
1410
899
if (if_tag.getAttribute("name")
1425
914
except (AttributeError, xml.dom.DOMException,
1426
915
xml.parsers.expat.ExpatError) as error:
1427
916
logger.error("Failed to override Introspection method",
1428
exc_info=error)
1429
return xmlstring
1430
1431
try:
1432
dbus.OBJECT_MANAGER_IFACE
1433
except AttributeError:
1434
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1435
1436
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1437
"""A D-Bus object with an ObjectManager.
1438
1439
Classes inheriting from this exposes the standard
1440
GetManagedObjects call and the InterfacesAdded and
1441
InterfacesRemoved signals on the standard
1442
"org.freedesktop.DBus.ObjectManager" interface.
1443
1444
Note: No signals are sent automatically; they must be sent
1445
manually.
1446
"""
1447
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1448
out_signature = "a{oa{sa{sv}}}")
1449
def GetManagedObjects(self):
1450
"""This function must be overridden"""
1451
raise NotImplementedError()
1452
1453
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1454
signature = "oa{sa{sv}}")
1455
def InterfacesAdded(self, object_path, interfaces_and_properties):
1456
pass
1457
1458
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1459
def InterfacesRemoved(self, object_path, interfaces):
1460
pass
1461
1462
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1463
out_signature = "s",
1464
path_keyword = 'object_path',
1465
connection_keyword = 'connection')
1466
def Introspect(self, object_path, connection):
1467
"""Overloading of standard D-Bus method.
1468
1469
Override return argument name of GetManagedObjects to be
1470
"objpath_interfaces_and_properties"
1471
"""
1472
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1473
object_path,
1474
connection)
1475
try:
1476
document = xml.dom.minidom.parseString(xmlstring)
1477
1478
for if_tag in document.getElementsByTagName("interface"):
1479
# Fix argument name for the GetManagedObjects method
1480
if (if_tag.getAttribute("name")
1481
== dbus.OBJECT_MANAGER_IFACE):
1482
for cn in if_tag.getElementsByTagName("method"):
1483
if (cn.getAttribute("name")
1484
== "GetManagedObjects"):
1485
for arg in cn.getElementsByTagName("arg"):
1486
if (arg.getAttribute("direction")
1487
== "out"):
1488
arg.setAttribute(
1489
"name",
1490
"objpath_interfaces"
1491
"_and_properties")
1492
xmlstring = document.toxml("utf-8")
1493
document.unlink()
1494
except (AttributeError, xml.dom.DOMException,
1495
xml.parsers.expat.ExpatError) as error:
1496
logger.error("Failed to override Introspection method",
1497
exc_info = error)
1498
return xmlstring
1499
1500
def datetime_to_dbus(dt, variant_level=0):
917
error)
918
return xmlstring
919
920
921
def datetime_to_dbus (dt, variant_level=0):
1501
922
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1502
923
if dt is None:
1503
924
return dbus.String("", variant_level = variant_level)
1504
return dbus.String(dt.isoformat(), variant_level=variant_level)
1505
1506
1507
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1508
"""A class decorator; applied to a subclass of
1509
dbus.service.Object, it will add alternate D-Bus attributes with
1510
interface names according to the "alt_interface_names" mapping.
1511
Usage:
1512
1513
@alternate_dbus_interfaces({"org.example.Interface":
1514
"net.example.AlternateInterface"})
1515
class SampleDBusObject(dbus.service.Object):
1516
@dbus.service.method("org.example.Interface")
1517
def SampleDBusMethod():
1518
pass
1519
1520
The above "SampleDBusMethod" on "SampleDBusObject" will be
1521
reachable via two interfaces: "org.example.Interface" and
1522
"net.example.AlternateInterface", the latter of which will have
1523
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1524
"true", unless "deprecate" is passed with a False value.
1525
1526
This works for methods and signals, and also for D-Bus properties
1527
(from DBusObjectWithProperties) and interfaces (from the
1528
dbus_interface_annotations decorator).
925
return dbus.String(dt.isoformat(),
926
variant_level=variant_level)
927
928
929
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
930
.__metaclass__):
931
"""Applied to an empty subclass of a D-Bus object, this metaclass
932
will add additional D-Bus attributes matching a certain pattern.
1529
933
"""
1530
1531
def wrapper(cls):
1532
for orig_interface_name, alt_interface_name in (
1533
alt_interface_names.items()):
1534
attr = {}
1535
interface_names = set()
1536
# Go though all attributes of the class
1537
for attrname, attribute in inspect.getmembers(cls):
934
def __new__(mcs, name, bases, attr):
935
# Go through all the base classes which could have D-Bus
936
# methods, signals, or properties in them
937
for base in (b for b in bases
938
if issubclass(b, dbus.service.Object)):
939
# Go though all attributes of the base class
940
for attrname, attribute in inspect.getmembers(base):
1538
941
# Ignore non-D-Bus attributes, and D-Bus attributes
1539
942
# with the wrong interface name
1540
943
if (not hasattr(attribute, "_dbus_interface")
1541
or not attribute._dbus_interface.startswith(
1542
orig_interface_name)):
944
or not attribute._dbus_interface
945
.startswith("se.recompile.Mandos")):
1543
946
continue
1544
947
# Create an alternate D-Bus interface name based on
1545
948
# the current name
1546
alt_interface = attribute._dbus_interface.replace(
1547
orig_interface_name, alt_interface_name)
1548
interface_names.add(alt_interface)
949
alt_interface = (attribute._dbus_interface
950
.replace("se.recompile.Mandos",
951
"se.bsnet.fukt.Mandos"))
1549
952
# Is this a D-Bus signal?
1550
953
if getattr(attribute, "_dbus_is_signal", False):
1551
# Extract the original non-method undecorated
1552
# function by black magic
1553
if sys.version_info.major == 2:
1554
nonmethod_func = (dict(
954
# Extract the original non-method function by
955
# black magic
956
nonmethod_func = (dict(
1555
957
zip(attribute.func_code.co_freevars,
1556
attribute.__closure__))
1557
["func"].cell_contents)
1558
else:
1559
nonmethod_func = (dict(
1560
zip(attribute.__code__.co_freevars,
1561
attribute.__closure__))
1562
["func"].cell_contents)
958
attribute.__closure__))["func"]
959
.cell_contents)
1563
960
# Create a new, but exactly alike, function
1564
961
# object, and decorate it to be a new D-Bus signal
1565
962
# with the alternate D-Bus interface name
1566
new_function = copy_function(nonmethod_func)
1567
new_function = (dbus.service.signal(
1568
alt_interface,
1569
attribute._dbus_signature)(new_function))
1570
# Copy annotations, if any
1571
try:
1572
new_function._dbus_annotations = dict(
1573
attribute._dbus_annotations)
1574
except AttributeError:
1575
pass
963
new_function = (dbus.service.signal
964
(alt_interface,
965
attribute._dbus_signature)
966
(types.FunctionType(
967
nonmethod_func.func_code,
968
nonmethod_func.func_globals,
969
nonmethod_func.func_name,
970
nonmethod_func.func_defaults,
971
nonmethod_func.func_closure)))
1576
972
# Define a creator of a function to call both the
1577
# original and alternate functions, so both the
1578
# original and alternate signals gets sent when
1579
# the function is called
973
# old and new functions, so both the old and new
974
# signals gets sent when the function is called
1580
975
def fixscope(func1, func2):
1581
976
"""This function is a scope container to pass
1582
977
func1 and func2 to the "call_both" function
1583
978
outside of its arguments"""
1584
1585
@functools.wraps(func2)
1586
979
def call_both(*args, **kwargs):
1587
980
"""This function will emit two D-Bus
1588
981
signals by calling func1 and func2"""
1589
982
func1(*args, **kwargs)
1590
983
func2(*args, **kwargs)
1591
# Make wrapper function look like a D-Bus signal
1592
for name, attr in inspect.getmembers(func2):
1593
if name.startswith("_dbus_"):
1594
setattr(call_both, name, attr)
1595
1596
984
return call_both
1597
985
# Create the "call_both" function and add it to
1598
986
# the class
1599
attr[attrname] = fixscope(attribute, new_function)
987
attr[attrname] = fixscope(attribute,
988
new_function)
1600
989
# Is this a D-Bus method?
1601
990
elif getattr(attribute, "_dbus_is_method", False):
1602
991
# Create a new, but exactly alike, function
1603
992
# object. Decorate it to be a new D-Bus method
1604
993
# with the alternate D-Bus interface name. Add it
1605
994
# to the class.
1606
attr[attrname] = (
1607
dbus.service.method(
1608
alt_interface,
1609
attribute._dbus_in_signature,
1610
attribute._dbus_out_signature)
1611
(copy_function(attribute)))
1612
# Copy annotations, if any
1613
try:
1614
attr[attrname]._dbus_annotations = dict(
1615
attribute._dbus_annotations)
1616
except AttributeError:
1617
pass
995
attr[attrname] = (dbus.service.method
996
(alt_interface,
997
attribute._dbus_in_signature,
998
attribute._dbus_out_signature)
999
(types.FunctionType
1000
(attribute.func_code,
1001
attribute.func_globals,
1002
attribute.func_name,
1003
attribute.func_defaults,
1004
attribute.func_closure)))
1618
1005
# Is this a D-Bus property?
1619
1006
elif getattr(attribute, "_dbus_is_property", False):
1620
1007
# Create a new, but exactly alike, function
1621
1008
# object, and decorate it to be a new D-Bus
1622
1009
# property with the alternate D-Bus interface
1623
1010
# name. Add it to the class.
1624
attr[attrname] = (dbus_service_property(
1625
alt_interface, attribute._dbus_signature,
1626
attribute._dbus_access,
1627
attribute._dbus_get_args_options
1628
["byte_arrays"])
1629
(copy_function(attribute)))
1630
# Copy annotations, if any
1631
try:
1632
attr[attrname]._dbus_annotations = dict(
1633
attribute._dbus_annotations)
1634
except AttributeError:
1635
pass
1636
# Is this a D-Bus interface?
1637
elif getattr(attribute, "_dbus_is_interface", False):
1638
# Create a new, but exactly alike, function
1639
# object. Decorate it to be a new D-Bus interface
1640
# with the alternate D-Bus interface name. Add it
1641
# to the class.
1642
attr[attrname] = (
1643
dbus_interface_annotations(alt_interface)
1644
(copy_function(attribute)))
1645
if deprecate:
1646
# Deprecate all alternate interfaces
1647
iname="_AlternateDBusNames_interface_annotation{}"
1648
for interface_name in interface_names:
1649
1650
@dbus_interface_annotations(interface_name)
1651
def func(self):
1652
return { "org.freedesktop.DBus.Deprecated":
1653
"true" }
1654
# Find an unused name
1655
for aname in (iname.format(i)
1656
for i in itertools.count()):
1657
if aname not in attr:
1658
attr[aname] = func
1659
break
1660
if interface_names:
1661
# Replace the class with a new subclass of it with
1662
# methods, signals, etc. as created above.
1663
if sys.version_info.major == 2:
1664
cls = type(b"{}Alternate".format(cls.__name__),
1665
(cls, ), attr)
1666
else:
1667
cls = type("{}Alternate".format(cls.__name__),
1668
(cls, ), attr)
1669
return cls
1670
1671
return wrapper
1672
1673
1674
@alternate_dbus_interfaces({"se.recompile.Mandos":
1675
"se.bsnet.fukt.Mandos"})
1011
attr[attrname] = (dbus_service_property
1012
(alt_interface,
1013
attribute._dbus_signature,
1014
attribute._dbus_access,
1015
attribute
1016
._dbus_get_args_options
1017
["byte_arrays"])
1018
(types.FunctionType
1019
(attribute.func_code,
1020
attribute.func_globals,
1021
attribute.func_name,
1022
attribute.func_defaults,
1023
attribute.func_closure)))
1024
return type.__new__(mcs, name, bases, attr)
1025
1026
1676
1027
class ClientDBus(Client, DBusObjectWithProperties):
1677
1028
"""A Client class using D-Bus
1678
1029
1682
1033
"""
1683
1034
1684
1035
runtime_expansions = (Client.runtime_expansions
1685
+ ("dbus_object_path", ))
1686
1687
_interface = "se.recompile.Mandos.Client"
1036
+ ("dbus_object_path",))
1688
1037
1689
1038
# dbus.service.Object doesn't use super(), so we can't either.
1690
1039
1691
1040
def __init__(self, bus = None, *args, **kwargs):
1692
1041
self.bus = bus
1693
1042
Client.__init__(self, *args, **kwargs)
1043
self._approvals_pending = 0
1044
1045
self._approvals_pending = 0
1694
1046
# Only now, when this client is initialized, can it show up on
1695
1047
# the D-Bus
1696
client_object_name = str(self.name).translate(
1048
client_object_name = unicode(self.name).translate(
1697
1049
{ord("."): ord("_"),
1698
1050
ord("-"): ord("_")})
1699
self.dbus_object_path = dbus.ObjectPath(
1700
"/clients/" + client_object_name)
1051
self.dbus_object_path = (dbus.ObjectPath
1052
("/clients/" + client_object_name))
1701
1053
DBusObjectWithProperties.__init__(self, self.bus,
1702
1054
self.dbus_object_path)
1703
1704
def notifychangeproperty(transform_func, dbus_name,
1705
type_func=lambda x: x,
1706
variant_level=1,
1707
invalidate_only=False,
1708
_interface=_interface):
1055
1056
def notifychangeproperty(transform_func,
1057
dbus_name, type_func=lambda x: x,
1058
variant_level=1):
1709
1059
""" Modify a variable so that it's a property which announces
1710
1060
its changes to DBus.
1711
1061
1716
1066
to the D-Bus. Default: no transform
1717
1067
variant_level: D-Bus variant level. Default: 1
1718
1068
"""
1719
attrname = "_{}".format(dbus_name)
1720
1069
attrname = "_{0}".format(dbus_name)
1721
1070
def setter(self, value):
1722
1071
if hasattr(self, "dbus_object_path"):
1723
1072
if (not hasattr(self, attrname) or
1724
1073
type_func(getattr(self, attrname, None))
1725
1074
!= type_func(value)):
1726
if invalidate_only:
1727
self.PropertiesChanged(
1728
_interface, dbus.Dictionary(),
1729
dbus.Array((dbus_name, )))
1730
else:
1731
dbus_value = transform_func(
1732
type_func(value),
1733
variant_level = variant_level)
1734
self.PropertyChanged(dbus.String(dbus_name),
1735
dbus_value)
1736
self.PropertiesChanged(
1737
_interface,
1738
dbus.Dictionary({ dbus.String(dbus_name):
1739
dbus_value }),
1740
dbus.Array())
1075
dbus_value = transform_func(type_func(value),
1076
variant_level
1077
=variant_level)
1078
self.PropertyChanged(dbus.String(dbus_name),
1079
dbus_value)
1741
1080
setattr(self, attrname, value)
1742
1081
1743
1082
return property(lambda self: getattr(self, attrname), setter)
1744
1083
1084
1745
1085
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1746
1086
approvals_pending = notifychangeproperty(dbus.Boolean,
1747
1087
"ApprovalPending",
1749
1089
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1750
1090
last_enabled = notifychangeproperty(datetime_to_dbus,
1751
1091
"LastEnabled")
1752
checker = notifychangeproperty(
1753
dbus.Boolean, "CheckerRunning",
1754
type_func = lambda checker: checker is not None)
1092
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1093
type_func = lambda checker:
1094
checker is not None)
1755
1095
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1756
1096
"LastCheckedOK")
1757
last_checker_status = notifychangeproperty(dbus.Int16,
1758
"LastCheckerStatus")
1759
1097
last_approval_request = notifychangeproperty(
1760
1098
datetime_to_dbus, "LastApprovalRequest")
1761
1099
approved_by_default = notifychangeproperty(dbus.Boolean,
1762
1100
"ApprovedByDefault")
1763
approval_delay = notifychangeproperty(
1764
dbus.UInt64, "ApprovalDelay",
1765
type_func = lambda td: td.total_seconds() * 1000)
1101
approval_delay = notifychangeproperty(dbus.UInt64,
1102
"ApprovalDelay",
1103
type_func =
1104
timedelta_to_milliseconds)
1766
1105
approval_duration = notifychangeproperty(
1767
1106
dbus.UInt64, "ApprovalDuration",
1768
type_func = lambda td: td.total_seconds() * 1000)
1107
type_func = timedelta_to_milliseconds)
1769
1108
host = notifychangeproperty(dbus.String, "Host")
1770
timeout = notifychangeproperty(
1771
dbus.UInt64, "Timeout",
1772
type_func = lambda td: td.total_seconds() * 1000)
1109
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1110
type_func =
1111
timedelta_to_milliseconds)
1773
1112
extended_timeout = notifychangeproperty(
1774
1113
dbus.UInt64, "ExtendedTimeout",
1775
type_func = lambda td: td.total_seconds() * 1000)
1776
interval = notifychangeproperty(
1777
dbus.UInt64, "Interval",
1778
type_func = lambda td: td.total_seconds() * 1000)
1114
type_func = timedelta_to_milliseconds)
1115
interval = notifychangeproperty(dbus.UInt64,
1116
"Interval",
1117
type_func =
1118
timedelta_to_milliseconds)
1779
1119
checker_command = notifychangeproperty(dbus.String, "Checker")
1780
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1781
invalidate_only=True)
1782
1120
1783
1121
del notifychangeproperty
1784
1122
1791
1129
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1792
1130
Client.__del__(self, *args, **kwargs)
1793
1131
1794
def checker_callback(self, source, condition,
1795
connection, command, *args, **kwargs):
1796
ret = Client.checker_callback(self, source, condition,
1797
connection, command, *args,
1798
**kwargs)
1799
exitstatus = self.last_checker_status
1800
if exitstatus >= 0:
1132
def checker_callback(self, pid, condition, command,
1133
*args, **kwargs):
1134
self.checker_callback_tag = None
1135
self.checker = None
1136
if os.WIFEXITED(condition):
1137
exitstatus = os.WEXITSTATUS(condition)
1801
1138
# Emit D-Bus signal
1802
1139
self.CheckerCompleted(dbus.Int16(exitstatus),
1803
# This is specific to GNU libC
1804
dbus.Int64(exitstatus << 8),
1140
dbus.Int64(condition),
1805
1141
dbus.String(command))
1806
1142
else:
1807
1143
# Emit D-Bus signal
1808
1144
self.CheckerCompleted(dbus.Int16(-1),
1809
dbus.Int64(
1810
# This is specific to GNU libC
1811
(exitstatus << 8)
1812
| self.last_checker_signal),
1145
dbus.Int64(condition),
1813
1146
dbus.String(command))
1814
return ret
1147
1148
return Client.checker_callback(self, pid, condition, command,
1149
*args, **kwargs)
1815
1150
1816
1151
def start_checker(self, *args, **kwargs):
1817
old_checker_pid = getattr(self.checker, "pid", None)
1152
old_checker = self.checker
1153
if self.checker is not None:
1154
old_checker_pid = self.checker.pid
1155
else:
1156
old_checker_pid = None
1818
1157
r = Client.start_checker(self, *args, **kwargs)
1819
1158
# Only if new checker process was started
1820
1159
if (self.checker is not None
1828
1167
return False
1829
1168
1830
1169
def approve(self, value=True):
1170
self.send_changedstate()
1831
1171
self.approved = value
1832
GLib.timeout_add(int(self.approval_duration.total_seconds()
1833
* 1000), self._reset_approved)
1834
self.send_changedstate()
1172
gobject.timeout_add(timedelta_to_milliseconds
1173
(self.approval_duration),
1174
self._reset_approved)
1175
1835
1176
1836
1177
## D-Bus methods, signals & properties
1837
1838
## Interfaces
1178
_interface = "se.recompile.Mandos.Client"
1839
1179
1840
1180
## Signals
1841
1181
1852
1192
pass
1853
1193
1854
1194
# PropertyChanged - signal
1855
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1856
1195
@dbus.service.signal(_interface, signature="sv")
1857
1196
def PropertyChanged(self, property, value):
1858
1197
"D-Bus signal"
1879
1218
"D-Bus signal"
1880
1219
return self.need_approval()
1881
1220
1221
# NeRwequest - signal
1222
@dbus.service.signal(_interface, signature="s")
1223
def NewRequest(self, ip):
1224
"""D-Bus signal
1225
Is sent after a client request a password.
1226
"""
1227
pass
1228
1882
1229
## Methods
1883
1230
1884
1231
# Approve - method
1892
1239
self.checked_ok()
1893
1240
1894
1241
# Enable - method
1895
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1896
1242
@dbus.service.method(_interface)
1897
1243
def Enable(self):
1898
1244
"D-Bus method"
1899
1245
self.enable()
1900
1246
1901
1247
# StartChecker - method
1902
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1903
1248
@dbus.service.method(_interface)
1904
1249
def StartChecker(self):
1905
1250
"D-Bus method"
1906
1251
self.start_checker()
1907
1252
1908
1253
# Disable - method
1909
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1910
1254
@dbus.service.method(_interface)
1911
1255
def Disable(self):
1912
1256
"D-Bus method"
1913
1257
self.disable()
1914
1258
1915
1259
# StopChecker - method
1916
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1917
1260
@dbus.service.method(_interface)
1918
1261
def StopChecker(self):
1919
1262
self.stop_checker()
1926
1269
return dbus.Boolean(bool(self.approvals_pending))
1927
1270
1928
1271
# ApprovedByDefault - property
1929
@dbus_service_property(_interface,
1930
signature="b",
1272
@dbus_service_property(_interface, signature="b",
1931
1273
access="readwrite")
1932
1274
def ApprovedByDefault_dbus_property(self, value=None):
1933
1275
if value is None: # get
1935
1277
self.approved_by_default = bool(value)
1936
1278
1937
1279
# ApprovalDelay - property
1938
@dbus_service_property(_interface,
1939
signature="t",
1280
@dbus_service_property(_interface, signature="t",
1940
1281
access="readwrite")
1941
1282
def ApprovalDelay_dbus_property(self, value=None):
1942
1283
if value is None: # get
1943
return dbus.UInt64(self.approval_delay.total_seconds()
1944
* 1000)
1284
return dbus.UInt64(self.approval_delay_milliseconds())
1945
1285
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1946
1286
1947
1287
# ApprovalDuration - property
1948
@dbus_service_property(_interface,
1949
signature="t",
1288
@dbus_service_property(_interface, signature="t",
1950
1289
access="readwrite")
1951
1290
def ApprovalDuration_dbus_property(self, value=None):
1952
1291
if value is None: # get
1953
return dbus.UInt64(self.approval_duration.total_seconds()
1954
* 1000)
1292
return dbus.UInt64(timedelta_to_milliseconds(
1293
self.approval_duration))
1955
1294
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1956
1295
1957
1296
# Name - property
1958
@dbus_annotations(
1959
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1960
1297
@dbus_service_property(_interface, signature="s", access="read")
1961
1298
def Name_dbus_property(self):
1962
1299
return dbus.String(self.name)
1963
1300
1964
1301
# Fingerprint - property
1965
@dbus_annotations(
1966
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1967
1302
@dbus_service_property(_interface, signature="s", access="read")
1968
1303
def Fingerprint_dbus_property(self):
1969
1304
return dbus.String(self.fingerprint)
1970
1305
1971
1306
# Host - property
1972
@dbus_service_property(_interface,
1973
signature="s",
1307
@dbus_service_property(_interface, signature="s",
1974
1308
access="readwrite")
1975
1309
def Host_dbus_property(self, value=None):
1976
1310
if value is None: # get
1977
1311
return dbus.String(self.host)
1978
self.host = str(value)
1312
self.host = unicode(value)
1979
1313
1980
1314
# Created - property
1981
@dbus_annotations(
1982
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1983
1315
@dbus_service_property(_interface, signature="s", access="read")
1984
1316
def Created_dbus_property(self):
1985
1317
return datetime_to_dbus(self.created)
1990
1322
return datetime_to_dbus(self.last_enabled)
1991
1323
1992
1324
# Enabled - property
1993
@dbus_service_property(_interface,
1994
signature="b",
1325
@dbus_service_property(_interface, signature="b",
1995
1326
access="readwrite")
1996
1327
def Enabled_dbus_property(self, value=None):
1997
1328
if value is None: # get
2002
1333
self.disable()
2003
1334
2004
1335
# LastCheckedOK - property
2005
@dbus_service_property(_interface,
2006
signature="s",
1336
@dbus_service_property(_interface, signature="s",
2007
1337
access="readwrite")
2008
1338
def LastCheckedOK_dbus_property(self, value=None):
2009
1339
if value is not None:
2011
1341
return
2012
1342
return datetime_to_dbus(self.last_checked_ok)
2013
1343
2014
# LastCheckerStatus - property
2015
@dbus_service_property(_interface, signature="n", access="read")
2016
def LastCheckerStatus_dbus_property(self):
2017
return dbus.Int16(self.last_checker_status)
2018
2019
1344
# Expires - property
2020
1345
@dbus_service_property(_interface, signature="s", access="read")
2021
1346
def Expires_dbus_property(self):
2027
1352
return datetime_to_dbus(self.last_approval_request)
2028
1353
2029
1354
# Timeout - property
2030
@dbus_service_property(_interface,
2031
signature="t",
1355
@dbus_service_property(_interface, signature="t",
2032
1356
access="readwrite")
2033
1357
def Timeout_dbus_property(self, value=None):
2034
1358
if value is None: # get
2035
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2036
old_timeout = self.timeout
1359
return dbus.UInt64(self.timeout_milliseconds())
2037
1360
self.timeout = datetime.timedelta(0, 0, 0, value)
2038
# Reschedule disabling
2039
if self.enabled:
2040
now = datetime.datetime.utcnow()
2041
self.expires += self.timeout - old_timeout
2042
if self.expires <= now:
2043
# The timeout has passed
2044
self.disable()
2045
else:
2046
if (getattr(self, "disable_initiator_tag", None)
2047
is None):
2048
return
2049
GLib.source_remove(self.disable_initiator_tag)
2050
self.disable_initiator_tag = GLib.timeout_add(
2051
int((self.expires - now).total_seconds() * 1000),
2052
self.disable)
1361
if getattr(self, "disable_initiator_tag", None) is None:
1362
return
1363
# Reschedule timeout
1364
gobject.source_remove(self.disable_initiator_tag)
1365
self.disable_initiator_tag = None
1366
self.expires = None
1367
time_to_die = timedelta_to_milliseconds((self
1368
.last_checked_ok
1369
+ self.timeout)
1370
- datetime.datetime
1371
.utcnow())
1372
if time_to_die <= 0:
1373
# The timeout has passed
1374
self.disable()
1375
else:
1376
self.expires = (datetime.datetime.utcnow()
1377
+ datetime.timedelta(milliseconds =
1378
time_to_die))
1379
self.disable_initiator_tag = (gobject.timeout_add
1380
(time_to_die, self.disable))
2053
1381
2054
1382
# ExtendedTimeout - property
2055
@dbus_service_property(_interface,
2056
signature="t",
1383
@dbus_service_property(_interface, signature="t",
2057
1384
access="readwrite")
2058
1385
def ExtendedTimeout_dbus_property(self, value=None):
2059
1386
if value is None: # get
2060
return dbus.UInt64(self.extended_timeout.total_seconds()
2061
* 1000)
1387
return dbus.UInt64(self.extended_timeout_milliseconds())
2062
1388
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2063
1389
2064
1390
# Interval - property
2065
@dbus_service_property(_interface,
2066
signature="t",
1391
@dbus_service_property(_interface, signature="t",
2067
1392
access="readwrite")
2068
1393
def Interval_dbus_property(self, value=None):
2069
1394
if value is None: # get
2070
return dbus.UInt64(self.interval.total_seconds() * 1000)
1395
return dbus.UInt64(self.interval_milliseconds())
2071
1396
self.interval = datetime.timedelta(0, 0, 0, value)
2072
1397
if getattr(self, "checker_initiator_tag", None) is None:
2073
1398
return
2074
1399
if self.enabled:
2075
1400
# Reschedule checker run
2076
GLib.source_remove(self.checker_initiator_tag)
2077
self.checker_initiator_tag = GLib.timeout_add(
2078
value, self.start_checker)
2079
self.start_checker() # Start one now, too
1401
gobject.source_remove(self.checker_initiator_tag)
1402
self.checker_initiator_tag = (gobject.timeout_add
1403
(value, self.start_checker))
1404
self.start_checker() # Start one now, too
2080
1405
2081
1406
# Checker - property
2082
@dbus_service_property(_interface,
2083
signature="s",
1407
@dbus_service_property(_interface, signature="s",
2084
1408
access="readwrite")
2085
1409
def Checker_dbus_property(self, value=None):
2086
1410
if value is None: # get
2087
1411
return dbus.String(self.checker_command)
2088
self.checker_command = str(value)
1412
self.checker_command = unicode(value)
2089
1413
2090
1414
# CheckerRunning - property
2091
@dbus_service_property(_interface,
2092
signature="b",
1415
@dbus_service_property(_interface, signature="b",
2093
1416
access="readwrite")
2094
1417
def CheckerRunning_dbus_property(self, value=None):
2095
1418
if value is None: # get
2100
1423
self.stop_checker()
2101
1424
2102
1425
# ObjectPath - property
2103
@dbus_annotations(
2104
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2105
"org.freedesktop.DBus.Deprecated": "true"})
2106
1426
@dbus_service_property(_interface, signature="o", access="read")
2107
1427
def ObjectPath_dbus_property(self):
2108
1428
return self.dbus_object_path # is already a dbus.ObjectPath
2109
1429
2110
1430
# Secret = property
2111
@dbus_annotations(
2112
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2113
"invalidates"})
2114
@dbus_service_property(_interface,
2115
signature="ay",
2116
access="write",
2117
byte_arrays=True)
1431
@dbus_service_property(_interface, signature="ay",
1432
access="write", byte_arrays=True)
2118
1433
def Secret_dbus_property(self, value):
2119
self.secret = bytes(value)
1434
self.secret = str(value)
2120
1435
2121
1436
del _interface
2122
1437
2126
1441
self._pipe = child_pipe
2127
1442
self._pipe.send(('init', fpr, address))
2128
1443
if not self._pipe.recv():
2129
raise KeyError(fpr)
1444
raise KeyError()
2130
1445
2131
1446
def __getattribute__(self, name):
2132
1447
if name == '_pipe':
2136
1451
if data[0] == 'data':
2137
1452
return data[1]
2138
1453
if data[0] == 'function':
2139
2140
1454
def func(*args, **kwargs):
2141
1455
self._pipe.send(('funcall', name, args, kwargs))
2142
1456
return self._pipe.recv()[1]
2143
2144
1457
return func
2145
1458
2146
1459
def __setattr__(self, name, value):
2149
1462
self._pipe.send(('setattr', name, value))
2150
1463
2151
1464
1465
class ClientDBusTransitional(ClientDBus):
1466
__metaclass__ = AlternateDBusNamesMetaclass
1467
1468
2152
1469
class ClientHandler(socketserver.BaseRequestHandler, object):
2153
1470
"""A class to handle client connections.
2154
1471
2158
1475
def handle(self):
2159
1476
with contextlib.closing(self.server.child_pipe) as child_pipe:
2160
1477
logger.info("TCP connection from: %s",
2161
str(self.client_address))
1478
unicode(self.client_address))
2162
1479
logger.debug("Pipe FD: %d",
2163
1480
self.server.child_pipe.fileno())
2164
1481
2165
session = gnutls.ClientSession(self.request)
1482
session = (gnutls.connection
1483
.ClientSession(self.request,
1484
gnutls.connection
1485
.X509Credentials()))
1486
1487
# Note: gnutls.connection.X509Credentials is really a
1488
# generic GnuTLS certificate credentials object so long as
1489
# no X.509 keys are added to it. Therefore, we can use it
1490
# here despite using OpenPGP certificates.
2166
1491
2167
1492
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2168
1493
# "+AES-256-CBC", "+SHA1",
2172
1497
priority = self.server.gnutls_priority
2173
1498
if priority is None:
2174
1499
priority = "NORMAL"
2175
gnutls.priority_set_direct(session._c_object, priority,
2176
None)
1500
(gnutls.library.functions
1501
.gnutls_priority_set_direct(session._c_object,
1502
priority, None))
2177
1503
2178
1504
# Start communication using the Mandos protocol
2179
1505
# Get protocol number
2181
1507
logger.debug("Protocol version: %r", line)
2182
1508
try:
2183
1509
if int(line.strip().split()[0]) > 1:
2184
raise RuntimeError(line)
1510
raise RuntimeError
2185
1511
except (ValueError, IndexError, RuntimeError) as error:
2186
1512
logger.error("Unknown protocol version: %s", error)
2187
1513
return
2189
1515
# Start GnuTLS connection
2190
1516
try:
2191
1517
session.handshake()
2192
except gnutls.Error as error:
1518
except gnutls.errors.GNUTLSError as error:
2193
1519
logger.warning("Handshake failed: %s", error)
2194
1520
# Do not run session.bye() here: the session is not
2195
1521
# established. Just abandon the request.
2199
1525
approval_required = False
2200
1526
try:
2201
1527
try:
2202
fpr = self.fingerprint(
2203
self.peer_certificate(session))
2204
except (TypeError, gnutls.Error) as error:
1528
fpr = self.fingerprint(self.peer_certificate
1529
(session))
1530
except (TypeError,
1531
gnutls.errors.GNUTLSError) as error:
2205
1532
logger.warning("Bad certificate: %s", error)
2206
1533
return
2207
1534
logger.debug("Fingerprint: %s", fpr)
2212
1539
except KeyError:
2213
1540
return
2214
1541
1542
if self.server.use_dbus:
1543
# Emit D-Bus signal
1544
client.NewRequest(str(self.client_address))
1545
2215
1546
if client.approval_delay:
2216
1547
delay = client.approval_delay
2217
1548
client.approvals_pending += 1
2220
1551
while True:
2221
1552
if not client.enabled:
2222
1553
logger.info("Client %s is disabled",
2223
client.name)
1554
client.name)
2224
1555
if self.server.use_dbus:
2225
1556
# Emit D-Bus signal
2226
1557
client.Rejected("Disabled")
2235
1566
if self.server.use_dbus:
2236
1567
# Emit D-Bus signal
2237
1568
client.NeedApproval(
2238
client.approval_delay.total_seconds()
2239
* 1000, client.approved_by_default)
1569
client.approval_delay_milliseconds(),
1570
client.approved_by_default)
2240
1571
else:
2241
1572
logger.warning("Client %s was not approved",
2242
1573
client.name)
2248
1579
#wait until timeout or approved
2249
1580
time = datetime.datetime.now()
2250
1581
client.changedstate.acquire()
2251
client.changedstate.wait(delay.total_seconds())
1582
(client.changedstate.wait
1583
(float(client.timedelta_to_milliseconds(delay)
1584
/ 1000)))
2252
1585
client.changedstate.release()
2253
1586
time2 = datetime.datetime.now()
2254
1587
if (time2 - time) >= delay:
2265
1598
else:
2266
1599
delay -= time2 - time
2267
1600
2268
try:
2269
session.send(client.secret)
2270
except gnutls.Error as error:
2271
logger.warning("gnutls send failed",
2272
exc_info = error)
2273
return
1601
sent_size = 0
1602
while sent_size < len(client.secret):
1603
try:
1604
sent = session.send(client.secret[sent_size:])
1605
except gnutls.errors.GNUTLSError as error:
1606
logger.warning("gnutls send failed")
1607
return
1608
logger.debug("Sent: %d, remaining: %d",
1609
sent, len(client.secret)
1610
- (sent_size + sent))
1611
sent_size += sent
2274
1612
2275
1613
logger.info("Sending secret to %s", client.name)
2276
1614
# bump the timeout using extended_timeout
2277
client.bump_timeout(client.extended_timeout)
1615
client.checked_ok(client.extended_timeout)
2278
1616
if self.server.use_dbus:
2279
1617
# Emit D-Bus signal
2280
1618
client.GotSecret()
2284
1622
client.approvals_pending -= 1
2285
1623
try:
2286
1624
session.bye()
2287
except gnutls.Error as error:
2288
logger.warning("GnuTLS bye failed",
2289
exc_info=error)
1625
except gnutls.errors.GNUTLSError as error:
1626
logger.warning("GnuTLS bye failed")
2290
1627
2291
1628
@staticmethod
2292
1629
def peer_certificate(session):
2293
1630
"Return the peer's OpenPGP certificate as a bytestring"
2294
1631
# If not an OpenPGP certificate...
2295
if (gnutls.certificate_type_get(session._c_object)
2296
!= gnutls.CRT_OPENPGP):
2297
# ...return invalid data
2298
return b""
1632
if (gnutls.library.functions
1633
.gnutls_certificate_type_get(session._c_object)
1634
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1635
# ...do the normal thing
1636
return session.peer_certificate
2299
1637
list_size = ctypes.c_uint(1)
2300
cert_list = (gnutls.certificate_get_peers
1638
cert_list = (gnutls.library.functions
1639
.gnutls_certificate_get_peers
2301
1640
(session._c_object, ctypes.byref(list_size)))
2302
1641
if not bool(cert_list) and list_size.value != 0:
2303
raise gnutls.Error("error getting peer certificate")
1642
raise gnutls.errors.GNUTLSError("error getting peer"
1643
" certificate")
2304
1644
if list_size.value == 0:
2305
1645
return None
2306
1646
cert = cert_list[0]
2310
1650
def fingerprint(openpgp):
2311
1651
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2312
1652
# New GnuTLS "datum" with the OpenPGP public key
2313
datum = gnutls.datum_t(
2314
ctypes.cast(ctypes.c_char_p(openpgp),
2315
ctypes.POINTER(ctypes.c_ubyte)),
2316
ctypes.c_uint(len(openpgp)))
1653
datum = (gnutls.library.types
1654
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1655
ctypes.POINTER
1656
(ctypes.c_ubyte)),
1657
ctypes.c_uint(len(openpgp))))
2317
1658
# New empty GnuTLS certificate
2318
crt = gnutls.openpgp_crt_t()
2319
gnutls.openpgp_crt_init(ctypes.byref(crt))
1659
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1660
(gnutls.library.functions
1661
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2320
1662
# Import the OpenPGP public key into the certificate
2321
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2322
gnutls.OPENPGP_FMT_RAW)
1663
(gnutls.library.functions
1664
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1665
gnutls.library.constants
1666
.GNUTLS_OPENPGP_FMT_RAW))
2323
1667
# Verify the self signature in the key
2324
1668
crtverify = ctypes.c_uint()
2325
gnutls.openpgp_crt_verify_self(crt, 0,
2326
ctypes.byref(crtverify))
1669
(gnutls.library.functions
1670
.gnutls_openpgp_crt_verify_self(crt, 0,
1671
ctypes.byref(crtverify)))
2327
1672
if crtverify.value != 0:
2328
gnutls.openpgp_crt_deinit(crt)
2329
raise gnutls.CertificateSecurityError("Verify failed")
1673
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1674
raise (gnutls.errors.CertificateSecurityError
1675
("Verify failed"))
2330
1676
# New buffer for the fingerprint
2331
1677
buf = ctypes.create_string_buffer(20)
2332
1678
buf_len = ctypes.c_size_t()
2333
1679
# Get the fingerprint from the certificate into the buffer
2334
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2335
ctypes.byref(buf_len))
1680
(gnutls.library.functions
1681
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1682
ctypes.byref(buf_len)))
2336
1683
# Deinit the certificate
2337
gnutls.openpgp_crt_deinit(crt)
1684
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2338
1685
# Convert the buffer to a Python bytestring
2339
1686
fpr = ctypes.string_at(buf, buf_len.value)
2340
1687
# Convert the bytestring to hexadecimal notation
2344
1691
2345
1692
class MultiprocessingMixIn(object):
2346
1693
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2347
2348
1694
def sub_process_main(self, request, address):
2349
1695
try:
2350
1696
self.finish_request(request, address)
2355
1701
def process_request(self, request, address):
2356
1702
"""Start a new process to process the request."""
2357
1703
proc = multiprocessing.Process(target = self.sub_process_main,
2358
args = (request, address))
1704
args = (request,
1705
address))
2359
1706
proc.start()
2360
1707
return proc
2361
1708
2362
1709
2363
1710
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2364
1711
""" adds a pipe to the MixIn """
2365
2366
1712
def process_request(self, request, client_address):
2367
1713
"""Overrides and wraps the original process_request().
2368
1714
2377
1723
2378
1724
def add_pipe(self, parent_pipe, proc):
2379
1725
"""Dummy function; override as necessary"""
2380
raise NotImplementedError()
1726
raise NotImplementedError
2381
1727
2382
1728
2383
1729
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2389
1735
interface: None or a network interface name (string)
2390
1736
use_ipv6: Boolean; to use IPv6 or not
2391
1737
"""
2392
2393
1738
def __init__(self, server_address, RequestHandlerClass,
2394
interface=None,
2395
use_ipv6=True,
2396
socketfd=None):
2397
"""If socketfd is set, use that file descriptor instead of
2398
creating a new one with socket.socket().
2399
"""
1739
interface=None, use_ipv6=True):
2400
1740
self.interface = interface
2401
1741
if use_ipv6:
2402
1742
self.address_family = socket.AF_INET6
2403
if socketfd is not None:
2404
# Save the file descriptor
2405
self.socketfd = socketfd
2406
# Save the original socket.socket() function
2407
self.socket_socket = socket.socket
2408
# To implement --socket, we monkey patch socket.socket.
2409
#
2410
# (When socketserver.TCPServer is a new-style class, we
2411
# could make self.socket into a property instead of monkey
2412
# patching socket.socket.)
2413
#
2414
# Create a one-time-only replacement for socket.socket()
2415
@functools.wraps(socket.socket)
2416
def socket_wrapper(*args, **kwargs):
2417
# Restore original function so subsequent calls are
2418
# not affected.
2419
socket.socket = self.socket_socket
2420
del self.socket_socket
2421
# This time only, return a new socket object from the
2422
# saved file descriptor.
2423
return socket.fromfd(self.socketfd, *args, **kwargs)
2424
# Replace socket.socket() function with wrapper
2425
socket.socket = socket_wrapper
2426
# The socketserver.TCPServer.__init__ will call
2427
# socket.socket(), which might be our replacement,
2428
# socket_wrapper(), if socketfd was set.
2429
1743
socketserver.TCPServer.__init__(self, server_address,
2430
1744
RequestHandlerClass)
2431
2432
1745
def server_bind(self):
2433
1746
"""This overrides the normal server_bind() function
2434
1747
to bind to an interface if one was specified, and also NOT to
2440
1753
self.interface)
2441
1754
else:
2442
1755
try:
2443
self.socket.setsockopt(
2444
socket.SOL_SOCKET, SO_BINDTODEVICE,
2445
(self.interface + "\0").encode("utf-8"))
1756
self.socket.setsockopt(socket.SOL_SOCKET,
1757
SO_BINDTODEVICE,
1758
str(self.interface
1759
+ '\0'))
2446
1760
except socket.error as error:
2447
if error.errno == errno.EPERM:
2448
logger.error("No permission to bind to"
2449
" interface %s", self.interface)
2450
elif error.errno == errno.ENOPROTOOPT:
1761
if error[0] == errno.EPERM:
1762
logger.error("No permission to"
1763
" bind to interface %s",
1764
self.interface)
1765
elif error[0] == errno.ENOPROTOOPT:
2451
1766
logger.error("SO_BINDTODEVICE not available;"
2452
1767
" cannot bind to interface %s",
2453
1768
self.interface)
2454
elif error.errno == errno.ENODEV:
2455
logger.error("Interface %s does not exist,"
2456
" cannot bind", self.interface)
2457
1769
else:
2458
1770
raise
2459
1771
# Only bind(2) the socket if we really need to.
2462
1774
if self.address_family == socket.AF_INET6:
2463
1775
any_address = "::" # in6addr_any
2464
1776
else:
2465
any_address = "0.0.0.0" # INADDR_ANY
1777
any_address = socket.INADDR_ANY
2466
1778
self.server_address = (any_address,
2467
1779
self.server_address[1])
2468
1780
elif not self.server_address[1]:
2469
self.server_address = (self.server_address[0], 0)
1781
self.server_address = (self.server_address[0],
1782
0)
2470
1783
# if self.interface:
2471
1784
# self.server_address = (self.server_address[0],
2472
1785
# 0, # port
2484
1797
gnutls_priority GnuTLS priority string
2485
1798
use_dbus: Boolean; to emit D-Bus signals or not
2486
1799
2487
Assumes a GLib.MainLoop event loop.
1800
Assumes a gobject.MainLoop event loop.
2488
1801
"""
2489
2490
1802
def __init__(self, server_address, RequestHandlerClass,
2491
interface=None,
2492
use_ipv6=True,
2493
clients=None,
2494
gnutls_priority=None,
2495
use_dbus=True,
2496
socketfd=None):
1803
interface=None, use_ipv6=True, clients=None,
1804
gnutls_priority=None, use_dbus=True):
2497
1805
self.enabled = False
2498
1806
self.clients = clients
2499
1807
if self.clients is None:
2503
1811
IPv6_TCPServer.__init__(self, server_address,
2504
1812
RequestHandlerClass,
2505
1813
interface = interface,
2506
use_ipv6 = use_ipv6,
2507
socketfd = socketfd)
2508
1814
use_ipv6 = use_ipv6)
2509
1815
def server_activate(self):
2510
1816
if self.enabled:
2511
1817
return socketserver.TCPServer.server_activate(self)
2515
1821
2516
1822
def add_pipe(self, parent_pipe, proc):
2517
1823
# Call "handle_ipc" for both data and EOF events
2518
GLib.io_add_watch(
2519
parent_pipe.fileno(),
2520
GLib.IO_IN | GLib.IO_HUP,
2521
functools.partial(self.handle_ipc,
2522
parent_pipe = parent_pipe,
2523
proc = proc))
1824
gobject.io_add_watch(parent_pipe.fileno(),
1825
gobject.IO_IN | gobject.IO_HUP,
1826
functools.partial(self.handle_ipc,
1827
parent_pipe =
1828
parent_pipe,
1829
proc = proc))
2524
1830
2525
def handle_ipc(self, source, condition,
2526
parent_pipe=None,
2527
proc = None,
2528
client_object=None):
1831
def handle_ipc(self, source, condition, parent_pipe=None,
1832
proc = None, client_object=None):
1833
condition_names = {
1834
gobject.IO_IN: "IN", # There is data to read.
1835
gobject.IO_OUT: "OUT", # Data can be written (without
1836
# blocking).
1837
gobject.IO_PRI: "PRI", # There is urgent data to read.
1838
gobject.IO_ERR: "ERR", # Error condition.
1839
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1840
# broken, usually for pipes and
1841
# sockets).
1842
}
1843
conditions_string = ' | '.join(name
1844
for cond, name in
1845
condition_names.iteritems()
1846
if cond & condition)
2529
1847
# error, or the other end of multiprocessing.Pipe has closed
2530
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1848
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2531
1849
# Wait for other process to exit
2532
1850
proc.join()
2533
1851
return False
2540
1858
fpr = request[1]
2541
1859
address = request[2]
2542
1860
2543
for c in self.clients.values():
1861
for c in self.clients.itervalues():
2544
1862
if c.fingerprint == fpr:
2545
1863
client = c
2546
1864
break
2554
1872
parent_pipe.send(False)
2555
1873
return False
2556
1874
2557
GLib.io_add_watch(
2558
parent_pipe.fileno(),
2559
GLib.IO_IN | GLib.IO_HUP,
2560
functools.partial(self.handle_ipc,
2561
parent_pipe = parent_pipe,
2562
proc = proc,
2563
client_object = client))
1875
gobject.io_add_watch(parent_pipe.fileno(),
1876
gobject.IO_IN | gobject.IO_HUP,
1877
functools.partial(self.handle_ipc,
1878
parent_pipe =
1879
parent_pipe,
1880
proc = proc,
1881
client_object =
1882
client))
2564
1883
parent_pipe.send(True)
2565
1884
# remove the old hook in favor of the new above hook on
2566
1885
# same fileno
2572
1891
2573
1892
parent_pipe.send(('data', getattr(client_object,
2574
1893
funcname)(*args,
2575
**kwargs)))
1894
**kwargs)))
2576
1895
2577
1896
if command == 'getattr':
2578
1897
attrname = request[1]
2579
if isinstance(client_object.__getattribute__(attrname),
2580
collections.Callable):
2581
parent_pipe.send(('function', ))
1898
if callable(client_object.__getattribute__(attrname)):
1899
parent_pipe.send(('function',))
2582
1900
else:
2583
parent_pipe.send((
2584
'data', client_object.__getattribute__(attrname)))
1901
parent_pipe.send(('data', client_object
1902
.__getattribute__(attrname)))
2585
1903
2586
1904
if command == 'setattr':
2587
1905
attrname = request[1]
2591
1909
return True
2592
1910
2593
1911
2594
def rfc3339_duration_to_delta(duration):
2595
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2596
2597
>>> rfc3339_duration_to_delta("P7D")
2598
datetime.timedelta(7)
2599
>>> rfc3339_duration_to_delta("PT60S")
2600
datetime.timedelta(0, 60)
2601
>>> rfc3339_duration_to_delta("PT60M")
2602
datetime.timedelta(0, 3600)
2603
>>> rfc3339_duration_to_delta("PT24H")
2604
datetime.timedelta(1)
2605
>>> rfc3339_duration_to_delta("P1W")
2606
datetime.timedelta(7)
2607
>>> rfc3339_duration_to_delta("PT5M30S")
2608
datetime.timedelta(0, 330)
2609
>>> rfc3339_duration_to_delta("P1DT3M20S")
2610
datetime.timedelta(1, 200)
2611
"""
2612
2613
# Parsing an RFC 3339 duration with regular expressions is not
2614
# possible - there would have to be multiple places for the same
2615
# values, like seconds. The current code, while more esoteric, is
2616
# cleaner without depending on a parsing library. If Python had a
2617
# built-in library for parsing we would use it, but we'd like to
2618
# avoid excessive use of external libraries.
2619
2620
# New type for defining tokens, syntax, and semantics all-in-one
2621
Token = collections.namedtuple("Token", (
2622
"regexp", # To match token; if "value" is not None, must have
2623
# a "group" containing digits
2624
"value", # datetime.timedelta or None
2625
"followers")) # Tokens valid after this token
2626
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2627
# the "duration" ABNF definition in RFC 3339, Appendix A.
2628
token_end = Token(re.compile(r"$"), None, frozenset())
2629
token_second = Token(re.compile(r"(\d+)S"),
2630
datetime.timedelta(seconds=1),
2631
frozenset((token_end, )))
2632
token_minute = Token(re.compile(r"(\d+)M"),
2633
datetime.timedelta(minutes=1),
2634
frozenset((token_second, token_end)))
2635
token_hour = Token(re.compile(r"(\d+)H"),
2636
datetime.timedelta(hours=1),
2637
frozenset((token_minute, token_end)))
2638
token_time = Token(re.compile(r"T"),
2639
None,
2640
frozenset((token_hour, token_minute,
2641
token_second)))
2642
token_day = Token(re.compile(r"(\d+)D"),
2643
datetime.timedelta(days=1),
2644
frozenset((token_time, token_end)))
2645
token_month = Token(re.compile(r"(\d+)M"),
2646
datetime.timedelta(weeks=4),
2647
frozenset((token_day, token_end)))
2648
token_year = Token(re.compile(r"(\d+)Y"),
2649
datetime.timedelta(weeks=52),
2650
frozenset((token_month, token_end)))
2651
token_week = Token(re.compile(r"(\d+)W"),
2652
datetime.timedelta(weeks=1),
2653
frozenset((token_end, )))
2654
token_duration = Token(re.compile(r"P"), None,
2655
frozenset((token_year, token_month,
2656
token_day, token_time,
2657
token_week)))
2658
# Define starting values
2659
value = datetime.timedelta() # Value so far
2660
found_token = None
2661
followers = frozenset((token_duration, )) # Following valid tokens
2662
s = duration # String left to parse
2663
# Loop until end token is found
2664
while found_token is not token_end:
2665
# Search for any currently valid tokens
2666
for token in followers:
2667
match = token.regexp.match(s)
2668
if match is not None:
2669
# Token found
2670
if token.value is not None:
2671
# Value found, parse digits
2672
factor = int(match.group(1), 10)
2673
# Add to value so far
2674
value += factor * token.value
2675
# Strip token from string
2676
s = token.regexp.sub("", s, 1)
2677
# Go to found token
2678
found_token = token
2679
# Set valid next tokens
2680
followers = found_token.followers
2681
break
2682
else:
2683
# No currently valid tokens were found
2684
raise ValueError("Invalid RFC 3339 duration: {!r}"
2685
.format(duration))
2686
# End token found
2687
return value
2688
2689
2690
1912
def string_to_delta(interval):
2691
1913
"""Parse a string and return a datetime.timedelta
2692
1914
2703
1925
>>> string_to_delta('5m 30s')
2704
1926
datetime.timedelta(0, 330)
2705
1927
"""
2706
2707
try:
2708
return rfc3339_duration_to_delta(interval)
2709
except ValueError:
2710
pass
2711
2712
1928
timevalue = datetime.timedelta(0)
2713
1929
for s in interval.split():
2714
1930
try:
2715
suffix = s[-1]
1931
suffix = unicode(s[-1])
2716
1932
value = int(s[:-1])
2717
1933
if suffix == "d":
2718
1934
delta = datetime.timedelta(value)
2725
1941
elif suffix == "w":
2726
1942
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2727
1943
else:
2728
raise ValueError("Unknown suffix {!r}".format(suffix))
2729
except IndexError as e:
1944
raise ValueError("Unknown suffix %r" % suffix)
1945
except (ValueError, IndexError) as e:
2730
1946
raise ValueError(*(e.args))
2731
1947
timevalue += delta
2732
1948
return timevalue
2745
1961
sys.exit()
2746
1962
if not noclose:
2747
1963
# Close all standard open file descriptors
2748
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1964
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2749
1965
if not stat.S_ISCHR(os.fstat(null).st_mode):
2750
1966
raise OSError(errno.ENODEV,
2751
"{} not a character device"
2752
.format(os.devnull))
1967
"%s not a character device"
1968
% os.path.devnull)
2753
1969
os.dup2(null, sys.stdin.fileno())
2754
1970
os.dup2(null, sys.stdout.fileno())
2755
1971
os.dup2(null, sys.stderr.fileno())
2764
1980
2765
1981
parser = argparse.ArgumentParser()
2766
1982
parser.add_argument("-v", "--version", action="version",
2767
version = "%(prog)s {}".format(version),
1983
version = "%%(prog)s %s" % version,
2768
1984
help="show version number and exit")
2769
1985
parser.add_argument("-i", "--interface", metavar="IF",
2770
1986
help="Bind to interface IF")
2776
1992
help="Run self-test")
2777
1993
parser.add_argument("--debug", action="store_true",
2778
1994
help="Debug mode; run in foreground and log"
2779
" to terminal", default=None)
1995
" to terminal")
2780
1996
parser.add_argument("--debuglevel", metavar="LEVEL",
2781
1997
help="Debug level for stdout output")
2782
1998
parser.add_argument("--priority", help="GnuTLS"
2789
2005
" files")
2790
2006
parser.add_argument("--no-dbus", action="store_false",
2791
2007
dest="use_dbus", help="Do not provide D-Bus"
2792
" system bus interface", default=None)
2008
" system bus interface")
2793
2009
parser.add_argument("--no-ipv6", action="store_false",
2794
dest="use_ipv6", help="Do not use IPv6",
2795
default=None)
2010
dest="use_ipv6", help="Do not use IPv6")
2796
2011
parser.add_argument("--no-restore", action="store_false",
2797
2012
dest="restore", help="Do not restore stored"
2798
" state", default=None)
2799
parser.add_argument("--socket", type=int,
2800
help="Specify a file descriptor to a network"
2801
" socket to use instead of creating one")
2013
" state")
2802
2014
parser.add_argument("--statedir", metavar="DIR",
2803
2015
help="Directory to save/restore state in")
2804
parser.add_argument("--foreground", action="store_true",
2805
help="Run in foreground", default=None)
2806
parser.add_argument("--no-zeroconf", action="store_false",
2807
dest="zeroconf", help="Do not use Zeroconf",
2808
default=None)
2809
2016
2810
2017
options = parser.parse_args()
2811
2018
2812
2019
if options.check:
2813
2020
import doctest
2814
fail_count, test_count = doctest.testmod()
2815
sys.exit(os.EX_OK if fail_count == 0 else 1)
2021
doctest.testmod()
2022
sys.exit()
2816
2023
2817
2024
# Default values for config file for server-global settings
2818
2025
server_defaults = { "interface": "",
2820
2027
"port": "",
2821
2028
"debug": "False",
2822
2029
"priority":
2823
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2824
":+SIGN-DSA-SHA256",
2030
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2825
2031
"servicename": "Mandos",
2826
2032
"use_dbus": "True",
2827
2033
"use_ipv6": "True",
2828
2034
"debuglevel": "",
2829
2035
"restore": "True",
2830
"socket": "",
2831
"statedir": "/var/lib/mandos",
2832
"foreground": "False",
2833
"zeroconf": "True",
2834
}
2036
"statedir": "/var/lib/mandos"
2037
}
2835
2038
2836
2039
# Parse config file for server-global settings
2837
2040
server_config = configparser.SafeConfigParser(server_defaults)
2838
2041
del server_defaults
2839
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2042
server_config.read(os.path.join(options.configdir,
2043
"mandos.conf"))
2840
2044
# Convert the SafeConfigParser object to a dict
2841
2045
server_settings = server_config.defaults()
2842
2046
# Use the appropriate methods on the non-string config options
2843
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2047
for option in ("debug", "use_dbus", "use_ipv6"):
2844
2048
server_settings[option] = server_config.getboolean("DEFAULT",
2845
2049
option)
2846
2050
if server_settings["port"]:
2847
2051
server_settings["port"] = server_config.getint("DEFAULT",
2848
2052
"port")
2849
if server_settings["socket"]:
2850
server_settings["socket"] = server_config.getint("DEFAULT",
2851
"socket")
2852
# Later, stdin will, and stdout and stderr might, be dup'ed
2853
# over with an opened os.devnull. But we don't want this to
2854
# happen with a supplied network socket.
2855
if 0 <= server_settings["socket"] <= 2:
2856
server_settings["socket"] = os.dup(server_settings
2857
["socket"])
2858
2053
del server_config
2859
2054
2860
2055
# Override the settings from the config file with command line
2861
2056
# options, if set.
2862
2057
for option in ("interface", "address", "port", "debug",
2863
"priority", "servicename", "configdir", "use_dbus",
2864
"use_ipv6", "debuglevel", "restore", "statedir",
2865
"socket", "foreground", "zeroconf"):
2058
"priority", "servicename", "configdir",
2059
"use_dbus", "use_ipv6", "debuglevel", "restore",
2060
"statedir"):
2866
2061
value = getattr(options, option)
2867
2062
if value is not None:
2868
2063
server_settings[option] = value
2869
2064
del options
2870
2065
# Force all strings to be unicode
2871
2066
for option in server_settings.keys():
2872
if isinstance(server_settings[option], bytes):
2873
server_settings[option] = (server_settings[option]
2874
.decode("utf-8"))
2875
# Force all boolean options to be boolean
2876
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2877
"foreground", "zeroconf"):
2878
server_settings[option] = bool(server_settings[option])
2879
# Debug implies foreground
2880
if server_settings["debug"]:
2881
server_settings["foreground"] = True
2067
if type(server_settings[option]) is str:
2068
server_settings[option] = unicode(server_settings[option])
2882
2069
# Now we have our good server settings in "server_settings"
2883
2070
2884
2071
##################################################################
2885
2072
2886
if (not server_settings["zeroconf"]
2887
and not (server_settings["port"]
2888
or server_settings["socket"] != "")):
2889
parser.error("Needs port or socket to work without Zeroconf")
2890
2891
2073
# For convenience
2892
2074
debug = server_settings["debug"]
2893
2075
debuglevel = server_settings["debuglevel"]
2895
2077
use_ipv6 = server_settings["use_ipv6"]
2896
2078
stored_state_path = os.path.join(server_settings["statedir"],
2897
2079
stored_state_file)
2898
foreground = server_settings["foreground"]
2899
zeroconf = server_settings["zeroconf"]
2900
2080
2901
2081
if debug:
2902
2082
initlogger(debug, logging.DEBUG)
2908
2088
initlogger(debug, level)
2909
2089
2910
2090
if server_settings["servicename"] != "Mandos":
2911
syslogger.setFormatter(
2912
logging.Formatter('Mandos ({}) [%(process)d]:'
2913
' %(levelname)s: %(message)s'.format(
2914
server_settings["servicename"])))
2091
syslogger.setFormatter(logging.Formatter
2092
('Mandos (%s) [%%(process)d]:'
2093
' %%(levelname)s: %%(message)s'
2094
% server_settings["servicename"]))
2915
2095
2916
2096
# Parse config file with clients
2917
client_config = configparser.SafeConfigParser(Client
2918
.client_defaults)
2097
client_config = configparser.SafeConfigParser(Client.client_defaults)
2919
2098
client_config.read(os.path.join(server_settings["configdir"],
2920
2099
"clients.conf"))
2921
2100
2922
2101
global mandos_dbus_service
2923
2102
mandos_dbus_service = None
2924
2103
2925
socketfd = None
2926
if server_settings["socket"] != "":
2927
socketfd = server_settings["socket"]
2928
tcp_server = MandosServer(
2929
(server_settings["address"], server_settings["port"]),
2930
ClientHandler,
2931
interface=(server_settings["interface"] or None),
2932
use_ipv6=use_ipv6,
2933
gnutls_priority=server_settings["priority"],
2934
use_dbus=use_dbus,
2935
socketfd=socketfd)
2936
if not foreground:
2937
pidfilename = "/run/mandos.pid"
2938
if not os.path.isdir("/run/."):
2939
pidfilename = "/var/run/mandos.pid"
2940
pidfile = None
2104
tcp_server = MandosServer((server_settings["address"],
2105
server_settings["port"]),
2106
ClientHandler,
2107
interface=(server_settings["interface"]
2108
or None),
2109
use_ipv6=use_ipv6,
2110
gnutls_priority=
2111
server_settings["priority"],
2112
use_dbus=use_dbus)
2113
if not debug:
2114
pidfilename = "/var/run/mandos.pid"
2941
2115
try:
2942
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2943
except IOError as e:
2944
logger.error("Could not open file %r", pidfilename,
2945
exc_info=e)
2116
pidfile = open(pidfilename, "w")
2117
except IOError:
2118
logger.error("Could not open file %r", pidfilename)
2946
2119
2947
for name, group in (("_mandos", "_mandos"),
2948
("mandos", "mandos"),
2949
("nobody", "nogroup")):
2120
try:
2121
uid = pwd.getpwnam("_mandos").pw_uid
2122
gid = pwd.getpwnam("_mandos").pw_gid
2123
except KeyError:
2950
2124
try:
2951
uid = pwd.getpwnam(name).pw_uid
2952
gid = pwd.getpwnam(group).pw_gid
2953
break
2125
uid = pwd.getpwnam("mandos").pw_uid
2126
gid = pwd.getpwnam("mandos").pw_gid
2954
2127
except KeyError:
2955
continue
2956
else:
2957
uid = 65534
2958
gid = 65534
2128
try:
2129
uid = pwd.getpwnam("nobody").pw_uid
2130
gid = pwd.getpwnam("nobody").pw_gid
2131
except KeyError:
2132
uid = 65534
2133
gid = 65534
2959
2134
try:
2960
2135
os.setgid(gid)
2961
2136
os.setuid(uid)
2962
if debug:
2963
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2964
gid))
2965
2137
except OSError as error:
2966
logger.warning("Failed to setuid/setgid to {}:{}: {}"
2967
.format(uid, gid, os.strerror(error.errno)))
2968
if error.errno != errno.EPERM:
2969
raise
2138
if error[0] != errno.EPERM:
2139
raise error
2970
2140
2971
2141
if debug:
2972
2142
# Enable all possible GnuTLS debugging
2973
2143
2974
2144
# "Use a log level over 10 to enable all debugging options."
2975
2145
# - GnuTLS manual
2976
gnutls.global_set_log_level(11)
2146
gnutls.library.functions.gnutls_global_set_log_level(11)
2977
2147
2978
@gnutls.log_func
2148
@gnutls.library.types.gnutls_log_func
2979
2149
def debug_gnutls(level, string):
2980
2150
logger.debug("GnuTLS: %s", string[:-1])
2981
2151
2982
gnutls.global_set_log_function(debug_gnutls)
2152
(gnutls.library.functions
2153
.gnutls_global_set_log_function(debug_gnutls))
2983
2154
2984
2155
# Redirect stdin so all checkers get /dev/null
2985
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2156
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2986
2157
os.dup2(null, sys.stdin.fileno())
2987
2158
if null > 2:
2988
2159
os.close(null)
2989
2160
2990
2161
# Need to fork before connecting to D-Bus
2991
if not foreground:
2162
if not debug:
2992
2163
# Close all input and output, do double fork, etc.
2993
2164
daemon()
2994
2165
2995
# multiprocessing will use threads, so before we use GLib we need
2996
# to inform GLib that threads will be used.
2997
GLib.threads_init()
2166
gobject.threads_init()
2998
2167
2999
2168
global main_loop
3000
2169
# From the Avahi example code
3001
DBusGMainLoop(set_as_default=True)
3002
main_loop = GLib.MainLoop()
2170
DBusGMainLoop(set_as_default=True )
2171
main_loop = gobject.MainLoop()
3003
2172
bus = dbus.SystemBus()
3004
2173
# End of Avahi example code
3005
2174
if use_dbus:
3006
2175
try:
3007
2176
bus_name = dbus.service.BusName("se.recompile.Mandos",
3008
bus,
3009
do_not_queue=True)
3010
old_bus_name = dbus.service.BusName(
3011
"se.bsnet.fukt.Mandos", bus,
3012
do_not_queue=True)
3013
except dbus.exceptions.DBusException as e:
3014
logger.error("Disabling D-Bus:", exc_info=e)
2177
bus, do_not_queue=True)
2178
old_bus_name = (dbus.service.BusName
2179
("se.bsnet.fukt.Mandos", bus,
2180
do_not_queue=True))
2181
except dbus.exceptions.NameExistsException as e:
2182
logger.error(unicode(e) + ", disabling D-Bus")
3015
2183
use_dbus = False
3016
2184
server_settings["use_dbus"] = False
3017
2185
tcp_server.use_dbus = False
3018
if zeroconf:
3019
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3020
service = AvahiServiceToSyslog(
3021
name = server_settings["servicename"],
3022
servicetype = "_mandos._tcp",
3023
protocol = protocol,
3024
bus = bus)
3025
if server_settings["interface"]:
3026
service.interface = if_nametoindex(
3027
server_settings["interface"].encode("utf-8"))
2186
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
2191
if server_settings["interface"]:
2192
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
3028
2194
3029
2195
global multiprocessing_manager
3030
2196
multiprocessing_manager = multiprocessing.Manager()
3031
2197
3032
2198
client_class = Client
3033
2199
if use_dbus:
3034
client_class = functools.partial(ClientDBus, bus = bus)
2200
client_class = functools.partial(ClientDBusTransitional,
2201
bus = bus)
3035
2202
3036
2203
client_settings = Client.config_parser(client_config)
3037
2204
old_client_settings = {}
3038
2205
clients_data = {}
3039
2206
3040
# This is used to redirect stdout and stderr for checker processes
3041
global wnull
3042
wnull = open(os.devnull, "w") # A writable /dev/null
3043
# Only used if server is running in foreground but not in debug
3044
# mode
3045
if debug or not foreground:
3046
wnull.close()
3047
3048
2207
# Get client data and settings from last running state.
3049
2208
if server_settings["restore"]:
3050
2209
try:
3051
2210
with open(stored_state_path, "rb") as stored_state:
3052
if sys.version_info.major == 2:
3053
clients_data, old_client_settings = pickle.load(
3054
stored_state)
3055
else:
3056
bytes_clients_data, bytes_old_client_settings = (
3057
pickle.load(stored_state, encoding = "bytes"))
3058
### Fix bytes to strings
3059
## clients_data
3060
# .keys()
3061
clients_data = { (key.decode("utf-8")
3062
if isinstance(key, bytes)
3063
else key): value
3064
for key, value in
3065
bytes_clients_data.items() }
3066
del bytes_clients_data
3067
for key in clients_data:
3068
value = { (k.decode("utf-8")
3069
if isinstance(k, bytes) else k): v
3070
for k, v in
3071
clients_data[key].items() }
3072
clients_data[key] = value
3073
# .client_structure
3074
value["client_structure"] = [
3075
(s.decode("utf-8")
3076
if isinstance(s, bytes)
3077
else s) for s in
3078
value["client_structure"] ]
3079
# .name & .host
3080
for k in ("name", "host"):
3081
if isinstance(value[k], bytes):
3082
value[k] = value[k].decode("utf-8")
3083
## old_client_settings
3084
# .keys()
3085
old_client_settings = {
3086
(key.decode("utf-8")
3087
if isinstance(key, bytes)
3088
else key): value
3089
for key, value in
3090
bytes_old_client_settings.items() }
3091
del bytes_old_client_settings
3092
# .host
3093
for value in old_client_settings.values():
3094
if isinstance(value["host"], bytes):
3095
value["host"] = (value["host"]
3096
.decode("utf-8"))
2211
clients_data, old_client_settings = (pickle.load
2212
(stored_state))
3097
2213
os.remove(stored_state_path)
3098
2214
except IOError as e:
3099
if e.errno == errno.ENOENT:
3100
logger.warning("Could not load persistent state:"
3101
" {}".format(os.strerror(e.errno)))
3102
else:
3103
logger.critical("Could not load persistent state:",
3104
exc_info=e)
2215
logger.warning("Could not load persistent state: {0}"
2216
.format(e))
2217
if e.errno != errno.ENOENT:
3105
2218
raise
3106
2219
except EOFError as e:
3107
2220
logger.warning("Could not load persistent state: "
3108
"EOFError:",
3109
exc_info=e)
2221
"EOFError: {0}".format(e))
3110
2222
3111
2223
with PGPEngine() as pgp:
3112
for client_name, client in clients_data.items():
3113
# Skip removed clients
3114
if client_name not in client_settings:
3115
continue
3116
2224
for client_name, client in clients_data.iteritems():
3117
2225
# Decide which value to use after restoring saved state.
3118
2226
# We have three different values: Old config file,
3119
2227
# new config file, and saved state.
3124
2232
# For each value in new config, check if it
3125
2233
# differs from the old config value (Except for
3126
2234
# the "secret" attribute)
3127
if (name != "secret"
3128
and (value !=
3129
old_client_settings[client_name][name])):
2235
if (name != "secret" and
2236
value != old_client_settings[client_name]
2237
[name]):
3130
2238
client[name] = value
3131
2239
except KeyError:
3132
2240
pass
3133
2241
3134
2242
# Clients who has passed its expire date can still be
3135
# enabled if its last checker was successful. A Client
3136
# whose checker succeeded before we stored its state is
3137
# assumed to have successfully run all checkers during
3138
# downtime.
2243
# enabled if its last checker was successful. Clients
2244
# whose checker failed before we stored its state is
2245
# assumed to have failed all checkers during downtime.
3139
2246
if client["enabled"]:
3140
2247
if datetime.datetime.utcnow() >= client["expires"]:
3141
2248
if not client["last_checked_ok"]:
3142
2249
logger.warning(
3143
"disabling client {} - Client never "
3144
"performed a successful checker".format(
3145
client_name))
2250
"disabling client {0} - Client never "
2251
"performed a successfull checker"
2252
.format(client["name"]))
3146
2253
client["enabled"] = False
3147
2254
elif client["last_checker_status"] != 0:
3148
2255
logger.warning(
3149
"disabling client {} - Client last"
3150
" checker failed with error code"
3151
" {}".format(
3152
client_name,
3153
client["last_checker_status"]))
2256
"disabling client {0} - Client "
2257
"last checker failed with error code {1}"
2258
.format(client["name"],
2259
client["last_checker_status"]))
3154
2260
client["enabled"] = False
3155
2261
else:
3156
client["expires"] = (
3157
datetime.datetime.utcnow()
3158
+ client["timeout"])
3159
logger.debug("Last checker succeeded,"
3160
" keeping {} enabled".format(
3161
client_name))
2262
client["expires"] = (datetime.datetime
2263
.utcnow()
2264
+ client["timeout"])
2265
3162
2266
try:
3163
client["secret"] = pgp.decrypt(
3164
client["encrypted_secret"],
3165
client_settings[client_name]["secret"])
2267
client["secret"] = (
2268
pgp.decrypt(client["encrypted_secret"],
2269
client_settings[client_name]
2270
["secret"]))
3166
2271
except PGPError:
3167
2272
# If decryption fails, we use secret from new settings
3168
logger.debug("Failed to decrypt {} old secret".format(
3169
client_name))
3170
client["secret"] = (client_settings[client_name]
3171
["secret"])
2273
logger.debug("Failed to decrypt {0} old secret"
2274
.format(client_name))
2275
client["secret"] = (
2276
client_settings[client_name]["secret"])
2277
3172
2278
3173
2279
# Add/remove clients based on new changes made to config
3174
for client_name in (set(old_client_settings)
3175
- set(client_settings)):
2280
for client_name in set(old_client_settings) - set(client_settings):
3176
2281
del clients_data[client_name]
3177
for client_name in (set(client_settings)
3178
- set(old_client_settings)):
2282
for client_name in set(client_settings) - set(old_client_settings):
3179
2283
clients_data[client_name] = client_settings[client_name]
3180
3181
# Create all client objects
3182
for client_name, client in clients_data.items():
2284
2285
# Create clients all clients
2286
for client_name, client in clients_data.iteritems():
3183
2287
tcp_server.clients[client_name] = client_class(
3184
name = client_name,
3185
settings = client,
3186
server_settings = server_settings)
2288
name = client_name, settings = client)
3187
2289
3188
2290
if not tcp_server.clients:
3189
2291
logger.warning("No clients defined")
3190
3191
if not foreground:
3192
if pidfile is not None:
3193
pid = os.getpid()
3194
try:
3195
with pidfile:
3196
print(pid, file=pidfile)
3197
except IOError:
3198
logger.error("Could not write to file %r with PID %d",
3199
pidfilename, pid)
3200
del pidfile
2292
2293
if not debug:
2294
try:
2295
with pidfile:
2296
pid = os.getpid()
2297
pidfile.write(str(pid) + "\n".encode("utf-8"))
2298
del pidfile
2299
except IOError:
2300
logger.error("Could not write to file %r with PID %d",
2301
pidfilename, pid)
2302
except NameError:
2303
# "pidfile" was never created
2304
pass
3201
2305
del pidfilename
2306
signal.signal(signal.SIGINT, signal.SIG_IGN)
3202
2307
3203
for termsig in (signal.SIGHUP, signal.SIGTERM):
3204
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3205
lambda: main_loop.quit() and False)
2308
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2309
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3206
2310
3207
2311
if use_dbus:
3208
3209
@alternate_dbus_interfaces(
3210
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3211
class MandosDBusService(DBusObjectWithObjectManager):
2312
class MandosDBusService(dbus.service.Object):
3212
2313
"""A D-Bus proxy object"""
3213
3214
2314
def __init__(self):
3215
2315
dbus.service.Object.__init__(self, bus, "/")
3216
3217
2316
_interface = "se.recompile.Mandos"
3218
2317
3219
2318
@dbus.service.signal(_interface, signature="o")
3226
2325
"D-Bus signal"
3227
2326
pass
3228
2327
3229
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3230
"true"})
3231
2328
@dbus.service.signal(_interface, signature="os")
3232
2329
def ClientRemoved(self, objpath, name):
3233
2330
"D-Bus signal"
3234
2331
pass
3235
2332
3236
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3237
"true"})
3238
2333
@dbus.service.method(_interface, out_signature="ao")
3239
2334
def GetAllClients(self):
3240
2335
"D-Bus method"
3241
return dbus.Array(c.dbus_object_path for c in
3242
tcp_server.clients.values())
2336
return dbus.Array(c.dbus_object_path
2337
for c in
2338
tcp_server.clients.itervalues())
3243
2339
3244
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3245
"true"})
3246
2340
@dbus.service.method(_interface,
3247
2341
out_signature="a{oa{sv}}")
3248
2342
def GetAllClientsWithProperties(self):
3249
2343
"D-Bus method"
3250
2344
return dbus.Dictionary(
3251
{ c.dbus_object_path: c.GetAll(
3252
"se.recompile.Mandos.Client")
3253
for c in tcp_server.clients.values() },
2345
((c.dbus_object_path, c.GetAll(""))
2346
for c in tcp_server.clients.itervalues()),
3254
2347
signature="oa{sv}")
3255
2348
3256
2349
@dbus.service.method(_interface, in_signature="o")
3257
2350
def RemoveClient(self, object_path):
3258
2351
"D-Bus method"
3259
for c in tcp_server.clients.values():
2352
for c in tcp_server.clients.itervalues():
3260
2353
if c.dbus_object_path == object_path:
3261
2354
del tcp_server.clients[c.name]
3262
2355
c.remove_from_connection()
3263
# Don't signal the disabling
2356
# Don't signal anything except ClientRemoved
3264
2357
c.disable(quiet=True)
3265
# Emit D-Bus signal for removal
3266
self.client_removed_signal(c)
2358
# Emit D-Bus signal
2359
self.ClientRemoved(object_path, c.name)
3267
2360
return
3268
2361
raise KeyError(object_path)
3269
2362
3270
2363
del _interface
3271
3272
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3273
out_signature = "a{oa{sa{sv}}}")
3274
def GetManagedObjects(self):
3275
"""D-Bus method"""
3276
return dbus.Dictionary(
3277
{ client.dbus_object_path:
3278
dbus.Dictionary(
3279
{ interface: client.GetAll(interface)
3280
for interface in
3281
client._get_all_interface_names()})
3282
for client in tcp_server.clients.values()})
3283
3284
def client_added_signal(self, client):
3285
"""Send the new standard signal and the old signal"""
3286
if use_dbus:
3287
# New standard signal
3288
self.InterfacesAdded(
3289
client.dbus_object_path,
3290
dbus.Dictionary(
3291
{ interface: client.GetAll(interface)
3292
for interface in
3293
client._get_all_interface_names()}))
3294
# Old signal
3295
self.ClientAdded(client.dbus_object_path)
3296
3297
def client_removed_signal(self, client):
3298
"""Send the new standard signal and the old signal"""
3299
if use_dbus:
3300
# New standard signal
3301
self.InterfacesRemoved(
3302
client.dbus_object_path,
3303
client._get_all_interface_names())
3304
# Old signal
3305
self.ClientRemoved(client.dbus_object_path,
3306
client.name)
3307
2364
3308
mandos_dbus_service = MandosDBusService()
2365
class MandosDBusServiceTransitional(MandosDBusService):
2366
__metaclass__ = AlternateDBusNamesMetaclass
2367
mandos_dbus_service = MandosDBusServiceTransitional()
3309
2368
3310
2369
def cleanup():
3311
2370
"Cleanup function; run on exit"
3312
if zeroconf:
3313
service.cleanup()
2371
service.cleanup()
3314
2372
3315
2373
multiprocessing.active_children()
3316
wnull.close()
3317
2374
if not (tcp_server.clients or client_settings):
3318
2375
return
3319
2376
3322
2379
# removed/edited, old secret will thus be unrecovable.
3323
2380
clients = {}
3324
2381
with PGPEngine() as pgp:
3325
for client in tcp_server.clients.values():
2382
for client in tcp_server.clients.itervalues():
3326
2383
key = client_settings[client.name]["secret"]
3327
2384
client.encrypted_secret = pgp.encrypt(client.secret,
3328
2385
key)
3330
2387
3331
2388
# A list of attributes that can not be pickled
3332
2389
# + secret.
3333
exclude = { "bus", "changedstate", "secret",
3334
"checker", "server_settings" }
3335
for name, typ in inspect.getmembers(dbus.service
3336
.Object):
2390
exclude = set(("bus", "changedstate", "secret",
2391
"checker"))
2392
for name, typ in (inspect.getmembers
2393
(dbus.service.Object)):
3337
2394
exclude.add(name)
3338
2395
3339
2396
client_dict["encrypted_secret"] = (client
3346
2403
del client_settings[client.name]["secret"]
3347
2404
3348
2405
try:
3349
with tempfile.NamedTemporaryFile(
3350
mode='wb',
3351
suffix=".pickle",
3352
prefix='clients-',
3353
dir=os.path.dirname(stored_state_path),
3354
delete=False) as stored_state:
3355
pickle.dump((clients, client_settings), stored_state,
3356
protocol = 2)
3357
tempname = stored_state.name
2406
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2407
prefix="clients-",
2408
dir=os.path.dirname
2409
(stored_state_path))
2410
with os.fdopen(tempfd, "wb") as stored_state:
2411
pickle.dump((clients, client_settings), stored_state)
3358
2412
os.rename(tempname, stored_state_path)
3359
2413
except (IOError, OSError) as e:
2414
logger.warning("Could not save persistent state: {0}"
2415
.format(e))
3360
2416
if not debug:
3361
2417
try:
3362
2418
os.remove(tempname)
3363
2419
except NameError:
3364
2420
pass
3365
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3366
logger.warning("Could not save persistent state: {}"
3367
.format(os.strerror(e.errno)))
3368
else:
3369
logger.warning("Could not save persistent state:",
3370
exc_info=e)
3371
raise
2421
if e.errno not in set((errno.ENOENT, errno.EACCES,
2422
errno.EEXIST)):
2423
raise e
3372
2424
3373
2425
# Delete all clients, and settings from config
3374
2426
while tcp_server.clients:
3375
2427
name, client = tcp_server.clients.popitem()
3376
2428
if use_dbus:
3377
2429
client.remove_from_connection()
3378
# Don't signal the disabling
2430
# Don't signal anything except ClientRemoved
3379
2431
client.disable(quiet=True)
3380
# Emit D-Bus signal for removal
3381
2432
if use_dbus:
3382
mandos_dbus_service.client_removed_signal(client)
2433
# Emit D-Bus signal
2434
mandos_dbus_service.ClientRemoved(client
2435
.dbus_object_path,
2436
client.name)
3383
2437
client_settings.clear()
3384
2438
3385
2439
atexit.register(cleanup)
3386
2440
3387
for client in tcp_server.clients.values():
2441
for client in tcp_server.clients.itervalues():
3388
2442
if use_dbus:
3389
# Emit D-Bus signal for adding
3390
mandos_dbus_service.client_added_signal(client)
2443
# Emit D-Bus signal
2444
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3391
2445
# Need to initiate checking of clients
3392
2446
if client.enabled:
3393
2447
client.init_checker()
3396
2450
tcp_server.server_activate()
3397
2451
3398
2452
# Find out what port we got
3399
if zeroconf:
3400
service.port = tcp_server.socket.getsockname()[1]
2453
service.port = tcp_server.socket.getsockname()[1]
3401
2454
if use_ipv6:
3402
2455
logger.info("Now listening on address %r, port %d,"
3403
" flowinfo %d, scope_id %d",
3404
*tcp_server.socket.getsockname())
2456
" flowinfo %d, scope_id %d"
2457
% tcp_server.socket.getsockname())
3405
2458
else: # IPv4
3406
logger.info("Now listening on address %r, port %d",
3407
*tcp_server.socket.getsockname())
2459
logger.info("Now listening on address %r, port %d"
2460
% tcp_server.socket.getsockname())
3408
2461
3409
2462
#service.interface = tcp_server.socket.getsockname()[3]
3410
2463
3411
2464
try:
3412
if zeroconf:
3413
# From the Avahi example code
3414
try:
3415
service.activate()
3416
except dbus.exceptions.DBusException as error:
3417
logger.critical("D-Bus Exception", exc_info=error)
3418
cleanup()
3419
sys.exit(1)
3420
# End of Avahi example code
2465
# From the Avahi example code
2466
try:
2467
service.activate()
2468
except dbus.exceptions.DBusException as error:
2469
logger.critical("DBusException: %s", error)
2470
cleanup()
2471
sys.exit(1)
2472
# End of Avahi example code
3421
2473
3422
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3423
lambda *args, **kwargs:
3424
(tcp_server.handle_request
3425
(*args[2:], **kwargs) or True))
2474
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2475
lambda *args, **kwargs:
2476
(tcp_server.handle_request
2477
(*args[2:], **kwargs) or True))
3426
2478
3427
2479
logger.debug("Starting main loop")
3428
2480
main_loop.run()
3429
2481
except AvahiError as error:
3430
logger.critical("Avahi Error", exc_info=error)
2482
logger.critical("AvahiError: %s", error)
3431
2483
cleanup()
3432
2484
sys.exit(1)
3433
2485
except KeyboardInterrupt:
3438
2490
# Must run before the D-Bus bus name gets deregistered
3439
2491
cleanup()
3440
2492
3441
3442
2493
if __name__ == '__main__':
3443
2494
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0