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 1132
- compare with another revision
- download diff
- download tarball
- view history from revision 1132
- Committer: Teddy Hogeborn
- Date: 2019-07-30 17:03:57 UTC
- Revision ID: teddy@recompile.se-20190730170357-jte0piul5mq7j5pr
Server: Reap zombies created by multiprocessing.Process()
When creating checkers as multiprocessing.Process() objects, the
multiprocessing module also creates a parent process (for the
call_pipe() function) to call the actual checker process, but this
parent process is not reaped. This is not a huge problem, since the
zombie is always reaped automatically the next time the multiprocess
starts a new process, but the zombies can be up to as many as there
have ever been simultaneous checker processes. To fix this, the
process object must be join():ed when they report completion of the
child checker process.
* mandos (Client): Fix doc string to correctly state that
Client.checker is a multiprocess.Process() and not
a subprocess.Popen() object.
(Client.checker_callback): After the returncode of the checker
process has been read, wait for the
self.checker Process object to finish by
calling join() on it.
Reported-by: Peter Palfrader <weasel@debian.org>
When creating checkers as multiprocessing.Process() objects, the
multiprocessing module also creates a parent process (for the
call_pipe() function) to call the actual checker process, but this
parent process is not reaped. This is not a huge problem, since the
zombie is always reaped automatically the next time the multiprocess
starts a new process, but the zombies can be up to as many as there
have ever been simultaneous checker processes. To fix this, the
process object must be join():ed when they report completion of the
child checker process.
* mandos (Client): Fix doc string to correctly state that
Client.checker is a multiprocess.Process() and not
a subprocess.Popen() object.
(Client.checker_callback): After the returncode of the checker
process has been read, wait for the
self.checker Process object to finish by
calling join() on it.
Reported-by: Peter Palfrader <weasel@debian.org>
- files removed:
- debian/po/de.po
- files modified:
- .bzrignore
added
removed
mandos
1
#!/usr/bin/python3 -bI
2
# -*- mode: python; after-save-hook: (lambda () (let ((command (if (fboundp 'file-local-name) (file-local-name (buffer-file-name)) (or (file-remote-p (buffer-file-name) 'localname) (buffer-file-name))))) (if (= (progn (if (get-buffer "*Test*") (kill-buffer "*Test*")) (process-file-shell-command (format "%s --check" (shell-quote-argument command)) nil "*Test*")) 0) (let ((w (get-buffer-window "*Test*"))) (if w (delete-window w))) (progn (with-current-buffer "*Test*" (compilation-mode)) (display-buffer "*Test*" '(display-buffer-in-side-window)))))); coding: utf-8 -*-
1
#!/usr/bin/python
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
5
5
#
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2020 Teddy Hogeborn
15
# Copyright © 2008-2020 Björn Påhlsson
14
# Copyright © 2008-2019 Teddy Hogeborn
15
# Copyright © 2008-2019 Björn Påhlsson
16
16
#
17
17
# This file is part of Mandos.
18
18
#
77
77
import itertools
78
78
import collections
79
79
import codecs
80
import unittest
81
import random
82
import shlex
83
80
84
81
import dbus
85
82
import dbus.service
86
import gi
87
83
from gi.repository import GLib
88
84
from dbus.mainloop.glib import DBusGMainLoop
89
85
import ctypes
91
87
import xml.dom.minidom
92
88
import inspect
93
89
94
if sys.version_info.major == 2:
95
__metaclass__ = type
96
str = unicode
97
98
# Add collections.abc.Callable if it does not exist
99
try:
100
collections.abc.Callable
101
except AttributeError:
102
class abc:
103
Callable = collections.Callable
104
collections.abc = abc
105
del abc
106
107
# Add shlex.quote if it does not exist
108
try:
109
shlex.quote
110
except AttributeError:
111
shlex.quote = re.escape
112
113
# Show warnings by default
114
if not sys.warnoptions:
115
import warnings
116
warnings.simplefilter("default")
117
118
90
# Try to find the value of SO_BINDTODEVICE:
119
91
try:
120
92
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
140
112
# No value found
141
113
SO_BINDTODEVICE = None
142
114
143
if sys.version_info < (3, 2):
144
configparser.Configparser = configparser.SafeConfigParser
115
if sys.version_info.major == 2:
116
str = unicode
145
117
146
version = "1.8.14"
118
version = "1.8.4"
147
119
stored_state_file = "clients.pickle"
148
120
149
121
logger = logging.getLogger()
150
logging.captureWarnings(True) # Show warnings via the logging system
151
122
syslogger = None
152
123
153
124
try:
189
160
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
190
161
address="/dev/log"))
191
162
syslogger.setFormatter(logging.Formatter
192
("Mandos [%(process)d]: %(levelname)s:"
193
" %(message)s"))
163
('Mandos [%(process)d]: %(levelname)s:'
164
' %(message)s'))
194
165
logger.addHandler(syslogger)
195
166
196
167
if debug:
197
168
console = logging.StreamHandler()
198
console.setFormatter(logging.Formatter("%(asctime)s %(name)s"
199
" [%(process)d]:"
200
" %(levelname)s:"
201
" %(message)s"))
169
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
170
' [%(process)d]:'
171
' %(levelname)s:'
172
' %(message)s'))
202
173
logger.addHandler(console)
203
174
logger.setLevel(level)
204
175
208
179
pass
209
180
210
181
211
class PGPEngine:
182
class PGPEngine(object):
212
183
"""A simple class for OpenPGP symmetric encryption & decryption"""
213
184
214
185
def __init__(self):
218
189
output = subprocess.check_output(["gpgconf"])
219
190
for line in output.splitlines():
220
191
name, text, path = line.split(b":")
221
if name == b"gpg":
192
if name == "gpg":
222
193
self.gpg = path
223
194
break
224
195
except OSError as e:
225
196
if e.errno != errno.ENOENT:
226
197
raise
227
self.gnupgargs = ["--batch",
228
"--homedir", self.tempdir,
229
"--force-mdc",
230
"--quiet"]
198
self.gnupgargs = ['--batch',
199
'--homedir', self.tempdir,
200
'--force-mdc',
201
'--quiet']
231
202
# Only GPG version 1 has the --no-use-agent option.
232
if self.gpg == b"gpg" or self.gpg.endswith(b"/gpg"):
203
if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
233
204
self.gnupgargs.append("--no-use-agent")
234
205
235
206
def __enter__(self):
272
243
dir=self.tempdir) as passfile:
273
244
passfile.write(passphrase)
274
245
passfile.flush()
275
proc = subprocess.Popen([self.gpg, "--symmetric",
276
"--passphrase-file",
246
proc = subprocess.Popen([self.gpg, '--symmetric',
247
'--passphrase-file',
277
248
passfile.name]
278
249
+ self.gnupgargs,
279
250
stdin=subprocess.PIPE,
290
261
dir=self.tempdir) as passfile:
291
262
passfile.write(passphrase)
292
263
passfile.flush()
293
proc = subprocess.Popen([self.gpg, "--decrypt",
294
"--passphrase-file",
264
proc = subprocess.Popen([self.gpg, '--decrypt',
265
'--passphrase-file',
295
266
passfile.name]
296
267
+ self.gnupgargs,
297
268
stdin=subprocess.PIPE,
304
275
305
276
306
277
# Pretend that we have an Avahi module
307
class avahi:
278
class avahi(object):
308
279
"""This isn't so much a class as it is a module-like namespace."""
309
280
IF_UNSPEC = -1 # avahi-common/address.h
310
281
PROTO_UNSPEC = -1 # avahi-common/address.h
344
315
pass
345
316
346
317
347
class AvahiService:
318
class AvahiService(object):
348
319
"""An Avahi (Zeroconf) service.
349
320
350
321
Attributes:
351
322
interface: integer; avahi.IF_UNSPEC or an interface index.
352
323
Used to optionally bind to the specified interface.
353
name: string; Example: "Mandos"
354
type: string; Example: "_mandos._tcp".
324
name: string; Example: 'Mandos'
325
type: string; Example: '_mandos._tcp'.
355
326
See <https://www.iana.org/assignments/service-names-port-numbers>
356
327
port: integer; what port to announce
357
328
TXT: list of strings; TXT record for the service
435
406
avahi.DBUS_INTERFACE_ENTRY_GROUP)
436
407
self.entry_group_state_changed_match = (
437
408
self.group.connect_to_signal(
438
"StateChanged", self.entry_group_state_changed))
409
'StateChanged', self.entry_group_state_changed))
439
410
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
440
411
self.name, self.type)
441
412
self.group.AddService(
524
495
class AvahiServiceToSyslog(AvahiService):
525
496
def rename(self, *args, **kwargs):
526
497
"""Add the new name to the syslog messages"""
527
ret = super(AvahiServiceToSyslog, self).rename(*args,
528
**kwargs)
498
ret = super(AvahiServiceToSyslog, self).rename(*args, **kwargs)
529
499
syslogger.setFormatter(logging.Formatter(
530
"Mandos ({}) [%(process)d]: %(levelname)s: %(message)s"
500
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
531
501
.format(self.name)))
532
502
return ret
533
503
534
504
535
505
# Pretend that we have a GnuTLS module
536
class gnutls:
506
class gnutls(object):
537
507
"""This isn't so much a class as it is a module-like namespace."""
538
508
539
509
library = ctypes.util.find_library("gnutls")
563
533
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
564
534
565
535
# Types
566
class _session_int(ctypes.Structure):
536
class session_int(ctypes.Structure):
567
537
_fields_ = []
568
session_t = ctypes.POINTER(_session_int)
538
session_t = ctypes.POINTER(session_int)
569
539
570
540
class certificate_credentials_st(ctypes.Structure):
571
541
_fields_ = []
574
544
certificate_type_t = ctypes.c_int
575
545
576
546
class datum_t(ctypes.Structure):
577
_fields_ = [("data", ctypes.POINTER(ctypes.c_ubyte)),
578
("size", ctypes.c_uint)]
547
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
548
('size', ctypes.c_uint)]
579
549
580
class _openpgp_crt_int(ctypes.Structure):
550
class openpgp_crt_int(ctypes.Structure):
581
551
_fields_ = []
582
openpgp_crt_t = ctypes.POINTER(_openpgp_crt_int)
552
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
583
553
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
584
554
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
585
555
credentials_type_t = ctypes.c_int
594
564
# gnutls.strerror()
595
565
self.code = code
596
566
if message is None and code is not None:
597
message = gnutls.strerror(code).decode(
598
"utf-8", errors="replace")
567
message = gnutls.strerror(code)
599
568
return super(gnutls.Error, self).__init__(
600
569
message, *args)
601
570
602
571
class CertificateSecurityError(Error):
603
572
pass
604
573
605
class PointerTo:
606
def __init__(self, cls):
607
self.cls = cls
608
609
def from_param(self, obj):
610
if not isinstance(obj, self.cls):
611
raise TypeError("Not of type {}: {!r}"
612
.format(self.cls.__name__, obj))
613
return ctypes.byref(obj.from_param(obj))
614
615
class CastToVoidPointer:
616
def __init__(self, cls):
617
self.cls = cls
618
619
def from_param(self, obj):
620
if not isinstance(obj, self.cls):
621
raise TypeError("Not of type {}: {!r}"
622
.format(self.cls.__name__, obj))
623
return ctypes.cast(obj.from_param(obj), ctypes.c_void_p)
624
625
class With_from_param:
626
@classmethod
627
def from_param(cls, obj):
628
return obj._as_parameter_
629
630
574
# Classes
631
class Credentials(With_from_param):
575
class Credentials(object):
632
576
def __init__(self):
633
self._as_parameter_ = gnutls.certificate_credentials_t()
634
gnutls.certificate_allocate_credentials(self)
577
self._c_object = gnutls.certificate_credentials_t()
578
gnutls.certificate_allocate_credentials(
579
ctypes.byref(self._c_object))
635
580
self.type = gnutls.CRD_CERTIFICATE
636
581
637
582
def __del__(self):
638
gnutls.certificate_free_credentials(self)
583
gnutls.certificate_free_credentials(self._c_object)
639
584
640
class ClientSession(With_from_param):
585
class ClientSession(object):
641
586
def __init__(self, socket, credentials=None):
642
self._as_parameter_ = gnutls.session_t()
587
self._c_object = gnutls.session_t()
643
588
gnutls_flags = gnutls.CLIENT
644
589
if gnutls.check_version(b"3.5.6"):
645
590
gnutls_flags |= gnutls.NO_TICKETS
646
591
if gnutls.has_rawpk:
647
592
gnutls_flags |= gnutls.ENABLE_RAWPK
648
gnutls.init(self, gnutls_flags)
593
gnutls.init(ctypes.byref(self._c_object), gnutls_flags)
649
594
del gnutls_flags
650
gnutls.set_default_priority(self)
651
gnutls.transport_set_ptr(self, socket.fileno())
652
gnutls.handshake_set_private_extensions(self, True)
595
gnutls.set_default_priority(self._c_object)
596
gnutls.transport_set_ptr(self._c_object, socket.fileno())
597
gnutls.handshake_set_private_extensions(self._c_object,
598
True)
653
599
self.socket = socket
654
600
if credentials is None:
655
601
credentials = gnutls.Credentials()
656
gnutls.credentials_set(self, credentials.type,
657
credentials)
602
gnutls.credentials_set(self._c_object, credentials.type,
603
ctypes.cast(credentials._c_object,
604
ctypes.c_void_p))
658
605
self.credentials = credentials
659
606
660
607
def __del__(self):
661
gnutls.deinit(self)
608
gnutls.deinit(self._c_object)
662
609
663
610
def handshake(self):
664
return gnutls.handshake(self)
611
return gnutls.handshake(self._c_object)
665
612
666
613
def send(self, data):
667
614
data = bytes(data)
668
615
data_len = len(data)
669
616
while data_len > 0:
670
data_len -= gnutls.record_send(self, data[-data_len:],
617
data_len -= gnutls.record_send(self._c_object,
618
data[-data_len:],
671
619
data_len)
672
620
673
621
def bye(self):
674
return gnutls.bye(self, gnutls.SHUT_RDWR)
622
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
675
623
676
624
# Error handling functions
677
625
def _error_code(result):
678
626
"""A function to raise exceptions on errors, suitable
679
for the "restype" attribute on ctypes functions"""
680
if result >= gnutls.E_SUCCESS:
627
for the 'restype' attribute on ctypes functions"""
628
if result >= 0:
681
629
return result
682
630
if result == gnutls.E_NO_CERTIFICATE_FOUND:
683
631
raise gnutls.CertificateSecurityError(code=result)
684
632
raise gnutls.Error(code=result)
685
633
686
def _retry_on_error(result, func, arguments,
687
_error_code=_error_code):
634
def _retry_on_error(result, func, arguments):
688
635
"""A function to retry on some errors, suitable
689
for the "errcheck" attribute on ctypes functions"""
690
while result < gnutls.E_SUCCESS:
636
for the 'errcheck' attribute on ctypes functions"""
637
while result < 0:
691
638
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
692
639
return _error_code(result)
693
640
result = func(*arguments)
698
645
699
646
# Functions
700
647
priority_set_direct = _library.gnutls_priority_set_direct
701
priority_set_direct.argtypes = [ClientSession, ctypes.c_char_p,
648
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
702
649
ctypes.POINTER(ctypes.c_char_p)]
703
650
priority_set_direct.restype = _error_code
704
651
705
652
init = _library.gnutls_init
706
init.argtypes = [PointerTo(ClientSession), ctypes.c_int]
653
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
707
654
init.restype = _error_code
708
655
709
656
set_default_priority = _library.gnutls_set_default_priority
710
set_default_priority.argtypes = [ClientSession]
657
set_default_priority.argtypes = [session_t]
711
658
set_default_priority.restype = _error_code
712
659
713
660
record_send = _library.gnutls_record_send
714
record_send.argtypes = [ClientSession, ctypes.c_void_p,
661
record_send.argtypes = [session_t, ctypes.c_void_p,
715
662
ctypes.c_size_t]
716
663
record_send.restype = ctypes.c_ssize_t
717
664
record_send.errcheck = _retry_on_error
719
666
certificate_allocate_credentials = (
720
667
_library.gnutls_certificate_allocate_credentials)
721
668
certificate_allocate_credentials.argtypes = [
722
PointerTo(Credentials)]
669
ctypes.POINTER(certificate_credentials_t)]
723
670
certificate_allocate_credentials.restype = _error_code
724
671
725
672
certificate_free_credentials = (
726
673
_library.gnutls_certificate_free_credentials)
727
certificate_free_credentials.argtypes = [Credentials]
674
certificate_free_credentials.argtypes = [
675
certificate_credentials_t]
728
676
certificate_free_credentials.restype = None
729
677
730
678
handshake_set_private_extensions = (
731
679
_library.gnutls_handshake_set_private_extensions)
732
handshake_set_private_extensions.argtypes = [ClientSession,
680
handshake_set_private_extensions.argtypes = [session_t,
733
681
ctypes.c_int]
734
682
handshake_set_private_extensions.restype = None
735
683
736
684
credentials_set = _library.gnutls_credentials_set
737
credentials_set.argtypes = [ClientSession, credentials_type_t,
738
CastToVoidPointer(Credentials)]
685
credentials_set.argtypes = [session_t, credentials_type_t,
686
ctypes.c_void_p]
739
687
credentials_set.restype = _error_code
740
688
741
689
strerror = _library.gnutls_strerror
743
691
strerror.restype = ctypes.c_char_p
744
692
745
693
certificate_type_get = _library.gnutls_certificate_type_get
746
certificate_type_get.argtypes = [ClientSession]
694
certificate_type_get.argtypes = [session_t]
747
695
certificate_type_get.restype = _error_code
748
696
749
697
certificate_get_peers = _library.gnutls_certificate_get_peers
750
certificate_get_peers.argtypes = [ClientSession,
698
certificate_get_peers.argtypes = [session_t,
751
699
ctypes.POINTER(ctypes.c_uint)]
752
700
certificate_get_peers.restype = ctypes.POINTER(datum_t)
753
701
760
708
global_set_log_function.restype = None
761
709
762
710
deinit = _library.gnutls_deinit
763
deinit.argtypes = [ClientSession]
711
deinit.argtypes = [session_t]
764
712
deinit.restype = None
765
713
766
714
handshake = _library.gnutls_handshake
767
handshake.argtypes = [ClientSession]
768
handshake.restype = ctypes.c_int
715
handshake.argtypes = [session_t]
716
handshake.restype = _error_code
769
717
handshake.errcheck = _retry_on_error
770
718
771
719
transport_set_ptr = _library.gnutls_transport_set_ptr
772
transport_set_ptr.argtypes = [ClientSession, transport_ptr_t]
720
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
773
721
transport_set_ptr.restype = None
774
722
775
723
bye = _library.gnutls_bye
776
bye.argtypes = [ClientSession, close_request_t]
777
bye.restype = ctypes.c_int
724
bye.argtypes = [session_t, close_request_t]
725
bye.restype = _error_code
778
726
bye.errcheck = _retry_on_error
779
727
780
728
check_version = _library.gnutls_check_version
797
745
798
746
x509_crt_fmt_t = ctypes.c_int
799
747
800
# All the function declarations below are from
801
# gnutls/abstract.h
748
# All the function declarations below are from gnutls/abstract.h
802
749
pubkey_init = _library.gnutls_pubkey_init
803
750
pubkey_init.argtypes = [ctypes.POINTER(pubkey_t)]
804
751
pubkey_init.restype = _error_code
818
765
pubkey_deinit.argtypes = [pubkey_t]
819
766
pubkey_deinit.restype = None
820
767
else:
821
# All the function declarations below are from
822
# gnutls/openpgp.h
768
# All the function declarations below are from gnutls/openpgp.h
823
769
824
770
openpgp_crt_init = _library.gnutls_openpgp_crt_init
825
771
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
831
777
openpgp_crt_fmt_t]
832
778
openpgp_crt_import.restype = _error_code
833
779
834
openpgp_crt_verify_self = \
835
_library.gnutls_openpgp_crt_verify_self
836
openpgp_crt_verify_self.argtypes = [
837
openpgp_crt_t,
838
ctypes.c_uint,
839
ctypes.POINTER(ctypes.c_uint),
840
]
780
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
781
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
782
ctypes.POINTER(ctypes.c_uint)]
841
783
openpgp_crt_verify_self.restype = _error_code
842
784
843
785
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
854
796
855
797
if check_version(b"3.6.4"):
856
798
certificate_type_get2 = _library.gnutls_certificate_type_get2
857
certificate_type_get2.argtypes = [ClientSession, ctypes.c_int]
799
certificate_type_get2.argtypes = [session_t, ctypes.c_int]
858
800
certificate_type_get2.restype = _error_code
859
801
860
802
# Remove non-public functions
872
814
connection.close()
873
815
874
816
875
class Client:
817
class Client(object):
876
818
"""A representation of a client host served by this server.
877
819
878
820
Attributes:
879
approved: bool(); None if not yet approved/disapproved
821
approved: bool(); 'None' if not yet approved/disapproved
880
822
approval_delay: datetime.timedelta(); Time to wait for approval
881
823
approval_duration: datetime.timedelta(); Duration of one approval
882
824
checker: multiprocessing.Process(); a running checker process used
883
to see if the client lives. None if no process is
825
to see if the client lives. 'None' if no process is
884
826
running.
885
827
checker_callback_tag: a GLib event source tag, or None
886
828
checker_command: string; External command which is run to check
1081
1023
if self.checker_initiator_tag is not None:
1082
1024
GLib.source_remove(self.checker_initiator_tag)
1083
1025
self.checker_initiator_tag = GLib.timeout_add(
1084
random.randrange(int(self.interval.total_seconds() * 1000
1085
+ 1)),
1026
int(self.interval.total_seconds() * 1000),
1086
1027
self.start_checker)
1087
1028
# Schedule a disable() when 'timeout' has passed
1088
1029
if self.disable_initiator_tag is not None:
1098
1039
# Read return code from connection (see call_pipe)
1099
1040
returncode = connection.recv()
1100
1041
connection.close()
1101
if self.checker is not None:
1102
self.checker.join()
1042
self.checker.join()
1103
1043
self.checker_callback_tag = None
1104
1044
self.checker = None
1105
1045
1163
1103
if self.checker is None:
1164
1104
# Escape attributes for the shell
1165
1105
escaped_attrs = {
1166
attr: shlex.quote(str(getattr(self, attr)))
1106
attr: re.escape(str(getattr(self, attr)))
1167
1107
for attr in self.runtime_expansions}
1168
1108
try:
1169
1109
command = self.checker_command % escaped_attrs
1196
1136
kwargs=popen_args)
1197
1137
self.checker.start()
1198
1138
self.checker_callback_tag = GLib.io_add_watch(
1199
GLib.IOChannel.unix_new(pipe[0].fileno()),
1200
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
1139
pipe[0].fileno(), GLib.IO_IN,
1201
1140
self.checker_callback, pipe[0], command)
1202
1141
# Re-run this periodically if run by GLib.timeout_add
1203
1142
return True
1242
1181
func._dbus_name = func.__name__
1243
1182
if func._dbus_name.endswith("_dbus_property"):
1244
1183
func._dbus_name = func._dbus_name[:-14]
1245
func._dbus_get_args_options = {"byte_arrays": byte_arrays}
1184
func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1246
1185
return func
1247
1186
1248
1187
return decorator
1337
1276
1338
1277
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1339
1278
out_signature="s",
1340
path_keyword="object_path",
1341
connection_keyword="connection")
1279
path_keyword='object_path',
1280
connection_keyword='connection')
1342
1281
def Introspect(self, object_path, connection):
1343
1282
"""Overloading of standard D-Bus method.
1344
1283
1458
1397
raise ValueError("Byte arrays not supported for non-"
1459
1398
"'ay' signature {!r}"
1460
1399
.format(prop._dbus_signature))
1461
value = dbus.ByteArray(bytes(value))
1400
value = dbus.ByteArray(b''.join(chr(byte)
1401
for byte in value))
1462
1402
prop(value)
1463
1403
1464
1404
@dbus.service.method(dbus.PROPERTIES_IFACE,
1497
1437
1498
1438
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1499
1439
out_signature="s",
1500
path_keyword="object_path",
1501
connection_keyword="connection")
1440
path_keyword='object_path',
1441
connection_keyword='connection')
1502
1442
def Introspect(self, object_path, connection):
1503
1443
"""Overloading of standard D-Bus method.
1504
1444
1599
1539
1600
1540
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1601
1541
out_signature="s",
1602
path_keyword="object_path",
1603
connection_keyword="connection")
1542
path_keyword='object_path',
1543
connection_keyword='connection')
1604
1544
def Introspect(self, object_path, connection):
1605
1545
"""Overloading of standard D-Bus method.
1606
1546
2269
2209
del _interface
2270
2210
2271
2211
2272
class ProxyClient:
2212
class ProxyClient(object):
2273
2213
def __init__(self, child_pipe, key_id, fpr, address):
2274
2214
self._pipe = child_pipe
2275
self._pipe.send(("init", key_id, fpr, address))
2215
self._pipe.send(('init', key_id, fpr, address))
2276
2216
if not self._pipe.recv():
2277
2217
raise KeyError(key_id or fpr)
2278
2218
2279
2219
def __getattribute__(self, name):
2280
if name == "_pipe":
2220
if name == '_pipe':
2281
2221
return super(ProxyClient, self).__getattribute__(name)
2282
self._pipe.send(("getattr", name))
2222
self._pipe.send(('getattr', name))
2283
2223
data = self._pipe.recv()
2284
if data[0] == "data":
2224
if data[0] == 'data':
2285
2225
return data[1]
2286
if data[0] == "function":
2226
if data[0] == 'function':
2287
2227
2288
2228
def func(*args, **kwargs):
2289
self._pipe.send(("funcall", name, args, kwargs))
2229
self._pipe.send(('funcall', name, args, kwargs))
2290
2230
return self._pipe.recv()[1]
2291
2231
2292
2232
return func
2293
2233
2294
2234
def __setattr__(self, name, value):
2295
if name == "_pipe":
2235
if name == '_pipe':
2296
2236
return super(ProxyClient, self).__setattr__(name, value)
2297
self._pipe.send(("setattr", name, value))
2237
self._pipe.send(('setattr', name, value))
2298
2238
2299
2239
2300
2240
class ClientHandler(socketserver.BaseRequestHandler, object):
2312
2252
2313
2253
session = gnutls.ClientSession(self.request)
2314
2254
2315
# priority = ":".join(("NONE", "+VERS-TLS1.1",
2255
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2316
2256
# "+AES-256-CBC", "+SHA1",
2317
2257
# "+COMP-NULL", "+CTYPE-OPENPGP",
2318
2258
# "+DHE-DSS"))
2320
2260
priority = self.server.gnutls_priority
2321
2261
if priority is None:
2322
2262
priority = "NORMAL"
2323
gnutls.priority_set_direct(session,
2324
priority.encode("utf-8"), None)
2263
gnutls.priority_set_direct(session._c_object,
2264
priority.encode("utf-8"),
2265
None)
2325
2266
2326
2267
# Start communication using the Mandos protocol
2327
2268
# Get protocol number
2354
2295
except (TypeError, gnutls.Error) as error:
2355
2296
logger.warning("Bad certificate: %s", error)
2356
2297
return
2357
logger.debug("Key ID: %s",
2358
key_id.decode("utf-8",
2359
errors="replace"))
2298
logger.debug("Key ID: %s", key_id)
2360
2299
2361
2300
else:
2362
2301
key_id = b""
2454
2393
def peer_certificate(session):
2455
2394
"Return the peer's certificate as a bytestring"
2456
2395
try:
2457
cert_type = gnutls.certificate_type_get2(
2458
session, gnutls.CTYPE_PEERS)
2396
cert_type = gnutls.certificate_type_get2(session._c_object,
2397
gnutls.CTYPE_PEERS)
2459
2398
except AttributeError:
2460
cert_type = gnutls.certificate_type_get(session)
2399
cert_type = gnutls.certificate_type_get(session._c_object)
2461
2400
if gnutls.has_rawpk:
2462
2401
valid_cert_types = frozenset((gnutls.CRT_RAWPK,))
2463
2402
else:
2470
2409
return b""
2471
2410
list_size = ctypes.c_uint(1)
2472
2411
cert_list = (gnutls.certificate_get_peers
2473
(session, ctypes.byref(list_size)))
2412
(session._c_object, ctypes.byref(list_size)))
2474
2413
if not bool(cert_list) and list_size.value != 0:
2475
2414
raise gnutls.Error("error getting peer certificate")
2476
2415
if list_size.value == 0:
2498
2437
buf = ctypes.create_string_buffer(32)
2499
2438
buf_len = ctypes.c_size_t(len(buf))
2500
2439
# Get the key ID from the raw public key into the buffer
2501
gnutls.pubkey_get_key_id(
2502
pubkey,
2503
gnutls.KEYID_USE_SHA256,
2504
ctypes.cast(ctypes.byref(buf),
2505
ctypes.POINTER(ctypes.c_ubyte)),
2506
ctypes.byref(buf_len))
2440
gnutls.pubkey_get_key_id(pubkey,
2441
gnutls.KEYID_USE_SHA256,
2442
ctypes.cast(ctypes.byref(buf),
2443
ctypes.POINTER(ctypes.c_ubyte)),
2444
ctypes.byref(buf_len))
2507
2445
# Deinit the certificate
2508
2446
gnutls.pubkey_deinit(pubkey)
2509
2447
2550
2488
return hex_fpr
2551
2489
2552
2490
2553
class MultiprocessingMixIn:
2491
class MultiprocessingMixIn(object):
2554
2492
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2555
2493
2556
2494
def sub_process_main(self, request, address):
2568
2506
return proc
2569
2507
2570
2508
2571
class MultiprocessingMixInWithPipe(MultiprocessingMixIn):
2509
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2572
2510
""" adds a pipe to the MixIn """
2573
2511
2574
2512
def process_request(self, request, client_address):
2589
2527
2590
2528
2591
2529
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2592
socketserver.TCPServer):
2593
"""IPv6-capable TCP server. Accepts None as address and/or port
2530
socketserver.TCPServer, object):
2531
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2594
2532
2595
2533
Attributes:
2596
2534
enabled: Boolean; whether this server is activated yet
2728
2666
def add_pipe(self, parent_pipe, proc):
2729
2667
# Call "handle_ipc" for both data and EOF events
2730
2668
GLib.io_add_watch(
2731
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2732
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2669
parent_pipe.fileno(),
2670
GLib.IO_IN | GLib.IO_HUP,
2733
2671
functools.partial(self.handle_ipc,
2734
2672
parent_pipe=parent_pipe,
2735
2673
proc=proc))
2748
2686
request = parent_pipe.recv()
2749
2687
command = request[0]
2750
2688
2751
if command == "init":
2689
if command == 'init':
2752
2690
key_id = request[1].decode("ascii")
2753
2691
fpr = request[2].decode("ascii")
2754
2692
address = request[3]
2755
2693
2756
2694
for c in self.clients.values():
2757
if key_id == ("E3B0C44298FC1C149AFBF4C8996FB924"
2758
"27AE41E4649B934CA495991B7852B855"):
2695
if key_id == "E3B0C44298FC1C149AFBF4C8996FB92427AE41E4649B934CA495991B7852B855":
2759
2696
continue
2760
2697
if key_id and c.key_id == key_id:
2761
2698
client = c
2774
2711
return False
2775
2712
2776
2713
GLib.io_add_watch(
2777
GLib.IOChannel.unix_new(parent_pipe.fileno()),
2778
GLib.PRIORITY_DEFAULT, GLib.IO_IN | GLib.IO_HUP,
2714
parent_pipe.fileno(),
2715
GLib.IO_IN | GLib.IO_HUP,
2779
2716
functools.partial(self.handle_ipc,
2780
2717
parent_pipe=parent_pipe,
2781
2718
proc=proc,
2784
2721
# remove the old hook in favor of the new above hook on
2785
2722
# same fileno
2786
2723
return False
2787
if command == "funcall":
2724
if command == 'funcall':
2788
2725
funcname = request[1]
2789
2726
args = request[2]
2790
2727
kwargs = request[3]
2791
2728
2792
parent_pipe.send(("data", getattr(client_object,
2729
parent_pipe.send(('data', getattr(client_object,
2793
2730
funcname)(*args,
2794
2731
**kwargs)))
2795
2732
2796
if command == "getattr":
2733
if command == 'getattr':
2797
2734
attrname = request[1]
2798
2735
if isinstance(client_object.__getattribute__(attrname),
2799
collections.abc.Callable):
2800
parent_pipe.send(("function", ))
2736
collections.Callable):
2737
parent_pipe.send(('function', ))
2801
2738
else:
2802
2739
parent_pipe.send((
2803
"data", client_object.__getattribute__(attrname)))
2740
'data', client_object.__getattribute__(attrname)))
2804
2741
2805
if command == "setattr":
2742
if command == 'setattr':
2806
2743
attrname = request[1]
2807
2744
value = request[2]
2808
2745
setattr(client_object, attrname, value)
2813
2750
def rfc3339_duration_to_delta(duration):
2814
2751
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2815
2752
2816
>>> timedelta = datetime.timedelta
2817
>>> rfc3339_duration_to_delta("P7D") == timedelta(7)
2818
True
2819
>>> rfc3339_duration_to_delta("PT60S") == timedelta(0, 60)
2820
True
2821
>>> rfc3339_duration_to_delta("PT60M") == timedelta(0, 3600)
2822
True
2823
>>> rfc3339_duration_to_delta("PT24H") == timedelta(1)
2824
True
2825
>>> rfc3339_duration_to_delta("P1W") == timedelta(7)
2826
True
2827
>>> rfc3339_duration_to_delta("PT5M30S") == timedelta(0, 330)
2828
True
2829
>>> rfc3339_duration_to_delta("P1DT3M20S") == timedelta(1, 200)
2830
True
2831
>>> del timedelta
2753
>>> rfc3339_duration_to_delta("P7D")
2754
datetime.timedelta(7)
2755
>>> rfc3339_duration_to_delta("PT60S")
2756
datetime.timedelta(0, 60)
2757
>>> rfc3339_duration_to_delta("PT60M")
2758
datetime.timedelta(0, 3600)
2759
>>> rfc3339_duration_to_delta("PT24H")
2760
datetime.timedelta(1)
2761
>>> rfc3339_duration_to_delta("P1W")
2762
datetime.timedelta(7)
2763
>>> rfc3339_duration_to_delta("PT5M30S")
2764
datetime.timedelta(0, 330)
2765
>>> rfc3339_duration_to_delta("P1DT3M20S")
2766
datetime.timedelta(1, 200)
2832
2767
"""
2833
2768
2834
2769
# Parsing an RFC 3339 duration with regular expressions is not
2914
2849
def string_to_delta(interval):
2915
2850
"""Parse a string and return a datetime.timedelta
2916
2851
2917
>>> string_to_delta("7d") == datetime.timedelta(7)
2918
True
2919
>>> string_to_delta("60s") == datetime.timedelta(0, 60)
2920
True
2921
>>> string_to_delta("60m") == datetime.timedelta(0, 3600)
2922
True
2923
>>> string_to_delta("24h") == datetime.timedelta(1)
2924
True
2925
>>> string_to_delta("1w") == datetime.timedelta(7)
2926
True
2927
>>> string_to_delta("5m 30s") == datetime.timedelta(0, 330)
2928
True
2852
>>> string_to_delta('7d')
2853
datetime.timedelta(7)
2854
>>> string_to_delta('60s')
2855
datetime.timedelta(0, 60)
2856
>>> string_to_delta('60m')
2857
datetime.timedelta(0, 3600)
2858
>>> string_to_delta('24h')
2859
datetime.timedelta(1)
2860
>>> string_to_delta('1w')
2861
datetime.timedelta(7)
2862
>>> string_to_delta('5m 30s')
2863
datetime.timedelta(0, 330)
2929
2864
"""
2930
2865
2931
2866
try:
3033
2968
3034
2969
options = parser.parse_args()
3035
2970
2971
if options.check:
2972
import doctest
2973
fail_count, test_count = doctest.testmod()
2974
sys.exit(os.EX_OK if fail_count == 0 else 1)
2975
3036
2976
# Default values for config file for server-global settings
3037
2977
if gnutls.has_rawpk:
3038
2978
priority = ("SECURE128:!CTYPE-X.509:+CTYPE-RAWPK:!RSA"
3058
2998
del priority
3059
2999
3060
3000
# Parse config file for server-global settings
3061
server_config = configparser.ConfigParser(server_defaults)
3001
server_config = configparser.SafeConfigParser(server_defaults)
3062
3002
del server_defaults
3063
3003
server_config.read(os.path.join(options.configdir, "mandos.conf"))
3064
# Convert the ConfigParser object to a dict
3004
# Convert the SafeConfigParser object to a dict
3065
3005
server_settings = server_config.defaults()
3066
3006
# Use the appropriate methods on the non-string config options
3067
3007
for option in ("debug", "use_dbus", "use_ipv6", "restore",
3134
3074
3135
3075
if server_settings["servicename"] != "Mandos":
3136
3076
syslogger.setFormatter(
3137
logging.Formatter("Mandos ({}) [%(process)d]:"
3138
" %(levelname)s: %(message)s".format(
3077
logging.Formatter('Mandos ({}) [%(process)d]:'
3078
' %(levelname)s: %(message)s'.format(
3139
3079
server_settings["servicename"])))
3140
3080
3141
3081
# Parse config file with clients
3142
client_config = configparser.ConfigParser(Client.client_defaults)
3082
client_config = configparser.SafeConfigParser(Client
3083
.client_defaults)
3143
3084
client_config.read(os.path.join(server_settings["configdir"],
3144
3085
"clients.conf"))
3145
3086
3201
3142
3202
3143
@gnutls.log_func
3203
3144
def debug_gnutls(level, string):
3204
logger.debug("GnuTLS: %s",
3205
string[:-1].decode("utf-8",
3206
errors="replace"))
3145
logger.debug("GnuTLS: %s", string[:-1])
3207
3146
3208
3147
gnutls.global_set_log_function(debug_gnutls)
3209
3148
3218
3157
# Close all input and output, do double fork, etc.
3219
3158
daemon()
3220
3159
3221
if gi.version_info < (3, 10, 2):
3222
# multiprocessing will use threads, so before we use GLib we
3223
# need to inform GLib that threads will be used.
3224
GLib.threads_init()
3160
# multiprocessing will use threads, so before we use GLib we need
3161
# to inform GLib that threads will be used.
3162
GLib.threads_init()
3225
3163
3226
3164
global main_loop
3227
3165
# From the Avahi example code
3303
3241
if isinstance(s, bytes)
3304
3242
else s) for s in
3305
3243
value["client_structure"]]
3306
# .name, .host, and .checker_command
3307
for k in ("name", "host", "checker_command"):
3244
# .name & .host
3245
for k in ("name", "host"):
3308
3246
if isinstance(value[k], bytes):
3309
3247
value[k] = value[k].decode("utf-8")
3310
3248
if "key_id" not in value:
3320
3258
for key, value in
3321
3259
bytes_old_client_settings.items()}
3322
3260
del bytes_old_client_settings
3323
# .host and .checker_command
3261
# .host
3324
3262
for value in old_client_settings.values():
3325
for attribute in ("host", "checker_command"):
3326
if isinstance(value[attribute], bytes):
3327
value[attribute] = (value[attribute]
3328
.decode("utf-8"))
3263
if isinstance(value["host"], bytes):
3264
value["host"] = (value["host"]
3265
.decode("utf-8"))
3329
3266
os.remove(stored_state_path)
3330
3267
except IOError as e:
3331
3268
if e.errno == errno.ENOENT:
3584
3521
3585
3522
try:
3586
3523
with tempfile.NamedTemporaryFile(
3587
mode="wb",
3524
mode='wb',
3588
3525
suffix=".pickle",
3589
prefix="clients-",
3526
prefix='clients-',
3590
3527
dir=os.path.dirname(stored_state_path),
3591
3528
delete=False) as stored_state:
3592
3529
pickle.dump((clients, client_settings), stored_state,
3656
3593
sys.exit(1)
3657
3594
# End of Avahi example code
3658
3595
3659
GLib.io_add_watch(
3660
GLib.IOChannel.unix_new(tcp_server.fileno()),
3661
GLib.PRIORITY_DEFAULT, GLib.IO_IN,
3662
lambda *args, **kwargs: (tcp_server.handle_request
3663
(*args[2:], **kwargs) or True))
3596
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3597
lambda *args, **kwargs:
3598
(tcp_server.handle_request
3599
(*args[2:], **kwargs) or True))
3664
3600
3665
3601
logger.debug("Starting main loop")
3666
3602
main_loop.run()
3676
3612
# Must run before the D-Bus bus name gets deregistered
3677
3613
cleanup()
3678
3614
3679
3680
def should_only_run_tests():
3681
parser = argparse.ArgumentParser(add_help=False)
3682
parser.add_argument("--check", action="store_true")
3683
args, unknown_args = parser.parse_known_args()
3684
run_tests = args.check
3685
if run_tests:
3686
# Remove --check argument from sys.argv
3687
sys.argv[1:] = unknown_args
3688
return run_tests
3689
3690
# Add all tests from doctest strings
3691
def load_tests(loader, tests, none):
3692
import doctest
3693
tests.addTests(doctest.DocTestSuite())
3694
return tests
3695
3696
if __name__ == "__main__":
3697
try:
3698
if should_only_run_tests():
3699
# Call using ./mandos --check [--verbose]
3700
unittest.main()
3701
else:
3702
main()
3703
finally:
3704
logging.shutdown()
3615
3616
if __name__ == '__main__':
3617
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0