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