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