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