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