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