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