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