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