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