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