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