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