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