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