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