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 815
- compare with another revision
- download diff
- download tarball
- view history from revision 815
- Committer: Teddy Hogeborn
- Date: 2016-03-02 16:45:38 UTC
- Revision ID: teddy@recompile.se-20160302164538-n9ocll4izthzw1ov
Ignore any error from initramfs-tools' "configure_networking".
* initramfs-tools-script: Wrap call to "configure_networking" with
"set +e" and "set -e", since configure_networking was not designed
to run in a "set -e" environment.
Closes: 816513
Thanks: Carlos Alberto Lopez Perez <clopez@igalia.com>
Thanks: Ben Hutchings <ben@decadent.org.uk>
* initramfs-tools-script: Wrap call to "configure_networking" with
"set +e" and "set -e", since configure_networking was not designed
to run in a "set -e" environment.
Closes: 816513
Thanks: Carlos Alberto Lopez Perez <clopez@igalia.com>
Thanks: Ben Hutchings <ben@decadent.org.uk>
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
14
# Copyright © 2008-2016 Teddy Hogeborn
15
15
# Copyright © 2008-2016 Björn Påhlsson
16
#
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
19
19
# the Free Software Foundation, either version 3 of the License, or
23
23
# but WITHOUT ANY WARRANTY; without even the implied warranty of
24
24
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25
25
# GNU General Public License for more details.
26
#
26
#
27
27
# You should have received a copy of the GNU General Public License
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
#
30
#
31
31
# Contact the authors at <mandos@recompile.se>.
32
#
32
#
33
33
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
try:
38
from future_builtins import *
39
except ImportError:
40
pass
37
from future_builtins import *
41
38
42
39
try:
43
40
import SocketServer as socketserver
79
76
80
77
import dbus
81
78
import dbus.service
82
from gi.repository import GLib
79
try:
80
import gobject
81
except ImportError:
82
from gi.repository import GObject as gobject
83
import avahi
83
84
from dbus.mainloop.glib import DBusGMainLoop
84
85
import ctypes
85
86
import ctypes.util
86
87
import xml.dom.minidom
87
88
import inspect
88
89
89
# Try to find the value of SO_BINDTODEVICE:
90
90
try:
91
# This is where SO_BINDTODEVICE is in Python 3.3 (or 3.4?) and
92
# newer, and it is also the most natural place for it:
93
91
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
92
except AttributeError:
95
93
try:
96
# This is where SO_BINDTODEVICE was up to and including Python
97
# 2.6, and also 3.2:
98
94
from IN import SO_BINDTODEVICE
99
95
except ImportError:
100
# In Python 2.7 it seems to have been removed entirely.
101
# Try running the C preprocessor:
102
try:
103
cc = subprocess.Popen(["cc", "--language=c", "-E",
104
"/dev/stdin"],
105
stdin=subprocess.PIPE,
106
stdout=subprocess.PIPE)
107
stdout = cc.communicate(
108
"#include <sys/socket.h>\nSO_BINDTODEVICE\n")[0]
109
SO_BINDTODEVICE = int(stdout.splitlines()[-1])
110
except (OSError, ValueError, IndexError):
111
# No value found
112
SO_BINDTODEVICE = None
96
SO_BINDTODEVICE = None
113
97
114
98
if sys.version_info.major == 2:
115
99
str = unicode
116
100
117
version = "1.7.13"
101
version = "1.7.3"
118
102
stored_state_file = "clients.pickle"
119
103
120
104
logger = logging.getLogger()
124
108
if_nametoindex = ctypes.cdll.LoadLibrary(
125
109
ctypes.util.find_library("c")).if_nametoindex
126
110
except (OSError, AttributeError):
127
111
128
112
def if_nametoindex(interface):
129
113
"Get an interface index the hard way, i.e. using fcntl()"
130
114
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
135
119
return interface_index
136
120
137
121
138
def copy_function(func):
139
"""Make a copy of a function"""
140
if sys.version_info.major == 2:
141
return types.FunctionType(func.func_code,
142
func.func_globals,
143
func.func_name,
144
func.func_defaults,
145
func.func_closure)
146
else:
147
return types.FunctionType(func.__code__,
148
func.__globals__,
149
func.__name__,
150
func.__defaults__,
151
func.__closure__)
152
153
154
122
def initlogger(debug, level=logging.WARNING):
155
123
"""init logger and add loglevel"""
156
124
157
125
global syslogger
158
126
syslogger = (logging.handlers.SysLogHandler(
159
facility=logging.handlers.SysLogHandler.LOG_DAEMON,
160
address="/dev/log"))
127
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
128
address = "/dev/log"))
161
129
syslogger.setFormatter(logging.Formatter
162
130
('Mandos [%(process)d]: %(levelname)s:'
163
131
' %(message)s'))
164
132
logger.addHandler(syslogger)
165
133
166
134
if debug:
167
135
console = logging.StreamHandler()
168
136
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
180
148
181
149
class PGPEngine(object):
182
150
"""A simple class for OpenPGP symmetric encryption & decryption"""
183
151
184
152
def __init__(self):
185
153
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
186
154
self.gpg = "gpg"
187
155
try:
188
156
output = subprocess.check_output(["gpgconf"])
189
157
for line in output.splitlines():
190
name, text, path = line.split(b":")
158
name, text, path = line.split(":")
191
159
if name == "gpg":
192
160
self.gpg = path
193
161
break
197
165
self.gnupgargs = ['--batch',
198
166
'--homedir', self.tempdir,
199
167
'--force-mdc',
200
'--quiet']
201
# Only GPG version 1 has the --no-use-agent option.
202
if self.gpg == "gpg" or self.gpg.endswith("/gpg"):
203
self.gnupgargs.append("--no-use-agent")
204
168
'--quiet',
169
'--no-use-agent']
170
205
171
def __enter__(self):
206
172
return self
207
173
208
174
def __exit__(self, exc_type, exc_value, traceback):
209
175
self._cleanup()
210
176
return False
211
177
212
178
def __del__(self):
213
179
self._cleanup()
214
180
215
181
def _cleanup(self):
216
182
if self.tempdir is not None:
217
183
# Delete contents of tempdir
218
184
for root, dirs, files in os.walk(self.tempdir,
219
topdown=False):
185
topdown = False):
220
186
for filename in files:
221
187
os.remove(os.path.join(root, filename))
222
188
for dirname in dirs:
224
190
# Remove tempdir
225
191
os.rmdir(self.tempdir)
226
192
self.tempdir = None
227
193
228
194
def password_encode(self, password):
229
195
# Passphrase can not be empty and can not contain newlines or
230
196
# NUL bytes. So we prefix it and hex encode it.
235
201
.replace(b"\n", b"\\n")
236
202
.replace(b"\0", b"\\x00"))
237
203
return encoded
238
204
239
205
def encrypt(self, data, password):
240
206
passphrase = self.password_encode(password)
241
207
with tempfile.NamedTemporaryFile(
246
212
'--passphrase-file',
247
213
passfile.name]
248
214
+ self.gnupgargs,
249
stdin=subprocess.PIPE,
250
stdout=subprocess.PIPE,
251
stderr=subprocess.PIPE)
252
ciphertext, err = proc.communicate(input=data)
215
stdin = subprocess.PIPE,
216
stdout = subprocess.PIPE,
217
stderr = subprocess.PIPE)
218
ciphertext, err = proc.communicate(input = data)
253
219
if proc.returncode != 0:
254
220
raise PGPError(err)
255
221
return ciphertext
256
222
257
223
def decrypt(self, data, password):
258
224
passphrase = self.password_encode(password)
259
225
with tempfile.NamedTemporaryFile(
260
dir=self.tempdir) as passfile:
226
dir = self.tempdir) as passfile:
261
227
passfile.write(passphrase)
262
228
passfile.flush()
263
229
proc = subprocess.Popen([self.gpg, '--decrypt',
264
230
'--passphrase-file',
265
231
passfile.name]
266
232
+ self.gnupgargs,
267
stdin=subprocess.PIPE,
268
stdout=subprocess.PIPE,
269
stderr=subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input=data)
233
stdin = subprocess.PIPE,
234
stdout = subprocess.PIPE,
235
stderr = subprocess.PIPE)
236
decrypted_plaintext, err = proc.communicate(input = data)
271
237
if proc.returncode != 0:
272
238
raise PGPError(err)
273
239
return decrypted_plaintext
274
240
275
241
276
# Pretend that we have an Avahi module
277
class Avahi(object):
278
"""This isn't so much a class as it is a module-like namespace.
279
It is instantiated once, and simulates having an Avahi module."""
280
IF_UNSPEC = -1 # avahi-common/address.h
281
PROTO_UNSPEC = -1 # avahi-common/address.h
282
PROTO_INET = 0 # avahi-common/address.h
283
PROTO_INET6 = 1 # avahi-common/address.h
284
DBUS_NAME = "org.freedesktop.Avahi"
285
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
286
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
287
DBUS_PATH_SERVER = "/"
288
289
def string_array_to_txt_array(self, t):
290
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
291
for s in t), signature="ay")
292
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
293
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
294
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
295
SERVER_INVALID = 0 # avahi-common/defs.h
296
SERVER_REGISTERING = 1 # avahi-common/defs.h
297
SERVER_RUNNING = 2 # avahi-common/defs.h
298
SERVER_COLLISION = 3 # avahi-common/defs.h
299
SERVER_FAILURE = 4 # avahi-common/defs.h
300
avahi = Avahi()
301
302
303
242
class AvahiError(Exception):
304
243
def __init__(self, value, *args, **kwargs):
305
244
self.value = value
317
256
318
257
class AvahiService(object):
319
258
"""An Avahi (Zeroconf) service.
320
259
321
260
Attributes:
322
261
interface: integer; avahi.IF_UNSPEC or an interface index.
323
262
Used to optionally bind to the specified interface.
335
274
server: D-Bus Server
336
275
bus: dbus.SystemBus()
337
276
"""
338
277
339
278
def __init__(self,
340
interface=avahi.IF_UNSPEC,
341
name=None,
342
servicetype=None,
343
port=None,
344
TXT=None,
345
domain="",
346
host="",
347
max_renames=32768,
348
protocol=avahi.PROTO_UNSPEC,
349
bus=None):
279
interface = avahi.IF_UNSPEC,
280
name = None,
281
servicetype = None,
282
port = None,
283
TXT = None,
284
domain = "",
285
host = "",
286
max_renames = 32768,
287
protocol = avahi.PROTO_UNSPEC,
288
bus = None):
350
289
self.interface = interface
351
290
self.name = name
352
291
self.type = servicetype
361
300
self.server = None
362
301
self.bus = bus
363
302
self.entry_group_state_changed_match = None
364
303
365
304
def rename(self, remove=True):
366
305
"""Derived from the Avahi example code"""
367
306
if self.rename_count >= self.max_renames:
387
326
logger.critical("D-Bus Exception", exc_info=error)
388
327
self.cleanup()
389
328
os._exit(1)
390
329
391
330
def remove(self):
392
331
"""Derived from the Avahi example code"""
393
332
if self.entry_group_state_changed_match is not None:
395
334
self.entry_group_state_changed_match = None
396
335
if self.group is not None:
397
336
self.group.Reset()
398
337
399
338
def add(self):
400
339
"""Derived from the Avahi example code"""
401
340
self.remove()
418
357
dbus.UInt16(self.port),
419
358
avahi.string_array_to_txt_array(self.TXT))
420
359
self.group.Commit()
421
360
422
361
def entry_group_state_changed(self, state, error):
423
362
"""Derived from the Avahi example code"""
424
363
logger.debug("Avahi entry group state change: %i", state)
425
364
426
365
if state == avahi.ENTRY_GROUP_ESTABLISHED:
427
366
logger.debug("Zeroconf service established.")
428
367
elif state == avahi.ENTRY_GROUP_COLLISION:
432
371
logger.critical("Avahi: Error in group state changed %s",
433
372
str(error))
434
373
raise AvahiGroupError("State changed: {!s}".format(error))
435
374
436
375
def cleanup(self):
437
376
"""Derived from the Avahi example code"""
438
377
if self.group is not None:
443
382
pass
444
383
self.group = None
445
384
self.remove()
446
385
447
386
def server_state_changed(self, state, error=None):
448
387
"""Derived from the Avahi example code"""
449
388
logger.debug("Avahi server state change: %i", state)
478
417
logger.debug("Unknown state: %r", state)
479
418
else:
480
419
logger.debug("Unknown state: %r: %r", state, error)
481
420
482
421
def activate(self):
483
422
"""Derived from the Avahi example code"""
484
423
if self.server is None:
501
440
.format(self.name)))
502
441
return ret
503
442
504
505
443
# Pretend that we have a GnuTLS module
506
444
class GnuTLS(object):
507
445
"""This isn't so much a class as it is a module-like namespace.
508
446
It is instantiated once, and simulates having a GnuTLS module."""
509
510
library = ctypes.util.find_library("gnutls")
511
if library is None:
512
library = ctypes.util.find_library("gnutls-deb0")
513
_library = ctypes.cdll.LoadLibrary(library)
514
del library
515
_need_version = b"3.3.0"
516
447
448
_library = ctypes.cdll.LoadLibrary(
449
ctypes.util.find_library("gnutls"))
450
_need_version = "3.3.0"
517
451
def __init__(self):
518
452
# Need to use class name "GnuTLS" here, since this method is
519
453
# called before the assignment to the "gnutls" global variable
521
455
if GnuTLS.check_version(self._need_version) is None:
522
456
raise GnuTLS.Error("Needs GnuTLS {} or later"
523
457
.format(self._need_version))
524
458
525
459
# Unless otherwise indicated, the constants and types below are
526
460
# all from the gnutls/gnutls.h C header file.
527
461
528
462
# Constants
529
463
E_SUCCESS = 0
530
464
E_INTERRUPTED = -52
535
469
CRD_CERTIFICATE = 1
536
470
E_NO_CERTIFICATE_FOUND = -49
537
471
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
538
472
539
473
# Types
540
474
class session_int(ctypes.Structure):
541
475
_fields_ = []
542
476
session_t = ctypes.POINTER(session_int)
543
544
477
class certificate_credentials_st(ctypes.Structure):
545
478
_fields_ = []
546
479
certificate_credentials_t = ctypes.POINTER(
547
480
certificate_credentials_st)
548
481
certificate_type_t = ctypes.c_int
549
550
482
class datum_t(ctypes.Structure):
551
483
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
552
484
('size', ctypes.c_uint)]
553
554
485
class openpgp_crt_int(ctypes.Structure):
555
486
_fields_ = []
556
487
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
557
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
488
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
558
489
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
559
credentials_type_t = ctypes.c_int
490
credentials_type_t = ctypes.c_int #
560
491
transport_ptr_t = ctypes.c_void_p
561
492
close_request_t = ctypes.c_int
562
493
563
494
# Exceptions
564
495
class Error(Exception):
565
496
# We need to use the class name "GnuTLS" here, since this
566
497
# exception might be raised from within GnuTLS.__init__,
567
498
# which is called before the assignment to the "gnutls"
568
499
# global variable has happened.
569
def __init__(self, message=None, code=None, args=()):
500
def __init__(self, message = None, code = None, args=()):
570
501
# Default usage is by a message string, but if a return
571
502
# code is passed, convert it to a string with
572
503
# gnutls.strerror()
575
506
message = GnuTLS.strerror(code)
576
507
return super(GnuTLS.Error, self).__init__(
577
508
message, *args)
578
509
579
510
class CertificateSecurityError(Error):
580
511
pass
581
512
582
513
# Classes
583
514
class Credentials(object):
584
515
def __init__(self):
586
517
gnutls.certificate_allocate_credentials(
587
518
ctypes.byref(self._c_object))
588
519
self.type = gnutls.CRD_CERTIFICATE
589
520
590
521
def __del__(self):
591
522
gnutls.certificate_free_credentials(self._c_object)
592
523
593
524
class ClientSession(object):
594
def __init__(self, socket, credentials=None):
525
def __init__(self, socket, credentials = None):
595
526
self._c_object = gnutls.session_t()
596
527
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
597
528
gnutls.set_default_priority(self._c_object)
605
536
ctypes.cast(credentials._c_object,
606
537
ctypes.c_void_p))
607
538
self.credentials = credentials
608
539
609
540
def __del__(self):
610
541
gnutls.deinit(self._c_object)
611
542
612
543
def handshake(self):
613
544
return gnutls.handshake(self._c_object)
614
545
615
546
def send(self, data):
616
547
data = bytes(data)
617
548
data_len = len(data)
619
550
data_len -= gnutls.record_send(self._c_object,
620
551
data[-data_len:],
621
552
data_len)
622
553
623
554
def bye(self):
624
555
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
625
556
626
557
# Error handling functions
627
558
def _error_code(result):
628
559
"""A function to raise exceptions on errors, suitable
630
561
if result >= 0:
631
562
return result
632
563
if result == gnutls.E_NO_CERTIFICATE_FOUND:
633
raise gnutls.CertificateSecurityError(code=result)
634
raise gnutls.Error(code=result)
635
564
raise gnutls.CertificateSecurityError(code = result)
565
raise gnutls.Error(code = result)
566
636
567
def _retry_on_error(result, func, arguments):
637
568
"""A function to retry on some errors, suitable
638
569
for the 'errcheck' attribute on ctypes functions"""
641
572
return _error_code(result)
642
573
result = func(*arguments)
643
574
return result
644
575
645
576
# Unless otherwise indicated, the function declarations below are
646
577
# all from the gnutls/gnutls.h C header file.
647
578
648
579
# Functions
649
580
priority_set_direct = _library.gnutls_priority_set_direct
650
581
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
651
582
ctypes.POINTER(ctypes.c_char_p)]
652
583
priority_set_direct.restype = _error_code
653
584
654
585
init = _library.gnutls_init
655
586
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
656
587
init.restype = _error_code
657
588
658
589
set_default_priority = _library.gnutls_set_default_priority
659
590
set_default_priority.argtypes = [session_t]
660
591
set_default_priority.restype = _error_code
661
592
662
593
record_send = _library.gnutls_record_send
663
594
record_send.argtypes = [session_t, ctypes.c_void_p,
664
595
ctypes.c_size_t]
665
596
record_send.restype = ctypes.c_ssize_t
666
597
record_send.errcheck = _retry_on_error
667
598
668
599
certificate_allocate_credentials = (
669
600
_library.gnutls_certificate_allocate_credentials)
670
601
certificate_allocate_credentials.argtypes = [
671
602
ctypes.POINTER(certificate_credentials_t)]
672
603
certificate_allocate_credentials.restype = _error_code
673
604
674
605
certificate_free_credentials = (
675
606
_library.gnutls_certificate_free_credentials)
676
certificate_free_credentials.argtypes = [
677
certificate_credentials_t]
607
certificate_free_credentials.argtypes = [certificate_credentials_t]
678
608
certificate_free_credentials.restype = None
679
609
680
610
handshake_set_private_extensions = (
681
611
_library.gnutls_handshake_set_private_extensions)
682
612
handshake_set_private_extensions.argtypes = [session_t,
683
613
ctypes.c_int]
684
614
handshake_set_private_extensions.restype = None
685
615
686
616
credentials_set = _library.gnutls_credentials_set
687
617
credentials_set.argtypes = [session_t, credentials_type_t,
688
618
ctypes.c_void_p]
689
619
credentials_set.restype = _error_code
690
620
691
621
strerror = _library.gnutls_strerror
692
622
strerror.argtypes = [ctypes.c_int]
693
623
strerror.restype = ctypes.c_char_p
694
624
695
625
certificate_type_get = _library.gnutls_certificate_type_get
696
626
certificate_type_get.argtypes = [session_t]
697
627
certificate_type_get.restype = _error_code
698
628
699
629
certificate_get_peers = _library.gnutls_certificate_get_peers
700
630
certificate_get_peers.argtypes = [session_t,
701
631
ctypes.POINTER(ctypes.c_uint)]
702
632
certificate_get_peers.restype = ctypes.POINTER(datum_t)
703
633
704
634
global_set_log_level = _library.gnutls_global_set_log_level
705
635
global_set_log_level.argtypes = [ctypes.c_int]
706
636
global_set_log_level.restype = None
707
637
708
638
global_set_log_function = _library.gnutls_global_set_log_function
709
639
global_set_log_function.argtypes = [log_func]
710
640
global_set_log_function.restype = None
711
641
712
642
deinit = _library.gnutls_deinit
713
643
deinit.argtypes = [session_t]
714
644
deinit.restype = None
715
645
716
646
handshake = _library.gnutls_handshake
717
647
handshake.argtypes = [session_t]
718
648
handshake.restype = _error_code
719
649
handshake.errcheck = _retry_on_error
720
650
721
651
transport_set_ptr = _library.gnutls_transport_set_ptr
722
652
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
723
653
transport_set_ptr.restype = None
724
654
725
655
bye = _library.gnutls_bye
726
656
bye.argtypes = [session_t, close_request_t]
727
657
bye.restype = _error_code
728
658
bye.errcheck = _retry_on_error
729
659
730
660
check_version = _library.gnutls_check_version
731
661
check_version.argtypes = [ctypes.c_char_p]
732
662
check_version.restype = ctypes.c_char_p
733
663
734
664
# All the function declarations below are from gnutls/openpgp.h
735
665
736
666
openpgp_crt_init = _library.gnutls_openpgp_crt_init
737
667
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
738
668
openpgp_crt_init.restype = _error_code
739
669
740
670
openpgp_crt_import = _library.gnutls_openpgp_crt_import
741
671
openpgp_crt_import.argtypes = [openpgp_crt_t,
742
672
ctypes.POINTER(datum_t),
743
673
openpgp_crt_fmt_t]
744
674
openpgp_crt_import.restype = _error_code
745
675
746
676
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
747
677
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
748
678
ctypes.POINTER(ctypes.c_uint)]
749
679
openpgp_crt_verify_self.restype = _error_code
750
680
751
681
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
752
682
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
753
683
openpgp_crt_deinit.restype = None
754
684
755
685
openpgp_crt_get_fingerprint = (
756
686
_library.gnutls_openpgp_crt_get_fingerprint)
757
687
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
759
689
ctypes.POINTER(
760
690
ctypes.c_size_t)]
761
691
openpgp_crt_get_fingerprint.restype = _error_code
762
692
763
693
# Remove non-public functions
764
694
del _error_code, _retry_on_error
765
695
# Create the global "gnutls" object, simulating a module
766
696
gnutls = GnuTLS()
767
697
768
769
698
def call_pipe(connection, # : multiprocessing.Connection
770
699
func, *args, **kwargs):
771
700
"""This function is meant to be called by multiprocessing.Process
772
701
773
702
This function runs func(*args, **kwargs), and writes the resulting
774
703
return value on the provided multiprocessing.Connection.
775
704
"""
776
705
connection.send(func(*args, **kwargs))
777
706
connection.close()
778
707
779
780
708
class Client(object):
781
709
"""A representation of a client host served by this server.
782
710
783
711
Attributes:
784
712
approved: bool(); 'None' if not yet approved/disapproved
785
713
approval_delay: datetime.timedelta(); Time to wait for approval
787
715
checker: subprocess.Popen(); a running checker process used
788
716
to see if the client lives.
789
717
'None' if no process is running.
790
checker_callback_tag: a GLib event source tag, or None
718
checker_callback_tag: a gobject event source tag, or None
791
719
checker_command: string; External command which is run to check
792
720
if client lives. %() expansions are done at
793
721
runtime with vars(self) as dict, so that for
794
722
instance %(name)s can be used in the command.
795
checker_initiator_tag: a GLib event source tag, or None
723
checker_initiator_tag: a gobject event source tag, or None
796
724
created: datetime.datetime(); (UTC) object creation
797
725
client_structure: Object describing what attributes a client has
798
726
and is used for storing the client at exit
799
727
current_checker_command: string; current running checker_command
800
disable_initiator_tag: a GLib event source tag, or None
728
disable_initiator_tag: a gobject event source tag, or None
801
729
enabled: bool()
802
730
fingerprint: string (40 or 32 hexadecimal digits); used to
803
731
uniquely identify the client
822
750
disabled, or None
823
751
server_settings: The server_settings dict from main()
824
752
"""
825
753
826
754
runtime_expansions = ("approval_delay", "approval_duration",
827
755
"created", "enabled", "expires",
828
756
"fingerprint", "host", "interval",
839
767
"approved_by_default": "True",
840
768
"enabled": "True",
841
769
}
842
770
843
771
@staticmethod
844
772
def config_parser(config):
845
773
"""Construct a new dict of client settings of this form:
852
780
for client_name in config.sections():
853
781
section = dict(config.items(client_name))
854
782
client = settings[client_name] = {}
855
783
856
784
client["host"] = section["host"]
857
785
# Reformat values from string types to Python types
858
786
client["approved_by_default"] = config.getboolean(
859
787
client_name, "approved_by_default")
860
788
client["enabled"] = config.getboolean(client_name,
861
789
"enabled")
862
790
863
791
# Uppercase and remove spaces from fingerprint for later
864
792
# comparison purposes with return value from the
865
793
# fingerprint() function
866
794
client["fingerprint"] = (section["fingerprint"].upper()
867
795
.replace(" ", ""))
868
796
if "secret" in section:
869
client["secret"] = codecs.decode(section["secret"]
870
.encode("utf-8"),
871
"base64")
797
client["secret"] = section["secret"].decode("base64")
872
798
elif "secfile" in section:
873
799
with open(os.path.expanduser(os.path.expandvars
874
800
(section["secfile"])),
889
815
client["last_approval_request"] = None
890
816
client["last_checked_ok"] = None
891
817
client["last_checker_status"] = -2
892
818
893
819
return settings
894
895
def __init__(self, settings, name=None, server_settings=None):
820
821
def __init__(self, settings, name = None, server_settings=None):
896
822
self.name = name
897
823
if server_settings is None:
898
824
server_settings = {}
900
826
# adding all client settings
901
827
for setting, value in settings.items():
902
828
setattr(self, setting, value)
903
829
904
830
if self.enabled:
905
831
if not hasattr(self, "last_enabled"):
906
832
self.last_enabled = datetime.datetime.utcnow()
910
836
else:
911
837
self.last_enabled = None
912
838
self.expires = None
913
839
914
840
logger.debug("Creating client %r", self.name)
915
841
logger.debug(" Fingerprint: %s", self.fingerprint)
916
842
self.created = settings.get("created",
917
843
datetime.datetime.utcnow())
918
844
919
845
# attributes specific for this server instance
920
846
self.checker = None
921
847
self.checker_initiator_tag = None
927
853
self.changedstate = multiprocessing_manager.Condition(
928
854
multiprocessing_manager.Lock())
929
855
self.client_structure = [attr
930
for attr in self.__dict__.keys()
856
for attr in self.__dict__.iterkeys()
931
857
if not attr.startswith("_")]
932
858
self.client_structure.append("client_structure")
933
859
934
860
for name, t in inspect.getmembers(
935
861
type(self), lambda obj: isinstance(obj, property)):
936
862
if not name.startswith("_"):
937
863
self.client_structure.append(name)
938
864
939
865
# Send notice to process children that client state has changed
940
866
def send_changedstate(self):
941
867
with self.changedstate:
942
868
self.changedstate.notify_all()
943
869
944
870
def enable(self):
945
871
"""Start this client's checker and timeout hooks"""
946
872
if getattr(self, "enabled", False):
951
877
self.last_enabled = datetime.datetime.utcnow()
952
878
self.init_checker()
953
879
self.send_changedstate()
954
880
955
881
def disable(self, quiet=True):
956
882
"""Disable this client."""
957
883
if not getattr(self, "enabled", False):
959
885
if not quiet:
960
886
logger.info("Disabling client %s", self.name)
961
887
if getattr(self, "disable_initiator_tag", None) is not None:
962
GLib.source_remove(self.disable_initiator_tag)
888
gobject.source_remove(self.disable_initiator_tag)
963
889
self.disable_initiator_tag = None
964
890
self.expires = None
965
891
if getattr(self, "checker_initiator_tag", None) is not None:
966
GLib.source_remove(self.checker_initiator_tag)
892
gobject.source_remove(self.checker_initiator_tag)
967
893
self.checker_initiator_tag = None
968
894
self.stop_checker()
969
895
self.enabled = False
970
896
if not quiet:
971
897
self.send_changedstate()
972
# Do not run this again if called by a GLib.timeout_add
898
# Do not run this again if called by a gobject.timeout_add
973
899
return False
974
900
975
901
def __del__(self):
976
902
self.disable()
977
903
978
904
def init_checker(self):
979
905
# Schedule a new checker to be started an 'interval' from now,
980
906
# and every interval from then on.
981
907
if self.checker_initiator_tag is not None:
982
GLib.source_remove(self.checker_initiator_tag)
983
self.checker_initiator_tag = GLib.timeout_add(
908
gobject.source_remove(self.checker_initiator_tag)
909
self.checker_initiator_tag = gobject.timeout_add(
984
910
int(self.interval.total_seconds() * 1000),
985
911
self.start_checker)
986
912
# Schedule a disable() when 'timeout' has passed
987
913
if self.disable_initiator_tag is not None:
988
GLib.source_remove(self.disable_initiator_tag)
989
self.disable_initiator_tag = GLib.timeout_add(
914
gobject.source_remove(self.disable_initiator_tag)
915
self.disable_initiator_tag = gobject.timeout_add(
990
916
int(self.timeout.total_seconds() * 1000), self.disable)
991
917
# Also start a new checker *right now*.
992
918
self.start_checker()
993
919
994
920
def checker_callback(self, source, condition, connection,
995
921
command):
996
922
"""The checker has completed, so take appropriate actions."""
999
925
# Read return code from connection (see call_pipe)
1000
926
returncode = connection.recv()
1001
927
connection.close()
1002
928
1003
929
if returncode >= 0:
1004
930
self.last_checker_status = returncode
1005
931
self.last_checker_signal = None
1015
941
logger.warning("Checker for %(name)s crashed?",
1016
942
vars(self))
1017
943
return False
1018
944
1019
945
def checked_ok(self):
1020
946
"""Assert that the client has been seen, alive and well."""
1021
947
self.last_checked_ok = datetime.datetime.utcnow()
1022
948
self.last_checker_status = 0
1023
949
self.last_checker_signal = None
1024
950
self.bump_timeout()
1025
951
1026
952
def bump_timeout(self, timeout=None):
1027
953
"""Bump up the timeout for this client."""
1028
954
if timeout is None:
1029
955
timeout = self.timeout
1030
956
if self.disable_initiator_tag is not None:
1031
GLib.source_remove(self.disable_initiator_tag)
957
gobject.source_remove(self.disable_initiator_tag)
1032
958
self.disable_initiator_tag = None
1033
959
if getattr(self, "enabled", False):
1034
self.disable_initiator_tag = GLib.timeout_add(
960
self.disable_initiator_tag = gobject.timeout_add(
1035
961
int(timeout.total_seconds() * 1000), self.disable)
1036
962
self.expires = datetime.datetime.utcnow() + timeout
1037
963
1038
964
def need_approval(self):
1039
965
self.last_approval_request = datetime.datetime.utcnow()
1040
966
1041
967
def start_checker(self):
1042
968
"""Start a new checker subprocess if one is not running.
1043
969
1044
970
If a checker already exists, leave it running and do
1045
971
nothing."""
1046
972
# The reason for not killing a running checker is that if we
1051
977
# checkers alone, the checker would have to take more time
1052
978
# than 'timeout' for the client to be disabled, which is as it
1053
979
# should be.
1054
980
1055
981
if self.checker is not None and not self.checker.is_alive():
1056
982
logger.warning("Checker was not alive; joining")
1057
983
self.checker.join()
1061
987
# Escape attributes for the shell
1062
988
escaped_attrs = {
1063
989
attr: re.escape(str(getattr(self, attr)))
1064
for attr in self.runtime_expansions}
990
for attr in self.runtime_expansions }
1065
991
try:
1066
992
command = self.checker_command % escaped_attrs
1067
993
except TypeError as error:
1079
1005
# The exception is when not debugging but nevertheless
1080
1006
# running in the foreground; use the previously
1081
1007
# created wnull.
1082
popen_args = {"close_fds": True,
1083
"shell": True,
1084
"cwd": "/"}
1008
popen_args = { "close_fds": True,
1009
"shell": True,
1010
"cwd": "/" }
1085
1011
if (not self.server_settings["debug"]
1086
1012
and self.server_settings["foreground"]):
1087
1013
popen_args.update({"stdout": wnull,
1088
"stderr": wnull})
1089
pipe = multiprocessing.Pipe(duplex=False)
1014
"stderr": wnull })
1015
pipe = multiprocessing.Pipe(duplex = False)
1090
1016
self.checker = multiprocessing.Process(
1091
target=call_pipe,
1092
args=(pipe[1], subprocess.call, command),
1093
kwargs=popen_args)
1017
target = call_pipe,
1018
args = (pipe[1], subprocess.call, command),
1019
kwargs = popen_args)
1094
1020
self.checker.start()
1095
self.checker_callback_tag = GLib.io_add_watch(
1096
pipe[0].fileno(), GLib.IO_IN,
1021
self.checker_callback_tag = gobject.io_add_watch(
1022
pipe[0].fileno(), gobject.IO_IN,
1097
1023
self.checker_callback, pipe[0], command)
1098
# Re-run this periodically if run by GLib.timeout_add
1024
# Re-run this periodically if run by gobject.timeout_add
1099
1025
return True
1100
1026
1101
1027
def stop_checker(self):
1102
1028
"""Force the checker process, if any, to stop."""
1103
1029
if self.checker_callback_tag:
1104
GLib.source_remove(self.checker_callback_tag)
1030
gobject.source_remove(self.checker_callback_tag)
1105
1031
self.checker_callback_tag = None
1106
1032
if getattr(self, "checker", None) is None:
1107
1033
return
1116
1042
byte_arrays=False):
1117
1043
"""Decorators for marking methods of a DBusObjectWithProperties to
1118
1044
become properties on the D-Bus.
1119
1045
1120
1046
The decorated method will be called with no arguments by "Get"
1121
1047
and with one argument by "Set".
1122
1048
1123
1049
The parameters, where they are supported, are the same as
1124
1050
dbus.service.method, except there is only "signature", since the
1125
1051
type from Get() and the type sent to Set() is the same.
1129
1055
if byte_arrays and signature != "ay":
1130
1056
raise ValueError("Byte arrays not supported for non-'ay'"
1131
1057
" signature {!r}".format(signature))
1132
1058
1133
1059
def decorator(func):
1134
1060
func._dbus_is_property = True
1135
1061
func._dbus_interface = dbus_interface
1138
1064
func._dbus_name = func.__name__
1139
1065
if func._dbus_name.endswith("_dbus_property"):
1140
1066
func._dbus_name = func._dbus_name[:-14]
1141
func._dbus_get_args_options = {'byte_arrays': byte_arrays}
1067
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1142
1068
return func
1143
1069
1144
1070
return decorator
1145
1071
1146
1072
1147
1073
def dbus_interface_annotations(dbus_interface):
1148
1074
"""Decorator for marking functions returning interface annotations
1149
1075
1150
1076
Usage:
1151
1077
1152
1078
@dbus_interface_annotations("org.example.Interface")
1153
1079
def _foo(self): # Function name does not matter
1154
1080
return {"org.freedesktop.DBus.Deprecated": "true",
1155
1081
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1156
1082
"false"}
1157
1083
"""
1158
1084
1159
1085
def decorator(func):
1160
1086
func._dbus_is_interface = True
1161
1087
func._dbus_interface = dbus_interface
1162
1088
func._dbus_name = dbus_interface
1163
1089
return func
1164
1090
1165
1091
return decorator
1166
1092
1167
1093
1168
1094
def dbus_annotations(annotations):
1169
1095
"""Decorator to annotate D-Bus methods, signals or properties
1170
1096
Usage:
1171
1097
1172
1098
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1173
1099
"org.freedesktop.DBus.Property."
1174
1100
"EmitsChangedSignal": "false"})
1176
1102
access="r")
1177
1103
def Property_dbus_property(self):
1178
1104
return dbus.Boolean(False)
1179
1105
1180
1106
See also the DBusObjectWithAnnotations class.
1181
1107
"""
1182
1108
1183
1109
def decorator(func):
1184
1110
func._dbus_annotations = annotations
1185
1111
return func
1186
1112
1187
1113
return decorator
1188
1114
1189
1115
1207
1133
1208
1134
class DBusObjectWithAnnotations(dbus.service.Object):
1209
1135
"""A D-Bus object with annotations.
1210
1136
1211
1137
Classes inheriting from this can use the dbus_annotations
1212
1138
decorator to add annotations to methods or signals.
1213
1139
"""
1214
1140
1215
1141
@staticmethod
1216
1142
def _is_dbus_thing(thing):
1217
1143
"""Returns a function testing if an attribute is a D-Bus thing
1218
1144
1219
1145
If called like _is_dbus_thing("method") it returns a function
1220
1146
suitable for use as predicate to inspect.getmembers().
1221
1147
"""
1222
1148
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1223
1149
False)
1224
1150
1225
1151
def _get_all_dbus_things(self, thing):
1226
1152
"""Returns a generator of (name, attribute) pairs
1227
1153
"""
1230
1156
for cls in self.__class__.__mro__
1231
1157
for name, athing in
1232
1158
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1233
1159
1234
1160
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1235
out_signature="s",
1236
path_keyword='object_path',
1237
connection_keyword='connection')
1161
out_signature = "s",
1162
path_keyword = 'object_path',
1163
connection_keyword = 'connection')
1238
1164
def Introspect(self, object_path, connection):
1239
1165
"""Overloading of standard D-Bus method.
1240
1166
1241
1167
Inserts annotation tags on methods and signals.
1242
1168
"""
1243
1169
xmlstring = dbus.service.Object.Introspect(self, object_path,
1244
1170
connection)
1245
1171
try:
1246
1172
document = xml.dom.minidom.parseString(xmlstring)
1247
1173
1248
1174
for if_tag in document.getElementsByTagName("interface"):
1249
1175
# Add annotation tags
1250
1176
for typ in ("method", "signal"):
1277
1203
if_tag.appendChild(ann_tag)
1278
1204
# Fix argument name for the Introspect method itself
1279
1205
if (if_tag.getAttribute("name")
1280
== dbus.INTROSPECTABLE_IFACE):
1206
== dbus.INTROSPECTABLE_IFACE):
1281
1207
for cn in if_tag.getElementsByTagName("method"):
1282
1208
if cn.getAttribute("name") == "Introspect":
1283
1209
for arg in cn.getElementsByTagName("arg"):
1296
1222
1297
1223
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1298
1224
"""A D-Bus object with properties.
1299
1225
1300
1226
Classes inheriting from this can use the dbus_service_property
1301
1227
decorator to expose methods as D-Bus properties. It exposes the
1302
1228
standard Get(), Set(), and GetAll() methods on the D-Bus.
1303
1229
"""
1304
1230
1305
1231
def _get_dbus_property(self, interface_name, property_name):
1306
1232
"""Returns a bound method if one exists which is a D-Bus
1307
1233
property with the specified name and interface.
1312
1238
if (value._dbus_name == property_name
1313
1239
and value._dbus_interface == interface_name):
1314
1240
return value.__get__(self)
1315
1241
1316
1242
# No such property
1317
1243
raise DBusPropertyNotFound("{}:{}.{}".format(
1318
1244
self.dbus_object_path, interface_name, property_name))
1319
1245
1320
1246
@classmethod
1321
1247
def _get_all_interface_names(cls):
1322
1248
"""Get a sequence of all interfaces supported by an object"""
1325
1251
for x in (inspect.getmro(cls))
1326
1252
for attr in dir(x))
1327
1253
if name is not None)
1328
1254
1329
1255
@dbus.service.method(dbus.PROPERTIES_IFACE,
1330
1256
in_signature="ss",
1331
1257
out_signature="v")
1339
1265
if not hasattr(value, "variant_level"):
1340
1266
return value
1341
1267
return type(value)(value, variant_level=value.variant_level+1)
1342
1268
1343
1269
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
1344
1270
def Set(self, interface_name, property_name, value):
1345
1271
"""Standard D-Bus property Set() method, see D-Bus standard.
1357
1283
value = dbus.ByteArray(b''.join(chr(byte)
1358
1284
for byte in value))
1359
1285
prop(value)
1360
1286
1361
1287
@dbus.service.method(dbus.PROPERTIES_IFACE,
1362
1288
in_signature="s",
1363
1289
out_signature="a{sv}")
1364
1290
def GetAll(self, interface_name):
1365
1291
"""Standard D-Bus property GetAll() method, see D-Bus
1366
1292
standard.
1367
1293
1368
1294
Note: Will not include properties with access="write".
1369
1295
"""
1370
1296
properties = {}
1381
1307
properties[name] = value
1382
1308
continue
1383
1309
properties[name] = type(value)(
1384
value, variant_level=value.variant_level + 1)
1310
value, variant_level = value.variant_level + 1)
1385
1311
return dbus.Dictionary(properties, signature="sv")
1386
1312
1387
1313
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
1388
1314
def PropertiesChanged(self, interface_name, changed_properties,
1389
1315
invalidated_properties):
1391
1317
standard.
1392
1318
"""
1393
1319
pass
1394
1320
1395
1321
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1396
1322
out_signature="s",
1397
1323
path_keyword='object_path',
1398
1324
connection_keyword='connection')
1399
1325
def Introspect(self, object_path, connection):
1400
1326
"""Overloading of standard D-Bus method.
1401
1327
1402
1328
Inserts property tags and interface annotation tags.
1403
1329
"""
1404
1330
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1406
1332
connection)
1407
1333
try:
1408
1334
document = xml.dom.minidom.parseString(xmlstring)
1409
1335
1410
1336
def make_tag(document, name, prop):
1411
1337
e = document.createElement("property")
1412
1338
e.setAttribute("name", name)
1413
1339
e.setAttribute("type", prop._dbus_signature)
1414
1340
e.setAttribute("access", prop._dbus_access)
1415
1341
return e
1416
1342
1417
1343
for if_tag in document.getElementsByTagName("interface"):
1418
1344
# Add property tags
1419
1345
for tag in (make_tag(document, name, prop)
1466
1392
except AttributeError:
1467
1393
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1468
1394
1469
1470
1395
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1471
1396
"""A D-Bus object with an ObjectManager.
1472
1397
1473
1398
Classes inheriting from this exposes the standard
1474
1399
GetManagedObjects call and the InterfacesAdded and
1475
1400
InterfacesRemoved signals on the standard
1476
1401
"org.freedesktop.DBus.ObjectManager" interface.
1477
1402
1478
1403
Note: No signals are sent automatically; they must be sent
1479
1404
manually.
1480
1405
"""
1481
1406
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1482
out_signature="a{oa{sa{sv}}}")
1407
out_signature = "a{oa{sa{sv}}}")
1483
1408
def GetManagedObjects(self):
1484
1409
"""This function must be overridden"""
1485
1410
raise NotImplementedError()
1486
1411
1487
1412
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1488
signature="oa{sa{sv}}")
1413
signature = "oa{sa{sv}}")
1489
1414
def InterfacesAdded(self, object_path, interfaces_and_properties):
1490
1415
pass
1491
1492
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature="oas")
1416
1417
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1493
1418
def InterfacesRemoved(self, object_path, interfaces):
1494
1419
pass
1495
1420
1496
1421
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1497
out_signature="s",
1498
path_keyword='object_path',
1499
connection_keyword='connection')
1422
out_signature = "s",
1423
path_keyword = 'object_path',
1424
connection_keyword = 'connection')
1500
1425
def Introspect(self, object_path, connection):
1501
1426
"""Overloading of standard D-Bus method.
1502
1427
1503
1428
Override return argument name of GetManagedObjects to be
1504
1429
"objpath_interfaces_and_properties"
1505
1430
"""
1508
1433
connection)
1509
1434
try:
1510
1435
document = xml.dom.minidom.parseString(xmlstring)
1511
1436
1512
1437
for if_tag in document.getElementsByTagName("interface"):
1513
1438
# Fix argument name for the GetManagedObjects method
1514
1439
if (if_tag.getAttribute("name")
1515
== dbus.OBJECT_MANAGER_IFACE):
1440
== dbus.OBJECT_MANAGER_IFACE):
1516
1441
for cn in if_tag.getElementsByTagName("method"):
1517
1442
if (cn.getAttribute("name")
1518
1443
== "GetManagedObjects"):
1528
1453
except (AttributeError, xml.dom.DOMException,
1529
1454
xml.parsers.expat.ExpatError) as error:
1530
1455
logger.error("Failed to override Introspection method",
1531
exc_info=error)
1456
exc_info = error)
1532
1457
return xmlstring
1533
1458
1534
1535
1459
def datetime_to_dbus(dt, variant_level=0):
1536
1460
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1537
1461
if dt is None:
1538
return dbus.String("", variant_level=variant_level)
1462
return dbus.String("", variant_level = variant_level)
1539
1463
return dbus.String(dt.isoformat(), variant_level=variant_level)
1540
1464
1541
1465
1544
1468
dbus.service.Object, it will add alternate D-Bus attributes with
1545
1469
interface names according to the "alt_interface_names" mapping.
1546
1470
Usage:
1547
1471
1548
1472
@alternate_dbus_interfaces({"org.example.Interface":
1549
1473
"net.example.AlternateInterface"})
1550
1474
class SampleDBusObject(dbus.service.Object):
1551
1475
@dbus.service.method("org.example.Interface")
1552
1476
def SampleDBusMethod():
1553
1477
pass
1554
1478
1555
1479
The above "SampleDBusMethod" on "SampleDBusObject" will be
1556
1480
reachable via two interfaces: "org.example.Interface" and
1557
1481
"net.example.AlternateInterface", the latter of which will have
1558
1482
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1559
1483
"true", unless "deprecate" is passed with a False value.
1560
1484
1561
1485
This works for methods and signals, and also for D-Bus properties
1562
1486
(from DBusObjectWithProperties) and interfaces (from the
1563
1487
dbus_interface_annotations decorator).
1564
1488
"""
1565
1489
1566
1490
def wrapper(cls):
1567
1491
for orig_interface_name, alt_interface_name in (
1568
1492
alt_interface_names.items()):
1583
1507
interface_names.add(alt_interface)
1584
1508
# Is this a D-Bus signal?
1585
1509
if getattr(attribute, "_dbus_is_signal", False):
1586
# Extract the original non-method undecorated
1587
# function by black magic
1588
1510
if sys.version_info.major == 2:
1511
# Extract the original non-method undecorated
1512
# function by black magic
1589
1513
nonmethod_func = (dict(
1590
1514
zip(attribute.func_code.co_freevars,
1591
1515
attribute.__closure__))
1592
1516
["func"].cell_contents)
1593
1517
else:
1594
nonmethod_func = (dict(
1595
zip(attribute.__code__.co_freevars,
1596
attribute.__closure__))
1597
["func"].cell_contents)
1518
nonmethod_func = attribute
1598
1519
# Create a new, but exactly alike, function
1599
1520
# object, and decorate it to be a new D-Bus signal
1600
1521
# with the alternate D-Bus interface name
1601
new_function = copy_function(nonmethod_func)
1522
if sys.version_info.major == 2:
1523
new_function = types.FunctionType(
1524
nonmethod_func.func_code,
1525
nonmethod_func.func_globals,
1526
nonmethod_func.func_name,
1527
nonmethod_func.func_defaults,
1528
nonmethod_func.func_closure)
1529
else:
1530
new_function = types.FunctionType(
1531
nonmethod_func.__code__,
1532
nonmethod_func.__globals__,
1533
nonmethod_func.__name__,
1534
nonmethod_func.__defaults__,
1535
nonmethod_func.__closure__)
1602
1536
new_function = (dbus.service.signal(
1603
1537
alt_interface,
1604
1538
attribute._dbus_signature)(new_function))
1608
1542
attribute._dbus_annotations)
1609
1543
except AttributeError:
1610
1544
pass
1611
1612
1545
# Define a creator of a function to call both the
1613
1546
# original and alternate functions, so both the
1614
1547
# original and alternate signals gets sent when
1617
1550
"""This function is a scope container to pass
1618
1551
func1 and func2 to the "call_both" function
1619
1552
outside of its arguments"""
1620
1553
1621
1554
@functools.wraps(func2)
1622
1555
def call_both(*args, **kwargs):
1623
1556
"""This function will emit two D-Bus
1624
1557
signals by calling func1 and func2"""
1625
1558
func1(*args, **kwargs)
1626
1559
func2(*args, **kwargs)
1627
# Make wrapper function look like a D-Bus
1628
# signal
1560
# Make wrapper function look like a D-Bus signal
1629
1561
for name, attr in inspect.getmembers(func2):
1630
1562
if name.startswith("_dbus_"):
1631
1563
setattr(call_both, name, attr)
1632
1564
1633
1565
return call_both
1634
1566
# Create the "call_both" function and add it to
1635
1567
# the class
1645
1577
alt_interface,
1646
1578
attribute._dbus_in_signature,
1647
1579
attribute._dbus_out_signature)
1648
(copy_function(attribute)))
1580
(types.FunctionType(attribute.func_code,
1581
attribute.func_globals,
1582
attribute.func_name,
1583
attribute.func_defaults,
1584
attribute.func_closure)))
1649
1585
# Copy annotations, if any
1650
1586
try:
1651
1587
attr[attrname]._dbus_annotations = dict(
1663
1599
attribute._dbus_access,
1664
1600
attribute._dbus_get_args_options
1665
1601
["byte_arrays"])
1666
(copy_function(attribute)))
1602
(types.FunctionType(
1603
attribute.func_code,
1604
attribute.func_globals,
1605
attribute.func_name,
1606
attribute.func_defaults,
1607
attribute.func_closure)))
1667
1608
# Copy annotations, if any
1668
1609
try:
1669
1610
attr[attrname]._dbus_annotations = dict(
1678
1619
# to the class.
1679
1620
attr[attrname] = (
1680
1621
dbus_interface_annotations(alt_interface)
1681
(copy_function(attribute)))
1622
(types.FunctionType(attribute.func_code,
1623
attribute.func_globals,
1624
attribute.func_name,
1625
attribute.func_defaults,
1626
attribute.func_closure)))
1682
1627
if deprecate:
1683
1628
# Deprecate all alternate interfaces
1684
iname = "_AlternateDBusNames_interface_annotation{}"
1629
iname="_AlternateDBusNames_interface_annotation{}"
1685
1630
for interface_name in interface_names:
1686
1631
1687
1632
@dbus_interface_annotations(interface_name)
1688
1633
def func(self):
1689
return {"org.freedesktop.DBus.Deprecated":
1690
"true"}
1634
return { "org.freedesktop.DBus.Deprecated":
1635
"true" }
1691
1636
# Find an unused name
1692
1637
for aname in (iname.format(i)
1693
1638
for i in itertools.count()):
1697
1642
if interface_names:
1698
1643
# Replace the class with a new subclass of it with
1699
1644
# methods, signals, etc. as created above.
1700
if sys.version_info.major == 2:
1701
cls = type(b"{}Alternate".format(cls.__name__),
1702
(cls, ), attr)
1703
else:
1704
cls = type("{}Alternate".format(cls.__name__),
1705
(cls, ), attr)
1645
cls = type(b"{}Alternate".format(cls.__name__),
1646
(cls, ), attr)
1706
1647
return cls
1707
1648
1708
1649
return wrapper
1709
1650
1710
1651
1712
1653
"se.bsnet.fukt.Mandos"})
1713
1654
class ClientDBus(Client, DBusObjectWithProperties):
1714
1655
"""A Client class using D-Bus
1715
1656
1716
1657
Attributes:
1717
1658
dbus_object_path: dbus.ObjectPath
1718
1659
bus: dbus.SystemBus()
1719
1660
"""
1720
1661
1721
1662
runtime_expansions = (Client.runtime_expansions
1722
1663
+ ("dbus_object_path", ))
1723
1664
1724
1665
_interface = "se.recompile.Mandos.Client"
1725
1666
1726
1667
# dbus.service.Object doesn't use super(), so we can't either.
1727
1728
def __init__(self, bus=None, *args, **kwargs):
1668
1669
def __init__(self, bus = None, *args, **kwargs):
1729
1670
self.bus = bus
1730
1671
Client.__init__(self, *args, **kwargs)
1731
1672
# Only now, when this client is initialized, can it show up on
1737
1678
"/clients/" + client_object_name)
1738
1679
DBusObjectWithProperties.__init__(self, self.bus,
1739
1680
self.dbus_object_path)
1740
1681
1741
1682
def notifychangeproperty(transform_func, dbus_name,
1742
1683
type_func=lambda x: x,
1743
1684
variant_level=1,
1745
1686
_interface=_interface):
1746
1687
""" Modify a variable so that it's a property which announces
1747
1688
its changes to DBus.
1748
1689
1749
1690
transform_fun: Function that takes a value and a variant_level
1750
1691
and transforms it to a D-Bus type.
1751
1692
dbus_name: D-Bus name of the variable
1754
1695
variant_level: D-Bus variant level. Default: 1
1755
1696
"""
1756
1697
attrname = "_{}".format(dbus_name)
1757
1698
1758
1699
def setter(self, value):
1759
1700
if hasattr(self, "dbus_object_path"):
1760
1701
if (not hasattr(self, attrname) or
1767
1708
else:
1768
1709
dbus_value = transform_func(
1769
1710
type_func(value),
1770
variant_level=variant_level)
1711
variant_level = variant_level)
1771
1712
self.PropertyChanged(dbus.String(dbus_name),
1772
1713
dbus_value)
1773
1714
self.PropertiesChanged(
1774
1715
_interface,
1775
dbus.Dictionary({dbus.String(dbus_name):
1776
dbus_value}),
1716
dbus.Dictionary({ dbus.String(dbus_name):
1717
dbus_value }),
1777
1718
dbus.Array())
1778
1719
setattr(self, attrname, value)
1779
1720
1780
1721
return property(lambda self: getattr(self, attrname), setter)
1781
1722
1782
1723
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1783
1724
approvals_pending = notifychangeproperty(dbus.Boolean,
1784
1725
"ApprovalPending",
1785
type_func=bool)
1726
type_func = bool)
1786
1727
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1787
1728
last_enabled = notifychangeproperty(datetime_to_dbus,
1788
1729
"LastEnabled")
1789
1730
checker = notifychangeproperty(
1790
1731
dbus.Boolean, "CheckerRunning",
1791
type_func=lambda checker: checker is not None)
1732
type_func = lambda checker: checker is not None)
1792
1733
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1793
1734
"LastCheckedOK")
1794
1735
last_checker_status = notifychangeproperty(dbus.Int16,
1799
1740
"ApprovedByDefault")
1800
1741
approval_delay = notifychangeproperty(
1801
1742
dbus.UInt64, "ApprovalDelay",
1802
type_func=lambda td: td.total_seconds() * 1000)
1743
type_func = lambda td: td.total_seconds() * 1000)
1803
1744
approval_duration = notifychangeproperty(
1804
1745
dbus.UInt64, "ApprovalDuration",
1805
type_func=lambda td: td.total_seconds() * 1000)
1746
type_func = lambda td: td.total_seconds() * 1000)
1806
1747
host = notifychangeproperty(dbus.String, "Host")
1807
1748
timeout = notifychangeproperty(
1808
1749
dbus.UInt64, "Timeout",
1809
type_func=lambda td: td.total_seconds() * 1000)
1750
type_func = lambda td: td.total_seconds() * 1000)
1810
1751
extended_timeout = notifychangeproperty(
1811
1752
dbus.UInt64, "ExtendedTimeout",
1812
type_func=lambda td: td.total_seconds() * 1000)
1753
type_func = lambda td: td.total_seconds() * 1000)
1813
1754
interval = notifychangeproperty(
1814
1755
dbus.UInt64, "Interval",
1815
type_func=lambda td: td.total_seconds() * 1000)
1756
type_func = lambda td: td.total_seconds() * 1000)
1816
1757
checker_command = notifychangeproperty(dbus.String, "Checker")
1817
1758
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1818
1759
invalidate_only=True)
1819
1760
1820
1761
del notifychangeproperty
1821
1762
1822
1763
def __del__(self, *args, **kwargs):
1823
1764
try:
1824
1765
self.remove_from_connection()
1827
1768
if hasattr(DBusObjectWithProperties, "__del__"):
1828
1769
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1829
1770
Client.__del__(self, *args, **kwargs)
1830
1771
1831
1772
def checker_callback(self, source, condition,
1832
1773
connection, command, *args, **kwargs):
1833
1774
ret = Client.checker_callback(self, source, condition,
1849
1790
| self.last_checker_signal),
1850
1791
dbus.String(command))
1851
1792
return ret
1852
1793
1853
1794
def start_checker(self, *args, **kwargs):
1854
1795
old_checker_pid = getattr(self.checker, "pid", None)
1855
1796
r = Client.start_checker(self, *args, **kwargs)
1859
1800
# Emit D-Bus signal
1860
1801
self.CheckerStarted(self.current_checker_command)
1861
1802
return r
1862
1803
1863
1804
def _reset_approved(self):
1864
1805
self.approved = None
1865
1806
return False
1866
1807
1867
1808
def approve(self, value=True):
1868
1809
self.approved = value
1869
GLib.timeout_add(int(self.approval_duration.total_seconds()
1870
* 1000), self._reset_approved)
1810
gobject.timeout_add(int(self.approval_duration.total_seconds()
1811
* 1000), self._reset_approved)
1871
1812
self.send_changedstate()
1872
1873
# D-Bus methods, signals & properties
1874
1875
# Interfaces
1876
1877
# Signals
1878
1813
1814
## D-Bus methods, signals & properties
1815
1816
## Interfaces
1817
1818
## Signals
1819
1879
1820
# CheckerCompleted - signal
1880
1821
@dbus.service.signal(_interface, signature="nxs")
1881
1822
def CheckerCompleted(self, exitcode, waitstatus, command):
1882
1823
"D-Bus signal"
1883
1824
pass
1884
1825
1885
1826
# CheckerStarted - signal
1886
1827
@dbus.service.signal(_interface, signature="s")
1887
1828
def CheckerStarted(self, command):
1888
1829
"D-Bus signal"
1889
1830
pass
1890
1831
1891
1832
# PropertyChanged - signal
1892
1833
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1893
1834
@dbus.service.signal(_interface, signature="sv")
1894
1835
def PropertyChanged(self, property, value):
1895
1836
"D-Bus signal"
1896
1837
pass
1897
1838
1898
1839
# GotSecret - signal
1899
1840
@dbus.service.signal(_interface)
1900
1841
def GotSecret(self):
1903
1844
server to mandos-client
1904
1845
"""
1905
1846
pass
1906
1847
1907
1848
# Rejected - signal
1908
1849
@dbus.service.signal(_interface, signature="s")
1909
1850
def Rejected(self, reason):
1910
1851
"D-Bus signal"
1911
1852
pass
1912
1853
1913
1854
# NeedApproval - signal
1914
1855
@dbus.service.signal(_interface, signature="tb")
1915
1856
def NeedApproval(self, timeout, default):
1916
1857
"D-Bus signal"
1917
1858
return self.need_approval()
1918
1919
# Methods
1920
1859
1860
## Methods
1861
1921
1862
# Approve - method
1922
1863
@dbus.service.method(_interface, in_signature="b")
1923
1864
def Approve(self, value):
1924
1865
self.approve(value)
1925
1866
1926
1867
# CheckedOK - method
1927
1868
@dbus.service.method(_interface)
1928
1869
def CheckedOK(self):
1929
1870
self.checked_ok()
1930
1871
1931
1872
# Enable - method
1932
1873
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1933
1874
@dbus.service.method(_interface)
1934
1875
def Enable(self):
1935
1876
"D-Bus method"
1936
1877
self.enable()
1937
1878
1938
1879
# StartChecker - method
1939
1880
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1940
1881
@dbus.service.method(_interface)
1941
1882
def StartChecker(self):
1942
1883
"D-Bus method"
1943
1884
self.start_checker()
1944
1885
1945
1886
# Disable - method
1946
1887
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1947
1888
@dbus.service.method(_interface)
1948
1889
def Disable(self):
1949
1890
"D-Bus method"
1950
1891
self.disable()
1951
1892
1952
1893
# StopChecker - method
1953
1894
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1954
1895
@dbus.service.method(_interface)
1955
1896
def StopChecker(self):
1956
1897
self.stop_checker()
1957
1958
# Properties
1959
1898
1899
## Properties
1900
1960
1901
# ApprovalPending - property
1961
1902
@dbus_service_property(_interface, signature="b", access="read")
1962
1903
def ApprovalPending_dbus_property(self):
1963
1904
return dbus.Boolean(bool(self.approvals_pending))
1964
1905
1965
1906
# ApprovedByDefault - property
1966
1907
@dbus_service_property(_interface,
1967
1908
signature="b",
1970
1911
if value is None: # get
1971
1912
return dbus.Boolean(self.approved_by_default)
1972
1913
self.approved_by_default = bool(value)
1973
1914
1974
1915
# ApprovalDelay - property
1975
1916
@dbus_service_property(_interface,
1976
1917
signature="t",
1980
1921
return dbus.UInt64(self.approval_delay.total_seconds()
1981
1922
* 1000)
1982
1923
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1983
1924
1984
1925
# ApprovalDuration - property
1985
1926
@dbus_service_property(_interface,
1986
1927
signature="t",
1990
1931
return dbus.UInt64(self.approval_duration.total_seconds()
1991
1932
* 1000)
1992
1933
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1993
1934
1994
1935
# Name - property
1995
1936
@dbus_annotations(
1996
1937
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1997
1938
@dbus_service_property(_interface, signature="s", access="read")
1998
1939
def Name_dbus_property(self):
1999
1940
return dbus.String(self.name)
2000
1941
2001
1942
# Fingerprint - property
2002
1943
@dbus_annotations(
2003
1944
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2004
1945
@dbus_service_property(_interface, signature="s", access="read")
2005
1946
def Fingerprint_dbus_property(self):
2006
1947
return dbus.String(self.fingerprint)
2007
1948
2008
1949
# Host - property
2009
1950
@dbus_service_property(_interface,
2010
1951
signature="s",
2013
1954
if value is None: # get
2014
1955
return dbus.String(self.host)
2015
1956
self.host = str(value)
2016
1957
2017
1958
# Created - property
2018
1959
@dbus_annotations(
2019
1960
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2020
1961
@dbus_service_property(_interface, signature="s", access="read")
2021
1962
def Created_dbus_property(self):
2022
1963
return datetime_to_dbus(self.created)
2023
1964
2024
1965
# LastEnabled - property
2025
1966
@dbus_service_property(_interface, signature="s", access="read")
2026
1967
def LastEnabled_dbus_property(self):
2027
1968
return datetime_to_dbus(self.last_enabled)
2028
1969
2029
1970
# Enabled - property
2030
1971
@dbus_service_property(_interface,
2031
1972
signature="b",
2037
1978
self.enable()
2038
1979
else:
2039
1980
self.disable()
2040
1981
2041
1982
# LastCheckedOK - property
2042
1983
@dbus_service_property(_interface,
2043
1984
signature="s",
2047
1988
self.checked_ok()
2048
1989
return
2049
1990
return datetime_to_dbus(self.last_checked_ok)
2050
1991
2051
1992
# LastCheckerStatus - property
2052
1993
@dbus_service_property(_interface, signature="n", access="read")
2053
1994
def LastCheckerStatus_dbus_property(self):
2054
1995
return dbus.Int16(self.last_checker_status)
2055
1996
2056
1997
# Expires - property
2057
1998
@dbus_service_property(_interface, signature="s", access="read")
2058
1999
def Expires_dbus_property(self):
2059
2000
return datetime_to_dbus(self.expires)
2060
2001
2061
2002
# LastApprovalRequest - property
2062
2003
@dbus_service_property(_interface, signature="s", access="read")
2063
2004
def LastApprovalRequest_dbus_property(self):
2064
2005
return datetime_to_dbus(self.last_approval_request)
2065
2006
2066
2007
# Timeout - property
2067
2008
@dbus_service_property(_interface,
2068
2009
signature="t",
2083
2024
if (getattr(self, "disable_initiator_tag", None)
2084
2025
is None):
2085
2026
return
2086
GLib.source_remove(self.disable_initiator_tag)
2087
self.disable_initiator_tag = GLib.timeout_add(
2027
gobject.source_remove(self.disable_initiator_tag)
2028
self.disable_initiator_tag = gobject.timeout_add(
2088
2029
int((self.expires - now).total_seconds() * 1000),
2089
2030
self.disable)
2090
2031
2091
2032
# ExtendedTimeout - property
2092
2033
@dbus_service_property(_interface,
2093
2034
signature="t",
2097
2038
return dbus.UInt64(self.extended_timeout.total_seconds()
2098
2039
* 1000)
2099
2040
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2100
2041
2101
2042
# Interval - property
2102
2043
@dbus_service_property(_interface,
2103
2044
signature="t",
2110
2051
return
2111
2052
if self.enabled:
2112
2053
# Reschedule checker run
2113
GLib.source_remove(self.checker_initiator_tag)
2114
self.checker_initiator_tag = GLib.timeout_add(
2054
gobject.source_remove(self.checker_initiator_tag)
2055
self.checker_initiator_tag = gobject.timeout_add(
2115
2056
value, self.start_checker)
2116
self.start_checker() # Start one now, too
2117
2057
self.start_checker() # Start one now, too
2058
2118
2059
# Checker - property
2119
2060
@dbus_service_property(_interface,
2120
2061
signature="s",
2123
2064
if value is None: # get
2124
2065
return dbus.String(self.checker_command)
2125
2066
self.checker_command = str(value)
2126
2067
2127
2068
# CheckerRunning - property
2128
2069
@dbus_service_property(_interface,
2129
2070
signature="b",
2135
2076
self.start_checker()
2136
2077
else:
2137
2078
self.stop_checker()
2138
2079
2139
2080
# ObjectPath - property
2140
2081
@dbus_annotations(
2141
2082
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2142
2083
"org.freedesktop.DBus.Deprecated": "true"})
2143
2084
@dbus_service_property(_interface, signature="o", access="read")
2144
2085
def ObjectPath_dbus_property(self):
2145
return self.dbus_object_path # is already a dbus.ObjectPath
2146
2086
return self.dbus_object_path # is already a dbus.ObjectPath
2087
2147
2088
# Secret = property
2148
2089
@dbus_annotations(
2149
2090
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2154
2095
byte_arrays=True)
2155
2096
def Secret_dbus_property(self, value):
2156
2097
self.secret = bytes(value)
2157
2098
2158
2099
del _interface
2159
2100
2160
2101
2164
2105
self._pipe.send(('init', fpr, address))
2165
2106
if not self._pipe.recv():
2166
2107
raise KeyError(fpr)
2167
2108
2168
2109
def __getattribute__(self, name):
2169
2110
if name == '_pipe':
2170
2111
return super(ProxyClient, self).__getattribute__(name)
2173
2114
if data[0] == 'data':
2174
2115
return data[1]
2175
2116
if data[0] == 'function':
2176
2117
2177
2118
def func(*args, **kwargs):
2178
2119
self._pipe.send(('funcall', name, args, kwargs))
2179
2120
return self._pipe.recv()[1]
2180
2121
2181
2122
return func
2182
2123
2183
2124
def __setattr__(self, name, value):
2184
2125
if name == '_pipe':
2185
2126
return super(ProxyClient, self).__setattr__(name, value)
2188
2129
2189
2130
class ClientHandler(socketserver.BaseRequestHandler, object):
2190
2131
"""A class to handle client connections.
2191
2132
2192
2133
Instantiated once for each connection to handle it.
2193
2134
Note: This will run in its own forked process."""
2194
2135
2195
2136
def handle(self):
2196
2137
with contextlib.closing(self.server.child_pipe) as child_pipe:
2197
2138
logger.info("TCP connection from: %s",
2198
2139
str(self.client_address))
2199
2140
logger.debug("Pipe FD: %d",
2200
2141
self.server.child_pipe.fileno())
2201
2142
2202
2143
session = gnutls.ClientSession(self.request)
2203
2204
# priority = ':'.join(("NONE", "+VERS-TLS1.1",
2205
# "+AES-256-CBC", "+SHA1",
2206
# "+COMP-NULL", "+CTYPE-OPENPGP",
2207
# "+DHE-DSS"))
2144
2145
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2146
# "+AES-256-CBC", "+SHA1",
2147
# "+COMP-NULL", "+CTYPE-OPENPGP",
2148
# "+DHE-DSS"))
2208
2149
# Use a fallback default, since this MUST be set.
2209
2150
priority = self.server.gnutls_priority
2210
2151
if priority is None:
2211
2152
priority = "NORMAL"
2212
gnutls.priority_set_direct(session._c_object,
2213
priority.encode("utf-8"),
2153
gnutls.priority_set_direct(session._c_object, priority,
2214
2154
None)
2215
2155
2216
2156
# Start communication using the Mandos protocol
2217
2157
# Get protocol number
2218
2158
line = self.request.makefile().readline()
2223
2163
except (ValueError, IndexError, RuntimeError) as error:
2224
2164
logger.error("Unknown protocol version: %s", error)
2225
2165
return
2226
2166
2227
2167
# Start GnuTLS connection
2228
2168
try:
2229
2169
session.handshake()
2233
2173
# established. Just abandon the request.
2234
2174
return
2235
2175
logger.debug("Handshake succeeded")
2236
2176
2237
2177
approval_required = False
2238
2178
try:
2239
2179
try:
2243
2183
logger.warning("Bad certificate: %s", error)
2244
2184
return
2245
2185
logger.debug("Fingerprint: %s", fpr)
2246
2186
2247
2187
try:
2248
2188
client = ProxyClient(child_pipe, fpr,
2249
2189
self.client_address)
2250
2190
except KeyError:
2251
2191
return
2252
2192
2253
2193
if client.approval_delay:
2254
2194
delay = client.approval_delay
2255
2195
client.approvals_pending += 1
2256
2196
approval_required = True
2257
2197
2258
2198
while True:
2259
2199
if not client.enabled:
2260
2200
logger.info("Client %s is disabled",
2263
2203
# Emit D-Bus signal
2264
2204
client.Rejected("Disabled")
2265
2205
return
2266
2206
2267
2207
if client.approved or not client.approval_delay:
2268
# We are approved or approval is disabled
2208
#We are approved or approval is disabled
2269
2209
break
2270
2210
elif client.approved is None:
2271
2211
logger.info("Client %s needs approval",
2282
2222
# Emit D-Bus signal
2283
2223
client.Rejected("Denied")
2284
2224
return
2285
2286
# wait until timeout or approved
2225
2226
#wait until timeout or approved
2287
2227
time = datetime.datetime.now()
2288
2228
client.changedstate.acquire()
2289
2229
client.changedstate.wait(delay.total_seconds())
2302
2242
break
2303
2243
else:
2304
2244
delay -= time2 - time
2305
2245
2306
2246
try:
2307
2247
session.send(client.secret)
2308
2248
except gnutls.Error as error:
2309
2249
logger.warning("gnutls send failed",
2310
exc_info=error)
2250
exc_info = error)
2311
2251
return
2312
2252
2313
2253
logger.info("Sending secret to %s", client.name)
2314
2254
# bump the timeout using extended_timeout
2315
2255
client.bump_timeout(client.extended_timeout)
2316
2256
if self.server.use_dbus:
2317
2257
# Emit D-Bus signal
2318
2258
client.GotSecret()
2319
2259
2320
2260
finally:
2321
2261
if approval_required:
2322
2262
client.approvals_pending -= 1
2325
2265
except gnutls.Error as error:
2326
2266
logger.warning("GnuTLS bye failed",
2327
2267
exc_info=error)
2328
2268
2329
2269
@staticmethod
2330
2270
def peer_certificate(session):
2331
2271
"Return the peer's OpenPGP certificate as a bytestring"
2343
2283
return None
2344
2284
cert = cert_list[0]
2345
2285
return ctypes.string_at(cert.data, cert.size)
2346
2286
2347
2287
@staticmethod
2348
2288
def fingerprint(openpgp):
2349
2289
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2382
2322
2383
2323
class MultiprocessingMixIn(object):
2384
2324
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2385
2325
2386
2326
def sub_process_main(self, request, address):
2387
2327
try:
2388
2328
self.finish_request(request, address)
2389
2329
except Exception:
2390
2330
self.handle_error(request, address)
2391
2331
self.close_request(request)
2392
2332
2393
2333
def process_request(self, request, address):
2394
2334
"""Start a new process to process the request."""
2395
proc = multiprocessing.Process(target=self.sub_process_main,
2396
args=(request, address))
2335
proc = multiprocessing.Process(target = self.sub_process_main,
2336
args = (request, address))
2397
2337
proc.start()
2398
2338
return proc
2399
2339
2400
2340
2401
2341
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2402
2342
""" adds a pipe to the MixIn """
2403
2343
2404
2344
def process_request(self, request, client_address):
2405
2345
"""Overrides and wraps the original process_request().
2406
2346
2407
2347
This function creates a new pipe in self.pipe
2408
2348
"""
2409
2349
parent_pipe, self.child_pipe = multiprocessing.Pipe()
2410
2350
2411
2351
proc = MultiprocessingMixIn.process_request(self, request,
2412
2352
client_address)
2413
2353
self.child_pipe.close()
2414
2354
self.add_pipe(parent_pipe, proc)
2415
2355
2416
2356
def add_pipe(self, parent_pipe, proc):
2417
2357
"""Dummy function; override as necessary"""
2418
2358
raise NotImplementedError()
2421
2361
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2422
2362
socketserver.TCPServer, object):
2423
2363
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
2424
2364
2425
2365
Attributes:
2426
2366
enabled: Boolean; whether this server is activated yet
2427
2367
interface: None or a network interface name (string)
2428
2368
use_ipv6: Boolean; to use IPv6 or not
2429
2369
"""
2430
2370
2431
2371
def __init__(self, server_address, RequestHandlerClass,
2432
2372
interface=None,
2433
2373
use_ipv6=True,
2443
2383
self.socketfd = socketfd
2444
2384
# Save the original socket.socket() function
2445
2385
self.socket_socket = socket.socket
2446
2447
2386
# To implement --socket, we monkey patch socket.socket.
2448
#
2387
#
2449
2388
# (When socketserver.TCPServer is a new-style class, we
2450
2389
# could make self.socket into a property instead of monkey
2451
2390
# patching socket.socket.)
2452
#
2391
#
2453
2392
# Create a one-time-only replacement for socket.socket()
2454
2393
@functools.wraps(socket.socket)
2455
2394
def socket_wrapper(*args, **kwargs):
2467
2406
# socket_wrapper(), if socketfd was set.
2468
2407
socketserver.TCPServer.__init__(self, server_address,
2469
2408
RequestHandlerClass)
2470
2409
2471
2410
def server_bind(self):
2472
2411
"""This overrides the normal server_bind() function
2473
2412
to bind to an interface if one was specified, and also NOT to
2474
2413
bind to an address or port if they were not specified."""
2475
global SO_BINDTODEVICE
2476
2414
if self.interface is not None:
2477
2415
if SO_BINDTODEVICE is None:
2478
# Fall back to a hard-coded value which seems to be
2479
# common enough.
2480
logger.warning("SO_BINDTODEVICE not found, trying 25")
2481
SO_BINDTODEVICE = 25
2482
try:
2483
self.socket.setsockopt(
2484
socket.SOL_SOCKET, SO_BINDTODEVICE,
2485
(self.interface + "\0").encode("utf-8"))
2486
except socket.error as error:
2487
if error.errno == errno.EPERM:
2488
logger.error("No permission to bind to"
2489
" interface %s", self.interface)
2490
elif error.errno == errno.ENOPROTOOPT:
2491
logger.error("SO_BINDTODEVICE not available;"
2492
" cannot bind to interface %s",
2493
self.interface)
2494
elif error.errno == errno.ENODEV:
2495
logger.error("Interface %s does not exist,"
2496
" cannot bind", self.interface)
2497
else:
2498
raise
2416
logger.error("SO_BINDTODEVICE does not exist;"
2417
" cannot bind to interface %s",
2418
self.interface)
2419
else:
2420
try:
2421
self.socket.setsockopt(
2422
socket.SOL_SOCKET, SO_BINDTODEVICE,
2423
(self.interface + "\0").encode("utf-8"))
2424
except socket.error as error:
2425
if error.errno == errno.EPERM:
2426
logger.error("No permission to bind to"
2427
" interface %s", self.interface)
2428
elif error.errno == errno.ENOPROTOOPT:
2429
logger.error("SO_BINDTODEVICE not available;"
2430
" cannot bind to interface %s",
2431
self.interface)
2432
elif error.errno == errno.ENODEV:
2433
logger.error("Interface %s does not exist,"
2434
" cannot bind", self.interface)
2435
else:
2436
raise
2499
2437
# Only bind(2) the socket if we really need to.
2500
2438
if self.server_address[0] or self.server_address[1]:
2501
2439
if not self.server_address[0]:
2502
2440
if self.address_family == socket.AF_INET6:
2503
any_address = "::" # in6addr_any
2441
any_address = "::" # in6addr_any
2504
2442
else:
2505
any_address = "0.0.0.0" # INADDR_ANY
2443
any_address = "0.0.0.0" # INADDR_ANY
2506
2444
self.server_address = (any_address,
2507
2445
self.server_address[1])
2508
2446
elif not self.server_address[1]:
2518
2456
2519
2457
class MandosServer(IPv6_TCPServer):
2520
2458
"""Mandos server.
2521
2459
2522
2460
Attributes:
2523
2461
clients: set of Client objects
2524
2462
gnutls_priority GnuTLS priority string
2525
2463
use_dbus: Boolean; to emit D-Bus signals or not
2526
2527
Assumes a GLib.MainLoop event loop.
2464
2465
Assumes a gobject.MainLoop event loop.
2528
2466
"""
2529
2467
2530
2468
def __init__(self, server_address, RequestHandlerClass,
2531
2469
interface=None,
2532
2470
use_ipv6=True,
2542
2480
self.gnutls_priority = gnutls_priority
2543
2481
IPv6_TCPServer.__init__(self, server_address,
2544
2482
RequestHandlerClass,
2545
interface=interface,
2546
use_ipv6=use_ipv6,
2547
socketfd=socketfd)
2548
2483
interface = interface,
2484
use_ipv6 = use_ipv6,
2485
socketfd = socketfd)
2486
2549
2487
def server_activate(self):
2550
2488
if self.enabled:
2551
2489
return socketserver.TCPServer.server_activate(self)
2552
2490
2553
2491
def enable(self):
2554
2492
self.enabled = True
2555
2493
2556
2494
def add_pipe(self, parent_pipe, proc):
2557
2495
# Call "handle_ipc" for both data and EOF events
2558
GLib.io_add_watch(
2496
gobject.io_add_watch(
2559
2497
parent_pipe.fileno(),
2560
GLib.IO_IN | GLib.IO_HUP,
2498
gobject.IO_IN | gobject.IO_HUP,
2561
2499
functools.partial(self.handle_ipc,
2562
parent_pipe=parent_pipe,
2563
proc=proc))
2564
2500
parent_pipe = parent_pipe,
2501
proc = proc))
2502
2565
2503
def handle_ipc(self, source, condition,
2566
2504
parent_pipe=None,
2567
proc=None,
2505
proc = None,
2568
2506
client_object=None):
2569
2507
# error, or the other end of multiprocessing.Pipe has closed
2570
if condition & (GLib.IO_ERR | GLib.IO_HUP):
2508
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2571
2509
# Wait for other process to exit
2572
2510
proc.join()
2573
2511
return False
2574
2512
2575
2513
# Read a request from the child
2576
2514
request = parent_pipe.recv()
2577
2515
command = request[0]
2578
2516
2579
2517
if command == 'init':
2580
2518
fpr = request[1]
2581
2519
address = request[2]
2582
2583
for c in self.clients.values():
2520
2521
for c in self.clients.itervalues():
2584
2522
if c.fingerprint == fpr:
2585
2523
client = c
2586
2524
break
2593
2531
address[0])
2594
2532
parent_pipe.send(False)
2595
2533
return False
2596
2597
GLib.io_add_watch(
2534
2535
gobject.io_add_watch(
2598
2536
parent_pipe.fileno(),
2599
GLib.IO_IN | GLib.IO_HUP,
2537
gobject.IO_IN | gobject.IO_HUP,
2600
2538
functools.partial(self.handle_ipc,
2601
parent_pipe=parent_pipe,
2602
proc=proc,
2603
client_object=client))
2539
parent_pipe = parent_pipe,
2540
proc = proc,
2541
client_object = client))
2604
2542
parent_pipe.send(True)
2605
2543
# remove the old hook in favor of the new above hook on
2606
2544
# same fileno
2609
2547
funcname = request[1]
2610
2548
args = request[2]
2611
2549
kwargs = request[3]
2612
2550
2613
2551
parent_pipe.send(('data', getattr(client_object,
2614
2552
funcname)(*args,
2615
2553
**kwargs)))
2616
2554
2617
2555
if command == 'getattr':
2618
2556
attrname = request[1]
2619
2557
if isinstance(client_object.__getattribute__(attrname),
2622
2560
else:
2623
2561
parent_pipe.send((
2624
2562
'data', client_object.__getattribute__(attrname)))
2625
2563
2626
2564
if command == 'setattr':
2627
2565
attrname = request[1]
2628
2566
value = request[2]
2629
2567
setattr(client_object, attrname, value)
2630
2568
2631
2569
return True
2632
2570
2633
2571
2634
2572
def rfc3339_duration_to_delta(duration):
2635
2573
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2636
2574
2637
2575
>>> rfc3339_duration_to_delta("P7D")
2638
2576
datetime.timedelta(7)
2639
2577
>>> rfc3339_duration_to_delta("PT60S")
2649
2587
>>> rfc3339_duration_to_delta("P1DT3M20S")
2650
2588
datetime.timedelta(1, 200)
2651
2589
"""
2652
2590
2653
2591
# Parsing an RFC 3339 duration with regular expressions is not
2654
2592
# possible - there would have to be multiple places for the same
2655
2593
# values, like seconds. The current code, while more esoteric, is
2656
2594
# cleaner without depending on a parsing library. If Python had a
2657
2595
# built-in library for parsing we would use it, but we'd like to
2658
2596
# avoid excessive use of external libraries.
2659
2597
2660
2598
# New type for defining tokens, syntax, and semantics all-in-one
2661
2599
Token = collections.namedtuple("Token", (
2662
2600
"regexp", # To match token; if "value" is not None, must have
2695
2633
frozenset((token_year, token_month,
2696
2634
token_day, token_time,
2697
2635
token_week)))
2698
# Define starting values:
2699
# Value so far
2700
value = datetime.timedelta()
2636
# Define starting values
2637
value = datetime.timedelta() # Value so far
2701
2638
found_token = None
2702
# Following valid tokens
2703
followers = frozenset((token_duration, ))
2704
# String left to parse
2705
s = duration
2639
followers = frozenset((token_duration, )) # Following valid tokens
2640
s = duration # String left to parse
2706
2641
# Loop until end token is found
2707
2642
while found_token is not token_end:
2708
2643
# Search for any currently valid tokens
2732
2667
2733
2668
def string_to_delta(interval):
2734
2669
"""Parse a string and return a datetime.timedelta
2735
2670
2736
2671
>>> string_to_delta('7d')
2737
2672
datetime.timedelta(7)
2738
2673
>>> string_to_delta('60s')
2746
2681
>>> string_to_delta('5m 30s')
2747
2682
datetime.timedelta(0, 330)
2748
2683
"""
2749
2684
2750
2685
try:
2751
2686
return rfc3339_duration_to_delta(interval)
2752
2687
except ValueError:
2753
2688
pass
2754
2689
2755
2690
timevalue = datetime.timedelta(0)
2756
2691
for s in interval.split():
2757
2692
try:
2775
2710
return timevalue
2776
2711
2777
2712
2778
def daemon(nochdir=False, noclose=False):
2713
def daemon(nochdir = False, noclose = False):
2779
2714
"""See daemon(3). Standard BSD Unix function.
2780
2715
2781
2716
This should really exist as os.daemon, but it doesn't (yet)."""
2782
2717
if os.fork():
2783
2718
sys.exit()
2801
2736
2802
2737
2803
2738
def main():
2804
2739
2805
2740
##################################################################
2806
2741
# Parsing of options, both command line and config file
2807
2742
2808
2743
parser = argparse.ArgumentParser()
2809
2744
parser.add_argument("-v", "--version", action="version",
2810
version="%(prog)s {}".format(version),
2745
version = "%(prog)s {}".format(version),
2811
2746
help="show version number and exit")
2812
2747
parser.add_argument("-i", "--interface", metavar="IF",
2813
2748
help="Bind to interface IF")
2849
2784
parser.add_argument("--no-zeroconf", action="store_false",
2850
2785
dest="zeroconf", help="Do not use Zeroconf",
2851
2786
default=None)
2852
2787
2853
2788
options = parser.parse_args()
2854
2789
2855
2790
if options.check:
2856
2791
import doctest
2857
2792
fail_count, test_count = doctest.testmod()
2858
2793
sys.exit(os.EX_OK if fail_count == 0 else 1)
2859
2794
2860
2795
# Default values for config file for server-global settings
2861
server_defaults = {"interface": "",
2862
"address": "",
2863
"port": "",
2864
"debug": "False",
2865
"priority":
2866
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2867
":+SIGN-DSA-SHA256",
2868
"servicename": "Mandos",
2869
"use_dbus": "True",
2870
"use_ipv6": "True",
2871
"debuglevel": "",
2872
"restore": "True",
2873
"socket": "",
2874
"statedir": "/var/lib/mandos",
2875
"foreground": "False",
2876
"zeroconf": "True",
2877
}
2878
2796
server_defaults = { "interface": "",
2797
"address": "",
2798
"port": "",
2799
"debug": "False",
2800
"priority":
2801
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2802
":+SIGN-DSA-SHA256",
2803
"servicename": "Mandos",
2804
"use_dbus": "True",
2805
"use_ipv6": "True",
2806
"debuglevel": "",
2807
"restore": "True",
2808
"socket": "",
2809
"statedir": "/var/lib/mandos",
2810
"foreground": "False",
2811
"zeroconf": "True",
2812
}
2813
2879
2814
# Parse config file for server-global settings
2880
2815
server_config = configparser.SafeConfigParser(server_defaults)
2881
2816
del server_defaults
2899
2834
server_settings["socket"] = os.dup(server_settings
2900
2835
["socket"])
2901
2836
del server_config
2902
2837
2903
2838
# Override the settings from the config file with command line
2904
2839
# options, if set.
2905
2840
for option in ("interface", "address", "port", "debug",
2923
2858
if server_settings["debug"]:
2924
2859
server_settings["foreground"] = True
2925
2860
# Now we have our good server settings in "server_settings"
2926
2861
2927
2862
##################################################################
2928
2863
2929
2864
if (not server_settings["zeroconf"]
2930
2865
and not (server_settings["port"]
2931
2866
or server_settings["socket"] != "")):
2932
2867
parser.error("Needs port or socket to work without Zeroconf")
2933
2868
2934
2869
# For convenience
2935
2870
debug = server_settings["debug"]
2936
2871
debuglevel = server_settings["debuglevel"]
2940
2875
stored_state_file)
2941
2876
foreground = server_settings["foreground"]
2942
2877
zeroconf = server_settings["zeroconf"]
2943
2878
2944
2879
if debug:
2945
2880
initlogger(debug, logging.DEBUG)
2946
2881
else:
2949
2884
else:
2950
2885
level = getattr(logging, debuglevel.upper())
2951
2886
initlogger(debug, level)
2952
2887
2953
2888
if server_settings["servicename"] != "Mandos":
2954
2889
syslogger.setFormatter(
2955
2890
logging.Formatter('Mandos ({}) [%(process)d]:'
2956
2891
' %(levelname)s: %(message)s'.format(
2957
2892
server_settings["servicename"])))
2958
2893
2959
2894
# Parse config file with clients
2960
2895
client_config = configparser.SafeConfigParser(Client
2961
2896
.client_defaults)
2962
2897
client_config.read(os.path.join(server_settings["configdir"],
2963
2898
"clients.conf"))
2964
2899
2965
2900
global mandos_dbus_service
2966
2901
mandos_dbus_service = None
2967
2902
2968
2903
socketfd = None
2969
2904
if server_settings["socket"] != "":
2970
2905
socketfd = server_settings["socket"]
2986
2921
except IOError as e:
2987
2922
logger.error("Could not open file %r", pidfilename,
2988
2923
exc_info=e)
2989
2990
for name, group in (("_mandos", "_mandos"),
2991
("mandos", "mandos"),
2992
("nobody", "nogroup")):
2924
2925
for name in ("_mandos", "mandos", "nobody"):
2993
2926
try:
2994
2927
uid = pwd.getpwnam(name).pw_uid
2995
gid = pwd.getpwnam(group).pw_gid
2928
gid = pwd.getpwnam(name).pw_gid
2996
2929
break
2997
2930
except KeyError:
2998
2931
continue
3002
2935
try:
3003
2936
os.setgid(gid)
3004
2937
os.setuid(uid)
3005
if debug:
3006
logger.debug("Did setuid/setgid to {}:{}".format(uid,
3007
gid))
3008
2938
except OSError as error:
3009
logger.warning("Failed to setuid/setgid to {}:{}: {}"
3010
.format(uid, gid, os.strerror(error.errno)))
3011
2939
if error.errno != errno.EPERM:
3012
2940
raise
3013
2941
3014
2942
if debug:
3015
2943
# Enable all possible GnuTLS debugging
3016
2944
3017
2945
# "Use a log level over 10 to enable all debugging options."
3018
2946
# - GnuTLS manual
3019
2947
gnutls.global_set_log_level(11)
3020
2948
3021
2949
@gnutls.log_func
3022
2950
def debug_gnutls(level, string):
3023
2951
logger.debug("GnuTLS: %s", string[:-1])
3024
2952
3025
2953
gnutls.global_set_log_function(debug_gnutls)
3026
2954
3027
2955
# Redirect stdin so all checkers get /dev/null
3028
2956
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
3029
2957
os.dup2(null, sys.stdin.fileno())
3030
2958
if null > 2:
3031
2959
os.close(null)
3032
2960
3033
2961
# Need to fork before connecting to D-Bus
3034
2962
if not foreground:
3035
2963
# Close all input and output, do double fork, etc.
3036
2964
daemon()
3037
3038
# multiprocessing will use threads, so before we use GLib we need
3039
# to inform GLib that threads will be used.
3040
GLib.threads_init()
3041
2965
2966
# multiprocessing will use threads, so before we use gobject we
2967
# need to inform gobject that threads will be used.
2968
gobject.threads_init()
2969
3042
2970
global main_loop
3043
2971
# From the Avahi example code
3044
2972
DBusGMainLoop(set_as_default=True)
3045
main_loop = GLib.MainLoop()
2973
main_loop = gobject.MainLoop()
3046
2974
bus = dbus.SystemBus()
3047
2975
# End of Avahi example code
3048
2976
if use_dbus:
3061
2989
if zeroconf:
3062
2990
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3063
2991
service = AvahiServiceToSyslog(
3064
name=server_settings["servicename"],
3065
servicetype="_mandos._tcp",
3066
protocol=protocol,
3067
bus=bus)
2992
name = server_settings["servicename"],
2993
servicetype = "_mandos._tcp",
2994
protocol = protocol,
2995
bus = bus)
3068
2996
if server_settings["interface"]:
3069
2997
service.interface = if_nametoindex(
3070
2998
server_settings["interface"].encode("utf-8"))
3071
2999
3072
3000
global multiprocessing_manager
3073
3001
multiprocessing_manager = multiprocessing.Manager()
3074
3002
3075
3003
client_class = Client
3076
3004
if use_dbus:
3077
client_class = functools.partial(ClientDBus, bus=bus)
3078
3005
client_class = functools.partial(ClientDBus, bus = bus)
3006
3079
3007
client_settings = Client.config_parser(client_config)
3080
3008
old_client_settings = {}
3081
3009
clients_data = {}
3082
3010
3083
3011
# This is used to redirect stdout and stderr for checker processes
3084
3012
global wnull
3085
wnull = open(os.devnull, "w") # A writable /dev/null
3013
wnull = open(os.devnull, "w") # A writable /dev/null
3086
3014
# Only used if server is running in foreground but not in debug
3087
3015
# mode
3088
3016
if debug or not foreground:
3089
3017
wnull.close()
3090
3018
3091
3019
# Get client data and settings from last running state.
3092
3020
if server_settings["restore"]:
3093
3021
try:
3094
3022
with open(stored_state_path, "rb") as stored_state:
3095
if sys.version_info.major == 2:
3096
clients_data, old_client_settings = pickle.load(
3097
stored_state)
3098
else:
3099
bytes_clients_data, bytes_old_client_settings = (
3100
pickle.load(stored_state, encoding="bytes"))
3101
# Fix bytes to strings
3102
# clients_data
3103
# .keys()
3104
clients_data = {(key.decode("utf-8")
3105
if isinstance(key, bytes)
3106
else key): value
3107
for key, value in
3108
bytes_clients_data.items()}
3109
del bytes_clients_data
3110
for key in clients_data:
3111
value = {(k.decode("utf-8")
3112
if isinstance(k, bytes) else k): v
3113
for k, v in
3114
clients_data[key].items()}
3115
clients_data[key] = value
3116
# .client_structure
3117
value["client_structure"] = [
3118
(s.decode("utf-8")
3119
if isinstance(s, bytes)
3120
else s) for s in
3121
value["client_structure"]]
3122
# .name & .host
3123
for k in ("name", "host"):
3124
if isinstance(value[k], bytes):
3125
value[k] = value[k].decode("utf-8")
3126
# old_client_settings
3127
# .keys()
3128
old_client_settings = {
3129
(key.decode("utf-8")
3130
if isinstance(key, bytes)
3131
else key): value
3132
for key, value in
3133
bytes_old_client_settings.items()}
3134
del bytes_old_client_settings
3135
# .host
3136
for value in old_client_settings.values():
3137
if isinstance(value["host"], bytes):
3138
value["host"] = (value["host"]
3139
.decode("utf-8"))
3023
clients_data, old_client_settings = pickle.load(
3024
stored_state)
3140
3025
os.remove(stored_state_path)
3141
3026
except IOError as e:
3142
3027
if e.errno == errno.ENOENT:
3150
3035
logger.warning("Could not load persistent state: "
3151
3036
"EOFError:",
3152
3037
exc_info=e)
3153
3038
3154
3039
with PGPEngine() as pgp:
3155
3040
for client_name, client in clients_data.items():
3156
3041
# Skip removed clients
3157
3042
if client_name not in client_settings:
3158
3043
continue
3159
3044
3160
3045
# Decide which value to use after restoring saved state.
3161
3046
# We have three different values: Old config file,
3162
3047
# new config file, and saved state.
3173
3058
client[name] = value
3174
3059
except KeyError:
3175
3060
pass
3176
3061
3177
3062
# Clients who has passed its expire date can still be
3178
3063
# enabled if its last checker was successful. A Client
3179
3064
# whose checker succeeded before we stored its state is
3212
3097
client_name))
3213
3098
client["secret"] = (client_settings[client_name]
3214
3099
["secret"])
3215
3100
3216
3101
# Add/remove clients based on new changes made to config
3217
3102
for client_name in (set(old_client_settings)
3218
3103
- set(client_settings)):
3220
3105
for client_name in (set(client_settings)
3221
3106
- set(old_client_settings)):
3222
3107
clients_data[client_name] = client_settings[client_name]
3223
3108
3224
3109
# Create all client objects
3225
3110
for client_name, client in clients_data.items():
3226
3111
tcp_server.clients[client_name] = client_class(
3227
name=client_name,
3228
settings=client,
3229
server_settings=server_settings)
3230
3112
name = client_name,
3113
settings = client,
3114
server_settings = server_settings)
3115
3231
3116
if not tcp_server.clients:
3232
3117
logger.warning("No clients defined")
3233
3118
3234
3119
if not foreground:
3235
3120
if pidfile is not None:
3236
3121
pid = os.getpid()
3242
3127
pidfilename, pid)
3243
3128
del pidfile
3244
3129
del pidfilename
3245
3246
for termsig in (signal.SIGHUP, signal.SIGTERM):
3247
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3248
lambda: main_loop.quit() and False)
3249
3130
3131
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
3132
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3133
3250
3134
if use_dbus:
3251
3135
3252
3136
@alternate_dbus_interfaces(
3253
{"se.recompile.Mandos": "se.bsnet.fukt.Mandos"})
3137
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3254
3138
class MandosDBusService(DBusObjectWithObjectManager):
3255
3139
"""A D-Bus proxy object"""
3256
3140
3257
3141
def __init__(self):
3258
3142
dbus.service.Object.__init__(self, bus, "/")
3259
3143
3260
3144
_interface = "se.recompile.Mandos"
3261
3145
3262
3146
@dbus.service.signal(_interface, signature="o")
3263
3147
def ClientAdded(self, objpath):
3264
3148
"D-Bus signal"
3265
3149
pass
3266
3150
3267
3151
@dbus.service.signal(_interface, signature="ss")
3268
3152
def ClientNotFound(self, fingerprint, address):
3269
3153
"D-Bus signal"
3270
3154
pass
3271
3155
3272
3156
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3273
3157
"true"})
3274
3158
@dbus.service.signal(_interface, signature="os")
3275
3159
def ClientRemoved(self, objpath, name):
3276
3160
"D-Bus signal"
3277
3161
pass
3278
3162
3279
3163
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3280
3164
"true"})
3281
3165
@dbus.service.method(_interface, out_signature="ao")
3282
3166
def GetAllClients(self):
3283
3167
"D-Bus method"
3284
3168
return dbus.Array(c.dbus_object_path for c in
3285
tcp_server.clients.values())
3286
3169
tcp_server.clients.itervalues())
3170
3287
3171
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3288
3172
"true"})
3289
3173
@dbus.service.method(_interface,
3291
3175
def GetAllClientsWithProperties(self):
3292
3176
"D-Bus method"
3293
3177
return dbus.Dictionary(
3294
{c.dbus_object_path: c.GetAll(
3178
{ c.dbus_object_path: c.GetAll(
3295
3179
"se.recompile.Mandos.Client")
3296
for c in tcp_server.clients.values()},
3180
for c in tcp_server.clients.itervalues() },
3297
3181
signature="oa{sv}")
3298
3182
3299
3183
@dbus.service.method(_interface, in_signature="o")
3300
3184
def RemoveClient(self, object_path):
3301
3185
"D-Bus method"
3302
for c in tcp_server.clients.values():
3186
for c in tcp_server.clients.itervalues():
3303
3187
if c.dbus_object_path == object_path:
3304
3188
del tcp_server.clients[c.name]
3305
3189
c.remove_from_connection()
3309
3193
self.client_removed_signal(c)
3310
3194
return
3311
3195
raise KeyError(object_path)
3312
3196
3313
3197
del _interface
3314
3198
3315
3199
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3316
out_signature="a{oa{sa{sv}}}")
3200
out_signature = "a{oa{sa{sv}}}")
3317
3201
def GetManagedObjects(self):
3318
3202
"""D-Bus method"""
3319
3203
return dbus.Dictionary(
3320
{client.dbus_object_path:
3321
dbus.Dictionary(
3322
{interface: client.GetAll(interface)
3323
for interface in
3324
client._get_all_interface_names()})
3325
for client in tcp_server.clients.values()})
3326
3204
{ client.dbus_object_path:
3205
dbus.Dictionary(
3206
{ interface: client.GetAll(interface)
3207
for interface in
3208
client._get_all_interface_names()})
3209
for client in tcp_server.clients.values()})
3210
3327
3211
def client_added_signal(self, client):
3328
3212
"""Send the new standard signal and the old signal"""
3329
3213
if use_dbus:
3331
3215
self.InterfacesAdded(
3332
3216
client.dbus_object_path,
3333
3217
dbus.Dictionary(
3334
{interface: client.GetAll(interface)
3335
for interface in
3336
client._get_all_interface_names()}))
3218
{ interface: client.GetAll(interface)
3219
for interface in
3220
client._get_all_interface_names()}))
3337
3221
# Old signal
3338
3222
self.ClientAdded(client.dbus_object_path)
3339
3223
3340
3224
def client_removed_signal(self, client):
3341
3225
"""Send the new standard signal and the old signal"""
3342
3226
if use_dbus:
3347
3231
# Old signal
3348
3232
self.ClientRemoved(client.dbus_object_path,
3349
3233
client.name)
3350
3234
3351
3235
mandos_dbus_service = MandosDBusService()
3352
3353
# Save modules to variables to exempt the modules from being
3354
# unloaded before the function registered with atexit() is run.
3355
mp = multiprocessing
3356
wn = wnull
3357
3236
3358
3237
def cleanup():
3359
3238
"Cleanup function; run on exit"
3360
3239
if zeroconf:
3361
3240
service.cleanup()
3362
3363
mp.active_children()
3364
wn.close()
3241
3242
multiprocessing.active_children()
3243
wnull.close()
3365
3244
if not (tcp_server.clients or client_settings):
3366
3245
return
3367
3246
3368
3247
# Store client before exiting. Secrets are encrypted with key
3369
3248
# based on what config file has. If config file is
3370
3249
# removed/edited, old secret will thus be unrecovable.
3371
3250
clients = {}
3372
3251
with PGPEngine() as pgp:
3373
for client in tcp_server.clients.values():
3252
for client in tcp_server.clients.itervalues():
3374
3253
key = client_settings[client.name]["secret"]
3375
3254
client.encrypted_secret = pgp.encrypt(client.secret,
3376
3255
key)
3377
3256
client_dict = {}
3378
3257
3379
3258
# A list of attributes that can not be pickled
3380
3259
# + secret.
3381
exclude = {"bus", "changedstate", "secret",
3382
"checker", "server_settings"}
3260
exclude = { "bus", "changedstate", "secret",
3261
"checker", "server_settings" }
3383
3262
for name, typ in inspect.getmembers(dbus.service
3384
3263
.Object):
3385
3264
exclude.add(name)
3386
3265
3387
3266
client_dict["encrypted_secret"] = (client
3388
3267
.encrypted_secret)
3389
3268
for attr in client.client_structure:
3390
3269
if attr not in exclude:
3391
3270
client_dict[attr] = getattr(client, attr)
3392
3271
3393
3272
clients[client.name] = client_dict
3394
3273
del client_settings[client.name]["secret"]
3395
3274
3396
3275
try:
3397
3276
with tempfile.NamedTemporaryFile(
3398
3277
mode='wb',
3400
3279
prefix='clients-',
3401
3280
dir=os.path.dirname(stored_state_path),
3402
3281
delete=False) as stored_state:
3403
pickle.dump((clients, client_settings), stored_state,
3404
protocol=2)
3282
pickle.dump((clients, client_settings), stored_state)
3405
3283
tempname = stored_state.name
3406
3284
os.rename(tempname, stored_state_path)
3407
3285
except (IOError, OSError) as e:
3417
3295
logger.warning("Could not save persistent state:",
3418
3296
exc_info=e)
3419
3297
raise
3420
3298
3421
3299
# Delete all clients, and settings from config
3422
3300
while tcp_server.clients:
3423
3301
name, client = tcp_server.clients.popitem()
3429
3307
if use_dbus:
3430
3308
mandos_dbus_service.client_removed_signal(client)
3431
3309
client_settings.clear()
3432
3310
3433
3311
atexit.register(cleanup)
3434
3435
for client in tcp_server.clients.values():
3312
3313
for client in tcp_server.clients.itervalues():
3436
3314
if use_dbus:
3437
3315
# Emit D-Bus signal for adding
3438
3316
mandos_dbus_service.client_added_signal(client)
3439
3317
# Need to initiate checking of clients
3440
3318
if client.enabled:
3441
3319
client.init_checker()
3442
3320
3443
3321
tcp_server.enable()
3444
3322
tcp_server.server_activate()
3445
3323
3446
3324
# Find out what port we got
3447
3325
if zeroconf:
3448
3326
service.port = tcp_server.socket.getsockname()[1]
3453
3331
else: # IPv4
3454
3332
logger.info("Now listening on address %r, port %d",
3455
3333
*tcp_server.socket.getsockname())
3456
3457
# service.interface = tcp_server.socket.getsockname()[3]
3458
3334
3335
#service.interface = tcp_server.socket.getsockname()[3]
3336
3459
3337
try:
3460
3338
if zeroconf:
3461
3339
# From the Avahi example code
3466
3344
cleanup()
3467
3345
sys.exit(1)
3468
3346
# End of Avahi example code
3469
3470
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3471
lambda *args, **kwargs:
3472
(tcp_server.handle_request
3473
(*args[2:], **kwargs) or True))
3474
3347
3348
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3349
lambda *args, **kwargs:
3350
(tcp_server.handle_request
3351
(*args[2:], **kwargs) or True))
3352
3475
3353
logger.debug("Starting main loop")
3476
3354
main_loop.run()
3477
3355
except AvahiError as error:
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0