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