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