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