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