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