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