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