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