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