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