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