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 524
- compare with another revision
- download diff
- download tarball
- view history from revision 524
- Committer: Björn Påhlsson
- Date: 2011-12-21 00:29:33 UTC
- mfrom: (518.1.15 mandos-persistent)
- Revision ID: belorn@recompile.se-20111221002933-6sc0a64o1ns2s2s8
Working persistant state
- files removed:
- bugs.xml
- debian/upstream
- network-hooks.d
- plugin-helpers
- files modified:
- .bzrignore
added
removed
mandos
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-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 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
41
42
try:
43
import SocketServer as socketserver
44
except ImportError:
45
import socketserver
37
import SocketServer as socketserver
46
38
import socket
47
39
import argparse
48
40
import datetime
49
41
import errno
50
try:
51
import ConfigParser as configparser
52
except ImportError:
53
import configparser
42
import gnutls.crypto
43
import gnutls.connection
44
import gnutls.errors
45
import gnutls.library.functions
46
import gnutls.library.constants
47
import gnutls.library.types
48
import ConfigParser as configparser
54
49
import sys
55
50
import re
56
51
import os
65
60
import struct
66
61
import fcntl
67
62
import functools
68
try:
69
import cPickle as pickle
70
except ImportError:
71
import pickle
63
import cPickle as pickle
72
64
import multiprocessing
73
65
import types
74
66
import binascii
75
67
import tempfile
76
import itertools
77
import collections
78
import codecs
79
68
80
69
import dbus
81
70
import dbus.service
82
from gi.repository import GLib
71
import gobject
72
import avahi
83
73
from dbus.mainloop.glib import DBusGMainLoop
84
74
import ctypes
85
75
import ctypes.util
86
76
import xml.dom.minidom
87
77
import inspect
78
import GnuPGInterface
88
79
89
# Try to find the value of SO_BINDTODEVICE:
90
80
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
81
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
94
82
except AttributeError:
95
83
try:
96
# This is where SO_BINDTODEVICE was up to and including Python
97
# 2.6, and also 3.2:
98
84
from IN import SO_BINDTODEVICE
99
85
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.7"
86
SO_BINDTODEVICE = None
87
88
version = "1.4.1"
118
89
stored_state_file = "clients.pickle"
119
90
120
91
logger = logging.getLogger()
121
syslogger = None
92
syslogger = (logging.handlers.SysLogHandler
93
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
94
address = str("/dev/log")))
122
95
123
96
try:
124
if_nametoindex = ctypes.cdll.LoadLibrary(
125
ctypes.util.find_library("c")).if_nametoindex
97
if_nametoindex = (ctypes.cdll.LoadLibrary
98
(ctypes.util.find_library("c"))
99
.if_nametoindex)
126
100
except (OSError, AttributeError):
127
128
101
def if_nametoindex(interface):
129
102
"Get an interface index the hard way, i.e. using fcntl()"
130
103
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
131
104
with contextlib.closing(socket.socket()) as s:
132
105
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
133
struct.pack(b"16s16x", interface))
134
interface_index = struct.unpack("I", ifreq[16:20])[0]
106
struct.pack(str("16s16x"),
107
interface))
108
interface_index = struct.unpack(str("I"),
109
ifreq[16:20])[0]
135
110
return interface_index
136
111
137
112
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
def initlogger(debug, level=logging.WARNING):
113
def initlogger(level=logging.WARNING):
155
114
"""init logger and add loglevel"""
156
115
157
global syslogger
158
syslogger = (logging.handlers.SysLogHandler(
159
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
160
address = "/dev/log"))
161
116
syslogger.setFormatter(logging.Formatter
162
117
('Mandos [%(process)d]: %(levelname)s:'
163
118
' %(message)s'))
164
119
logger.addHandler(syslogger)
165
120
166
if debug:
167
console = logging.StreamHandler()
168
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
169
' [%(process)d]:'
170
' %(levelname)s:'
171
' %(message)s'))
172
logger.addHandler(console)
121
console = logging.StreamHandler()
122
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
123
' [%(process)d]:'
124
' %(levelname)s:'
125
' %(message)s'))
126
logger.addHandler(console)
173
127
logger.setLevel(level)
174
128
175
129
180
134
181
135
class PGPEngine(object):
182
136
"""A simple class for OpenPGP symmetric encryption & decryption"""
183
184
137
def __init__(self):
138
self.gnupg = GnuPGInterface.GnuPG()
185
139
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
self.gnupgargs = ['--batch',
198
'--homedir', self.tempdir,
199
'--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")
140
self.gnupg = GnuPGInterface.GnuPG()
141
self.gnupg.options.meta_interactive = False
142
self.gnupg.options.homedir = self.tempdir
143
self.gnupg.options.extra_args.extend(['--force-mdc',
144
'--quiet'])
204
145
205
146
def __enter__(self):
206
147
return self
207
148
208
def __exit__(self, exc_type, exc_value, traceback):
149
def __exit__ (self, exc_type, exc_value, traceback):
209
150
self._cleanup()
210
151
return False
211
152
228
169
def password_encode(self, password):
229
170
# Passphrase can not be empty and can not contain newlines or
230
171
# NUL bytes. So we prefix it and hex encode it.
231
encoded = b"mandos" + binascii.hexlify(password)
232
if len(encoded) > 2048:
233
# GnuPG can't handle long passwords, so encode differently
234
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
235
.replace(b"\n", b"\\n")
236
.replace(b"\0", b"\\x00"))
237
return encoded
172
return b"mandos" + binascii.hexlify(password)
238
173
239
174
def encrypt(self, data, password):
240
passphrase = self.password_encode(password)
241
with tempfile.NamedTemporaryFile(
242
dir=self.tempdir) as passfile:
243
passfile.write(passphrase)
244
passfile.flush()
245
proc = subprocess.Popen([self.gpg, '--symmetric',
246
'--passphrase-file',
247
passfile.name]
248
+ self.gnupgargs,
249
stdin = subprocess.PIPE,
250
stdout = subprocess.PIPE,
251
stderr = subprocess.PIPE)
252
ciphertext, err = proc.communicate(input = data)
253
if proc.returncode != 0:
254
raise PGPError(err)
175
self.gnupg.passphrase = self.password_encode(password)
176
with open(os.devnull) as devnull:
177
try:
178
proc = self.gnupg.run(['--symmetric'],
179
create_fhs=['stdin', 'stdout'],
180
attach_fhs={'stderr': devnull})
181
with contextlib.closing(proc.handles['stdin']) as f:
182
f.write(data)
183
with contextlib.closing(proc.handles['stdout']) as f:
184
ciphertext = f.read()
185
proc.wait()
186
except IOError as e:
187
raise PGPError(e)
188
self.gnupg.passphrase = None
255
189
return ciphertext
256
190
257
191
def decrypt(self, data, password):
258
passphrase = self.password_encode(password)
259
with tempfile.NamedTemporaryFile(
260
dir = self.tempdir) as passfile:
261
passfile.write(passphrase)
262
passfile.flush()
263
proc = subprocess.Popen([self.gpg, '--decrypt',
264
'--passphrase-file',
265
passfile.name]
266
+ self.gnupgargs,
267
stdin = subprocess.PIPE,
268
stdout = subprocess.PIPE,
269
stderr = subprocess.PIPE)
270
decrypted_plaintext, err = proc.communicate(input = data)
271
if proc.returncode != 0:
272
raise PGPError(err)
192
self.gnupg.passphrase = self.password_encode(password)
193
with open(os.devnull) as devnull:
194
try:
195
proc = self.gnupg.run(['--decrypt'],
196
create_fhs=['stdin', 'stdout'],
197
attach_fhs={'stderr': devnull})
198
with contextlib.closing(proc.handles['stdin'] ) as f:
199
f.write(data)
200
with contextlib.closing(proc.handles['stdout']) as f:
201
decrypted_plaintext = f.read()
202
proc.wait()
203
except IOError as e:
204
raise PGPError(e)
205
self.gnupg.passphrase = None
273
206
return decrypted_plaintext
274
207
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()
208
299
209
300
210
class AvahiError(Exception):
301
211
def __init__(self, value, *args, **kwargs):
302
212
self.value = value
303
return super(AvahiError, self).__init__(value, *args,
304
**kwargs)
305
213
super(AvahiError, self).__init__(value, *args, **kwargs)
214
def __unicode__(self):
215
return unicode(repr(self.value))
306
216
307
217
class AvahiServiceError(AvahiError):
308
218
pass
309
219
310
311
220
class AvahiGroupError(AvahiError):
312
221
pass
313
222
320
229
Used to optionally bind to the specified interface.
321
230
name: string; Example: 'Mandos'
322
231
type: string; Example: '_mandos._tcp'.
323
See <https://www.iana.org/assignments/service-names-port-numbers>
232
See <http://www.dns-sd.org/ServiceTypes.html>
324
233
port: integer; what port to announce
325
234
TXT: list of strings; TXT record for the service
326
235
domain: string; Domain to publish on, default to .local if empty.
332
241
server: D-Bus Server
333
242
bus: dbus.SystemBus()
334
243
"""
335
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):
244
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
245
servicetype = None, port = None, TXT = None,
246
domain = "", host = "", max_renames = 32768,
247
protocol = avahi.PROTO_UNSPEC, bus = None):
347
248
self.interface = interface
348
249
self.name = name
349
250
self.type = servicetype
358
259
self.server = None
359
260
self.bus = bus
360
261
self.entry_group_state_changed_match = None
361
362
def rename(self, remove=True):
262
def rename(self):
363
263
"""Derived from the Avahi example code"""
364
264
if self.rename_count >= self.max_renames:
365
265
logger.critical("No suitable Zeroconf service name found"
366
266
" after %i retries, exiting.",
367
267
self.rename_count)
368
268
raise AvahiServiceError("Too many renames")
369
self.name = str(
370
self.server.GetAlternativeServiceName(self.name))
371
self.rename_count += 1
269
self.name = unicode(self.server
270
.GetAlternativeServiceName(self.name))
372
271
logger.info("Changing Zeroconf service name to %r ...",
373
272
self.name)
374
if remove:
375
self.remove()
273
self.remove()
376
274
try:
377
275
self.add()
378
276
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)
387
277
logger.critical("DBusException: %s", error)
278
self.cleanup()
279
os._exit(1)
280
self.rename_count += 1
388
281
def remove(self):
389
282
"""Derived from the Avahi example code"""
390
283
if self.entry_group_state_changed_match is not None:
392
285
self.entry_group_state_changed_match = None
393
286
if self.group is not None:
394
287
self.group.Reset()
395
396
288
def add(self):
397
289
"""Derived from the Avahi example code"""
398
290
self.remove()
415
307
dbus.UInt16(self.port),
416
308
avahi.string_array_to_txt_array(self.TXT))
417
309
self.group.Commit()
418
419
310
def entry_group_state_changed(self, state, error):
420
311
"""Derived from the Avahi example code"""
421
312
logger.debug("Avahi entry group state change: %i", state)
427
318
self.rename()
428
319
elif state == avahi.ENTRY_GROUP_FAILURE:
429
320
logger.critical("Avahi: Error in group state changed %s",
430
str(error))
431
raise AvahiGroupError("State changed: {!s}".format(error))
432
321
unicode(error))
322
raise AvahiGroupError("State changed: %s"
323
% unicode(error))
433
324
def cleanup(self):
434
325
"""Derived from the Avahi example code"""
435
326
if self.group is not None:
440
331
pass
441
332
self.group = None
442
333
self.remove()
443
444
334
def server_state_changed(self, state, error=None):
445
335
"""Derived from the Avahi example code"""
446
336
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
}
337
bad_states = { avahi.SERVER_INVALID:
338
"Zeroconf server invalid",
339
avahi.SERVER_REGISTERING: None,
340
avahi.SERVER_COLLISION:
341
"Zeroconf server name collision",
342
avahi.SERVER_FAILURE:
343
"Zeroconf server failure" }
453
344
if state in bad_states:
454
345
if bad_states[state] is not None:
455
346
if error is None:
458
349
logger.error(bad_states[state] + ": %r", error)
459
350
self.cleanup()
460
351
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)
352
self.add()
473
353
else:
474
354
if error is None:
475
355
logger.debug("Unknown state: %r", state)
476
356
else:
477
357
logger.debug("Unknown state: %r: %r", state, error)
478
479
358
def activate(self):
480
359
"""Derived from the Avahi example code"""
481
360
if self.server is None:
485
364
follow_name_owner_changes=True),
486
365
avahi.DBUS_INTERFACE_SERVER)
487
366
self.server.connect_to_signal("StateChanged",
488
self.server_state_changed)
367
self.server_state_changed)
489
368
self.server_state_changed(self.server.GetState())
490
369
491
492
370
class AvahiServiceToSyslog(AvahiService):
493
def rename(self, *args, **kwargs):
371
def rename(self):
494
372
"""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)))
373
ret = AvahiService.rename(self)
374
syslogger.setFormatter(logging.Formatter
375
('Mandos (%s) [%%(process)d]:'
376
' %%(levelname)s: %%(message)s'
377
% self.name))
499
378
return ret
500
379
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
380
def timedelta_to_milliseconds(td):
381
"Convert a datetime.timedelta() to milliseconds"
382
return ((td.days * 24 * 60 * 60 * 1000)
383
+ (td.seconds * 1000)
384
+ (td.microseconds // 1000))
385
766
386
class Client(object):
767
387
"""A representation of a client host served by this server.
768
388
773
393
checker: subprocess.Popen(); a running checker process used
774
394
to see if the client lives.
775
395
'None' if no process is running.
776
checker_callback_tag: a GLib event source tag, or None
396
checker_callback_tag: a gobject event source tag, or None
777
397
checker_command: string; External command which is run to check
778
398
if client lives. %() expansions are done at
779
399
runtime with vars(self) as dict, so that for
780
400
instance %(name)s can be used in the command.
781
checker_initiator_tag: a GLib event source tag, or None
401
checker_initiator_tag: a gobject event source tag, or None
782
402
created: datetime.datetime(); (UTC) object creation
783
403
client_structure: Object describing what attributes a client has
784
404
and is used for storing the client at exit
785
405
current_checker_command: string; current running checker_command
786
disable_initiator_tag: a GLib event source tag, or None
406
disable_initiator_tag: a gobject event source tag, or None
787
407
enabled: bool()
788
408
fingerprint: string (40 or 32 hexadecimal digits); used to
789
409
uniquely identify the client
793
413
last_checked_ok: datetime.datetime(); (UTC) or None
794
414
last_checker_status: integer between 0 and 255 reflecting exit
795
415
status of last checker. -1 reflects crashed
796
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
416
checker, or None.
799
417
last_enabled: datetime.datetime(); (UTC) or None
800
418
name: string; from the config file, used in log messages and
801
419
D-Bus identifiers
802
420
secret: bytestring; sent verbatim (over TLS) to client
803
421
timeout: datetime.timedelta(); How long from last_checked_ok
804
422
until this client is disabled
805
extended_timeout: extra long timeout when secret has been sent
423
extended_timeout: extra long timeout when password has been sent
806
424
runtime_expansions: Allowed attributes for runtime expansion.
807
425
expires: datetime.datetime(); time (UTC) when a client will be
808
426
disabled, or None
809
server_settings: The server_settings dict from main()
810
427
"""
811
428
812
429
runtime_expansions = ("approval_delay", "approval_duration",
813
"created", "enabled", "expires",
814
"fingerprint", "host", "interval",
815
"last_approval_request", "last_checked_ok",
430
"created", "enabled", "fingerprint",
431
"host", "interval", "last_checked_ok",
816
432
"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
}
828
433
client_defaults = { "timeout": "5m",
434
"extended_timeout": "15m",
435
"interval": "2m",
436
"checker": "fping -q -- %%(host)s",
437
"host": "",
438
"approval_delay": "0s",
439
"approval_duration": "1s",
440
"approved_by_default": "True",
441
"enabled": "True",
442
}
443
444
def timeout_milliseconds(self):
445
"Return the 'timeout' attribute in milliseconds"
446
return timedelta_to_milliseconds(self.timeout)
447
448
def extended_timeout_milliseconds(self):
449
"Return the 'extended_timeout' attribute in milliseconds"
450
return timedelta_to_milliseconds(self.extended_timeout)
451
452
def interval_milliseconds(self):
453
"Return the 'interval' attribute in milliseconds"
454
return timedelta_to_milliseconds(self.interval)
455
456
def approval_delay_milliseconds(self):
457
return timedelta_to_milliseconds(self.approval_delay)
458
829
459
@staticmethod
830
460
def config_parser(config):
831
"""Construct a new dict of client settings of this form:
461
""" Construct a new dict of client settings of this form:
832
462
{ client_name: {setting_name: value, ...}, ...}
833
with exceptions for any special settings as defined above.
834
NOTE: Must be a pure function. Must return the same result
835
value given the same arguments.
836
"""
463
with exceptions for any special settings as defined above"""
837
464
settings = {}
838
465
for client_name in config.sections():
839
466
section = dict(config.items(client_name))
843
470
# Reformat values from string types to Python types
844
471
client["approved_by_default"] = config.getboolean(
845
472
client_name, "approved_by_default")
846
client["enabled"] = config.getboolean(client_name,
847
"enabled")
473
client["enabled"] = config.getboolean(client_name, "enabled")
848
474
849
# Uppercase and remove spaces from fingerprint for later
850
# comparison purposes with return value from the
851
# fingerprint() function
852
475
client["fingerprint"] = (section["fingerprint"].upper()
853
476
.replace(" ", ""))
854
477
if "secret" in section:
855
client["secret"] = codecs.decode(section["secret"]
856
.encode("utf-8"),
857
"base64")
478
client["secret"] = section["secret"].decode("base64")
858
479
elif "secfile" in section:
859
480
with open(os.path.expanduser(os.path.expandvars
860
481
(section["secfile"])),
861
482
"rb") as secfile:
862
483
client["secret"] = secfile.read()
863
484
else:
864
raise TypeError("No secret or secfile for section {}"
865
.format(section))
485
raise TypeError("No secret or secfile for section %s"
486
% section)
866
487
client["timeout"] = string_to_delta(section["timeout"])
867
488
client["extended_timeout"] = string_to_delta(
868
489
section["extended_timeout"])
874
495
client["checker_command"] = section["checker"]
875
496
client["last_approval_request"] = None
876
497
client["last_checked_ok"] = None
877
client["last_checker_status"] = -2
878
498
client["last_checker_status"] = None
499
if client["enabled"]:
500
client["last_enabled"] = datetime.datetime.utcnow()
501
client["expires"] = (datetime.datetime.utcnow()
502
+ client["timeout"])
503
else:
504
client["last_enabled"] = None
505
client["expires"] = None
506
879
507
return settings
880
881
def __init__(self, settings, name = None, server_settings=None):
508
509
510
def __init__(self, settings, name = None):
511
"""Note: the 'checker' key in 'config' sets the
512
'checker_command' attribute and *not* the 'checker'
513
attribute."""
882
514
self.name = name
883
if server_settings is None:
884
server_settings = {}
885
self.server_settings = server_settings
886
515
# adding all client settings
887
for setting, value in settings.items():
516
for setting, value in settings.iteritems():
888
517
setattr(self, setting, value)
889
518
890
if self.enabled:
891
if not hasattr(self, "last_enabled"):
892
self.last_enabled = datetime.datetime.utcnow()
893
if not hasattr(self, "expires"):
894
self.expires = (datetime.datetime.utcnow()
895
+ self.timeout)
896
else:
897
self.last_enabled = None
898
self.expires = None
899
900
519
logger.debug("Creating client %r", self.name)
520
# Uppercase and remove spaces from fingerprint for later
521
# comparison purposes with return value from the fingerprint()
522
# function
901
523
logger.debug(" Fingerprint: %s", self.fingerprint)
902
self.created = settings.get("created",
903
datetime.datetime.utcnow())
904
524
self.created = settings.get("created", datetime.datetime.utcnow())
525
905
526
# attributes specific for this server instance
906
527
self.checker = None
907
528
self.checker_initiator_tag = None
910
531
self.current_checker_command = None
911
532
self.approved = None
912
533
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()
534
self.changedstate = (multiprocessing_manager
535
.Condition(multiprocessing_manager
536
.Lock()))
537
self.client_structure = [attr for attr in
538
self.__dict__.iterkeys()
917
539
if not attr.startswith("_")]
918
540
self.client_structure.append("client_structure")
919
541
920
for name, t in inspect.getmembers(
921
type(self), lambda obj: isinstance(obj, property)):
542
for name, t in inspect.getmembers(type(self),
543
lambda obj:
544
isinstance(obj,
545
property)):
922
546
if not name.startswith("_"):
923
547
self.client_structure.append(name)
924
548
932
556
if getattr(self, "enabled", False):
933
557
# Already enabled
934
558
return
559
self.send_changedstate()
935
560
self.expires = datetime.datetime.utcnow() + self.timeout
936
561
self.enabled = True
937
562
self.last_enabled = datetime.datetime.utcnow()
938
563
self.init_checker()
939
self.send_changedstate()
940
564
941
565
def disable(self, quiet=True):
942
566
"""Disable this client."""
943
567
if not getattr(self, "enabled", False):
944
568
return False
945
569
if not quiet:
570
self.send_changedstate()
571
if not quiet:
946
572
logger.info("Disabling client %s", self.name)
947
if getattr(self, "disable_initiator_tag", None) is not None:
948
GLib.source_remove(self.disable_initiator_tag)
573
if getattr(self, "disable_initiator_tag", False):
574
gobject.source_remove(self.disable_initiator_tag)
949
575
self.disable_initiator_tag = None
950
576
self.expires = None
951
if getattr(self, "checker_initiator_tag", None) is not None:
952
GLib.source_remove(self.checker_initiator_tag)
577
if getattr(self, "checker_initiator_tag", False):
578
gobject.source_remove(self.checker_initiator_tag)
953
579
self.checker_initiator_tag = None
954
580
self.stop_checker()
955
581
self.enabled = False
956
if not quiet:
957
self.send_changedstate()
958
# Do not run this again if called by a GLib.timeout_add
582
# Do not run this again if called by a gobject.timeout_add
959
583
return False
960
584
961
585
def __del__(self):
964
588
def init_checker(self):
965
589
# Schedule a new checker to be started an 'interval' from now,
966
590
# and every interval from then on.
967
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)
591
self.checker_initiator_tag = (gobject.timeout_add
592
(self.interval_milliseconds(),
593
self.start_checker))
972
594
# Schedule a disable() when 'timeout' has passed
973
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)
595
self.disable_initiator_tag = (gobject.timeout_add
596
(self.timeout_milliseconds(),
597
self.disable))
977
598
# Also start a new checker *right now*.
978
599
self.start_checker()
979
600
980
def checker_callback(self, source, condition, connection,
981
command):
601
def checker_callback(self, pid, condition, command):
982
602
"""The checker has completed, so take appropriate actions."""
983
603
self.checker_callback_tag = None
984
604
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
605
if os.WIFEXITED(condition):
606
self.last_checker_status = os.WEXITSTATUS(condition)
992
607
if self.last_checker_status == 0:
993
608
logger.info("Checker for %(name)s succeeded",
994
609
vars(self))
995
610
self.checked_ok()
996
611
else:
997
logger.info("Checker for %(name)s failed", vars(self))
612
logger.info("Checker for %(name)s failed",
613
vars(self))
998
614
else:
999
615
self.last_checker_status = -1
1000
self.last_checker_signal = -returncode
1001
616
logger.warning("Checker for %(name)s crashed?",
1002
617
vars(self))
1003
return False
1004
1005
def checked_ok(self):
1006
"""Assert that the client has been seen, alive and well."""
1007
self.last_checked_ok = datetime.datetime.utcnow()
1008
self.last_checker_status = 0
1009
self.last_checker_signal = None
1010
self.bump_timeout()
1011
1012
def bump_timeout(self, timeout=None):
1013
"""Bump up the timeout for this client."""
618
619
def checked_ok(self, timeout=None):
620
"""Bump up the timeout for this client.
621
622
This should only be called when the client has been seen,
623
alive and well.
624
"""
1014
625
if timeout is None:
1015
626
timeout = self.timeout
627
self.last_checked_ok = datetime.datetime.utcnow()
1016
628
if self.disable_initiator_tag is not None:
1017
GLib.source_remove(self.disable_initiator_tag)
1018
self.disable_initiator_tag = None
629
gobject.source_remove(self.disable_initiator_tag)
1019
630
if getattr(self, "enabled", False):
1020
self.disable_initiator_tag = GLib.timeout_add(
1021
int(timeout.total_seconds() * 1000), self.disable)
631
self.disable_initiator_tag = (gobject.timeout_add
632
(timedelta_to_milliseconds
633
(timeout), self.disable))
1022
634
self.expires = datetime.datetime.utcnow() + timeout
1023
635
1024
636
def need_approval(self):
1030
642
If a checker already exists, leave it running and do
1031
643
nothing."""
1032
644
# The reason for not killing a running checker is that if we
1033
# did that, and if a checker (for some reason) started running
1034
# slowly and taking more than 'interval' time, then the client
1035
# would inevitably timeout, since no checker would get a
1036
# chance to run to completion. If we instead leave running
645
# did that, then if a checker (for some reason) started
646
# running slowly and taking more than 'interval' time, the
647
# client would inevitably timeout, since no checker would get
648
# a chance to run to completion. If we instead leave running
1037
649
# checkers alone, the checker would have to take more time
1038
650
# than 'timeout' for the client to be disabled, which is as it
1039
651
# should be.
1040
652
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
653
# If a checker exists, make sure it is not a zombie
654
try:
655
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
656
except (AttributeError, OSError) as error:
657
if (isinstance(error, OSError)
658
and error.errno != errno.ECHILD):
659
raise error
660
else:
661
if pid:
662
logger.warning("Checker was a zombie")
663
gobject.source_remove(self.checker_callback_tag)
664
self.checker_callback(pid, status,
665
self.current_checker_command)
1045
666
# Start a new checker if needed
1046
667
if self.checker is None:
1047
# Escape attributes for the shell
1048
escaped_attrs = {
1049
attr: re.escape(str(getattr(self, attr)))
1050
for attr in self.runtime_expansions }
1051
668
try:
1052
command = self.checker_command % escaped_attrs
1053
except TypeError as error:
1054
logger.error('Could not format string "%s"',
1055
self.checker_command,
1056
exc_info=error)
1057
return True # Try again later
669
# In case checker_command has exactly one % operator
670
command = self.checker_command % self.host
671
except TypeError:
672
# Escape attributes for the shell
673
escaped_attrs = dict(
674
(attr,
675
re.escape(unicode(str(getattr(self, attr, "")),
676
errors=
677
'replace')))
678
for attr in
679
self.runtime_expansions)
680
681
try:
682
command = self.checker_command % escaped_attrs
683
except TypeError as error:
684
logger.error('Could not format string "%s":'
685
' %s', self.checker_command, error)
686
return True # Try again later
1058
687
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
688
try:
689
logger.info("Starting checker %r for %s",
690
command, self.name)
691
# We don't need to redirect stdout and stderr, since
692
# in normal mode, that is already done by daemon(),
693
# and in debug mode we don't want to. (Stdin is
694
# always replaced by /dev/null.)
695
self.checker = subprocess.Popen(command,
696
close_fds=True,
697
shell=True, cwd="/")
698
self.checker_callback_tag = (gobject.child_watch_add
699
(self.checker.pid,
700
self.checker_callback,
701
data=command))
702
# The checker may have completed before the gobject
703
# watch was added. Check for this.
704
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
705
if pid:
706
gobject.source_remove(self.checker_callback_tag)
707
self.checker_callback(pid, status, command)
708
except OSError as error:
709
logger.error("Failed to start subprocess: %s",
710
error)
711
# Re-run this periodically if run by gobject.timeout_add
1085
712
return True
1086
713
1087
714
def stop_checker(self):
1088
715
"""Force the checker process, if any, to stop."""
1089
716
if self.checker_callback_tag:
1090
GLib.source_remove(self.checker_callback_tag)
717
gobject.source_remove(self.checker_callback_tag)
1091
718
self.checker_callback_tag = None
1092
719
if getattr(self, "checker", None) is None:
1093
720
return
1094
721
logger.debug("Stopping checker for %(name)s", vars(self))
1095
self.checker.terminate()
722
try:
723
os.kill(self.checker.pid, signal.SIGTERM)
724
#time.sleep(0.5)
725
#if self.checker.poll() is None:
726
# os.kill(self.checker.pid, signal.SIGKILL)
727
except OSError as error:
728
if error.errno != errno.ESRCH: # No such process
729
raise
1096
730
self.checker = None
1097
731
1098
732
1099
def dbus_service_property(dbus_interface,
1100
signature="v",
1101
access="readwrite",
1102
byte_arrays=False):
733
def dbus_service_property(dbus_interface, signature="v",
734
access="readwrite", byte_arrays=False):
1103
735
"""Decorators for marking methods of a DBusObjectWithProperties to
1104
736
become properties on the D-Bus.
1105
737
1114
746
# "Set" method, so we fail early here:
1115
747
if byte_arrays and signature != "ay":
1116
748
raise ValueError("Byte arrays not supported for non-'ay'"
1117
" signature {!r}".format(signature))
1118
749
" signature %r" % signature)
1119
750
def decorator(func):
1120
751
func._dbus_is_property = True
1121
752
func._dbus_interface = dbus_interface
1126
757
func._dbus_name = func._dbus_name[:-14]
1127
758
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
1128
759
return func
1129
1130
return decorator
1131
1132
1133
def dbus_interface_annotations(dbus_interface):
1134
"""Decorator for marking functions returning interface annotations
1135
1136
Usage:
1137
1138
@dbus_interface_annotations("org.example.Interface")
1139
def _foo(self): # Function name does not matter
1140
return {"org.freedesktop.DBus.Deprecated": "true",
1141
"org.freedesktop.DBus.Property.EmitsChangedSignal":
1142
"false"}
1143
"""
1144
1145
def decorator(func):
1146
func._dbus_is_interface = True
1147
func._dbus_interface = dbus_interface
1148
func._dbus_name = dbus_interface
1149
return func
1150
1151
return decorator
1152
1153
1154
def dbus_annotations(annotations):
1155
"""Decorator to annotate D-Bus methods, signals or properties
1156
Usage:
1157
1158
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
1159
"org.freedesktop.DBus.Property."
1160
"EmitsChangedSignal": "false"})
1161
@dbus_service_property("org.example.Interface", signature="b",
1162
access="r")
1163
def Property_dbus_property(self):
1164
return dbus.Boolean(False)
1165
1166
See also the DBusObjectWithAnnotations class.
1167
"""
1168
1169
def decorator(func):
1170
func._dbus_annotations = annotations
1171
return func
1172
1173
760
return decorator
1174
761
1175
762
1176
763
class DBusPropertyException(dbus.exceptions.DBusException):
1177
764
"""A base class for D-Bus property-related exceptions
1178
765
"""
1179
pass
766
def __unicode__(self):
767
return unicode(str(self))
1180
768
1181
769
1182
770
class DBusPropertyAccessException(DBusPropertyException):
1191
779
pass
1192
780
1193
781
1194
class DBusObjectWithAnnotations(dbus.service.Object):
1195
"""A D-Bus object with annotations.
1196
1197
Classes inheriting from this can use the dbus_annotations
1198
decorator to add annotations to methods or signals.
1199
"""
1200
1201
@staticmethod
1202
def _is_dbus_thing(thing):
1203
"""Returns a function testing if an attribute is a D-Bus thing
1204
1205
If called like _is_dbus_thing("method") it returns a function
1206
suitable for use as predicate to inspect.getmembers().
1207
"""
1208
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
1209
False)
1210
1211
def _get_all_dbus_things(self, thing):
1212
"""Returns a generator of (name, attribute) pairs
1213
"""
1214
return ((getattr(athing.__get__(self), "_dbus_name", name),
1215
athing.__get__(self))
1216
for cls in self.__class__.__mro__
1217
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):
782
class DBusObjectWithProperties(dbus.service.Object):
1284
783
"""A D-Bus object with properties.
1285
784
1286
785
Classes inheriting from this can use the dbus_service_property
1288
787
standard Get(), Set(), and GetAll() methods on the D-Bus.
1289
788
"""
1290
789
790
@staticmethod
791
def _is_dbus_property(obj):
792
return getattr(obj, "_dbus_is_property", False)
793
794
def _get_all_dbus_properties(self):
795
"""Returns a generator of (name, attribute) pairs
796
"""
797
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
798
for cls in self.__class__.__mro__
799
for name, prop in
800
inspect.getmembers(cls, self._is_dbus_property))
801
1291
802
def _get_dbus_property(self, interface_name, property_name):
1292
803
"""Returns a bound method if one exists which is a D-Bus
1293
804
property with the specified name and interface.
1294
805
"""
1295
for cls in self.__class__.__mro__:
1296
for name, value in inspect.getmembers(
1297
cls, self._is_dbus_thing("property")):
806
for cls in self.__class__.__mro__:
807
for name, value in (inspect.getmembers
808
(cls, self._is_dbus_property)):
1298
809
if (value._dbus_name == property_name
1299
810
and value._dbus_interface == interface_name):
1300
811
return value.__get__(self)
1301
812
1302
813
# 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",
814
raise DBusPropertyNotFound(self.dbus_object_path + ":"
815
+ interface_name + "."
816
+ property_name)
817
818
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
1317
819
out_signature="v")
1318
820
def Get(self, interface_name, property_name):
1319
821
"""Standard D-Bus property Get() method, see D-Bus standard.
1337
839
# The byte_arrays option is not supported yet on
1338
840
# signatures other than "ay".
1339
841
if prop._dbus_signature != "ay":
1340
raise ValueError("Byte arrays not supported for non-"
1341
"'ay' signature {!r}"
1342
.format(prop._dbus_signature))
1343
value = dbus.ByteArray(b''.join(chr(byte)
1344
for byte in value))
842
raise ValueError
843
value = dbus.ByteArray(''.join(unichr(byte)
844
for byte in value))
1345
845
prop(value)
1346
846
1347
@dbus.service.method(dbus.PROPERTIES_IFACE,
1348
in_signature="s",
847
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
1349
848
out_signature="a{sv}")
1350
849
def GetAll(self, interface_name):
1351
850
"""Standard D-Bus property GetAll() method, see D-Bus
1354
853
Note: Will not include properties with access="write".
1355
854
"""
1356
855
properties = {}
1357
for name, prop in self._get_all_dbus_things("property"):
856
for name, prop in self._get_all_dbus_properties():
1358
857
if (interface_name
1359
858
and interface_name != prop._dbus_interface):
1360
859
# Interface non-empty but did not match
1366
865
if not hasattr(value, "variant_level"):
1367
866
properties[name] = value
1368
867
continue
1369
properties[name] = type(value)(
1370
value, variant_level = value.variant_level + 1)
868
properties[name] = type(value)(value, variant_level=
869
value.variant_level+1)
1371
870
return dbus.Dictionary(properties, signature="sv")
1372
871
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
872
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1382
873
out_signature="s",
1383
874
path_keyword='object_path',
1384
875
connection_keyword='connection')
1385
876
def Introspect(self, object_path, connection):
1386
"""Overloading of standard D-Bus method.
1387
1388
Inserts property tags and interface annotation tags.
877
"""Standard D-Bus method, overloaded to insert property tags.
1389
878
"""
1390
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1391
object_path,
1392
connection)
879
xmlstring = dbus.service.Object.Introspect(self, object_path,
880
connection)
1393
881
try:
1394
882
document = xml.dom.minidom.parseString(xmlstring)
1395
1396
883
def make_tag(document, name, prop):
1397
884
e = document.createElement("property")
1398
885
e.setAttribute("name", name)
1399
886
e.setAttribute("type", prop._dbus_signature)
1400
887
e.setAttribute("access", prop._dbus_access)
1401
888
return e
1402
1403
889
for if_tag in document.getElementsByTagName("interface"):
1404
# Add property tags
1405
890
for tag in (make_tag(document, name, prop)
1406
891
for name, prop
1407
in self._get_all_dbus_things("property")
892
in self._get_all_dbus_properties()
1408
893
if prop._dbus_interface
1409
894
== if_tag.getAttribute("name")):
1410
895
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)
1427
896
# Add the names to the return values for the
1428
897
# "org.freedesktop.DBus.Properties" methods
1429
898
if (if_tag.getAttribute("name")
1444
913
except (AttributeError, xml.dom.DOMException,
1445
914
xml.parsers.expat.ExpatError) as error:
1446
915
logger.error("Failed to override Introspection method",
1447
exc_info=error)
1448
return xmlstring
1449
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
1519
def datetime_to_dbus(dt, variant_level=0):
916
error)
917
return xmlstring
918
919
920
def datetime_to_dbus (dt, variant_level=0):
1520
921
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1521
922
if dt is None:
1522
923
return dbus.String("", variant_level = variant_level)
1523
return dbus.String(dt.isoformat(), variant_level=variant_level)
1524
1525
1526
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1527
"""A class decorator; applied to a subclass of
1528
dbus.service.Object, it will add alternate D-Bus attributes with
1529
interface names according to the "alt_interface_names" mapping.
1530
Usage:
1531
1532
@alternate_dbus_interfaces({"org.example.Interface":
1533
"net.example.AlternateInterface"})
1534
class SampleDBusObject(dbus.service.Object):
1535
@dbus.service.method("org.example.Interface")
1536
def SampleDBusMethod():
1537
pass
1538
1539
The above "SampleDBusMethod" on "SampleDBusObject" will be
1540
reachable via two interfaces: "org.example.Interface" and
1541
"net.example.AlternateInterface", the latter of which will have
1542
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1543
"true", unless "deprecate" is passed with a False value.
1544
1545
This works for methods and signals, and also for D-Bus properties
1546
(from DBusObjectWithProperties) and interfaces (from the
1547
dbus_interface_annotations decorator).
924
return dbus.String(dt.isoformat(),
925
variant_level=variant_level)
926
927
928
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
929
.__metaclass__):
930
"""Applied to an empty subclass of a D-Bus object, this metaclass
931
will add additional D-Bus attributes matching a certain pattern.
1548
932
"""
1549
1550
def wrapper(cls):
1551
for orig_interface_name, alt_interface_name in (
1552
alt_interface_names.items()):
1553
attr = {}
1554
interface_names = set()
1555
# Go though all attributes of the class
1556
for attrname, attribute in inspect.getmembers(cls):
933
def __new__(mcs, name, bases, attr):
934
# Go through all the base classes which could have D-Bus
935
# methods, signals, or properties in them
936
for base in (b for b in bases
937
if issubclass(b, dbus.service.Object)):
938
# Go though all attributes of the base class
939
for attrname, attribute in inspect.getmembers(base):
1557
940
# Ignore non-D-Bus attributes, and D-Bus attributes
1558
941
# with the wrong interface name
1559
942
if (not hasattr(attribute, "_dbus_interface")
1560
or not attribute._dbus_interface.startswith(
1561
orig_interface_name)):
943
or not attribute._dbus_interface
944
.startswith("se.recompile.Mandos")):
1562
945
continue
1563
946
# Create an alternate D-Bus interface name based on
1564
947
# the current name
1565
alt_interface = attribute._dbus_interface.replace(
1566
orig_interface_name, alt_interface_name)
1567
interface_names.add(alt_interface)
948
alt_interface = (attribute._dbus_interface
949
.replace("se.recompile.Mandos",
950
"se.bsnet.fukt.Mandos"))
1568
951
# Is this a D-Bus signal?
1569
952
if getattr(attribute, "_dbus_is_signal", False):
1570
# Extract the original non-method undecorated
1571
# function by black magic
1572
if sys.version_info.major == 2:
1573
nonmethod_func = (dict(
953
# Extract the original non-method function by
954
# black magic
955
nonmethod_func = (dict(
1574
956
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)
957
attribute.__closure__))["func"]
958
.cell_contents)
1582
959
# Create a new, but exactly alike, function
1583
960
# object, and decorate it to be a new D-Bus signal
1584
961
# 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))
1589
# Copy annotations, if any
1590
try:
1591
new_function._dbus_annotations = dict(
1592
attribute._dbus_annotations)
1593
except AttributeError:
1594
pass
962
new_function = (dbus.service.signal
963
(alt_interface,
964
attribute._dbus_signature)
965
(types.FunctionType(
966
nonmethod_func.func_code,
967
nonmethod_func.func_globals,
968
nonmethod_func.func_name,
969
nonmethod_func.func_defaults,
970
nonmethod_func.func_closure)))
1595
971
# Define a creator of a function to call both the
1596
# original and alternate functions, so both the
1597
# original and alternate signals gets sent when
1598
# the function is called
972
# old and new functions, so both the old and new
973
# signals gets sent when the function is called
1599
974
def fixscope(func1, func2):
1600
975
"""This function is a scope container to pass
1601
976
func1 and func2 to the "call_both" function
1602
977
outside of its arguments"""
1603
1604
@functools.wraps(func2)
1605
978
def call_both(*args, **kwargs):
1606
979
"""This function will emit two D-Bus
1607
980
signals by calling func1 and func2"""
1608
981
func1(*args, **kwargs)
1609
982
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
983
return call_both
1616
984
# Create the "call_both" function and add it to
1617
985
# the class
1618
attr[attrname] = fixscope(attribute, new_function)
986
attr[attrname] = fixscope(attribute,
987
new_function)
1619
988
# Is this a D-Bus method?
1620
989
elif getattr(attribute, "_dbus_is_method", False):
1621
990
# Create a new, but exactly alike, function
1622
991
# object. Decorate it to be a new D-Bus method
1623
992
# with the alternate D-Bus interface name. Add it
1624
993
# 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)))
1631
# Copy annotations, if any
1632
try:
1633
attr[attrname]._dbus_annotations = dict(
1634
attribute._dbus_annotations)
1635
except AttributeError:
1636
pass
994
attr[attrname] = (dbus.service.method
995
(alt_interface,
996
attribute._dbus_in_signature,
997
attribute._dbus_out_signature)
998
(types.FunctionType
999
(attribute.func_code,
1000
attribute.func_globals,
1001
attribute.func_name,
1002
attribute.func_defaults,
1003
attribute.func_closure)))
1637
1004
# Is this a D-Bus property?
1638
1005
elif getattr(attribute, "_dbus_is_property", False):
1639
1006
# Create a new, but exactly alike, function
1640
1007
# object, and decorate it to be a new D-Bus
1641
1008
# property with the alternate D-Bus interface
1642
1009
# 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)))
1649
# Copy annotations, if any
1650
try:
1651
attr[attrname]._dbus_annotations = dict(
1652
attribute._dbus_annotations)
1653
except AttributeError:
1654
pass
1655
# Is this a D-Bus interface?
1656
elif getattr(attribute, "_dbus_is_interface", False):
1657
# Create a new, but exactly alike, function
1658
# object. Decorate it to be a new D-Bus interface
1659
# with the alternate D-Bus interface name. Add it
1660
# to the class.
1661
attr[attrname] = (
1662
dbus_interface_annotations(alt_interface)
1663
(copy_function(attribute)))
1664
if deprecate:
1665
# Deprecate all alternate interfaces
1666
iname="_AlternateDBusNames_interface_annotation{}"
1667
for interface_name in interface_names:
1668
1669
@dbus_interface_annotations(interface_name)
1670
def func(self):
1671
return { "org.freedesktop.DBus.Deprecated":
1672
"true" }
1673
# Find an unused name
1674
for aname in (iname.format(i)
1675
for i in itertools.count()):
1676
if aname not in attr:
1677
attr[aname] = func
1678
break
1679
if interface_names:
1680
# Replace the class with a new subclass of it with
1681
# 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)
1688
return cls
1689
1690
return wrapper
1691
1692
1693
@alternate_dbus_interfaces({"se.recompile.Mandos":
1694
"se.bsnet.fukt.Mandos"})
1010
attr[attrname] = (dbus_service_property
1011
(alt_interface,
1012
attribute._dbus_signature,
1013
attribute._dbus_access,
1014
attribute
1015
._dbus_get_args_options
1016
["byte_arrays"])
1017
(types.FunctionType
1018
(attribute.func_code,
1019
attribute.func_globals,
1020
attribute.func_name,
1021
attribute.func_defaults,
1022
attribute.func_closure)))
1023
return type.__new__(mcs, name, bases, attr)
1024
1025
1695
1026
class ClientDBus(Client, DBusObjectWithProperties):
1696
1027
"""A Client class using D-Bus
1697
1028
1701
1032
"""
1702
1033
1703
1034
runtime_expansions = (Client.runtime_expansions
1704
+ ("dbus_object_path", ))
1705
1706
_interface = "se.recompile.Mandos.Client"
1035
+ ("dbus_object_path",))
1707
1036
1708
1037
# dbus.service.Object doesn't use super(), so we can't either.
1709
1038
1710
1039
def __init__(self, bus = None, *args, **kwargs):
1711
1040
self.bus = bus
1712
1041
Client.__init__(self, *args, **kwargs)
1042
self._approvals_pending = 0
1043
1044
self._approvals_pending = 0
1713
1045
# Only now, when this client is initialized, can it show up on
1714
1046
# the D-Bus
1715
client_object_name = str(self.name).translate(
1047
client_object_name = unicode(self.name).translate(
1716
1048
{ord("."): ord("_"),
1717
1049
ord("-"): ord("_")})
1718
self.dbus_object_path = dbus.ObjectPath(
1719
"/clients/" + client_object_name)
1050
self.dbus_object_path = (dbus.ObjectPath
1051
("/clients/" + client_object_name))
1720
1052
DBusObjectWithProperties.__init__(self, self.bus,
1721
1053
self.dbus_object_path)
1722
1723
def notifychangeproperty(transform_func, dbus_name,
1724
type_func=lambda x: x,
1725
variant_level=1,
1726
invalidate_only=False,
1727
_interface=_interface):
1054
1055
def notifychangeproperty(transform_func,
1056
dbus_name, type_func=lambda x: x,
1057
variant_level=1):
1728
1058
""" Modify a variable so that it's a property which announces
1729
1059
its changes to DBus.
1730
1060
1735
1065
to the D-Bus. Default: no transform
1736
1066
variant_level: D-Bus variant level. Default: 1
1737
1067
"""
1738
attrname = "_{}".format(dbus_name)
1739
1068
attrname = "_{0}".format(dbus_name)
1740
1069
def setter(self, value):
1741
1070
if hasattr(self, "dbus_object_path"):
1742
1071
if (not hasattr(self, attrname) or
1743
1072
type_func(getattr(self, attrname, None))
1744
1073
!= 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())
1074
dbus_value = transform_func(type_func(value),
1075
variant_level
1076
=variant_level)
1077
self.PropertyChanged(dbus.String(dbus_name),
1078
dbus_value)
1760
1079
setattr(self, attrname, value)
1761
1080
1762
1081
return property(lambda self: getattr(self, attrname), setter)
1763
1082
1083
1764
1084
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1765
1085
approvals_pending = notifychangeproperty(dbus.Boolean,
1766
1086
"ApprovalPending",
1768
1088
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1769
1089
last_enabled = notifychangeproperty(datetime_to_dbus,
1770
1090
"LastEnabled")
1771
checker = notifychangeproperty(
1772
dbus.Boolean, "CheckerRunning",
1773
type_func = lambda checker: checker is not None)
1091
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1092
type_func = lambda checker:
1093
checker is not None)
1774
1094
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1775
1095
"LastCheckedOK")
1776
last_checker_status = notifychangeproperty(dbus.Int16,
1777
"LastCheckerStatus")
1778
1096
last_approval_request = notifychangeproperty(
1779
1097
datetime_to_dbus, "LastApprovalRequest")
1780
1098
approved_by_default = notifychangeproperty(dbus.Boolean,
1781
1099
"ApprovedByDefault")
1782
approval_delay = notifychangeproperty(
1783
dbus.UInt64, "ApprovalDelay",
1784
type_func = lambda td: td.total_seconds() * 1000)
1100
approval_delay = notifychangeproperty(dbus.UInt64,
1101
"ApprovalDelay",
1102
type_func =
1103
timedelta_to_milliseconds)
1785
1104
approval_duration = notifychangeproperty(
1786
1105
dbus.UInt64, "ApprovalDuration",
1787
type_func = lambda td: td.total_seconds() * 1000)
1106
type_func = timedelta_to_milliseconds)
1788
1107
host = notifychangeproperty(dbus.String, "Host")
1789
timeout = notifychangeproperty(
1790
dbus.UInt64, "Timeout",
1791
type_func = lambda td: td.total_seconds() * 1000)
1108
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1109
type_func =
1110
timedelta_to_milliseconds)
1792
1111
extended_timeout = notifychangeproperty(
1793
1112
dbus.UInt64, "ExtendedTimeout",
1794
type_func = lambda td: td.total_seconds() * 1000)
1795
interval = notifychangeproperty(
1796
dbus.UInt64, "Interval",
1797
type_func = lambda td: td.total_seconds() * 1000)
1113
type_func = timedelta_to_milliseconds)
1114
interval = notifychangeproperty(dbus.UInt64,
1115
"Interval",
1116
type_func =
1117
timedelta_to_milliseconds)
1798
1118
checker_command = notifychangeproperty(dbus.String, "Checker")
1799
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1800
invalidate_only=True)
1801
1119
1802
1120
del notifychangeproperty
1803
1121
1810
1128
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1811
1129
Client.__del__(self, *args, **kwargs)
1812
1130
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:
1131
def checker_callback(self, pid, condition, command,
1132
*args, **kwargs):
1133
self.checker_callback_tag = None
1134
self.checker = None
1135
if os.WIFEXITED(condition):
1136
exitstatus = os.WEXITSTATUS(condition)
1820
1137
# Emit D-Bus signal
1821
1138
self.CheckerCompleted(dbus.Int16(exitstatus),
1822
# This is specific to GNU libC
1823
dbus.Int64(exitstatus << 8),
1139
dbus.Int64(condition),
1824
1140
dbus.String(command))
1825
1141
else:
1826
1142
# Emit D-Bus signal
1827
1143
self.CheckerCompleted(dbus.Int16(-1),
1828
dbus.Int64(
1829
# This is specific to GNU libC
1830
(exitstatus << 8)
1831
| self.last_checker_signal),
1144
dbus.Int64(condition),
1832
1145
dbus.String(command))
1833
return ret
1146
1147
return Client.checker_callback(self, pid, condition, command,
1148
*args, **kwargs)
1834
1149
1835
1150
def start_checker(self, *args, **kwargs):
1836
old_checker_pid = getattr(self.checker, "pid", None)
1151
old_checker = self.checker
1152
if self.checker is not None:
1153
old_checker_pid = self.checker.pid
1154
else:
1155
old_checker_pid = None
1837
1156
r = Client.start_checker(self, *args, **kwargs)
1838
1157
# Only if new checker process was started
1839
1158
if (self.checker is not None
1847
1166
return False
1848
1167
1849
1168
def approve(self, value=True):
1169
self.send_changedstate()
1850
1170
self.approved = value
1851
GLib.timeout_add(int(self.approval_duration.total_seconds()
1852
* 1000), self._reset_approved)
1853
self.send_changedstate()
1171
gobject.timeout_add(timedelta_to_milliseconds
1172
(self.approval_duration),
1173
self._reset_approved)
1174
1854
1175
1855
1176
## D-Bus methods, signals & properties
1856
1857
## Interfaces
1177
_interface = "se.recompile.Mandos.Client"
1858
1178
1859
1179
## Signals
1860
1180
1871
1191
pass
1872
1192
1873
1193
# PropertyChanged - signal
1874
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1875
1194
@dbus.service.signal(_interface, signature="sv")
1876
1195
def PropertyChanged(self, property, value):
1877
1196
"D-Bus signal"
1898
1217
"D-Bus signal"
1899
1218
return self.need_approval()
1900
1219
1220
# NeRwequest - signal
1221
@dbus.service.signal(_interface, signature="s")
1222
def NewRequest(self, ip):
1223
"""D-Bus signal
1224
Is sent after a client request a password.
1225
"""
1226
pass
1227
1901
1228
## Methods
1902
1229
1903
1230
# Approve - method
1911
1238
self.checked_ok()
1912
1239
1913
1240
# Enable - method
1914
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1915
1241
@dbus.service.method(_interface)
1916
1242
def Enable(self):
1917
1243
"D-Bus method"
1918
1244
self.enable()
1919
1245
1920
1246
# StartChecker - method
1921
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1922
1247
@dbus.service.method(_interface)
1923
1248
def StartChecker(self):
1924
1249
"D-Bus method"
1925
1250
self.start_checker()
1926
1251
1927
1252
# Disable - method
1928
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1929
1253
@dbus.service.method(_interface)
1930
1254
def Disable(self):
1931
1255
"D-Bus method"
1932
1256
self.disable()
1933
1257
1934
1258
# StopChecker - method
1935
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1936
1259
@dbus.service.method(_interface)
1937
1260
def StopChecker(self):
1938
1261
self.stop_checker()
1945
1268
return dbus.Boolean(bool(self.approvals_pending))
1946
1269
1947
1270
# ApprovedByDefault - property
1948
@dbus_service_property(_interface,
1949
signature="b",
1271
@dbus_service_property(_interface, signature="b",
1950
1272
access="readwrite")
1951
1273
def ApprovedByDefault_dbus_property(self, value=None):
1952
1274
if value is None: # get
1954
1276
self.approved_by_default = bool(value)
1955
1277
1956
1278
# ApprovalDelay - property
1957
@dbus_service_property(_interface,
1958
signature="t",
1279
@dbus_service_property(_interface, signature="t",
1959
1280
access="readwrite")
1960
1281
def ApprovalDelay_dbus_property(self, value=None):
1961
1282
if value is None: # get
1962
return dbus.UInt64(self.approval_delay.total_seconds()
1963
* 1000)
1283
return dbus.UInt64(self.approval_delay_milliseconds())
1964
1284
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1965
1285
1966
1286
# ApprovalDuration - property
1967
@dbus_service_property(_interface,
1968
signature="t",
1287
@dbus_service_property(_interface, signature="t",
1969
1288
access="readwrite")
1970
1289
def ApprovalDuration_dbus_property(self, value=None):
1971
1290
if value is None: # get
1972
return dbus.UInt64(self.approval_duration.total_seconds()
1973
* 1000)
1291
return dbus.UInt64(timedelta_to_milliseconds(
1292
self.approval_duration))
1974
1293
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1975
1294
1976
1295
# Name - property
1977
@dbus_annotations(
1978
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1979
1296
@dbus_service_property(_interface, signature="s", access="read")
1980
1297
def Name_dbus_property(self):
1981
1298
return dbus.String(self.name)
1982
1299
1983
1300
# Fingerprint - property
1984
@dbus_annotations(
1985
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1986
1301
@dbus_service_property(_interface, signature="s", access="read")
1987
1302
def Fingerprint_dbus_property(self):
1988
1303
return dbus.String(self.fingerprint)
1989
1304
1990
1305
# Host - property
1991
@dbus_service_property(_interface,
1992
signature="s",
1306
@dbus_service_property(_interface, signature="s",
1993
1307
access="readwrite")
1994
1308
def Host_dbus_property(self, value=None):
1995
1309
if value is None: # get
1996
1310
return dbus.String(self.host)
1997
self.host = str(value)
1311
self.host = unicode(value)
1998
1312
1999
1313
# Created - property
2000
@dbus_annotations(
2001
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
2002
1314
@dbus_service_property(_interface, signature="s", access="read")
2003
1315
def Created_dbus_property(self):
2004
1316
return datetime_to_dbus(self.created)
2009
1321
return datetime_to_dbus(self.last_enabled)
2010
1322
2011
1323
# Enabled - property
2012
@dbus_service_property(_interface,
2013
signature="b",
1324
@dbus_service_property(_interface, signature="b",
2014
1325
access="readwrite")
2015
1326
def Enabled_dbus_property(self, value=None):
2016
1327
if value is None: # get
2021
1332
self.disable()
2022
1333
2023
1334
# LastCheckedOK - property
2024
@dbus_service_property(_interface,
2025
signature="s",
1335
@dbus_service_property(_interface, signature="s",
2026
1336
access="readwrite")
2027
1337
def LastCheckedOK_dbus_property(self, value=None):
2028
1338
if value is not None:
2030
1340
return
2031
1341
return datetime_to_dbus(self.last_checked_ok)
2032
1342
2033
# LastCheckerStatus - property
2034
@dbus_service_property(_interface, signature="n", access="read")
2035
def LastCheckerStatus_dbus_property(self):
2036
return dbus.Int16(self.last_checker_status)
2037
2038
1343
# Expires - property
2039
1344
@dbus_service_property(_interface, signature="s", access="read")
2040
1345
def Expires_dbus_property(self):
2046
1351
return datetime_to_dbus(self.last_approval_request)
2047
1352
2048
1353
# Timeout - property
2049
@dbus_service_property(_interface,
2050
signature="t",
1354
@dbus_service_property(_interface, signature="t",
2051
1355
access="readwrite")
2052
1356
def Timeout_dbus_property(self, value=None):
2053
1357
if value is None: # get
2054
return dbus.UInt64(self.timeout.total_seconds() * 1000)
2055
old_timeout = self.timeout
1358
return dbus.UInt64(self.timeout_milliseconds())
2056
1359
self.timeout = datetime.timedelta(0, 0, 0, value)
2057
# Reschedule disabling
2058
if self.enabled:
2059
now = datetime.datetime.utcnow()
2060
self.expires += self.timeout - old_timeout
2061
if self.expires <= now:
2062
# The timeout has passed
2063
self.disable()
2064
else:
2065
if (getattr(self, "disable_initiator_tag", None)
2066
is None):
2067
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)
1360
if getattr(self, "disable_initiator_tag", None) is None:
1361
return
1362
# Reschedule timeout
1363
gobject.source_remove(self.disable_initiator_tag)
1364
self.disable_initiator_tag = None
1365
self.expires = None
1366
time_to_die = timedelta_to_milliseconds((self
1367
.last_checked_ok
1368
+ self.timeout)
1369
- datetime.datetime
1370
.utcnow())
1371
if time_to_die <= 0:
1372
# The timeout has passed
1373
self.disable()
1374
else:
1375
self.expires = (datetime.datetime.utcnow()
1376
+ datetime.timedelta(milliseconds =
1377
time_to_die))
1378
self.disable_initiator_tag = (gobject.timeout_add
1379
(time_to_die, self.disable))
2072
1380
2073
1381
# ExtendedTimeout - property
2074
@dbus_service_property(_interface,
2075
signature="t",
1382
@dbus_service_property(_interface, signature="t",
2076
1383
access="readwrite")
2077
1384
def ExtendedTimeout_dbus_property(self, value=None):
2078
1385
if value is None: # get
2079
return dbus.UInt64(self.extended_timeout.total_seconds()
2080
* 1000)
1386
return dbus.UInt64(self.extended_timeout_milliseconds())
2081
1387
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
2082
1388
2083
1389
# Interval - property
2084
@dbus_service_property(_interface,
2085
signature="t",
1390
@dbus_service_property(_interface, signature="t",
2086
1391
access="readwrite")
2087
1392
def Interval_dbus_property(self, value=None):
2088
1393
if value is None: # get
2089
return dbus.UInt64(self.interval.total_seconds() * 1000)
1394
return dbus.UInt64(self.interval_milliseconds())
2090
1395
self.interval = datetime.timedelta(0, 0, 0, value)
2091
1396
if getattr(self, "checker_initiator_tag", None) is None:
2092
1397
return
2093
1398
if self.enabled:
2094
1399
# 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
1400
gobject.source_remove(self.checker_initiator_tag)
1401
self.checker_initiator_tag = (gobject.timeout_add
1402
(value, self.start_checker))
1403
self.start_checker() # Start one now, too
2099
1404
2100
1405
# Checker - property
2101
@dbus_service_property(_interface,
2102
signature="s",
1406
@dbus_service_property(_interface, signature="s",
2103
1407
access="readwrite")
2104
1408
def Checker_dbus_property(self, value=None):
2105
1409
if value is None: # get
2106
1410
return dbus.String(self.checker_command)
2107
self.checker_command = str(value)
1411
self.checker_command = unicode(value)
2108
1412
2109
1413
# CheckerRunning - property
2110
@dbus_service_property(_interface,
2111
signature="b",
1414
@dbus_service_property(_interface, signature="b",
2112
1415
access="readwrite")
2113
1416
def CheckerRunning_dbus_property(self, value=None):
2114
1417
if value is None: # get
2119
1422
self.stop_checker()
2120
1423
2121
1424
# ObjectPath - property
2122
@dbus_annotations(
2123
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2124
"org.freedesktop.DBus.Deprecated": "true"})
2125
1425
@dbus_service_property(_interface, signature="o", access="read")
2126
1426
def ObjectPath_dbus_property(self):
2127
1427
return self.dbus_object_path # is already a dbus.ObjectPath
2128
1428
2129
1429
# 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)
1430
@dbus_service_property(_interface, signature="ay",
1431
access="write", byte_arrays=True)
2137
1432
def Secret_dbus_property(self, value):
2138
self.secret = bytes(value)
1433
self.secret = str(value)
2139
1434
2140
1435
del _interface
2141
1436
2145
1440
self._pipe = child_pipe
2146
1441
self._pipe.send(('init', fpr, address))
2147
1442
if not self._pipe.recv():
2148
raise KeyError(fpr)
1443
raise KeyError()
2149
1444
2150
1445
def __getattribute__(self, name):
2151
1446
if name == '_pipe':
2155
1450
if data[0] == 'data':
2156
1451
return data[1]
2157
1452
if data[0] == 'function':
2158
2159
1453
def func(*args, **kwargs):
2160
1454
self._pipe.send(('funcall', name, args, kwargs))
2161
1455
return self._pipe.recv()[1]
2162
2163
1456
return func
2164
1457
2165
1458
def __setattr__(self, name, value):
2168
1461
self._pipe.send(('setattr', name, value))
2169
1462
2170
1463
1464
class ClientDBusTransitional(ClientDBus):
1465
__metaclass__ = AlternateDBusNamesMetaclass
1466
1467
2171
1468
class ClientHandler(socketserver.BaseRequestHandler, object):
2172
1469
"""A class to handle client connections.
2173
1470
2177
1474
def handle(self):
2178
1475
with contextlib.closing(self.server.child_pipe) as child_pipe:
2179
1476
logger.info("TCP connection from: %s",
2180
str(self.client_address))
1477
unicode(self.client_address))
2181
1478
logger.debug("Pipe FD: %d",
2182
1479
self.server.child_pipe.fileno())
2183
1480
2184
session = gnutls.ClientSession(self.request)
1481
session = (gnutls.connection
1482
.ClientSession(self.request,
1483
gnutls.connection
1484
.X509Credentials()))
1485
1486
# Note: gnutls.connection.X509Credentials is really a
1487
# generic GnuTLS certificate credentials object so long as
1488
# no X.509 keys are added to it. Therefore, we can use it
1489
# here despite using OpenPGP certificates.
2185
1490
2186
1491
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2187
1492
# "+AES-256-CBC", "+SHA1",
2191
1496
priority = self.server.gnutls_priority
2192
1497
if priority is None:
2193
1498
priority = "NORMAL"
2194
gnutls.priority_set_direct(session._c_object,
2195
priority.encode("utf-8"),
2196
None)
1499
(gnutls.library.functions
1500
.gnutls_priority_set_direct(session._c_object,
1501
priority, None))
2197
1502
2198
1503
# Start communication using the Mandos protocol
2199
1504
# Get protocol number
2201
1506
logger.debug("Protocol version: %r", line)
2202
1507
try:
2203
1508
if int(line.strip().split()[0]) > 1:
2204
raise RuntimeError(line)
1509
raise RuntimeError
2205
1510
except (ValueError, IndexError, RuntimeError) as error:
2206
1511
logger.error("Unknown protocol version: %s", error)
2207
1512
return
2209
1514
# Start GnuTLS connection
2210
1515
try:
2211
1516
session.handshake()
2212
except gnutls.Error as error:
1517
except gnutls.errors.GNUTLSError as error:
2213
1518
logger.warning("Handshake failed: %s", error)
2214
1519
# Do not run session.bye() here: the session is not
2215
1520
# established. Just abandon the request.
2219
1524
approval_required = False
2220
1525
try:
2221
1526
try:
2222
fpr = self.fingerprint(
2223
self.peer_certificate(session))
2224
except (TypeError, gnutls.Error) as error:
1527
fpr = self.fingerprint(self.peer_certificate
1528
(session))
1529
except (TypeError,
1530
gnutls.errors.GNUTLSError) as error:
2225
1531
logger.warning("Bad certificate: %s", error)
2226
1532
return
2227
1533
logger.debug("Fingerprint: %s", fpr)
2232
1538
except KeyError:
2233
1539
return
2234
1540
1541
if self.server.use_dbus:
1542
# Emit D-Bus signal
1543
client.NewRequest(str(self.client_address))
1544
2235
1545
if client.approval_delay:
2236
1546
delay = client.approval_delay
2237
1547
client.approvals_pending += 1
2240
1550
while True:
2241
1551
if not client.enabled:
2242
1552
logger.info("Client %s is disabled",
2243
client.name)
1553
client.name)
2244
1554
if self.server.use_dbus:
2245
1555
# Emit D-Bus signal
2246
1556
client.Rejected("Disabled")
2255
1565
if self.server.use_dbus:
2256
1566
# Emit D-Bus signal
2257
1567
client.NeedApproval(
2258
client.approval_delay.total_seconds()
2259
* 1000, client.approved_by_default)
1568
client.approval_delay_milliseconds(),
1569
client.approved_by_default)
2260
1570
else:
2261
1571
logger.warning("Client %s was not approved",
2262
1572
client.name)
2268
1578
#wait until timeout or approved
2269
1579
time = datetime.datetime.now()
2270
1580
client.changedstate.acquire()
2271
client.changedstate.wait(delay.total_seconds())
1581
(client.changedstate.wait
1582
(float(client.timedelta_to_milliseconds(delay)
1583
/ 1000)))
2272
1584
client.changedstate.release()
2273
1585
time2 = datetime.datetime.now()
2274
1586
if (time2 - time) >= delay:
2285
1597
else:
2286
1598
delay -= time2 - time
2287
1599
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
1600
sent_size = 0
1601
while sent_size < len(client.secret):
1602
try:
1603
sent = session.send(client.secret[sent_size:])
1604
except gnutls.errors.GNUTLSError as error:
1605
logger.warning("gnutls send failed")
1606
return
1607
logger.debug("Sent: %d, remaining: %d",
1608
sent, len(client.secret)
1609
- (sent_size + sent))
1610
sent_size += sent
2294
1611
2295
1612
logger.info("Sending secret to %s", client.name)
2296
1613
# bump the timeout using extended_timeout
2297
client.bump_timeout(client.extended_timeout)
1614
client.checked_ok(client.extended_timeout)
2298
1615
if self.server.use_dbus:
2299
1616
# Emit D-Bus signal
2300
1617
client.GotSecret()
2304
1621
client.approvals_pending -= 1
2305
1622
try:
2306
1623
session.bye()
2307
except gnutls.Error as error:
2308
logger.warning("GnuTLS bye failed",
2309
exc_info=error)
1624
except gnutls.errors.GNUTLSError as error:
1625
logger.warning("GnuTLS bye failed")
2310
1626
2311
1627
@staticmethod
2312
1628
def peer_certificate(session):
2313
1629
"Return the peer's OpenPGP certificate as a bytestring"
2314
1630
# 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""
1631
if (gnutls.library.functions
1632
.gnutls_certificate_type_get(session._c_object)
1633
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1634
# ...do the normal thing
1635
return session.peer_certificate
2319
1636
list_size = ctypes.c_uint(1)
2320
cert_list = (gnutls.certificate_get_peers
1637
cert_list = (gnutls.library.functions
1638
.gnutls_certificate_get_peers
2321
1639
(session._c_object, ctypes.byref(list_size)))
2322
1640
if not bool(cert_list) and list_size.value != 0:
2323
raise gnutls.Error("error getting peer certificate")
1641
raise gnutls.errors.GNUTLSError("error getting peer"
1642
" certificate")
2324
1643
if list_size.value == 0:
2325
1644
return None
2326
1645
cert = cert_list[0]
2330
1649
def fingerprint(openpgp):
2331
1650
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2332
1651
# 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)))
1652
datum = (gnutls.library.types
1653
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1654
ctypes.POINTER
1655
(ctypes.c_ubyte)),
1656
ctypes.c_uint(len(openpgp))))
2337
1657
# New empty GnuTLS certificate
2338
crt = gnutls.openpgp_crt_t()
2339
gnutls.openpgp_crt_init(ctypes.byref(crt))
1658
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1659
(gnutls.library.functions
1660
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
2340
1661
# Import the OpenPGP public key into the certificate
2341
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2342
gnutls.OPENPGP_FMT_RAW)
1662
(gnutls.library.functions
1663
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1664
gnutls.library.constants
1665
.GNUTLS_OPENPGP_FMT_RAW))
2343
1666
# Verify the self signature in the key
2344
1667
crtverify = ctypes.c_uint()
2345
gnutls.openpgp_crt_verify_self(crt, 0,
2346
ctypes.byref(crtverify))
1668
(gnutls.library.functions
1669
.gnutls_openpgp_crt_verify_self(crt, 0,
1670
ctypes.byref(crtverify)))
2347
1671
if crtverify.value != 0:
2348
gnutls.openpgp_crt_deinit(crt)
2349
raise gnutls.CertificateSecurityError("Verify failed")
1672
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1673
raise (gnutls.errors.CertificateSecurityError
1674
("Verify failed"))
2350
1675
# New buffer for the fingerprint
2351
1676
buf = ctypes.create_string_buffer(20)
2352
1677
buf_len = ctypes.c_size_t()
2353
1678
# Get the fingerprint from the certificate into the buffer
2354
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2355
ctypes.byref(buf_len))
1679
(gnutls.library.functions
1680
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1681
ctypes.byref(buf_len)))
2356
1682
# Deinit the certificate
2357
gnutls.openpgp_crt_deinit(crt)
1683
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2358
1684
# Convert the buffer to a Python bytestring
2359
1685
fpr = ctypes.string_at(buf, buf_len.value)
2360
1686
# Convert the bytestring to hexadecimal notation
2364
1690
2365
1691
class MultiprocessingMixIn(object):
2366
1692
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
2367
2368
1693
def sub_process_main(self, request, address):
2369
1694
try:
2370
1695
self.finish_request(request, address)
2375
1700
def process_request(self, request, address):
2376
1701
"""Start a new process to process the request."""
2377
1702
proc = multiprocessing.Process(target = self.sub_process_main,
2378
args = (request, address))
1703
args = (request,
1704
address))
2379
1705
proc.start()
2380
1706
return proc
2381
1707
2382
1708
2383
1709
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
2384
1710
""" adds a pipe to the MixIn """
2385
2386
1711
def process_request(self, request, client_address):
2387
1712
"""Overrides and wraps the original process_request().
2388
1713
2397
1722
2398
1723
def add_pipe(self, parent_pipe, proc):
2399
1724
"""Dummy function; override as necessary"""
2400
raise NotImplementedError()
1725
raise NotImplementedError
2401
1726
2402
1727
2403
1728
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
2409
1734
interface: None or a network interface name (string)
2410
1735
use_ipv6: Boolean; to use IPv6 or not
2411
1736
"""
2412
2413
1737
def __init__(self, server_address, RequestHandlerClass,
2414
interface=None,
2415
use_ipv6=True,
2416
socketfd=None):
2417
"""If socketfd is set, use that file descriptor instead of
2418
creating a new one with socket.socket().
2419
"""
1738
interface=None, use_ipv6=True):
2420
1739
self.interface = interface
2421
1740
if use_ipv6:
2422
1741
self.address_family = socket.AF_INET6
2423
if socketfd is not None:
2424
# Save the file descriptor
2425
self.socketfd = socketfd
2426
# Save the original socket.socket() function
2427
self.socket_socket = socket.socket
2428
# To implement --socket, we monkey patch socket.socket.
2429
#
2430
# (When socketserver.TCPServer is a new-style class, we
2431
# could make self.socket into a property instead of monkey
2432
# patching socket.socket.)
2433
#
2434
# Create a one-time-only replacement for socket.socket()
2435
@functools.wraps(socket.socket)
2436
def socket_wrapper(*args, **kwargs):
2437
# Restore original function so subsequent calls are
2438
# not affected.
2439
socket.socket = self.socket_socket
2440
del self.socket_socket
2441
# This time only, return a new socket object from the
2442
# saved file descriptor.
2443
return socket.fromfd(self.socketfd, *args, **kwargs)
2444
# Replace socket.socket() function with wrapper
2445
socket.socket = socket_wrapper
2446
# The socketserver.TCPServer.__init__ will call
2447
# socket.socket(), which might be our replacement,
2448
# socket_wrapper(), if socketfd was set.
2449
1742
socketserver.TCPServer.__init__(self, server_address,
2450
1743
RequestHandlerClass)
2451
2452
1744
def server_bind(self):
2453
1745
"""This overrides the normal server_bind() function
2454
1746
to bind to an interface if one was specified, and also NOT to
2455
1747
bind to an address or port if they were not specified."""
2456
1748
if self.interface is not None:
2457
1749
if SO_BINDTODEVICE is None:
2458
# Fall back to a hard-coded value which seems to be
2459
# common enough.
2460
logger.warning("SO_BINDTODEVICE not found, trying 25")
2461
SO_BINDTODEVICE = 25
2462
try:
2463
self.socket.setsockopt(
2464
socket.SOL_SOCKET, SO_BINDTODEVICE,
2465
(self.interface + "\0").encode("utf-8"))
2466
except socket.error as error:
2467
if error.errno == errno.EPERM:
2468
logger.error("No permission to bind to"
2469
" interface %s", self.interface)
2470
elif error.errno == errno.ENOPROTOOPT:
2471
logger.error("SO_BINDTODEVICE not available;"
2472
" cannot bind to interface %s",
2473
self.interface)
2474
elif error.errno == errno.ENODEV:
2475
logger.error("Interface %s does not exist,"
2476
" cannot bind", self.interface)
2477
else:
2478
raise
1750
logger.error("SO_BINDTODEVICE does not exist;"
1751
" cannot bind to interface %s",
1752
self.interface)
1753
else:
1754
try:
1755
self.socket.setsockopt(socket.SOL_SOCKET,
1756
SO_BINDTODEVICE,
1757
str(self.interface
1758
+ '\0'))
1759
except socket.error as error:
1760
if error[0] == errno.EPERM:
1761
logger.error("No permission to"
1762
" bind to interface %s",
1763
self.interface)
1764
elif error[0] == errno.ENOPROTOOPT:
1765
logger.error("SO_BINDTODEVICE not available;"
1766
" cannot bind to interface %s",
1767
self.interface)
1768
else:
1769
raise
2479
1770
# Only bind(2) the socket if we really need to.
2480
1771
if self.server_address[0] or self.server_address[1]:
2481
1772
if not self.server_address[0]:
2482
1773
if self.address_family == socket.AF_INET6:
2483
1774
any_address = "::" # in6addr_any
2484
1775
else:
2485
any_address = "0.0.0.0" # INADDR_ANY
1776
any_address = socket.INADDR_ANY
2486
1777
self.server_address = (any_address,
2487
1778
self.server_address[1])
2488
1779
elif not self.server_address[1]:
2489
self.server_address = (self.server_address[0], 0)
1780
self.server_address = (self.server_address[0],
1781
0)
2490
1782
# if self.interface:
2491
1783
# self.server_address = (self.server_address[0],
2492
1784
# 0, # port
2504
1796
gnutls_priority GnuTLS priority string
2505
1797
use_dbus: Boolean; to emit D-Bus signals or not
2506
1798
2507
Assumes a GLib.MainLoop event loop.
1799
Assumes a gobject.MainLoop event loop.
2508
1800
"""
2509
2510
1801
def __init__(self, server_address, RequestHandlerClass,
2511
interface=None,
2512
use_ipv6=True,
2513
clients=None,
2514
gnutls_priority=None,
2515
use_dbus=True,
2516
socketfd=None):
1802
interface=None, use_ipv6=True, clients=None,
1803
gnutls_priority=None, use_dbus=True):
2517
1804
self.enabled = False
2518
1805
self.clients = clients
2519
1806
if self.clients is None:
2523
1810
IPv6_TCPServer.__init__(self, server_address,
2524
1811
RequestHandlerClass,
2525
1812
interface = interface,
2526
use_ipv6 = use_ipv6,
2527
socketfd = socketfd)
2528
1813
use_ipv6 = use_ipv6)
2529
1814
def server_activate(self):
2530
1815
if self.enabled:
2531
1816
return socketserver.TCPServer.server_activate(self)
2535
1820
2536
1821
def add_pipe(self, parent_pipe, proc):
2537
1822
# Call "handle_ipc" for both data and EOF events
2538
GLib.io_add_watch(
2539
parent_pipe.fileno(),
2540
GLib.IO_IN | GLib.IO_HUP,
2541
functools.partial(self.handle_ipc,
2542
parent_pipe = parent_pipe,
2543
proc = proc))
1823
gobject.io_add_watch(parent_pipe.fileno(),
1824
gobject.IO_IN | gobject.IO_HUP,
1825
functools.partial(self.handle_ipc,
1826
parent_pipe =
1827
parent_pipe,
1828
proc = proc))
2544
1829
2545
def handle_ipc(self, source, condition,
2546
parent_pipe=None,
2547
proc = None,
2548
client_object=None):
1830
def handle_ipc(self, source, condition, parent_pipe=None,
1831
proc = None, client_object=None):
1832
condition_names = {
1833
gobject.IO_IN: "IN", # There is data to read.
1834
gobject.IO_OUT: "OUT", # Data can be written (without
1835
# blocking).
1836
gobject.IO_PRI: "PRI", # There is urgent data to read.
1837
gobject.IO_ERR: "ERR", # Error condition.
1838
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1839
# broken, usually for pipes and
1840
# sockets).
1841
}
1842
conditions_string = ' | '.join(name
1843
for cond, name in
1844
condition_names.iteritems()
1845
if cond & condition)
2549
1846
# error, or the other end of multiprocessing.Pipe has closed
2550
if condition & (GLib.IO_ERR | GLib.IO_HUP):
1847
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2551
1848
# Wait for other process to exit
2552
1849
proc.join()
2553
1850
return False
2560
1857
fpr = request[1]
2561
1858
address = request[2]
2562
1859
2563
for c in self.clients.values():
1860
for c in self.clients.itervalues():
2564
1861
if c.fingerprint == fpr:
2565
1862
client = c
2566
1863
break
2574
1871
parent_pipe.send(False)
2575
1872
return False
2576
1873
2577
GLib.io_add_watch(
2578
parent_pipe.fileno(),
2579
GLib.IO_IN | GLib.IO_HUP,
2580
functools.partial(self.handle_ipc,
2581
parent_pipe = parent_pipe,
2582
proc = proc,
2583
client_object = client))
1874
gobject.io_add_watch(parent_pipe.fileno(),
1875
gobject.IO_IN | gobject.IO_HUP,
1876
functools.partial(self.handle_ipc,
1877
parent_pipe =
1878
parent_pipe,
1879
proc = proc,
1880
client_object =
1881
client))
2584
1882
parent_pipe.send(True)
2585
1883
# remove the old hook in favor of the new above hook on
2586
1884
# same fileno
2592
1890
2593
1891
parent_pipe.send(('data', getattr(client_object,
2594
1892
funcname)(*args,
2595
**kwargs)))
1893
**kwargs)))
2596
1894
2597
1895
if command == 'getattr':
2598
1896
attrname = request[1]
2599
if isinstance(client_object.__getattribute__(attrname),
2600
collections.Callable):
2601
parent_pipe.send(('function', ))
1897
if callable(client_object.__getattribute__(attrname)):
1898
parent_pipe.send(('function',))
2602
1899
else:
2603
parent_pipe.send((
2604
'data', client_object.__getattribute__(attrname)))
1900
parent_pipe.send(('data', client_object
1901
.__getattribute__(attrname)))
2605
1902
2606
1903
if command == 'setattr':
2607
1904
attrname = request[1]
2611
1908
return True
2612
1909
2613
1910
2614
def rfc3339_duration_to_delta(duration):
2615
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2616
2617
>>> rfc3339_duration_to_delta("P7D")
2618
datetime.timedelta(7)
2619
>>> rfc3339_duration_to_delta("PT60S")
2620
datetime.timedelta(0, 60)
2621
>>> rfc3339_duration_to_delta("PT60M")
2622
datetime.timedelta(0, 3600)
2623
>>> rfc3339_duration_to_delta("PT24H")
2624
datetime.timedelta(1)
2625
>>> rfc3339_duration_to_delta("P1W")
2626
datetime.timedelta(7)
2627
>>> rfc3339_duration_to_delta("PT5M30S")
2628
datetime.timedelta(0, 330)
2629
>>> rfc3339_duration_to_delta("P1DT3M20S")
2630
datetime.timedelta(1, 200)
2631
"""
2632
2633
# Parsing an RFC 3339 duration with regular expressions is not
2634
# possible - there would have to be multiple places for the same
2635
# values, like seconds. The current code, while more esoteric, is
2636
# cleaner without depending on a parsing library. If Python had a
2637
# built-in library for parsing we would use it, but we'd like to
2638
# avoid excessive use of external libraries.
2639
2640
# New type for defining tokens, syntax, and semantics all-in-one
2641
Token = collections.namedtuple("Token", (
2642
"regexp", # To match token; if "value" is not None, must have
2643
# a "group" containing digits
2644
"value", # datetime.timedelta or None
2645
"followers")) # Tokens valid after this token
2646
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2647
# the "duration" ABNF definition in RFC 3339, Appendix A.
2648
token_end = Token(re.compile(r"$"), None, frozenset())
2649
token_second = Token(re.compile(r"(\d+)S"),
2650
datetime.timedelta(seconds=1),
2651
frozenset((token_end, )))
2652
token_minute = Token(re.compile(r"(\d+)M"),
2653
datetime.timedelta(minutes=1),
2654
frozenset((token_second, token_end)))
2655
token_hour = Token(re.compile(r"(\d+)H"),
2656
datetime.timedelta(hours=1),
2657
frozenset((token_minute, token_end)))
2658
token_time = Token(re.compile(r"T"),
2659
None,
2660
frozenset((token_hour, token_minute,
2661
token_second)))
2662
token_day = Token(re.compile(r"(\d+)D"),
2663
datetime.timedelta(days=1),
2664
frozenset((token_time, token_end)))
2665
token_month = Token(re.compile(r"(\d+)M"),
2666
datetime.timedelta(weeks=4),
2667
frozenset((token_day, token_end)))
2668
token_year = Token(re.compile(r"(\d+)Y"),
2669
datetime.timedelta(weeks=52),
2670
frozenset((token_month, token_end)))
2671
token_week = Token(re.compile(r"(\d+)W"),
2672
datetime.timedelta(weeks=1),
2673
frozenset((token_end, )))
2674
token_duration = Token(re.compile(r"P"), None,
2675
frozenset((token_year, token_month,
2676
token_day, token_time,
2677
token_week)))
2678
# Define starting values
2679
value = datetime.timedelta() # Value so far
2680
found_token = None
2681
followers = frozenset((token_duration, )) # Following valid tokens
2682
s = duration # String left to parse
2683
# Loop until end token is found
2684
while found_token is not token_end:
2685
# Search for any currently valid tokens
2686
for token in followers:
2687
match = token.regexp.match(s)
2688
if match is not None:
2689
# Token found
2690
if token.value is not None:
2691
# Value found, parse digits
2692
factor = int(match.group(1), 10)
2693
# Add to value so far
2694
value += factor * token.value
2695
# Strip token from string
2696
s = token.regexp.sub("", s, 1)
2697
# Go to found token
2698
found_token = token
2699
# Set valid next tokens
2700
followers = found_token.followers
2701
break
2702
else:
2703
# No currently valid tokens were found
2704
raise ValueError("Invalid RFC 3339 duration: {!r}"
2705
.format(duration))
2706
# End token found
2707
return value
2708
2709
2710
1911
def string_to_delta(interval):
2711
1912
"""Parse a string and return a datetime.timedelta
2712
1913
2723
1924
>>> string_to_delta('5m 30s')
2724
1925
datetime.timedelta(0, 330)
2725
1926
"""
2726
2727
try:
2728
return rfc3339_duration_to_delta(interval)
2729
except ValueError:
2730
pass
2731
2732
1927
timevalue = datetime.timedelta(0)
2733
1928
for s in interval.split():
2734
1929
try:
2735
suffix = s[-1]
1930
suffix = unicode(s[-1])
2736
1931
value = int(s[:-1])
2737
1932
if suffix == "d":
2738
1933
delta = datetime.timedelta(value)
2745
1940
elif suffix == "w":
2746
1941
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2747
1942
else:
2748
raise ValueError("Unknown suffix {!r}".format(suffix))
2749
except IndexError as e:
1943
raise ValueError("Unknown suffix %r" % suffix)
1944
except (ValueError, IndexError) as e:
2750
1945
raise ValueError(*(e.args))
2751
1946
timevalue += delta
2752
1947
return timevalue
2765
1960
sys.exit()
2766
1961
if not noclose:
2767
1962
# Close all standard open file descriptors
2768
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1963
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2769
1964
if not stat.S_ISCHR(os.fstat(null).st_mode):
2770
1965
raise OSError(errno.ENODEV,
2771
"{} not a character device"
2772
.format(os.devnull))
1966
"%s not a character device"
1967
% os.path.devnull)
2773
1968
os.dup2(null, sys.stdin.fileno())
2774
1969
os.dup2(null, sys.stdout.fileno())
2775
1970
os.dup2(null, sys.stderr.fileno())
2784
1979
2785
1980
parser = argparse.ArgumentParser()
2786
1981
parser.add_argument("-v", "--version", action="version",
2787
version = "%(prog)s {}".format(version),
1982
version = "%%(prog)s %s" % version,
2788
1983
help="show version number and exit")
2789
1984
parser.add_argument("-i", "--interface", metavar="IF",
2790
1985
help="Bind to interface IF")
2796
1991
help="Run self-test")
2797
1992
parser.add_argument("--debug", action="store_true",
2798
1993
help="Debug mode; run in foreground and log"
2799
" to terminal", default=None)
1994
" to terminal")
2800
1995
parser.add_argument("--debuglevel", metavar="LEVEL",
2801
1996
help="Debug level for stdout output")
2802
1997
parser.add_argument("--priority", help="GnuTLS"
2809
2004
" files")
2810
2005
parser.add_argument("--no-dbus", action="store_false",
2811
2006
dest="use_dbus", help="Do not provide D-Bus"
2812
" system bus interface", default=None)
2007
" system bus interface")
2813
2008
parser.add_argument("--no-ipv6", action="store_false",
2814
dest="use_ipv6", help="Do not use IPv6",
2815
default=None)
2009
dest="use_ipv6", help="Do not use IPv6")
2816
2010
parser.add_argument("--no-restore", action="store_false",
2817
2011
dest="restore", help="Do not restore stored"
2818
" state", default=None)
2819
parser.add_argument("--socket", type=int,
2820
help="Specify a file descriptor to a network"
2821
" socket to use instead of creating one")
2012
" state")
2822
2013
parser.add_argument("--statedir", metavar="DIR",
2823
2014
help="Directory to save/restore state in")
2824
parser.add_argument("--foreground", action="store_true",
2825
help="Run in foreground", default=None)
2826
parser.add_argument("--no-zeroconf", action="store_false",
2827
dest="zeroconf", help="Do not use Zeroconf",
2828
default=None)
2829
2015
2830
2016
options = parser.parse_args()
2831
2017
2832
2018
if options.check:
2833
2019
import doctest
2834
fail_count, test_count = doctest.testmod()
2835
sys.exit(os.EX_OK if fail_count == 0 else 1)
2020
doctest.testmod()
2021
sys.exit()
2836
2022
2837
2023
# Default values for config file for server-global settings
2838
2024
server_defaults = { "interface": "",
2840
2026
"port": "",
2841
2027
"debug": "False",
2842
2028
"priority":
2843
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2844
":+SIGN-DSA-SHA256",
2029
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2845
2030
"servicename": "Mandos",
2846
2031
"use_dbus": "True",
2847
2032
"use_ipv6": "True",
2848
2033
"debuglevel": "",
2849
2034
"restore": "True",
2850
"socket": "",
2851
"statedir": "/var/lib/mandos",
2852
"foreground": "False",
2853
"zeroconf": "True",
2854
}
2035
"statedir": "/var/lib/mandos"
2036
}
2855
2037
2856
2038
# Parse config file for server-global settings
2857
2039
server_config = configparser.SafeConfigParser(server_defaults)
2858
2040
del server_defaults
2859
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2041
server_config.read(os.path.join(options.configdir,
2042
"mandos.conf"))
2860
2043
# Convert the SafeConfigParser object to a dict
2861
2044
server_settings = server_config.defaults()
2862
2045
# Use the appropriate methods on the non-string config options
2863
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2046
for option in ("debug", "use_dbus", "use_ipv6"):
2864
2047
server_settings[option] = server_config.getboolean("DEFAULT",
2865
2048
option)
2866
2049
if server_settings["port"]:
2867
2050
server_settings["port"] = server_config.getint("DEFAULT",
2868
2051
"port")
2869
if server_settings["socket"]:
2870
server_settings["socket"] = server_config.getint("DEFAULT",
2871
"socket")
2872
# Later, stdin will, and stdout and stderr might, be dup'ed
2873
# over with an opened os.devnull. But we don't want this to
2874
# happen with a supplied network socket.
2875
if 0 <= server_settings["socket"] <= 2:
2876
server_settings["socket"] = os.dup(server_settings
2877
["socket"])
2878
2052
del server_config
2879
2053
2880
2054
# Override the settings from the config file with command line
2881
2055
# options, if set.
2882
2056
for option in ("interface", "address", "port", "debug",
2883
"priority", "servicename", "configdir", "use_dbus",
2884
"use_ipv6", "debuglevel", "restore", "statedir",
2885
"socket", "foreground", "zeroconf"):
2057
"priority", "servicename", "configdir",
2058
"use_dbus", "use_ipv6", "debuglevel", "restore",
2059
"statedir"):
2886
2060
value = getattr(options, option)
2887
2061
if value is not None:
2888
2062
server_settings[option] = value
2889
2063
del options
2890
2064
# Force all strings to be unicode
2891
2065
for option in server_settings.keys():
2892
if isinstance(server_settings[option], bytes):
2893
server_settings[option] = (server_settings[option]
2894
.decode("utf-8"))
2895
# Force all boolean options to be boolean
2896
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2897
"foreground", "zeroconf"):
2898
server_settings[option] = bool(server_settings[option])
2899
# Debug implies foreground
2900
if server_settings["debug"]:
2901
server_settings["foreground"] = True
2066
if type(server_settings[option]) is str:
2067
server_settings[option] = unicode(server_settings[option])
2902
2068
# Now we have our good server settings in "server_settings"
2903
2069
2904
2070
##################################################################
2905
2071
2906
if (not server_settings["zeroconf"]
2907
and not (server_settings["port"]
2908
or server_settings["socket"] != "")):
2909
parser.error("Needs port or socket to work without Zeroconf")
2910
2911
2072
# For convenience
2912
2073
debug = server_settings["debug"]
2913
2074
debuglevel = server_settings["debuglevel"]
2915
2076
use_ipv6 = server_settings["use_ipv6"]
2916
2077
stored_state_path = os.path.join(server_settings["statedir"],
2917
2078
stored_state_file)
2918
foreground = server_settings["foreground"]
2919
zeroconf = server_settings["zeroconf"]
2920
2079
2921
2080
if debug:
2922
initlogger(debug, logging.DEBUG)
2081
initlogger(logging.DEBUG)
2923
2082
else:
2924
2083
if not debuglevel:
2925
initlogger(debug)
2084
initlogger()
2926
2085
else:
2927
2086
level = getattr(logging, debuglevel.upper())
2928
initlogger(debug, level)
2087
initlogger(level)
2929
2088
2930
2089
if server_settings["servicename"] != "Mandos":
2931
syslogger.setFormatter(
2932
logging.Formatter('Mandos ({}) [%(process)d]:'
2933
' %(levelname)s: %(message)s'.format(
2934
server_settings["servicename"])))
2090
syslogger.setFormatter(logging.Formatter
2091
('Mandos (%s) [%%(process)d]:'
2092
' %%(levelname)s: %%(message)s'
2093
% server_settings["servicename"]))
2935
2094
2936
2095
# Parse config file with clients
2937
client_config = configparser.SafeConfigParser(Client
2938
.client_defaults)
2096
client_config = configparser.SafeConfigParser(Client.client_defaults)
2939
2097
client_config.read(os.path.join(server_settings["configdir"],
2940
2098
"clients.conf"))
2941
2099
2942
2100
global mandos_dbus_service
2943
2101
mandos_dbus_service = None
2944
2102
2945
socketfd = None
2946
if server_settings["socket"] != "":
2947
socketfd = server_settings["socket"]
2948
tcp_server = MandosServer(
2949
(server_settings["address"], server_settings["port"]),
2950
ClientHandler,
2951
interface=(server_settings["interface"] or None),
2952
use_ipv6=use_ipv6,
2953
gnutls_priority=server_settings["priority"],
2954
use_dbus=use_dbus,
2955
socketfd=socketfd)
2956
if not foreground:
2957
pidfilename = "/run/mandos.pid"
2958
if not os.path.isdir("/run/."):
2959
pidfilename = "/var/run/mandos.pid"
2960
pidfile = None
2103
tcp_server = MandosServer((server_settings["address"],
2104
server_settings["port"]),
2105
ClientHandler,
2106
interface=(server_settings["interface"]
2107
or None),
2108
use_ipv6=use_ipv6,
2109
gnutls_priority=
2110
server_settings["priority"],
2111
use_dbus=use_dbus)
2112
if not debug:
2113
pidfilename = "/var/run/mandos.pid"
2961
2114
try:
2962
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2963
except IOError as e:
2964
logger.error("Could not open file %r", pidfilename,
2965
exc_info=e)
2115
pidfile = open(pidfilename, "w")
2116
except IOError:
2117
logger.error("Could not open file %r", pidfilename)
2966
2118
2967
for name, group in (("_mandos", "_mandos"),
2968
("mandos", "mandos"),
2969
("nobody", "nogroup")):
2119
try:
2120
uid = pwd.getpwnam("_mandos").pw_uid
2121
gid = pwd.getpwnam("_mandos").pw_gid
2122
except KeyError:
2970
2123
try:
2971
uid = pwd.getpwnam(name).pw_uid
2972
gid = pwd.getpwnam(group).pw_gid
2973
break
2124
uid = pwd.getpwnam("mandos").pw_uid
2125
gid = pwd.getpwnam("mandos").pw_gid
2974
2126
except KeyError:
2975
continue
2976
else:
2977
uid = 65534
2978
gid = 65534
2127
try:
2128
uid = pwd.getpwnam("nobody").pw_uid
2129
gid = pwd.getpwnam("nobody").pw_gid
2130
except KeyError:
2131
uid = 65534
2132
gid = 65534
2979
2133
try:
2980
2134
os.setgid(gid)
2981
2135
os.setuid(uid)
2982
if debug:
2983
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2984
gid))
2985
2136
except OSError as error:
2986
logger.warning("Failed to setuid/setgid to {}:{}: {}"
2987
.format(uid, gid, os.strerror(error.errno)))
2988
if error.errno != errno.EPERM:
2989
raise
2137
if error[0] != errno.EPERM:
2138
raise error
2990
2139
2991
2140
if debug:
2992
2141
# Enable all possible GnuTLS debugging
2993
2142
2994
2143
# "Use a log level over 10 to enable all debugging options."
2995
2144
# - GnuTLS manual
2996
gnutls.global_set_log_level(11)
2145
gnutls.library.functions.gnutls_global_set_log_level(11)
2997
2146
2998
@gnutls.log_func
2147
@gnutls.library.types.gnutls_log_func
2999
2148
def debug_gnutls(level, string):
3000
2149
logger.debug("GnuTLS: %s", string[:-1])
3001
2150
3002
gnutls.global_set_log_function(debug_gnutls)
2151
(gnutls.library.functions
2152
.gnutls_global_set_log_function(debug_gnutls))
3003
2153
3004
2154
# Redirect stdin so all checkers get /dev/null
3005
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2155
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
3006
2156
os.dup2(null, sys.stdin.fileno())
3007
2157
if null > 2:
3008
2158
os.close(null)
2159
else:
2160
# No console logging
2161
logger.removeHandler(console)
3009
2162
3010
2163
# Need to fork before connecting to D-Bus
3011
if not foreground:
2164
if not debug:
3012
2165
# Close all input and output, do double fork, etc.
3013
2166
daemon()
3014
2167
3015
# multiprocessing will use threads, so before we use GLib we need
3016
# to inform GLib that threads will be used.
3017
GLib.threads_init()
3018
3019
2168
global main_loop
3020
2169
# From the Avahi example code
3021
DBusGMainLoop(set_as_default=True)
3022
main_loop = GLib.MainLoop()
2170
DBusGMainLoop(set_as_default=True )
2171
main_loop = gobject.MainLoop()
3023
2172
bus = dbus.SystemBus()
3024
2173
# End of Avahi example code
3025
2174
if use_dbus:
3026
2175
try:
3027
2176
bus_name = dbus.service.BusName("se.recompile.Mandos",
3028
bus,
3029
do_not_queue=True)
3030
old_bus_name = dbus.service.BusName(
3031
"se.bsnet.fukt.Mandos", bus,
3032
do_not_queue=True)
3033
except dbus.exceptions.DBusException as e:
3034
logger.error("Disabling D-Bus:", exc_info=e)
2177
bus, do_not_queue=True)
2178
old_bus_name = (dbus.service.BusName
2179
("se.bsnet.fukt.Mandos", bus,
2180
do_not_queue=True))
2181
except dbus.exceptions.NameExistsException as e:
2182
logger.error(unicode(e) + ", disabling D-Bus")
3035
2183
use_dbus = False
3036
2184
server_settings["use_dbus"] = False
3037
2185
tcp_server.use_dbus = False
3038
if zeroconf:
3039
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
3040
service = AvahiServiceToSyslog(
3041
name = server_settings["servicename"],
3042
servicetype = "_mandos._tcp",
3043
protocol = protocol,
3044
bus = bus)
3045
if server_settings["interface"]:
3046
service.interface = if_nametoindex(
3047
server_settings["interface"].encode("utf-8"))
2186
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2187
service = AvahiServiceToSyslog(name =
2188
server_settings["servicename"],
2189
servicetype = "_mandos._tcp",
2190
protocol = protocol, bus = bus)
2191
if server_settings["interface"]:
2192
service.interface = (if_nametoindex
2193
(str(server_settings["interface"])))
3048
2194
3049
2195
global multiprocessing_manager
3050
2196
multiprocessing_manager = multiprocessing.Manager()
3051
2197
3052
2198
client_class = Client
3053
2199
if use_dbus:
3054
client_class = functools.partial(ClientDBus, bus = bus)
2200
client_class = functools.partial(ClientDBusTransitional,
2201
bus = bus)
3055
2202
3056
2203
client_settings = Client.config_parser(client_config)
3057
2204
old_client_settings = {}
3058
2205
clients_data = {}
3059
2206
3060
# This is used to redirect stdout and stderr for checker processes
3061
global wnull
3062
wnull = open(os.devnull, "w") # A writable /dev/null
3063
# Only used if server is running in foreground but not in debug
3064
# mode
3065
if debug or not foreground:
3066
wnull.close()
3067
3068
2207
# Get client data and settings from last running state.
3069
2208
if server_settings["restore"]:
3070
2209
try:
3071
2210
with open(stored_state_path, "rb") as stored_state:
3072
if sys.version_info.major == 2:
3073
clients_data, old_client_settings = pickle.load(
3074
stored_state)
3075
else:
3076
bytes_clients_data, bytes_old_client_settings = (
3077
pickle.load(stored_state, encoding = "bytes"))
3078
### Fix bytes to strings
3079
## clients_data
3080
# .keys()
3081
clients_data = { (key.decode("utf-8")
3082
if isinstance(key, bytes)
3083
else key): value
3084
for key, value in
3085
bytes_clients_data.items() }
3086
del bytes_clients_data
3087
for key in clients_data:
3088
value = { (k.decode("utf-8")
3089
if isinstance(k, bytes) else k): v
3090
for k, v in
3091
clients_data[key].items() }
3092
clients_data[key] = value
3093
# .client_structure
3094
value["client_structure"] = [
3095
(s.decode("utf-8")
3096
if isinstance(s, bytes)
3097
else s) for s in
3098
value["client_structure"] ]
3099
# .name & .host
3100
for k in ("name", "host"):
3101
if isinstance(value[k], bytes):
3102
value[k] = value[k].decode("utf-8")
3103
## old_client_settings
3104
# .keys()
3105
old_client_settings = {
3106
(key.decode("utf-8")
3107
if isinstance(key, bytes)
3108
else key): value
3109
for key, value in
3110
bytes_old_client_settings.items() }
3111
del bytes_old_client_settings
3112
# .host
3113
for value in old_client_settings.values():
3114
if isinstance(value["host"], bytes):
3115
value["host"] = (value["host"]
3116
.decode("utf-8"))
2211
clients_data, old_client_settings = (pickle.load
2212
(stored_state))
3117
2213
os.remove(stored_state_path)
3118
2214
except IOError as e:
3119
if e.errno == errno.ENOENT:
3120
logger.warning("Could not load persistent state:"
3121
" {}".format(os.strerror(e.errno)))
3122
else:
3123
logger.critical("Could not load persistent state:",
3124
exc_info=e)
2215
logger.warning("Could not load persistent state: {0}"
2216
.format(e))
2217
if e.errno != errno.ENOENT:
3125
2218
raise
3126
except EOFError as e:
3127
logger.warning("Could not load persistent state: "
3128
"EOFError:",
3129
exc_info=e)
3130
2219
3131
2220
with PGPEngine() as pgp:
3132
for client_name, client in clients_data.items():
3133
# Skip removed clients
3134
if client_name not in client_settings:
3135
continue
3136
2221
for client_name, client in clients_data.iteritems():
3137
2222
# Decide which value to use after restoring saved state.
3138
2223
# We have three different values: Old config file,
3139
2224
# new config file, and saved state.
3144
2229
# For each value in new config, check if it
3145
2230
# differs from the old config value (Except for
3146
2231
# the "secret" attribute)
3147
if (name != "secret"
3148
and (value !=
3149
old_client_settings[client_name][name])):
2232
if (name != "secret" and
2233
value != old_client_settings[client_name]
2234
[name]):
3150
2235
client[name] = value
3151
2236
except KeyError:
3152
2237
pass
3153
2238
3154
2239
# Clients who has passed its expire date can still be
3155
# enabled if its last checker was successful. A Client
3156
# whose checker succeeded before we stored its state is
3157
# assumed to have successfully run all checkers during
3158
# downtime.
2240
# enabled if its last checker was successful. Clients
2241
# whose checker failed before we stored its state is
2242
# assumed to have failed all checkers during downtime.
3159
2243
if client["enabled"]:
3160
2244
if datetime.datetime.utcnow() >= client["expires"]:
3161
2245
if not client["last_checked_ok"]:
3162
2246
logger.warning(
3163
"disabling client {} - Client never "
3164
"performed a successful checker".format(
3165
client_name))
2247
"disabling client {0} - Client never "
2248
"performed a successfull checker"
2249
.format(client["name"]))
3166
2250
client["enabled"] = False
3167
2251
elif client["last_checker_status"] != 0:
3168
2252
logger.warning(
3169
"disabling client {} - Client last"
3170
" checker failed with error code"
3171
" {}".format(
3172
client_name,
3173
client["last_checker_status"]))
2253
"disabling client {0} - Client "
2254
"last checker failed with error code {1}"
2255
.format(client["name"],
2256
client["last_checker_status"]))
3174
2257
client["enabled"] = False
3175
2258
else:
3176
client["expires"] = (
3177
datetime.datetime.utcnow()
3178
+ client["timeout"])
3179
logger.debug("Last checker succeeded,"
3180
" keeping {} enabled".format(
3181
client_name))
2259
client["expires"] = (datetime.datetime
2260
.utcnow()
2261
+ client["timeout"])
2262
3182
2263
try:
3183
client["secret"] = pgp.decrypt(
3184
client["encrypted_secret"],
3185
client_settings[client_name]["secret"])
2264
client["secret"] = (
2265
pgp.decrypt(client["encrypted_secret"],
2266
client_settings[client_name]
2267
["secret"]))
3186
2268
except PGPError:
3187
2269
# If decryption fails, we use secret from new settings
3188
logger.debug("Failed to decrypt {} old secret".format(
3189
client_name))
3190
client["secret"] = (client_settings[client_name]
3191
["secret"])
2270
logger.debug("Failed to decrypt {0} old secret"
2271
.format(client_name))
2272
client["secret"] = (
2273
client_settings[client_name]["secret"])
2274
3192
2275
3193
2276
# Add/remove clients based on new changes made to config
3194
for client_name in (set(old_client_settings)
3195
- set(client_settings)):
2277
for client_name in set(old_client_settings) - set(client_settings):
3196
2278
del clients_data[client_name]
3197
for client_name in (set(client_settings)
3198
- set(old_client_settings)):
2279
for client_name in set(client_settings) - set(old_client_settings):
3199
2280
clients_data[client_name] = client_settings[client_name]
3200
3201
# Create all client objects
3202
for client_name, client in clients_data.items():
2281
2282
# Create clients all clients
2283
for client_name, client in clients_data.iteritems():
3203
2284
tcp_server.clients[client_name] = client_class(
3204
name = client_name,
3205
settings = client,
3206
server_settings = server_settings)
2285
name = client_name, settings = client)
3207
2286
3208
2287
if not tcp_server.clients:
3209
2288
logger.warning("No clients defined")
3210
3211
if not foreground:
3212
if pidfile is not None:
3213
pid = os.getpid()
3214
try:
3215
with pidfile:
3216
print(pid, file=pidfile)
3217
except IOError:
3218
logger.error("Could not write to file %r with PID %d",
3219
pidfilename, pid)
3220
del pidfile
2289
2290
if not debug:
2291
try:
2292
with pidfile:
2293
pid = os.getpid()
2294
pidfile.write(str(pid) + "\n".encode("utf-8"))
2295
del pidfile
2296
except IOError:
2297
logger.error("Could not write to file %r with PID %d",
2298
pidfilename, pid)
2299
except NameError:
2300
# "pidfile" was never created
2301
pass
3221
2302
del pidfilename
2303
signal.signal(signal.SIGINT, signal.SIG_IGN)
3222
2304
3223
for termsig in (signal.SIGHUP, signal.SIGTERM):
3224
GLib.unix_signal_add(GLib.PRIORITY_HIGH, termsig,
3225
lambda: main_loop.quit() and False)
2305
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2306
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
3226
2307
3227
2308
if use_dbus:
3228
3229
@alternate_dbus_interfaces(
3230
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3231
class MandosDBusService(DBusObjectWithObjectManager):
2309
class MandosDBusService(dbus.service.Object):
3232
2310
"""A D-Bus proxy object"""
3233
3234
2311
def __init__(self):
3235
2312
dbus.service.Object.__init__(self, bus, "/")
3236
3237
2313
_interface = "se.recompile.Mandos"
3238
2314
3239
2315
@dbus.service.signal(_interface, signature="o")
3246
2322
"D-Bus signal"
3247
2323
pass
3248
2324
3249
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3250
"true"})
3251
2325
@dbus.service.signal(_interface, signature="os")
3252
2326
def ClientRemoved(self, objpath, name):
3253
2327
"D-Bus signal"
3254
2328
pass
3255
2329
3256
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3257
"true"})
3258
2330
@dbus.service.method(_interface, out_signature="ao")
3259
2331
def GetAllClients(self):
3260
2332
"D-Bus method"
3261
return dbus.Array(c.dbus_object_path for c in
3262
tcp_server.clients.values())
2333
return dbus.Array(c.dbus_object_path
2334
for c in
2335
tcp_server.clients.itervalues())
3263
2336
3264
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3265
"true"})
3266
2337
@dbus.service.method(_interface,
3267
2338
out_signature="a{oa{sv}}")
3268
2339
def GetAllClientsWithProperties(self):
3269
2340
"D-Bus method"
3270
2341
return dbus.Dictionary(
3271
{ c.dbus_object_path: c.GetAll(
3272
"se.recompile.Mandos.Client")
3273
for c in tcp_server.clients.values() },
2342
((c.dbus_object_path, c.GetAll(""))
2343
for c in tcp_server.clients.itervalues()),
3274
2344
signature="oa{sv}")
3275
2345
3276
2346
@dbus.service.method(_interface, in_signature="o")
3277
2347
def RemoveClient(self, object_path):
3278
2348
"D-Bus method"
3279
for c in tcp_server.clients.values():
2349
for c in tcp_server.clients.itervalues():
3280
2350
if c.dbus_object_path == object_path:
3281
2351
del tcp_server.clients[c.name]
3282
2352
c.remove_from_connection()
3283
# Don't signal the disabling
2353
# Don't signal anything except ClientRemoved
3284
2354
c.disable(quiet=True)
3285
# Emit D-Bus signal for removal
3286
self.client_removed_signal(c)
2355
# Emit D-Bus signal
2356
self.ClientRemoved(object_path, c.name)
3287
2357
return
3288
2358
raise KeyError(object_path)
3289
2359
3290
2360
del _interface
3291
3292
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3293
out_signature = "a{oa{sa{sv}}}")
3294
def GetManagedObjects(self):
3295
"""D-Bus method"""
3296
return dbus.Dictionary(
3297
{ client.dbus_object_path:
3298
dbus.Dictionary(
3299
{ interface: client.GetAll(interface)
3300
for interface in
3301
client._get_all_interface_names()})
3302
for client in tcp_server.clients.values()})
3303
3304
def client_added_signal(self, client):
3305
"""Send the new standard signal and the old signal"""
3306
if use_dbus:
3307
# New standard signal
3308
self.InterfacesAdded(
3309
client.dbus_object_path,
3310
dbus.Dictionary(
3311
{ interface: client.GetAll(interface)
3312
for interface in
3313
client._get_all_interface_names()}))
3314
# Old signal
3315
self.ClientAdded(client.dbus_object_path)
3316
3317
def client_removed_signal(self, client):
3318
"""Send the new standard signal and the old signal"""
3319
if use_dbus:
3320
# New standard signal
3321
self.InterfacesRemoved(
3322
client.dbus_object_path,
3323
client._get_all_interface_names())
3324
# Old signal
3325
self.ClientRemoved(client.dbus_object_path,
3326
client.name)
3327
2361
3328
mandos_dbus_service = MandosDBusService()
2362
class MandosDBusServiceTransitional(MandosDBusService):
2363
__metaclass__ = AlternateDBusNamesMetaclass
2364
mandos_dbus_service = MandosDBusServiceTransitional()
3329
2365
3330
# Save modules to variables to exempt the modules from being
3331
# unloaded before the function registered with atexit() is run.
3332
mp = multiprocessing
3333
wn = wnull
3334
2366
def cleanup():
3335
2367
"Cleanup function; run on exit"
3336
if zeroconf:
3337
service.cleanup()
2368
service.cleanup()
3338
2369
3339
mp.active_children()
3340
wn.close()
2370
multiprocessing.active_children()
3341
2371
if not (tcp_server.clients or client_settings):
3342
2372
return
3343
2373
3346
2376
# removed/edited, old secret will thus be unrecovable.
3347
2377
clients = {}
3348
2378
with PGPEngine() as pgp:
3349
for client in tcp_server.clients.values():
2379
for client in tcp_server.clients.itervalues():
3350
2380
key = client_settings[client.name]["secret"]
3351
2381
client.encrypted_secret = pgp.encrypt(client.secret,
3352
2382
key)
3354
2384
3355
2385
# A list of attributes that can not be pickled
3356
2386
# + secret.
3357
exclude = { "bus", "changedstate", "secret",
3358
"checker", "server_settings" }
3359
for name, typ in inspect.getmembers(dbus.service
3360
.Object):
2387
exclude = set(("bus", "changedstate", "secret",
2388
"checker"))
2389
for name, typ in (inspect.getmembers
2390
(dbus.service.Object)):
3361
2391
exclude.add(name)
3362
2392
3363
2393
client_dict["encrypted_secret"] = (client
3370
2400
del client_settings[client.name]["secret"]
3371
2401
3372
2402
try:
3373
with tempfile.NamedTemporaryFile(
3374
mode='wb',
3375
suffix=".pickle",
3376
prefix='clients-',
3377
dir=os.path.dirname(stored_state_path),
3378
delete=False) as stored_state:
3379
pickle.dump((clients, client_settings), stored_state,
3380
protocol = 2)
3381
tempname = stored_state.name
3382
os.rename(tempname, stored_state_path)
2403
with os.fdopen(os.open(stored_state_path,
2404
os.O_CREAT|os.O_WRONLY|os.O_TRUNC,
2405
0600), "wb") as stored_state:
2406
pickle.dump((clients, client_settings), stored_state)
3383
2407
except (IOError, OSError) as e:
3384
if not debug:
3385
try:
3386
os.remove(tempname)
3387
except NameError:
3388
pass
3389
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
3390
logger.warning("Could not save persistent state: {}"
3391
.format(os.strerror(e.errno)))
3392
else:
3393
logger.warning("Could not save persistent state:",
3394
exc_info=e)
2408
logger.warning("Could not save persistent state: {0}"
2409
.format(e))
2410
if e.errno not in (errno.ENOENT, errno.EACCES):
3395
2411
raise
3396
2412
3397
2413
# Delete all clients, and settings from config
3399
2415
name, client = tcp_server.clients.popitem()
3400
2416
if use_dbus:
3401
2417
client.remove_from_connection()
3402
# Don't signal the disabling
2418
# Don't signal anything except ClientRemoved
3403
2419
client.disable(quiet=True)
3404
# Emit D-Bus signal for removal
3405
2420
if use_dbus:
3406
mandos_dbus_service.client_removed_signal(client)
2421
# Emit D-Bus signal
2422
mandos_dbus_service.ClientRemoved(client
2423
.dbus_object_path,
2424
client.name)
3407
2425
client_settings.clear()
3408
2426
3409
2427
atexit.register(cleanup)
3410
2428
3411
for client in tcp_server.clients.values():
2429
for client in tcp_server.clients.itervalues():
3412
2430
if use_dbus:
3413
# Emit D-Bus signal for adding
3414
mandos_dbus_service.client_added_signal(client)
2431
# Emit D-Bus signal
2432
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3415
2433
# Need to initiate checking of clients
3416
2434
if client.enabled:
3417
2435
client.init_checker()
3420
2438
tcp_server.server_activate()
3421
2439
3422
2440
# Find out what port we got
3423
if zeroconf:
3424
service.port = tcp_server.socket.getsockname()[1]
2441
service.port = tcp_server.socket.getsockname()[1]
3425
2442
if use_ipv6:
3426
2443
logger.info("Now listening on address %r, port %d,"
3427
" flowinfo %d, scope_id %d",
3428
*tcp_server.socket.getsockname())
2444
" flowinfo %d, scope_id %d"
2445
% tcp_server.socket.getsockname())
3429
2446
else: # IPv4
3430
logger.info("Now listening on address %r, port %d",
3431
*tcp_server.socket.getsockname())
2447
logger.info("Now listening on address %r, port %d"
2448
% tcp_server.socket.getsockname())
3432
2449
3433
2450
#service.interface = tcp_server.socket.getsockname()[3]
3434
2451
3435
2452
try:
3436
if zeroconf:
3437
# From the Avahi example code
3438
try:
3439
service.activate()
3440
except dbus.exceptions.DBusException as error:
3441
logger.critical("D-Bus Exception", exc_info=error)
3442
cleanup()
3443
sys.exit(1)
3444
# End of Avahi example code
2453
# From the Avahi example code
2454
try:
2455
service.activate()
2456
except dbus.exceptions.DBusException as error:
2457
logger.critical("DBusException: %s", error)
2458
cleanup()
2459
sys.exit(1)
2460
# End of Avahi example code
3445
2461
3446
GLib.io_add_watch(tcp_server.fileno(), GLib.IO_IN,
3447
lambda *args, **kwargs:
3448
(tcp_server.handle_request
3449
(*args[2:], **kwargs) or True))
2462
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2463
lambda *args, **kwargs:
2464
(tcp_server.handle_request
2465
(*args[2:], **kwargs) or True))
3450
2466
3451
2467
logger.debug("Starting main loop")
3452
2468
main_loop.run()
3453
2469
except AvahiError as error:
3454
logger.critical("Avahi Error", exc_info=error)
2470
logger.critical("AvahiError: %s", error)
3455
2471
cleanup()
3456
2472
sys.exit(1)
3457
2473
except KeyboardInterrupt:
3462
2478
# Must run before the D-Bus bus name gets deregistered
3463
2479
cleanup()
3464
2480
3465
3466
2481
if __name__ == '__main__':
3467
2482
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0