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