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