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