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