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 289
- compare with another revision
- download diff
- download tarball
- view history from revision 289
- Committer: Björn Påhlsson
- Date: 2011-10-15 16:48:03 UTC
- Revision ID: belorn@fukt.bsnet.se-20111015164803-61q3hzrv91d042mb
Tags: version-1.4.1-1
* Makefile (version): Changed to "1.4.1".
* NEWS (Version 1.4.1): New entry.
* debian/changelog (1.4.1-1): - '' -
* NEWS (Version 1.4.1): New entry.
* debian/changelog (1.4.1-1): - '' -
- files added:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
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
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
37
import SocketServer as socketserver
37
38
import socket
38
import optparse
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
from contextlib import closing
59
import contextlib
59
60
import struct
60
61
import fcntl
61
62
import functools
63
import cPickle as pickle
64
import multiprocessing
65
import types
62
66
63
67
import dbus
64
68
import dbus.service
79
83
SO_BINDTODEVICE = None
80
84
81
85
82
version = "1.0.12"
86
version = "1.4.1"
83
87
84
logger = logging.Logger(u'mandos')
88
#logger = logging.getLogger('mandos')
89
logger = logging.Logger('mandos')
85
90
syslogger = (logging.handlers.SysLogHandler
86
91
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
87
address = "/dev/log"))
92
address = str("/dev/log")))
88
93
syslogger.setFormatter(logging.Formatter
89
(u'Mandos [%(process)d]: %(levelname)s:'
90
u' %(message)s'))
94
('Mandos [%(process)d]: %(levelname)s:'
95
' %(message)s'))
91
96
logger.addHandler(syslogger)
92
97
93
98
console = logging.StreamHandler()
94
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
95
u' %(levelname)s:'
96
u' %(message)s'))
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
' %(levelname)s:'
101
' %(message)s'))
97
102
logger.addHandler(console)
98
103
99
104
class AvahiError(Exception):
116
121
Attributes:
117
122
interface: integer; avahi.IF_UNSPEC or an interface index.
118
123
Used to optionally bind to the specified interface.
119
name: string; Example: u'Mandos'
120
type: string; Example: u'_mandos._tcp'.
124
name: string; Example: 'Mandos'
125
type: string; Example: '_mandos._tcp'.
121
126
See <http://www.dns-sd.org/ServiceTypes.html>
122
127
port: integer; what port to announce
123
128
TXT: list of strings; TXT record for the service
132
137
"""
133
138
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
134
139
servicetype = None, port = None, TXT = None,
135
domain = u"", host = u"", max_renames = 32768,
140
domain = "", host = "", max_renames = 32768,
136
141
protocol = avahi.PROTO_UNSPEC, bus = None):
137
142
self.interface = interface
138
143
self.name = name
147
152
self.group = None # our entry group
148
153
self.server = None
149
154
self.bus = bus
155
self.entry_group_state_changed_match = None
150
156
def rename(self):
151
157
"""Derived from the Avahi example code"""
152
158
if self.rename_count >= self.max_renames:
153
logger.critical(u"No suitable Zeroconf service name found"
154
u" after %i retries, exiting.",
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
155
161
self.rename_count)
156
raise AvahiServiceError(u"Too many renames")
157
self.name = self.server.GetAlternativeServiceName(self.name)
158
logger.info(u"Changing Zeroconf service name to %r ...",
159
unicode(self.name))
162
raise AvahiServiceError("Too many renames")
163
self.name = unicode(self.server
164
.GetAlternativeServiceName(self.name))
165
logger.info("Changing Zeroconf service name to %r ...",
166
self.name)
160
167
syslogger.setFormatter(logging.Formatter
161
(u'Mandos (%s) [%%(process)d]:'
162
u' %%(levelname)s: %%(message)s'
168
('Mandos (%s) [%%(process)d]:'
169
' %%(levelname)s: %%(message)s'
163
170
% self.name))
164
171
self.remove()
165
self.add()
172
try:
173
self.add()
174
except dbus.exceptions.DBusException as error:
175
logger.critical("DBusException: %s", error)
176
self.cleanup()
177
os._exit(1)
166
178
self.rename_count += 1
167
179
def remove(self):
168
180
"""Derived from the Avahi example code"""
181
if self.entry_group_state_changed_match is not None:
182
self.entry_group_state_changed_match.remove()
183
self.entry_group_state_changed_match = None
169
184
if self.group is not None:
170
185
self.group.Reset()
171
186
def add(self):
172
187
"""Derived from the Avahi example code"""
188
self.remove()
173
189
if self.group is None:
174
190
self.group = dbus.Interface(
175
191
self.bus.get_object(avahi.DBUS_NAME,
176
192
self.server.EntryGroupNew()),
177
193
avahi.DBUS_INTERFACE_ENTRY_GROUP)
178
self.group.connect_to_signal('StateChanged',
179
self
180
.entry_group_state_changed)
181
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
194
self.entry_group_state_changed_match = (
195
self.group.connect_to_signal(
196
'StateChanged', self .entry_group_state_changed))
197
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
182
198
self.name, self.type)
183
199
self.group.AddService(
184
200
self.interface,
191
207
self.group.Commit()
192
208
def entry_group_state_changed(self, state, error):
193
209
"""Derived from the Avahi example code"""
194
logger.debug(u"Avahi state change: %i", state)
210
logger.debug("Avahi entry group state change: %i", state)
195
211
196
212
if state == avahi.ENTRY_GROUP_ESTABLISHED:
197
logger.debug(u"Zeroconf service established.")
213
logger.debug("Zeroconf service established.")
198
214
elif state == avahi.ENTRY_GROUP_COLLISION:
199
logger.warning(u"Zeroconf service name collision.")
215
logger.info("Zeroconf service name collision.")
200
216
self.rename()
201
217
elif state == avahi.ENTRY_GROUP_FAILURE:
202
logger.critical(u"Avahi: Error in group state changed %s",
218
logger.critical("Avahi: Error in group state changed %s",
203
219
unicode(error))
204
raise AvahiGroupError(u"State changed: %s"
220
raise AvahiGroupError("State changed: %s"
205
221
% unicode(error))
206
222
def cleanup(self):
207
223
"""Derived from the Avahi example code"""
208
224
if self.group is not None:
209
self.group.Free()
225
try:
226
self.group.Free()
227
except (dbus.exceptions.UnknownMethodException,
228
dbus.exceptions.DBusException) as e:
229
pass
210
230
self.group = None
211
def server_state_changed(self, state):
231
self.remove()
232
def server_state_changed(self, state, error=None):
212
233
"""Derived from the Avahi example code"""
213
if state == avahi.SERVER_COLLISION:
214
logger.error(u"Zeroconf server name collision")
215
self.remove()
234
logger.debug("Avahi server state change: %i", state)
235
bad_states = { avahi.SERVER_INVALID:
236
"Zeroconf server invalid",
237
avahi.SERVER_REGISTERING: None,
238
avahi.SERVER_COLLISION:
239
"Zeroconf server name collision",
240
avahi.SERVER_FAILURE:
241
"Zeroconf server failure" }
242
if state in bad_states:
243
if bad_states[state] is not None:
244
if error is None:
245
logger.error(bad_states[state])
246
else:
247
logger.error(bad_states[state] + ": %r", error)
248
self.cleanup()
216
249
elif state == avahi.SERVER_RUNNING:
217
250
self.add()
251
else:
252
if error is None:
253
logger.debug("Unknown state: %r", state)
254
else:
255
logger.debug("Unknown state: %r: %r", state, error)
218
256
def activate(self):
219
257
"""Derived from the Avahi example code"""
220
258
if self.server is None:
221
259
self.server = dbus.Interface(
222
260
self.bus.get_object(avahi.DBUS_NAME,
223
avahi.DBUS_PATH_SERVER),
261
avahi.DBUS_PATH_SERVER,
262
follow_name_owner_changes=True),
224
263
avahi.DBUS_INTERFACE_SERVER)
225
self.server.connect_to_signal(u"StateChanged",
264
self.server.connect_to_signal("StateChanged",
226
265
self.server_state_changed)
227
266
self.server_state_changed(self.server.GetState())
228
267
229
268
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
274
230
275
class Client(object):
231
276
"""A representation of a client host served by this server.
232
277
233
278
Attributes:
234
name: string; from the config file, used in log messages and
235
D-Bus identifiers
236
fingerprint: string (40 or 32 hexadecimal digits); used to
237
uniquely identify the client
238
secret: bytestring; sent verbatim (over TLS) to client
239
host: string; available for use by the checker command
240
created: datetime.datetime(); (UTC) object creation
241
last_enabled: datetime.datetime(); (UTC)
242
enabled: bool()
243
last_checked_ok: datetime.datetime(); (UTC) or None
244
timeout: datetime.timedelta(); How long from last_checked_ok
245
until this client is invalid
246
interval: datetime.timedelta(); How often to start a new checker
247
disable_hook: If set, called by disable() as disable_hook(self)
279
_approved: bool(); 'None' if not yet approved/disapproved
280
approval_delay: datetime.timedelta(); Time to wait for approval
281
approval_duration: datetime.timedelta(); Duration of one approval
248
282
checker: subprocess.Popen(); a running checker process used
249
283
to see if the client lives.
250
284
'None' if no process is running.
251
checker_initiator_tag: a gobject event source tag, or None
252
disable_initiator_tag: - '' -
253
checker_callback_tag: - '' -
254
checker_command: string; External command which is run to check if
255
client lives. %() expansions are done at
285
checker_callback_tag: a gobject event source tag, or None
286
checker_command: string; External command which is run to check
287
if client lives. %() expansions are done at
256
288
runtime with vars(self) as dict, so that for
257
289
instance %(name)s can be used in the command.
290
checker_initiator_tag: a gobject event source tag, or None
291
created: datetime.datetime(); (UTC) object creation
258
292
current_checker_command: string; current running checker_command
293
disable_hook: If set, called by disable() as disable_hook(self)
294
disable_initiator_tag: a gobject event source tag, or None
295
enabled: bool()
296
fingerprint: string (40 or 32 hexadecimal digits); used to
297
uniquely identify the client
298
host: string; available for use by the checker command
299
interval: datetime.timedelta(); How often to start a new checker
300
last_approval_request: datetime.datetime(); (UTC) or None
301
last_checked_ok: datetime.datetime(); (UTC) or None
302
last_enabled: datetime.datetime(); (UTC)
303
name: string; from the config file, used in log messages and
304
D-Bus identifiers
305
secret: bytestring; sent verbatim (over TLS) to client
306
timeout: datetime.timedelta(); How long from last_checked_ok
307
until this client is disabled
308
extended_timeout: extra long timeout when password has been sent
309
runtime_expansions: Allowed attributes for runtime expansion.
310
expires: datetime.datetime(); time (UTC) when a client will be
311
disabled, or None
259
312
"""
260
313
261
@staticmethod
262
def _timedelta_to_milliseconds(td):
263
"Convert a datetime.timedelta() to milliseconds"
264
return ((td.days * 24 * 60 * 60 * 1000)
265
+ (td.seconds * 1000)
266
+ (td.microseconds // 1000))
314
runtime_expansions = ("approval_delay", "approval_duration",
315
"created", "enabled", "fingerprint",
316
"host", "interval", "last_checked_ok",
317
"last_enabled", "name", "timeout")
267
318
268
319
def timeout_milliseconds(self):
269
320
"Return the 'timeout' attribute in milliseconds"
270
return self._timedelta_to_milliseconds(self.timeout)
321
return _timedelta_to_milliseconds(self.timeout)
322
323
def extended_timeout_milliseconds(self):
324
"Return the 'extended_timeout' attribute in milliseconds"
325
return _timedelta_to_milliseconds(self.extended_timeout)
271
326
272
327
def interval_milliseconds(self):
273
328
"Return the 'interval' attribute in milliseconds"
274
return self._timedelta_to_milliseconds(self.interval)
329
return _timedelta_to_milliseconds(self.interval)
330
331
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
275
333
276
334
def __init__(self, name = None, disable_hook=None, config=None):
277
335
"""Note: the 'checker' key in 'config' sets the
280
338
self.name = name
281
339
if config is None:
282
340
config = {}
283
logger.debug(u"Creating client %r", self.name)
341
logger.debug("Creating client %r", self.name)
284
342
# Uppercase and remove spaces from fingerprint for later
285
343
# comparison purposes with return value from the fingerprint()
286
344
# function
287
self.fingerprint = (config[u"fingerprint"].upper()
288
.replace(u" ", u""))
289
logger.debug(u" Fingerprint: %s", self.fingerprint)
290
if u"secret" in config:
291
self.secret = config[u"secret"].decode(u"base64")
292
elif u"secfile" in config:
293
with closing(open(os.path.expanduser
294
(os.path.expandvars
295
(config[u"secfile"])),
296
"rb")) as secfile:
345
self.fingerprint = (config["fingerprint"].upper()
346
.replace(" ", ""))
347
logger.debug(" Fingerprint: %s", self.fingerprint)
348
if "secret" in config:
349
self.secret = config["secret"].decode("base64")
350
elif "secfile" in config:
351
with open(os.path.expanduser(os.path.expandvars
352
(config["secfile"])),
353
"rb") as secfile:
297
354
self.secret = secfile.read()
298
355
else:
299
raise TypeError(u"No secret or secfile for client %s"
356
raise TypeError("No secret or secfile for client %s"
300
357
% self.name)
301
self.host = config.get(u"host", u"")
358
self.host = config.get("host", "")
302
359
self.created = datetime.datetime.utcnow()
303
360
self.enabled = False
361
self.last_approval_request = None
304
362
self.last_enabled = None
305
363
self.last_checked_ok = None
306
self.timeout = string_to_delta(config[u"timeout"])
307
self.interval = string_to_delta(config[u"interval"])
364
self.timeout = string_to_delta(config["timeout"])
365
self.extended_timeout = string_to_delta(config
366
["extended_timeout"])
367
self.interval = string_to_delta(config["interval"])
308
368
self.disable_hook = disable_hook
309
369
self.checker = None
310
370
self.checker_initiator_tag = None
311
371
self.disable_initiator_tag = None
372
self.expires = None
312
373
self.checker_callback_tag = None
313
self.checker_command = config[u"checker"]
374
self.checker_command = config["checker"]
314
375
self.current_checker_command = None
315
376
self.last_connect = None
377
self._approved = None
378
self.approved_by_default = config.get("approved_by_default",
379
True)
380
self.approvals_pending = 0
381
self.approval_delay = string_to_delta(
382
config["approval_delay"])
383
self.approval_duration = string_to_delta(
384
config["approval_duration"])
385
self.changedstate = (multiprocessing_manager
386
.Condition(multiprocessing_manager
387
.Lock()))
388
389
def send_changedstate(self):
390
self.changedstate.acquire()
391
self.changedstate.notify_all()
392
self.changedstate.release()
316
393
317
394
def enable(self):
318
395
"""Start this client's checker and timeout hooks"""
319
if getattr(self, u"enabled", False):
396
if getattr(self, "enabled", False):
320
397
# Already enabled
321
398
return
322
self.last_enabled = datetime.datetime.utcnow()
399
self.send_changedstate()
323
400
# Schedule a new checker to be started an 'interval' from now,
324
401
# and every interval from then on.
325
402
self.checker_initiator_tag = (gobject.timeout_add
326
403
(self.interval_milliseconds(),
327
404
self.start_checker))
328
# Also start a new checker *right now*.
329
self.start_checker()
330
405
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
331
407
self.disable_initiator_tag = (gobject.timeout_add
332
408
(self.timeout_milliseconds(),
333
409
self.disable))
334
410
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
412
# Also start a new checker *right now*.
413
self.start_checker()
335
414
336
def disable(self):
415
def disable(self, quiet=True):
337
416
"""Disable this client."""
338
417
if not getattr(self, "enabled", False):
339
418
return False
340
logger.info(u"Disabling client %s", self.name)
341
if getattr(self, u"disable_initiator_tag", False):
419
if not quiet:
420
self.send_changedstate()
421
if not quiet:
422
logger.info("Disabling client %s", self.name)
423
if getattr(self, "disable_initiator_tag", False):
342
424
gobject.source_remove(self.disable_initiator_tag)
343
425
self.disable_initiator_tag = None
344
if getattr(self, u"checker_initiator_tag", False):
426
self.expires = None
427
if getattr(self, "checker_initiator_tag", False):
345
428
gobject.source_remove(self.checker_initiator_tag)
346
429
self.checker_initiator_tag = None
347
430
self.stop_checker()
362
445
if os.WIFEXITED(condition):
363
446
exitstatus = os.WEXITSTATUS(condition)
364
447
if exitstatus == 0:
365
logger.info(u"Checker for %(name)s succeeded",
448
logger.info("Checker for %(name)s succeeded",
366
449
vars(self))
367
450
self.checked_ok()
368
451
else:
369
logger.info(u"Checker for %(name)s failed",
452
logger.info("Checker for %(name)s failed",
370
453
vars(self))
371
454
else:
372
logger.warning(u"Checker for %(name)s crashed?",
455
logger.warning("Checker for %(name)s crashed?",
373
456
vars(self))
374
457
375
def checked_ok(self):
458
def checked_ok(self, timeout=None):
376
459
"""Bump up the timeout for this client.
377
460
378
461
This should only be called when the client has been seen,
379
462
alive and well.
380
463
"""
464
if timeout is None:
465
timeout = self.timeout
381
466
self.last_checked_ok = datetime.datetime.utcnow()
382
gobject.source_remove(self.disable_initiator_tag)
383
self.disable_initiator_tag = (gobject.timeout_add
384
(self.timeout_milliseconds(),
385
self.disable))
467
if self.disable_initiator_tag is not None:
468
gobject.source_remove(self.disable_initiator_tag)
469
if getattr(self, "enabled", False):
470
self.disable_initiator_tag = (gobject.timeout_add
471
(_timedelta_to_milliseconds
472
(timeout), self.disable))
473
self.expires = datetime.datetime.utcnow() + timeout
474
475
def need_approval(self):
476
self.last_approval_request = datetime.datetime.utcnow()
386
477
387
478
def start_checker(self):
388
479
"""Start a new checker subprocess if one is not running.
395
486
# client would inevitably timeout, since no checker would get
396
487
# a chance to run to completion. If we instead leave running
397
488
# checkers alone, the checker would have to take more time
398
# than 'timeout' for the client to be declared invalid, which
399
# is as it should be.
489
# than 'timeout' for the client to be disabled, which is as it
490
# should be.
400
491
401
492
# If a checker exists, make sure it is not a zombie
402
493
try:
403
494
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
404
except (AttributeError, OSError), error:
495
except (AttributeError, OSError) as error:
405
496
if (isinstance(error, OSError)
406
497
and error.errno != errno.ECHILD):
407
498
raise error
408
499
else:
409
500
if pid:
410
logger.warning(u"Checker was a zombie")
501
logger.warning("Checker was a zombie")
411
502
gobject.source_remove(self.checker_callback_tag)
412
503
self.checker_callback(pid, status,
413
504
self.current_checker_command)
418
509
command = self.checker_command % self.host
419
510
except TypeError:
420
511
# Escape attributes for the shell
421
escaped_attrs = dict((key,
422
re.escape(unicode(str(val),
423
errors=
424
u'replace')))
425
for key, val in
426
vars(self).iteritems())
512
escaped_attrs = dict(
513
(attr,
514
re.escape(unicode(str(getattr(self, attr, "")),
515
errors=
516
'replace')))
517
for attr in
518
self.runtime_expansions)
519
427
520
try:
428
521
command = self.checker_command % escaped_attrs
429
except TypeError, error:
430
logger.error(u'Could not format string "%s":'
431
u' %s', self.checker_command, error)
522
except TypeError as error:
523
logger.error('Could not format string "%s":'
524
' %s', self.checker_command, error)
432
525
return True # Try again later
433
526
self.current_checker_command = command
434
527
try:
435
logger.info(u"Starting checker %r for %s",
528
logger.info("Starting checker %r for %s",
436
529
command, self.name)
437
530
# We don't need to redirect stdout and stderr, since
438
531
# in normal mode, that is already done by daemon(),
440
533
# always replaced by /dev/null.)
441
534
self.checker = subprocess.Popen(command,
442
535
close_fds=True,
443
shell=True, cwd=u"/")
536
shell=True, cwd="/")
444
537
self.checker_callback_tag = (gobject.child_watch_add
445
538
(self.checker.pid,
446
539
self.checker_callback,
451
544
if pid:
452
545
gobject.source_remove(self.checker_callback_tag)
453
546
self.checker_callback(pid, status, command)
454
except OSError, error:
455
logger.error(u"Failed to start subprocess: %s",
547
except OSError as error:
548
logger.error("Failed to start subprocess: %s",
456
549
error)
457
550
# Re-run this periodically if run by gobject.timeout_add
458
551
return True
462
555
if self.checker_callback_tag:
463
556
gobject.source_remove(self.checker_callback_tag)
464
557
self.checker_callback_tag = None
465
if getattr(self, u"checker", None) is None:
558
if getattr(self, "checker", None) is None:
466
559
return
467
logger.debug(u"Stopping checker for %(name)s", vars(self))
560
logger.debug("Stopping checker for %(name)s", vars(self))
468
561
try:
469
562
os.kill(self.checker.pid, signal.SIGTERM)
470
#os.sleep(0.5)
563
#time.sleep(0.5)
471
564
#if self.checker.poll() is None:
472
565
# os.kill(self.checker.pid, signal.SIGKILL)
473
except OSError, error:
566
except OSError as error:
474
567
if error.errno != errno.ESRCH: # No such process
475
568
raise
476
569
self.checker = None
477
478
def still_valid(self):
479
"""Has the timeout not yet passed for this client?"""
480
if not getattr(self, u"enabled", False):
481
return False
482
now = datetime.datetime.utcnow()
483
if self.last_checked_ok is None:
484
return now < (self.created + self.timeout)
485
else:
486
return now < (self.last_checked_ok + self.timeout)
487
488
489
def dbus_service_property(dbus_interface, signature=u"v",
490
access=u"readwrite", byte_arrays=False):
570
571
572
def dbus_service_property(dbus_interface, signature="v",
573
access="readwrite", byte_arrays=False):
491
574
"""Decorators for marking methods of a DBusObjectWithProperties to
492
575
become properties on the D-Bus.
493
576
498
581
dbus.service.method, except there is only "signature", since the
499
582
type from Get() and the type sent to Set() is the same.
500
583
"""
584
# Encoding deeply encoded byte arrays is not supported yet by the
585
# "Set" method, so we fail early here:
586
if byte_arrays and signature != "ay":
587
raise ValueError("Byte arrays not supported for non-'ay'"
588
" signature %r" % signature)
501
589
def decorator(func):
502
590
func._dbus_is_property = True
503
591
func._dbus_interface = dbus_interface
504
592
func._dbus_signature = signature
505
593
func._dbus_access = access
506
594
func._dbus_name = func.__name__
507
if func._dbus_name.endswith(u"_dbus_property"):
595
if func._dbus_name.endswith("_dbus_property"):
508
596
func._dbus_name = func._dbus_name[:-14]
509
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
597
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
510
598
return func
511
599
return decorator
512
600
532
620
533
621
class DBusObjectWithProperties(dbus.service.Object):
534
622
"""A D-Bus object with properties.
535
623
536
624
Classes inheriting from this can use the dbus_service_property
537
625
decorator to expose methods as D-Bus properties. It exposes the
538
626
standard Get(), Set(), and GetAll() methods on the D-Bus.
540
628
541
629
@staticmethod
542
630
def _is_dbus_property(obj):
543
return getattr(obj, u"_dbus_is_property", False)
631
return getattr(obj, "_dbus_is_property", False)
544
632
545
633
def _get_all_dbus_properties(self):
546
634
"""Returns a generator of (name, attribute) pairs
547
635
"""
548
return ((prop._dbus_name, prop)
636
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
637
for cls in self.__class__.__mro__
549
638
for name, prop in
550
inspect.getmembers(self, self._is_dbus_property))
639
inspect.getmembers(cls, self._is_dbus_property))
551
640
552
641
def _get_dbus_property(self, interface_name, property_name):
553
642
"""Returns a bound method if one exists which is a D-Bus
554
643
property with the specified name and interface.
555
644
"""
556
for name in (property_name,
557
property_name + u"_dbus_property"):
558
prop = getattr(self, name, None)
559
if (prop is None
560
or not self._is_dbus_property(prop)
561
or prop._dbus_name != property_name
562
or (interface_name and prop._dbus_interface
563
and interface_name != prop._dbus_interface)):
564
continue
565
return prop
645
for cls in self.__class__.__mro__:
646
for name, value in (inspect.getmembers
647
(cls, self._is_dbus_property)):
648
if (value._dbus_name == property_name
649
and value._dbus_interface == interface_name):
650
return value.__get__(self)
651
566
652
# No such property
567
raise DBusPropertyNotFound(self.dbus_object_path + u":"
568
+ interface_name + u"."
653
raise DBusPropertyNotFound(self.dbus_object_path + ":"
654
+ interface_name + "."
569
655
+ property_name)
570
656
571
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
572
out_signature=u"v")
657
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
658
out_signature="v")
573
659
def Get(self, interface_name, property_name):
574
660
"""Standard D-Bus property Get() method, see D-Bus standard.
575
661
"""
576
662
prop = self._get_dbus_property(interface_name, property_name)
577
if prop._dbus_access == u"write":
663
if prop._dbus_access == "write":
578
664
raise DBusPropertyAccessException(property_name)
579
665
value = prop()
580
if not hasattr(value, u"variant_level"):
666
if not hasattr(value, "variant_level"):
581
667
return value
582
668
return type(value)(value, variant_level=value.variant_level+1)
583
669
584
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
670
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
585
671
def Set(self, interface_name, property_name, value):
586
672
"""Standard D-Bus property Set() method, see D-Bus standard.
587
673
"""
588
674
prop = self._get_dbus_property(interface_name, property_name)
589
if prop._dbus_access == u"read":
675
if prop._dbus_access == "read":
590
676
raise DBusPropertyAccessException(property_name)
591
if prop._dbus_get_args_options[u"byte_arrays"]:
677
if prop._dbus_get_args_options["byte_arrays"]:
678
# The byte_arrays option is not supported yet on
679
# signatures other than "ay".
680
if prop._dbus_signature != "ay":
681
raise ValueError
592
682
value = dbus.ByteArray(''.join(unichr(byte)
593
683
for byte in value))
594
684
prop(value)
595
685
596
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
597
out_signature=u"a{sv}")
686
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
687
out_signature="a{sv}")
598
688
def GetAll(self, interface_name):
599
689
"""Standard D-Bus property GetAll() method, see D-Bus
600
690
standard.
601
691
602
692
Note: Will not include properties with access="write".
603
693
"""
604
694
all = {}
608
698
# Interface non-empty but did not match
609
699
continue
610
700
# Ignore write-only properties
611
if prop._dbus_access == u"write":
701
if prop._dbus_access == "write":
612
702
continue
613
703
value = prop()
614
if not hasattr(value, u"variant_level"):
704
if not hasattr(value, "variant_level"):
615
705
all[name] = value
616
706
continue
617
707
all[name] = type(value)(value, variant_level=
618
708
value.variant_level+1)
619
return dbus.Dictionary(all, signature=u"sv")
709
return dbus.Dictionary(all, signature="sv")
620
710
621
711
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
622
out_signature=u"s",
712
out_signature="s",
623
713
path_keyword='object_path',
624
714
connection_keyword='connection')
625
715
def Introspect(self, object_path, connection):
626
716
"""Standard D-Bus method, overloaded to insert property tags.
627
717
"""
628
718
xmlstring = dbus.service.Object.Introspect(self, object_path,
629
connection)
630
document = xml.dom.minidom.parseString(xmlstring)
631
del xmlstring
632
def make_tag(document, name, prop):
633
e = document.createElement(u"property")
634
e.setAttribute(u"name", name)
635
e.setAttribute(u"type", prop._dbus_signature)
636
e.setAttribute(u"access", prop._dbus_access)
637
return e
638
for if_tag in document.getElementsByTagName(u"interface"):
639
for tag in (make_tag(document, name, prop)
640
for name, prop
641
in self._get_all_dbus_properties()
642
if prop._dbus_interface
643
== if_tag.getAttribute(u"name")):
644
if_tag.appendChild(tag)
645
xmlstring = document.toxml(u"utf-8")
646
document.unlink()
719
connection)
720
try:
721
document = xml.dom.minidom.parseString(xmlstring)
722
def make_tag(document, name, prop):
723
e = document.createElement("property")
724
e.setAttribute("name", name)
725
e.setAttribute("type", prop._dbus_signature)
726
e.setAttribute("access", prop._dbus_access)
727
return e
728
for if_tag in document.getElementsByTagName("interface"):
729
for tag in (make_tag(document, name, prop)
730
for name, prop
731
in self._get_all_dbus_properties()
732
if prop._dbus_interface
733
== if_tag.getAttribute("name")):
734
if_tag.appendChild(tag)
735
# Add the names to the return values for the
736
# "org.freedesktop.DBus.Properties" methods
737
if (if_tag.getAttribute("name")
738
== "org.freedesktop.DBus.Properties"):
739
for cn in if_tag.getElementsByTagName("method"):
740
if cn.getAttribute("name") == "Get":
741
for arg in cn.getElementsByTagName("arg"):
742
if (arg.getAttribute("direction")
743
== "out"):
744
arg.setAttribute("name", "value")
745
elif cn.getAttribute("name") == "GetAll":
746
for arg in cn.getElementsByTagName("arg"):
747
if (arg.getAttribute("direction")
748
== "out"):
749
arg.setAttribute("name", "props")
750
xmlstring = document.toxml("utf-8")
751
document.unlink()
752
except (AttributeError, xml.dom.DOMException,
753
xml.parsers.expat.ExpatError) as error:
754
logger.error("Failed to override Introspection method",
755
error)
647
756
return xmlstring
648
757
649
758
759
def datetime_to_dbus (dt, variant_level=0):
760
"""Convert a UTC datetime.datetime() to a D-Bus type."""
761
if dt is None:
762
return dbus.String("", variant_level = variant_level)
763
return dbus.String(dt.isoformat(),
764
variant_level=variant_level)
765
766
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
767
.__metaclass__):
768
"""Applied to an empty subclass of a D-Bus object, this metaclass
769
will add additional D-Bus attributes matching a certain pattern.
770
"""
771
def __new__(mcs, name, bases, attr):
772
# Go through all the base classes which could have D-Bus
773
# methods, signals, or properties in them
774
for base in (b for b in bases
775
if issubclass(b, dbus.service.Object)):
776
# Go though all attributes of the base class
777
for attrname, attribute in inspect.getmembers(base):
778
# Ignore non-D-Bus attributes, and D-Bus attributes
779
# with the wrong interface name
780
if (not hasattr(attribute, "_dbus_interface")
781
or not attribute._dbus_interface
782
.startswith("se.recompile.Mandos")):
783
continue
784
# Create an alternate D-Bus interface name based on
785
# the current name
786
alt_interface = (attribute._dbus_interface
787
.replace("se.recompile.Mandos",
788
"se.bsnet.fukt.Mandos"))
789
# Is this a D-Bus signal?
790
if getattr(attribute, "_dbus_is_signal", False):
791
# Extract the original non-method function by
792
# black magic
793
nonmethod_func = (dict(
794
zip(attribute.func_code.co_freevars,
795
attribute.__closure__))["func"]
796
.cell_contents)
797
# Create a new, but exactly alike, function
798
# object, and decorate it to be a new D-Bus signal
799
# with the alternate D-Bus interface name
800
new_function = (dbus.service.signal
801
(alt_interface,
802
attribute._dbus_signature)
803
(types.FunctionType(
804
nonmethod_func.func_code,
805
nonmethod_func.func_globals,
806
nonmethod_func.func_name,
807
nonmethod_func.func_defaults,
808
nonmethod_func.func_closure)))
809
# Define a creator of a function to call both the
810
# old and new functions, so both the old and new
811
# signals gets sent when the function is called
812
def fixscope(func1, func2):
813
"""This function is a scope container to pass
814
func1 and func2 to the "call_both" function
815
outside of its arguments"""
816
def call_both(*args, **kwargs):
817
"""This function will emit two D-Bus
818
signals by calling func1 and func2"""
819
func1(*args, **kwargs)
820
func2(*args, **kwargs)
821
return call_both
822
# Create the "call_both" function and add it to
823
# the class
824
attr[attrname] = fixscope(attribute,
825
new_function)
826
# Is this a D-Bus method?
827
elif getattr(attribute, "_dbus_is_method", False):
828
# Create a new, but exactly alike, function
829
# object. Decorate it to be a new D-Bus method
830
# with the alternate D-Bus interface name. Add it
831
# to the class.
832
attr[attrname] = (dbus.service.method
833
(alt_interface,
834
attribute._dbus_in_signature,
835
attribute._dbus_out_signature)
836
(types.FunctionType
837
(attribute.func_code,
838
attribute.func_globals,
839
attribute.func_name,
840
attribute.func_defaults,
841
attribute.func_closure)))
842
# Is this a D-Bus property?
843
elif getattr(attribute, "_dbus_is_property", False):
844
# Create a new, but exactly alike, function
845
# object, and decorate it to be a new D-Bus
846
# property with the alternate D-Bus interface
847
# name. Add it to the class.
848
attr[attrname] = (dbus_service_property
849
(alt_interface,
850
attribute._dbus_signature,
851
attribute._dbus_access,
852
attribute
853
._dbus_get_args_options
854
["byte_arrays"])
855
(types.FunctionType
856
(attribute.func_code,
857
attribute.func_globals,
858
attribute.func_name,
859
attribute.func_defaults,
860
attribute.func_closure)))
861
return type.__new__(mcs, name, bases, attr)
862
650
863
class ClientDBus(Client, DBusObjectWithProperties):
651
864
"""A Client class using D-Bus
652
865
654
867
dbus_object_path: dbus.ObjectPath
655
868
bus: dbus.SystemBus()
656
869
"""
870
871
runtime_expansions = (Client.runtime_expansions
872
+ ("dbus_object_path",))
873
657
874
# dbus.service.Object doesn't use super(), so we can't either.
658
875
659
876
def __init__(self, bus = None, *args, **kwargs):
877
self._approvals_pending = 0
660
878
self.bus = bus
661
879
Client.__init__(self, *args, **kwargs)
662
880
# Only now, when this client is initialized, can it show up on
663
881
# the D-Bus
882
client_object_name = unicode(self.name).translate(
883
{ord("."): ord("_"),
884
ord("-"): ord("_")})
664
885
self.dbus_object_path = (dbus.ObjectPath
665
(u"/clients/"
666
+ self.name.replace(u".", u"_")))
886
("/clients/" + client_object_name))
667
887
DBusObjectWithProperties.__init__(self, self.bus,
668
888
self.dbus_object_path)
669
670
@staticmethod
671
def _datetime_to_dbus(dt, variant_level=0):
672
"""Convert a UTC datetime.datetime() to a D-Bus type."""
673
return dbus.String(dt.isoformat(),
674
variant_level=variant_level)
675
676
def enable(self):
677
oldstate = getattr(self, u"enabled", False)
678
r = Client.enable(self)
679
if oldstate != self.enabled:
680
# Emit D-Bus signals
681
self.PropertyChanged(dbus.String(u"enabled"),
682
dbus.Boolean(True, variant_level=1))
683
self.PropertyChanged(
684
dbus.String(u"last_enabled"),
685
self._datetime_to_dbus(self.last_enabled,
686
variant_level=1))
687
return r
688
689
def disable(self, signal = True):
690
oldstate = getattr(self, u"enabled", False)
691
r = Client.disable(self)
692
if signal and oldstate != self.enabled:
693
# Emit D-Bus signal
694
self.PropertyChanged(dbus.String(u"enabled"),
695
dbus.Boolean(False, variant_level=1))
696
return r
889
890
def notifychangeproperty(transform_func,
891
dbus_name, type_func=lambda x: x,
892
variant_level=1):
893
""" Modify a variable so that it's a property which announces
894
its changes to DBus.
895
896
transform_fun: Function that takes a value and a variant_level
897
and transforms it to a D-Bus type.
898
dbus_name: D-Bus name of the variable
899
type_func: Function that transform the value before sending it
900
to the D-Bus. Default: no transform
901
variant_level: D-Bus variant level. Default: 1
902
"""
903
attrname = "_{0}".format(dbus_name)
904
def setter(self, value):
905
if hasattr(self, "dbus_object_path"):
906
if (not hasattr(self, attrname) or
907
type_func(getattr(self, attrname, None))
908
!= type_func(value)):
909
dbus_value = transform_func(type_func(value),
910
variant_level
911
=variant_level)
912
self.PropertyChanged(dbus.String(dbus_name),
913
dbus_value)
914
setattr(self, attrname, value)
915
916
return property(lambda self: getattr(self, attrname), setter)
917
918
919
expires = notifychangeproperty(datetime_to_dbus, "Expires")
920
approvals_pending = notifychangeproperty(dbus.Boolean,
921
"ApprovalPending",
922
type_func = bool)
923
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
924
last_enabled = notifychangeproperty(datetime_to_dbus,
925
"LastEnabled")
926
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
927
type_func = lambda checker:
928
checker is not None)
929
last_checked_ok = notifychangeproperty(datetime_to_dbus,
930
"LastCheckedOK")
931
last_approval_request = notifychangeproperty(
932
datetime_to_dbus, "LastApprovalRequest")
933
approved_by_default = notifychangeproperty(dbus.Boolean,
934
"ApprovedByDefault")
935
approval_delay = notifychangeproperty(dbus.UInt16,
936
"ApprovalDelay",
937
type_func =
938
_timedelta_to_milliseconds)
939
approval_duration = notifychangeproperty(
940
dbus.UInt16, "ApprovalDuration",
941
type_func = _timedelta_to_milliseconds)
942
host = notifychangeproperty(dbus.String, "Host")
943
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
944
type_func =
945
_timedelta_to_milliseconds)
946
extended_timeout = notifychangeproperty(
947
dbus.UInt16, "ExtendedTimeout",
948
type_func = _timedelta_to_milliseconds)
949
interval = notifychangeproperty(dbus.UInt16,
950
"Interval",
951
type_func =
952
_timedelta_to_milliseconds)
953
checker_command = notifychangeproperty(dbus.String, "Checker")
954
955
del notifychangeproperty
697
956
698
957
def __del__(self, *args, **kwargs):
699
958
try:
700
959
self.remove_from_connection()
701
960
except LookupError:
702
961
pass
703
if hasattr(DBusObjectWithProperties, u"__del__"):
962
if hasattr(DBusObjectWithProperties, "__del__"):
704
963
DBusObjectWithProperties.__del__(self, *args, **kwargs)
705
964
Client.__del__(self, *args, **kwargs)
706
965
708
967
*args, **kwargs):
709
968
self.checker_callback_tag = None
710
969
self.checker = None
711
# Emit D-Bus signal
712
self.PropertyChanged(dbus.String(u"checker_running"),
713
dbus.Boolean(False, variant_level=1))
714
970
if os.WIFEXITED(condition):
715
971
exitstatus = os.WEXITSTATUS(condition)
716
972
# Emit D-Bus signal
726
982
return Client.checker_callback(self, pid, condition, command,
727
983
*args, **kwargs)
728
984
729
def checked_ok(self, *args, **kwargs):
730
r = Client.checked_ok(self, *args, **kwargs)
731
# Emit D-Bus signal
732
self.PropertyChanged(
733
dbus.String(u"last_checked_ok"),
734
(self._datetime_to_dbus(self.last_checked_ok,
735
variant_level=1)))
736
return r
737
738
985
def start_checker(self, *args, **kwargs):
739
986
old_checker = self.checker
740
987
if self.checker is not None:
747
994
and old_checker_pid != self.checker.pid):
748
995
# Emit D-Bus signal
749
996
self.CheckerStarted(self.current_checker_command)
750
self.PropertyChanged(
751
dbus.String(u"checker_running"),
752
dbus.Boolean(True, variant_level=1))
753
return r
754
755
def stop_checker(self, *args, **kwargs):
756
old_checker = getattr(self, u"checker", None)
757
r = Client.stop_checker(self, *args, **kwargs)
758
if (old_checker is not None
759
and getattr(self, u"checker", None) is None):
760
self.PropertyChanged(dbus.String(u"checker_running"),
761
dbus.Boolean(False, variant_level=1))
762
return r
763
764
## D-Bus methods & signals
765
_interface = u"se.bsnet.fukt.Mandos.Client"
766
767
# CheckedOK - method
768
@dbus.service.method(_interface)
769
def CheckedOK(self):
770
return self.checked_ok()
997
return r
998
999
def _reset_approved(self):
1000
self._approved = None
1001
return False
1002
1003
def approve(self, value=True):
1004
self.send_changedstate()
1005
self._approved = value
1006
gobject.timeout_add(_timedelta_to_milliseconds
1007
(self.approval_duration),
1008
self._reset_approved)
1009
1010
1011
## D-Bus methods, signals & properties
1012
_interface = "se.recompile.Mandos.Client"
1013
1014
## Signals
771
1015
772
1016
# CheckerCompleted - signal
773
@dbus.service.signal(_interface, signature=u"nxs")
1017
@dbus.service.signal(_interface, signature="nxs")
774
1018
def CheckerCompleted(self, exitcode, waitstatus, command):
775
1019
"D-Bus signal"
776
1020
pass
777
1021
778
1022
# CheckerStarted - signal
779
@dbus.service.signal(_interface, signature=u"s")
1023
@dbus.service.signal(_interface, signature="s")
780
1024
def CheckerStarted(self, command):
781
1025
"D-Bus signal"
782
1026
pass
783
1027
784
1028
# PropertyChanged - signal
785
@dbus.service.signal(_interface, signature=u"sv")
1029
@dbus.service.signal(_interface, signature="sv")
786
1030
def PropertyChanged(self, property, value):
787
1031
"D-Bus signal"
788
1032
pass
789
1033
790
# ReceivedSecret - signal
1034
# GotSecret - signal
791
1035
@dbus.service.signal(_interface)
792
def ReceivedSecret(self):
793
"D-Bus signal"
1036
def GotSecret(self):
1037
"""D-Bus signal
1038
Is sent after a successful transfer of secret from the Mandos
1039
server to mandos-client
1040
"""
794
1041
pass
795
1042
796
1043
# Rejected - signal
797
@dbus.service.signal(_interface)
798
def Rejected(self):
1044
@dbus.service.signal(_interface, signature="s")
1045
def Rejected(self, reason):
799
1046
"D-Bus signal"
800
1047
pass
801
1048
1049
# NeedApproval - signal
1050
@dbus.service.signal(_interface, signature="tb")
1051
def NeedApproval(self, timeout, default):
1052
"D-Bus signal"
1053
return self.need_approval()
1054
1055
## Methods
1056
1057
# Approve - method
1058
@dbus.service.method(_interface, in_signature="b")
1059
def Approve(self, value):
1060
self.approve(value)
1061
1062
# CheckedOK - method
1063
@dbus.service.method(_interface)
1064
def CheckedOK(self):
1065
self.checked_ok()
1066
802
1067
# Enable - method
803
1068
@dbus.service.method(_interface)
804
1069
def Enable(self):
822
1087
def StopChecker(self):
823
1088
self.stop_checker()
824
1089
825
# name - property
826
@dbus_service_property(_interface, signature=u"s", access=u"read")
827
def name_dbus_property(self):
1090
## Properties
1091
1092
# ApprovalPending - property
1093
@dbus_service_property(_interface, signature="b", access="read")
1094
def ApprovalPending_dbus_property(self):
1095
return dbus.Boolean(bool(self.approvals_pending))
1096
1097
# ApprovedByDefault - property
1098
@dbus_service_property(_interface, signature="b",
1099
access="readwrite")
1100
def ApprovedByDefault_dbus_property(self, value=None):
1101
if value is None: # get
1102
return dbus.Boolean(self.approved_by_default)
1103
self.approved_by_default = bool(value)
1104
1105
# ApprovalDelay - property
1106
@dbus_service_property(_interface, signature="t",
1107
access="readwrite")
1108
def ApprovalDelay_dbus_property(self, value=None):
1109
if value is None: # get
1110
return dbus.UInt64(self.approval_delay_milliseconds())
1111
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1112
1113
# ApprovalDuration - property
1114
@dbus_service_property(_interface, signature="t",
1115
access="readwrite")
1116
def ApprovalDuration_dbus_property(self, value=None):
1117
if value is None: # get
1118
return dbus.UInt64(_timedelta_to_milliseconds(
1119
self.approval_duration))
1120
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1121
1122
# Name - property
1123
@dbus_service_property(_interface, signature="s", access="read")
1124
def Name_dbus_property(self):
828
1125
return dbus.String(self.name)
829
1126
830
# fingerprint - property
831
@dbus_service_property(_interface, signature=u"s", access=u"read")
832
def fingerprint_dbus_property(self):
1127
# Fingerprint - property
1128
@dbus_service_property(_interface, signature="s", access="read")
1129
def Fingerprint_dbus_property(self):
833
1130
return dbus.String(self.fingerprint)
834
1131
835
# host - property
836
@dbus_service_property(_interface, signature=u"s",
837
access=u"readwrite")
838
def host_dbus_property(self, value=None):
1132
# Host - property
1133
@dbus_service_property(_interface, signature="s",
1134
access="readwrite")
1135
def Host_dbus_property(self, value=None):
839
1136
if value is None: # get
840
1137
return dbus.String(self.host)
841
1138
self.host = value
842
# Emit D-Bus signal
843
self.PropertyChanged(dbus.String(u"host"),
844
dbus.String(value, variant_level=1))
845
846
# created - property
847
@dbus_service_property(_interface, signature=u"s", access=u"read")
848
def created_dbus_property(self):
849
return dbus.String(self._datetime_to_dbus(self.created))
850
851
# last_enabled - property
852
@dbus_service_property(_interface, signature=u"s", access=u"read")
853
def last_enabled_dbus_property(self):
854
if self.last_enabled is None:
855
return dbus.String(u"")
856
return dbus.String(self._datetime_to_dbus(self.last_enabled))
857
858
# enabled - property
859
@dbus_service_property(_interface, signature=u"b",
860
access=u"readwrite")
861
def enabled_dbus_property(self, value=None):
1139
1140
# Created - property
1141
@dbus_service_property(_interface, signature="s", access="read")
1142
def Created_dbus_property(self):
1143
return dbus.String(datetime_to_dbus(self.created))
1144
1145
# LastEnabled - property
1146
@dbus_service_property(_interface, signature="s", access="read")
1147
def LastEnabled_dbus_property(self):
1148
return datetime_to_dbus(self.last_enabled)
1149
1150
# Enabled - property
1151
@dbus_service_property(_interface, signature="b",
1152
access="readwrite")
1153
def Enabled_dbus_property(self, value=None):
862
1154
if value is None: # get
863
1155
return dbus.Boolean(self.enabled)
864
1156
if value:
866
1158
else:
867
1159
self.disable()
868
1160
869
# last_checked_ok - property
870
@dbus_service_property(_interface, signature=u"s",
871
access=u"readwrite")
872
def last_checked_ok_dbus_property(self, value=None):
1161
# LastCheckedOK - property
1162
@dbus_service_property(_interface, signature="s",
1163
access="readwrite")
1164
def LastCheckedOK_dbus_property(self, value=None):
873
1165
if value is not None:
874
1166
self.checked_ok()
875
1167
return
876
if self.last_checked_ok is None:
877
return dbus.String(u"")
878
return dbus.String(self._datetime_to_dbus(self
879
.last_checked_ok))
880
881
# timeout - property
882
@dbus_service_property(_interface, signature=u"t",
883
access=u"readwrite")
884
def timeout_dbus_property(self, value=None):
1168
return datetime_to_dbus(self.last_checked_ok)
1169
1170
# Expires - property
1171
@dbus_service_property(_interface, signature="s", access="read")
1172
def Expires_dbus_property(self):
1173
return datetime_to_dbus(self.expires)
1174
1175
# LastApprovalRequest - property
1176
@dbus_service_property(_interface, signature="s", access="read")
1177
def LastApprovalRequest_dbus_property(self):
1178
return datetime_to_dbus(self.last_approval_request)
1179
1180
# Timeout - property
1181
@dbus_service_property(_interface, signature="t",
1182
access="readwrite")
1183
def Timeout_dbus_property(self, value=None):
885
1184
if value is None: # get
886
1185
return dbus.UInt64(self.timeout_milliseconds())
887
1186
self.timeout = datetime.timedelta(0, 0, 0, value)
888
# Emit D-Bus signal
889
self.PropertyChanged(dbus.String(u"timeout"),
890
dbus.UInt64(value, variant_level=1))
891
if getattr(self, u"disable_initiator_tag", None) is None:
1187
if getattr(self, "disable_initiator_tag", None) is None:
892
1188
return
893
1189
# Reschedule timeout
894
1190
gobject.source_remove(self.disable_initiator_tag)
895
1191
self.disable_initiator_tag = None
896
time_to_die = (self.
897
_timedelta_to_milliseconds((self
898
.last_checked_ok
899
+ self.timeout)
900
- datetime.datetime
901
.utcnow()))
1192
self.expires = None
1193
time_to_die = _timedelta_to_milliseconds((self
1194
.last_checked_ok
1195
+ self.timeout)
1196
- datetime.datetime
1197
.utcnow())
902
1198
if time_to_die <= 0:
903
1199
# The timeout has passed
904
1200
self.disable()
905
1201
else:
1202
self.expires = (datetime.datetime.utcnow()
1203
+ datetime.timedelta(milliseconds =
1204
time_to_die))
906
1205
self.disable_initiator_tag = (gobject.timeout_add
907
1206
(time_to_die, self.disable))
908
1207
909
# interval - property
910
@dbus_service_property(_interface, signature=u"t",
911
access=u"readwrite")
912
def interval_dbus_property(self, value=None):
1208
# ExtendedTimeout - property
1209
@dbus_service_property(_interface, signature="t",
1210
access="readwrite")
1211
def ExtendedTimeout_dbus_property(self, value=None):
1212
if value is None: # get
1213
return dbus.UInt64(self.extended_timeout_milliseconds())
1214
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1215
1216
# Interval - property
1217
@dbus_service_property(_interface, signature="t",
1218
access="readwrite")
1219
def Interval_dbus_property(self, value=None):
913
1220
if value is None: # get
914
1221
return dbus.UInt64(self.interval_milliseconds())
915
1222
self.interval = datetime.timedelta(0, 0, 0, value)
916
# Emit D-Bus signal
917
self.PropertyChanged(dbus.String(u"interval"),
918
dbus.UInt64(value, variant_level=1))
919
if getattr(self, u"checker_initiator_tag", None) is None:
1223
if getattr(self, "checker_initiator_tag", None) is None:
920
1224
return
921
1225
# Reschedule checker run
922
1226
gobject.source_remove(self.checker_initiator_tag)
923
1227
self.checker_initiator_tag = (gobject.timeout_add
924
1228
(value, self.start_checker))
925
1229
self.start_checker() # Start one now, too
926
927
# checker - property
928
@dbus_service_property(_interface, signature=u"s",
929
access=u"readwrite")
930
def checker_dbus_property(self, value=None):
1230
1231
# Checker - property
1232
@dbus_service_property(_interface, signature="s",
1233
access="readwrite")
1234
def Checker_dbus_property(self, value=None):
931
1235
if value is None: # get
932
1236
return dbus.String(self.checker_command)
933
1237
self.checker_command = value
934
# Emit D-Bus signal
935
self.PropertyChanged(dbus.String(u"checker"),
936
dbus.String(self.checker_command,
937
variant_level=1))
938
1238
939
# checker_running - property
940
@dbus_service_property(_interface, signature=u"b",
941
access=u"readwrite")
942
def checker_running_dbus_property(self, value=None):
1239
# CheckerRunning - property
1240
@dbus_service_property(_interface, signature="b",
1241
access="readwrite")
1242
def CheckerRunning_dbus_property(self, value=None):
943
1243
if value is None: # get
944
1244
return dbus.Boolean(self.checker is not None)
945
1245
if value:
947
1247
else:
948
1248
self.stop_checker()
949
1249
950
# object_path - property
951
@dbus_service_property(_interface, signature=u"o", access=u"read")
952
def object_path_dbus_property(self):
1250
# ObjectPath - property
1251
@dbus_service_property(_interface, signature="o", access="read")
1252
def ObjectPath_dbus_property(self):
953
1253
return self.dbus_object_path # is already a dbus.ObjectPath
954
1254
955
# secret = property
956
@dbus_service_property(_interface, signature=u"ay",
957
access=u"write", byte_arrays=True)
958
def secret_dbus_property(self, value):
1255
# Secret = property
1256
@dbus_service_property(_interface, signature="ay",
1257
access="write", byte_arrays=True)
1258
def Secret_dbus_property(self, value):
959
1259
self.secret = str(value)
960
1260
961
1261
del _interface
962
1262
963
1263
1264
class ProxyClient(object):
1265
def __init__(self, child_pipe, fpr, address):
1266
self._pipe = child_pipe
1267
self._pipe.send(('init', fpr, address))
1268
if not self._pipe.recv():
1269
raise KeyError()
1270
1271
def __getattribute__(self, name):
1272
if(name == '_pipe'):
1273
return super(ProxyClient, self).__getattribute__(name)
1274
self._pipe.send(('getattr', name))
1275
data = self._pipe.recv()
1276
if data[0] == 'data':
1277
return data[1]
1278
if data[0] == 'function':
1279
def func(*args, **kwargs):
1280
self._pipe.send(('funcall', name, args, kwargs))
1281
return self._pipe.recv()[1]
1282
return func
1283
1284
def __setattr__(self, name, value):
1285
if(name == '_pipe'):
1286
return super(ProxyClient, self).__setattr__(name, value)
1287
self._pipe.send(('setattr', name, value))
1288
1289
class ClientDBusTransitional(ClientDBus):
1290
__metaclass__ = AlternateDBusNamesMetaclass
1291
964
1292
class ClientHandler(socketserver.BaseRequestHandler, object):
965
1293
"""A class to handle client connections.
966
1294
968
1296
Note: This will run in its own forked process."""
969
1297
970
1298
def handle(self):
971
logger.info(u"TCP connection from: %s",
972
unicode(self.client_address))
973
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
974
# Open IPC pipe to parent process
975
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1299
with contextlib.closing(self.server.child_pipe) as child_pipe:
1300
logger.info("TCP connection from: %s",
1301
unicode(self.client_address))
1302
logger.debug("Pipe FD: %d",
1303
self.server.child_pipe.fileno())
1304
976
1305
session = (gnutls.connection
977
1306
.ClientSession(self.request,
978
1307
gnutls.connection
979
1308
.X509Credentials()))
980
1309
981
line = self.request.makefile().readline()
982
logger.debug(u"Protocol version: %r", line)
983
try:
984
if int(line.strip().split()[0]) > 1:
985
raise RuntimeError
986
except (ValueError, IndexError, RuntimeError), error:
987
logger.error(u"Unknown protocol version: %s", error)
988
return
989
990
1310
# Note: gnutls.connection.X509Credentials is really a
991
1311
# generic GnuTLS certificate credentials object so long as
992
1312
# no X.509 keys are added to it. Therefore, we can use it
993
1313
# here despite using OpenPGP certificates.
994
1314
995
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
996
# u"+AES-256-CBC", u"+SHA1",
997
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
998
# u"+DHE-DSS"))
1315
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1316
# "+AES-256-CBC", "+SHA1",
1317
# "+COMP-NULL", "+CTYPE-OPENPGP",
1318
# "+DHE-DSS"))
999
1319
# Use a fallback default, since this MUST be set.
1000
1320
priority = self.server.gnutls_priority
1001
1321
if priority is None:
1002
priority = u"NORMAL"
1322
priority = "NORMAL"
1003
1323
(gnutls.library.functions
1004
1324
.gnutls_priority_set_direct(session._c_object,
1005
1325
priority, None))
1006
1326
1327
# Start communication using the Mandos protocol
1328
# Get protocol number
1329
line = self.request.makefile().readline()
1330
logger.debug("Protocol version: %r", line)
1331
try:
1332
if int(line.strip().split()[0]) > 1:
1333
raise RuntimeError
1334
except (ValueError, IndexError, RuntimeError) as error:
1335
logger.error("Unknown protocol version: %s", error)
1336
return
1337
1338
# Start GnuTLS connection
1007
1339
try:
1008
1340
session.handshake()
1009
except gnutls.errors.GNUTLSError, error:
1010
logger.warning(u"Handshake failed: %s", error)
1341
except gnutls.errors.GNUTLSError as error:
1342
logger.warning("Handshake failed: %s", error)
1011
1343
# Do not run session.bye() here: the session is not
1012
1344
# established. Just abandon the request.
1013
1345
return
1014
logger.debug(u"Handshake succeeded")
1346
logger.debug("Handshake succeeded")
1347
1348
approval_required = False
1015
1349
try:
1016
fpr = self.fingerprint(self.peer_certificate(session))
1017
except (TypeError, gnutls.errors.GNUTLSError), error:
1018
logger.warning(u"Bad certificate: %s", error)
1019
session.bye()
1020
return
1021
logger.debug(u"Fingerprint: %s", fpr)
1350
try:
1351
fpr = self.fingerprint(self.peer_certificate
1352
(session))
1353
except (TypeError,
1354
gnutls.errors.GNUTLSError) as error:
1355
logger.warning("Bad certificate: %s", error)
1356
return
1357
logger.debug("Fingerprint: %s", fpr)
1358
1359
try:
1360
client = ProxyClient(child_pipe, fpr,
1361
self.client_address)
1362
except KeyError:
1363
return
1364
1365
if client.approval_delay:
1366
delay = client.approval_delay
1367
client.approvals_pending += 1
1368
approval_required = True
1369
1370
while True:
1371
if not client.enabled:
1372
logger.info("Client %s is disabled",
1373
client.name)
1374
if self.server.use_dbus:
1375
# Emit D-Bus signal
1376
client.Rejected("Disabled")
1377
return
1378
1379
if client._approved or not client.approval_delay:
1380
#We are approved or approval is disabled
1381
break
1382
elif client._approved is None:
1383
logger.info("Client %s needs approval",
1384
client.name)
1385
if self.server.use_dbus:
1386
# Emit D-Bus signal
1387
client.NeedApproval(
1388
client.approval_delay_milliseconds(),
1389
client.approved_by_default)
1390
else:
1391
logger.warning("Client %s was not approved",
1392
client.name)
1393
if self.server.use_dbus:
1394
# Emit D-Bus signal
1395
client.Rejected("Denied")
1396
return
1397
1398
#wait until timeout or approved
1399
time = datetime.datetime.now()
1400
client.changedstate.acquire()
1401
(client.changedstate.wait
1402
(float(client._timedelta_to_milliseconds(delay)
1403
/ 1000)))
1404
client.changedstate.release()
1405
time2 = datetime.datetime.now()
1406
if (time2 - time) >= delay:
1407
if not client.approved_by_default:
1408
logger.warning("Client %s timed out while"
1409
" waiting for approval",
1410
client.name)
1411
if self.server.use_dbus:
1412
# Emit D-Bus signal
1413
client.Rejected("Approval timed out")
1414
return
1415
else:
1416
break
1417
else:
1418
delay -= time2 - time
1419
1420
sent_size = 0
1421
while sent_size < len(client.secret):
1422
try:
1423
sent = session.send(client.secret[sent_size:])
1424
except gnutls.errors.GNUTLSError as error:
1425
logger.warning("gnutls send failed")
1426
return
1427
logger.debug("Sent: %d, remaining: %d",
1428
sent, len(client.secret)
1429
- (sent_size + sent))
1430
sent_size += sent
1431
1432
logger.info("Sending secret to %s", client.name)
1433
# bump the timeout using extended_timeout
1434
client.checked_ok(client.extended_timeout)
1435
if self.server.use_dbus:
1436
# Emit D-Bus signal
1437
client.GotSecret()
1022
1438
1023
for c in self.server.clients:
1024
if c.fingerprint == fpr:
1025
client = c
1026
break
1027
else:
1028
ipc.write(u"NOTFOUND %s %s\n"
1029
% (fpr, unicode(self.client_address)))
1030
session.bye()
1031
return
1032
# Have to check if client.still_valid(), since it is
1033
# possible that the client timed out while establishing
1034
# the GnuTLS session.
1035
if not client.still_valid():
1036
ipc.write(u"INVALID %s\n" % client.name)
1037
session.bye()
1038
return
1039
ipc.write(u"SENDING %s\n" % client.name)
1040
sent_size = 0
1041
while sent_size < len(client.secret):
1042
sent = session.send(client.secret[sent_size:])
1043
logger.debug(u"Sent: %d, remaining: %d",
1044
sent, len(client.secret)
1045
- (sent_size + sent))
1046
sent_size += sent
1047
session.bye()
1439
finally:
1440
if approval_required:
1441
client.approvals_pending -= 1
1442
try:
1443
session.bye()
1444
except gnutls.errors.GNUTLSError as error:
1445
logger.warning("GnuTLS bye failed")
1048
1446
1049
1447
@staticmethod
1050
1448
def peer_certificate(session):
1060
1458
.gnutls_certificate_get_peers
1061
1459
(session._c_object, ctypes.byref(list_size)))
1062
1460
if not bool(cert_list) and list_size.value != 0:
1063
raise gnutls.errors.GNUTLSError(u"error getting peer"
1064
u" certificate")
1461
raise gnutls.errors.GNUTLSError("error getting peer"
1462
" certificate")
1065
1463
if list_size.value == 0:
1066
1464
return None
1067
1465
cert = cert_list[0]
1093
1491
if crtverify.value != 0:
1094
1492
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1095
1493
raise (gnutls.errors.CertificateSecurityError
1096
(u"Verify failed"))
1494
("Verify failed"))
1097
1495
# New buffer for the fingerprint
1098
1496
buf = ctypes.create_string_buffer(20)
1099
1497
buf_len = ctypes.c_size_t()
1106
1504
# Convert the buffer to a Python bytestring
1107
1505
fpr = ctypes.string_at(buf, buf_len.value)
1108
1506
# Convert the bytestring to hexadecimal notation
1109
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1507
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1110
1508
return hex_fpr
1111
1509
1112
1510
1113
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1114
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1511
class MultiprocessingMixIn(object):
1512
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1513
def sub_process_main(self, request, address):
1514
try:
1515
self.finish_request(request, address)
1516
except:
1517
self.handle_error(request, address)
1518
self.close_request(request)
1519
1520
def process_request(self, request, address):
1521
"""Start a new process to process the request."""
1522
proc = multiprocessing.Process(target = self.sub_process_main,
1523
args = (request,
1524
address))
1525
proc.start()
1526
return proc
1527
1528
1529
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1530
""" adds a pipe to the MixIn """
1115
1531
def process_request(self, request, client_address):
1116
1532
"""Overrides and wraps the original process_request().
1117
1533
1118
1534
This function creates a new pipe in self.pipe
1119
1535
"""
1120
self.pipe = os.pipe()
1121
super(ForkingMixInWithPipe,
1122
self).process_request(request, client_address)
1123
os.close(self.pipe[1]) # close write end
1124
self.add_pipe(self.pipe[0])
1125
def add_pipe(self, pipe):
1536
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1537
1538
proc = MultiprocessingMixIn.process_request(self, request,
1539
client_address)
1540
self.child_pipe.close()
1541
self.add_pipe(parent_pipe, proc)
1542
1543
def add_pipe(self, parent_pipe, proc):
1126
1544
"""Dummy function; override as necessary"""
1127
os.close(pipe)
1128
1129
1130
class IPv6_TCPServer(ForkingMixInWithPipe,
1545
raise NotImplementedError
1546
1547
1548
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1131
1549
socketserver.TCPServer, object):
1132
1550
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1133
1551
1149
1567
bind to an address or port if they were not specified."""
1150
1568
if self.interface is not None:
1151
1569
if SO_BINDTODEVICE is None:
1152
logger.error(u"SO_BINDTODEVICE does not exist;"
1153
u" cannot bind to interface %s",
1570
logger.error("SO_BINDTODEVICE does not exist;"
1571
" cannot bind to interface %s",
1154
1572
self.interface)
1155
1573
else:
1156
1574
try:
1157
1575
self.socket.setsockopt(socket.SOL_SOCKET,
1158
1576
SO_BINDTODEVICE,
1159
1577
str(self.interface
1160
+ u'\0'))
1161
except socket.error, error:
1578
+ '\0'))
1579
except socket.error as error:
1162
1580
if error[0] == errno.EPERM:
1163
logger.error(u"No permission to"
1164
u" bind to interface %s",
1581
logger.error("No permission to"
1582
" bind to interface %s",
1165
1583
self.interface)
1166
1584
elif error[0] == errno.ENOPROTOOPT:
1167
logger.error(u"SO_BINDTODEVICE not available;"
1168
u" cannot bind to interface %s",
1585
logger.error("SO_BINDTODEVICE not available;"
1586
" cannot bind to interface %s",
1169
1587
self.interface)
1170
1588
else:
1171
1589
raise
1173
1591
if self.server_address[0] or self.server_address[1]:
1174
1592
if not self.server_address[0]:
1175
1593
if self.address_family == socket.AF_INET6:
1176
any_address = u"::" # in6addr_any
1594
any_address = "::" # in6addr_any
1177
1595
else:
1178
1596
any_address = socket.INADDR_ANY
1179
1597
self.server_address = (any_address,
1216
1634
def server_activate(self):
1217
1635
if self.enabled:
1218
1636
return socketserver.TCPServer.server_activate(self)
1637
1219
1638
def enable(self):
1220
1639
self.enabled = True
1221
def add_pipe(self, pipe):
1640
1641
def add_pipe(self, parent_pipe, proc):
1222
1642
# Call "handle_ipc" for both data and EOF events
1223
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1224
self.handle_ipc)
1225
def handle_ipc(self, source, condition, file_objects={}):
1643
gobject.io_add_watch(parent_pipe.fileno(),
1644
gobject.IO_IN | gobject.IO_HUP,
1645
functools.partial(self.handle_ipc,
1646
parent_pipe =
1647
parent_pipe,
1648
proc = proc))
1649
1650
def handle_ipc(self, source, condition, parent_pipe=None,
1651
proc = None, client_object=None):
1226
1652
condition_names = {
1227
gobject.IO_IN: u"IN", # There is data to read.
1228
gobject.IO_OUT: u"OUT", # Data can be written (without
1653
gobject.IO_IN: "IN", # There is data to read.
1654
gobject.IO_OUT: "OUT", # Data can be written (without
1229
1655
# blocking).
1230
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1231
gobject.IO_ERR: u"ERR", # Error condition.
1232
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1656
gobject.IO_PRI: "PRI", # There is urgent data to read.
1657
gobject.IO_ERR: "ERR", # Error condition.
1658
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1233
1659
# broken, usually for pipes and
1234
1660
# sockets).
1235
1661
}
1237
1663
for cond, name in
1238
1664
condition_names.iteritems()
1239
1665
if cond & condition)
1240
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1241
conditions_string)
1242
1243
# Turn the pipe file descriptor into a Python file object
1244
if source not in file_objects:
1245
file_objects[source] = os.fdopen(source, u"r", 1)
1246
1247
# Read a line from the file object
1248
cmdline = file_objects[source].readline()
1249
if not cmdline: # Empty line means end of file
1250
# close the IPC pipe
1251
file_objects[source].close()
1252
del file_objects[source]
1253
1254
# Stop calling this function
1255
return False
1256
1257
logger.debug(u"IPC command: %r", cmdline)
1258
1259
# Parse and act on command
1260
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1261
1262
if cmd == u"NOTFOUND":
1263
logger.warning(u"Client not found for fingerprint: %s",
1264
args)
1265
if self.use_dbus:
1266
# Emit D-Bus signal
1267
mandos_dbus_service.ClientNotFound(args)
1268
elif cmd == u"INVALID":
1269
for client in self.clients:
1270
if client.name == args:
1271
logger.warning(u"Client %s is invalid", args)
1272
if self.use_dbus:
1273
# Emit D-Bus signal
1274
client.Rejected()
1275
break
1276
else:
1277
logger.error(u"Unknown client %s is invalid", args)
1278
elif cmd == u"SENDING":
1279
for client in self.clients:
1280
if client.name == args:
1281
logger.info(u"Sending secret to %s", client.name)
1282
client.checked_ok()
1283
if self.use_dbus:
1284
# Emit D-Bus signal
1285
client.ReceivedSecret()
1286
break
1287
else:
1288
logger.error(u"Sending secret to unknown client %s",
1289
args)
1290
else:
1291
logger.error(u"Unknown IPC command: %r", cmdline)
1292
1293
# Keep calling this function
1666
# error, or the other end of multiprocessing.Pipe has closed
1667
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1668
# Wait for other process to exit
1669
proc.join()
1670
return False
1671
1672
# Read a request from the child
1673
request = parent_pipe.recv()
1674
command = request[0]
1675
1676
if command == 'init':
1677
fpr = request[1]
1678
address = request[2]
1679
1680
for c in self.clients:
1681
if c.fingerprint == fpr:
1682
client = c
1683
break
1684
else:
1685
logger.info("Client not found for fingerprint: %s, ad"
1686
"dress: %s", fpr, address)
1687
if self.use_dbus:
1688
# Emit D-Bus signal
1689
mandos_dbus_service.ClientNotFound(fpr,
1690
address[0])
1691
parent_pipe.send(False)
1692
return False
1693
1694
gobject.io_add_watch(parent_pipe.fileno(),
1695
gobject.IO_IN | gobject.IO_HUP,
1696
functools.partial(self.handle_ipc,
1697
parent_pipe =
1698
parent_pipe,
1699
proc = proc,
1700
client_object =
1701
client))
1702
parent_pipe.send(True)
1703
# remove the old hook in favor of the new above hook on
1704
# same fileno
1705
return False
1706
if command == 'funcall':
1707
funcname = request[1]
1708
args = request[2]
1709
kwargs = request[3]
1710
1711
parent_pipe.send(('data', getattr(client_object,
1712
funcname)(*args,
1713
**kwargs)))
1714
1715
if command == 'getattr':
1716
attrname = request[1]
1717
if callable(client_object.__getattribute__(attrname)):
1718
parent_pipe.send(('function',))
1719
else:
1720
parent_pipe.send(('data', client_object
1721
.__getattribute__(attrname)))
1722
1723
if command == 'setattr':
1724
attrname = request[1]
1725
value = request[2]
1726
setattr(client_object, attrname, value)
1727
1294
1728
return True
1295
1729
1296
1730
1297
1731
def string_to_delta(interval):
1298
1732
"""Parse a string and return a datetime.timedelta
1299
1733
1300
>>> string_to_delta(u'7d')
1734
>>> string_to_delta('7d')
1301
1735
datetime.timedelta(7)
1302
>>> string_to_delta(u'60s')
1736
>>> string_to_delta('60s')
1303
1737
datetime.timedelta(0, 60)
1304
>>> string_to_delta(u'60m')
1738
>>> string_to_delta('60m')
1305
1739
datetime.timedelta(0, 3600)
1306
>>> string_to_delta(u'24h')
1740
>>> string_to_delta('24h')
1307
1741
datetime.timedelta(1)
1308
>>> string_to_delta(u'1w')
1742
>>> string_to_delta('1w')
1309
1743
datetime.timedelta(7)
1310
>>> string_to_delta(u'5m 30s')
1744
>>> string_to_delta('5m 30s')
1311
1745
datetime.timedelta(0, 330)
1312
1746
"""
1313
1747
timevalue = datetime.timedelta(0)
1315
1749
try:
1316
1750
suffix = unicode(s[-1])
1317
1751
value = int(s[:-1])
1318
if suffix == u"d":
1752
if suffix == "d":
1319
1753
delta = datetime.timedelta(value)
1320
elif suffix == u"s":
1754
elif suffix == "s":
1321
1755
delta = datetime.timedelta(0, value)
1322
elif suffix == u"m":
1756
elif suffix == "m":
1323
1757
delta = datetime.timedelta(0, 0, 0, 0, value)
1324
elif suffix == u"h":
1758
elif suffix == "h":
1325
1759
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1326
elif suffix == u"w":
1760
elif suffix == "w":
1327
1761
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1328
1762
else:
1329
raise ValueError
1330
except (ValueError, IndexError):
1331
raise ValueError
1763
raise ValueError("Unknown suffix %r" % suffix)
1764
except (ValueError, IndexError) as e:
1765
raise ValueError(*(e.args))
1332
1766
timevalue += delta
1333
1767
return timevalue
1334
1768
1340
1774
global if_nametoindex
1341
1775
try:
1342
1776
if_nametoindex = (ctypes.cdll.LoadLibrary
1343
(ctypes.util.find_library(u"c"))
1777
(ctypes.util.find_library("c"))
1344
1778
.if_nametoindex)
1345
1779
except (OSError, AttributeError):
1346
logger.warning(u"Doing if_nametoindex the hard way")
1780
logger.warning("Doing if_nametoindex the hard way")
1347
1781
def if_nametoindex(interface):
1348
1782
"Get an interface index the hard way, i.e. using fcntl()"
1349
1783
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1350
with closing(socket.socket()) as s:
1784
with contextlib.closing(socket.socket()) as s:
1351
1785
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1352
struct.pack(str(u"16s16x"),
1786
struct.pack(str("16s16x"),
1353
1787
interface))
1354
interface_index = struct.unpack(str(u"I"),
1788
interface_index = struct.unpack(str("I"),
1355
1789
ifreq[16:20])[0]
1356
1790
return interface_index
1357
1791
return if_nametoindex(interface)
1365
1799
sys.exit()
1366
1800
os.setsid()
1367
1801
if not nochdir:
1368
os.chdir(u"/")
1802
os.chdir("/")
1369
1803
if os.fork():
1370
1804
sys.exit()
1371
1805
if not noclose:
1373
1807
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1374
1808
if not stat.S_ISCHR(os.fstat(null).st_mode):
1375
1809
raise OSError(errno.ENODEV,
1376
u"/dev/null not a character device")
1810
"%s not a character device"
1811
% os.path.devnull)
1377
1812
os.dup2(null, sys.stdin.fileno())
1378
1813
os.dup2(null, sys.stdout.fileno())
1379
1814
os.dup2(null, sys.stderr.fileno())
1386
1821
##################################################################
1387
1822
# Parsing of options, both command line and config file
1388
1823
1389
parser = optparse.OptionParser(version = "%%prog %s" % version)
1390
parser.add_option("-i", u"--interface", type=u"string",
1391
metavar="IF", help=u"Bind to interface IF")
1392
parser.add_option("-a", u"--address", type=u"string",
1393
help=u"Address to listen for requests on")
1394
parser.add_option("-p", u"--port", type=u"int",
1395
help=u"Port number to receive requests on")
1396
parser.add_option("--check", action=u"store_true",
1397
help=u"Run self-test")
1398
parser.add_option("--debug", action=u"store_true",
1399
help=u"Debug mode; run in foreground and log to"
1400
u" terminal")
1401
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1402
u" priority string (see GnuTLS documentation)")
1403
parser.add_option("--servicename", type=u"string",
1404
metavar=u"NAME", help=u"Zeroconf service name")
1405
parser.add_option("--configdir", type=u"string",
1406
default=u"/etc/mandos", metavar=u"DIR",
1407
help=u"Directory to search for configuration"
1408
u" files")
1409
parser.add_option("--no-dbus", action=u"store_false",
1410
dest=u"use_dbus", help=u"Do not provide D-Bus"
1411
u" system bus interface")
1412
parser.add_option("--no-ipv6", action=u"store_false",
1413
dest=u"use_ipv6", help=u"Do not use IPv6")
1414
options = parser.parse_args()[0]
1824
parser = argparse.ArgumentParser()
1825
parser.add_argument("-v", "--version", action="version",
1826
version = "%%(prog)s %s" % version,
1827
help="show version number and exit")
1828
parser.add_argument("-i", "--interface", metavar="IF",
1829
help="Bind to interface IF")
1830
parser.add_argument("-a", "--address",
1831
help="Address to listen for requests on")
1832
parser.add_argument("-p", "--port", type=int,
1833
help="Port number to receive requests on")
1834
parser.add_argument("--check", action="store_true",
1835
help="Run self-test")
1836
parser.add_argument("--debug", action="store_true",
1837
help="Debug mode; run in foreground and log"
1838
" to terminal")
1839
parser.add_argument("--debuglevel", metavar="LEVEL",
1840
help="Debug level for stdout output")
1841
parser.add_argument("--priority", help="GnuTLS"
1842
" priority string (see GnuTLS documentation)")
1843
parser.add_argument("--servicename",
1844
metavar="NAME", help="Zeroconf service name")
1845
parser.add_argument("--configdir",
1846
default="/etc/mandos", metavar="DIR",
1847
help="Directory to search for configuration"
1848
" files")
1849
parser.add_argument("--no-dbus", action="store_false",
1850
dest="use_dbus", help="Do not provide D-Bus"
1851
" system bus interface")
1852
parser.add_argument("--no-ipv6", action="store_false",
1853
dest="use_ipv6", help="Do not use IPv6")
1854
options = parser.parse_args()
1415
1855
1416
1856
if options.check:
1417
1857
import doctest
1419
1859
sys.exit()
1420
1860
1421
1861
# Default values for config file for server-global settings
1422
server_defaults = { u"interface": u"",
1423
u"address": u"",
1424
u"port": u"",
1425
u"debug": u"False",
1426
u"priority":
1427
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1428
u"servicename": u"Mandos",
1429
u"use_dbus": u"True",
1430
u"use_ipv6": u"True",
1862
server_defaults = { "interface": "",
1863
"address": "",
1864
"port": "",
1865
"debug": "False",
1866
"priority":
1867
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1868
"servicename": "Mandos",
1869
"use_dbus": "True",
1870
"use_ipv6": "True",
1871
"debuglevel": "",
1431
1872
}
1432
1873
1433
1874
# Parse config file for server-global settings
1434
1875
server_config = configparser.SafeConfigParser(server_defaults)
1435
1876
del server_defaults
1436
1877
server_config.read(os.path.join(options.configdir,
1437
u"mandos.conf"))
1878
"mandos.conf"))
1438
1879
# Convert the SafeConfigParser object to a dict
1439
1880
server_settings = server_config.defaults()
1440
1881
# Use the appropriate methods on the non-string config options
1441
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1442
server_settings[option] = server_config.getboolean(u"DEFAULT",
1882
for option in ("debug", "use_dbus", "use_ipv6"):
1883
server_settings[option] = server_config.getboolean("DEFAULT",
1443
1884
option)
1444
1885
if server_settings["port"]:
1445
server_settings["port"] = server_config.getint(u"DEFAULT",
1446
u"port")
1886
server_settings["port"] = server_config.getint("DEFAULT",
1887
"port")
1447
1888
del server_config
1448
1889
1449
1890
# Override the settings from the config file with command line
1450
1891
# options, if set.
1451
for option in (u"interface", u"address", u"port", u"debug",
1452
u"priority", u"servicename", u"configdir",
1453
u"use_dbus", u"use_ipv6"):
1892
for option in ("interface", "address", "port", "debug",
1893
"priority", "servicename", "configdir",
1894
"use_dbus", "use_ipv6", "debuglevel"):
1454
1895
value = getattr(options, option)
1455
1896
if value is not None:
1456
1897
server_settings[option] = value
1464
1905
##################################################################
1465
1906
1466
1907
# For convenience
1467
debug = server_settings[u"debug"]
1468
use_dbus = server_settings[u"use_dbus"]
1469
use_ipv6 = server_settings[u"use_ipv6"]
1470
1471
if not debug:
1472
syslogger.setLevel(logging.WARNING)
1473
console.setLevel(logging.WARNING)
1474
1475
if server_settings[u"servicename"] != u"Mandos":
1908
debug = server_settings["debug"]
1909
debuglevel = server_settings["debuglevel"]
1910
use_dbus = server_settings["use_dbus"]
1911
use_ipv6 = server_settings["use_ipv6"]
1912
1913
if server_settings["servicename"] != "Mandos":
1476
1914
syslogger.setFormatter(logging.Formatter
1477
(u'Mandos (%s) [%%(process)d]:'
1478
u' %%(levelname)s: %%(message)s'
1479
% server_settings[u"servicename"]))
1915
('Mandos (%s) [%%(process)d]:'
1916
' %%(levelname)s: %%(message)s'
1917
% server_settings["servicename"]))
1480
1918
1481
1919
# Parse config file with clients
1482
client_defaults = { u"timeout": u"1h",
1483
u"interval": u"5m",
1484
u"checker": u"fping -q -- %%(host)s",
1485
u"host": u"",
1920
client_defaults = { "timeout": "5m",
1921
"extended_timeout": "15m",
1922
"interval": "2m",
1923
"checker": "fping -q -- %%(host)s",
1924
"host": "",
1925
"approval_delay": "0s",
1926
"approval_duration": "1s",
1486
1927
}
1487
1928
client_config = configparser.SafeConfigParser(client_defaults)
1488
client_config.read(os.path.join(server_settings[u"configdir"],
1489
u"clients.conf"))
1929
client_config.read(os.path.join(server_settings["configdir"],
1930
"clients.conf"))
1490
1931
1491
1932
global mandos_dbus_service
1492
1933
mandos_dbus_service = None
1493
1934
1494
tcp_server = MandosServer((server_settings[u"address"],
1495
server_settings[u"port"]),
1935
tcp_server = MandosServer((server_settings["address"],
1936
server_settings["port"]),
1496
1937
ClientHandler,
1497
interface=server_settings[u"interface"],
1938
interface=(server_settings["interface"]
1939
or None),
1498
1940
use_ipv6=use_ipv6,
1499
1941
gnutls_priority=
1500
server_settings[u"priority"],
1942
server_settings["priority"],
1501
1943
use_dbus=use_dbus)
1502
pidfilename = u"/var/run/mandos.pid"
1503
try:
1504
pidfile = open(pidfilename, u"w")
1505
except IOError:
1506
logger.error(u"Could not open file %r", pidfilename)
1944
if not debug:
1945
pidfilename = "/var/run/mandos.pid"
1946
try:
1947
pidfile = open(pidfilename, "w")
1948
except IOError:
1949
logger.error("Could not open file %r", pidfilename)
1507
1950
1508
1951
try:
1509
uid = pwd.getpwnam(u"_mandos").pw_uid
1510
gid = pwd.getpwnam(u"_mandos").pw_gid
1952
uid = pwd.getpwnam("_mandos").pw_uid
1953
gid = pwd.getpwnam("_mandos").pw_gid
1511
1954
except KeyError:
1512
1955
try:
1513
uid = pwd.getpwnam(u"mandos").pw_uid
1514
gid = pwd.getpwnam(u"mandos").pw_gid
1956
uid = pwd.getpwnam("mandos").pw_uid
1957
gid = pwd.getpwnam("mandos").pw_gid
1515
1958
except KeyError:
1516
1959
try:
1517
uid = pwd.getpwnam(u"nobody").pw_uid
1518
gid = pwd.getpwnam(u"nobody").pw_gid
1960
uid = pwd.getpwnam("nobody").pw_uid
1961
gid = pwd.getpwnam("nobody").pw_gid
1519
1962
except KeyError:
1520
1963
uid = 65534
1521
1964
gid = 65534
1522
1965
try:
1523
1966
os.setgid(gid)
1524
1967
os.setuid(uid)
1525
except OSError, error:
1968
except OSError as error:
1526
1969
if error[0] != errno.EPERM:
1527
1970
raise error
1528
1971
1529
# Enable all possible GnuTLS debugging
1972
if not debug and not debuglevel:
1973
syslogger.setLevel(logging.WARNING)
1974
console.setLevel(logging.WARNING)
1975
if debuglevel:
1976
level = getattr(logging, debuglevel.upper())
1977
syslogger.setLevel(level)
1978
console.setLevel(level)
1979
1530
1980
if debug:
1981
# Enable all possible GnuTLS debugging
1982
1531
1983
# "Use a log level over 10 to enable all debugging options."
1532
1984
# - GnuTLS manual
1533
1985
gnutls.library.functions.gnutls_global_set_log_level(11)
1534
1986
1535
1987
@gnutls.library.types.gnutls_log_func
1536
1988
def debug_gnutls(level, string):
1537
logger.debug(u"GnuTLS: %s", string[:-1])
1989
logger.debug("GnuTLS: %s", string[:-1])
1538
1990
1539
1991
(gnutls.library.functions
1540
1992
.gnutls_global_set_log_function(debug_gnutls))
1993
1994
# Redirect stdin so all checkers get /dev/null
1995
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1996
os.dup2(null, sys.stdin.fileno())
1997
if null > 2:
1998
os.close(null)
1999
else:
2000
# No console logging
2001
logger.removeHandler(console)
2002
2003
# Need to fork before connecting to D-Bus
2004
if not debug:
2005
# Close all input and output, do double fork, etc.
2006
daemon()
1541
2007
1542
2008
global main_loop
1543
2009
# From the Avahi example code
1546
2012
bus = dbus.SystemBus()
1547
2013
# End of Avahi example code
1548
2014
if use_dbus:
1549
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
2015
try:
2016
bus_name = dbus.service.BusName("se.recompile.Mandos",
2017
bus, do_not_queue=True)
2018
old_bus_name = (dbus.service.BusName
2019
("se.bsnet.fukt.Mandos", bus,
2020
do_not_queue=True))
2021
except dbus.exceptions.NameExistsException as e:
2022
logger.error(unicode(e) + ", disabling D-Bus")
2023
use_dbus = False
2024
server_settings["use_dbus"] = False
2025
tcp_server.use_dbus = False
1550
2026
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1551
service = AvahiService(name = server_settings[u"servicename"],
1552
servicetype = u"_mandos._tcp",
2027
service = AvahiService(name = server_settings["servicename"],
2028
servicetype = "_mandos._tcp",
1553
2029
protocol = protocol, bus = bus)
1554
2030
if server_settings["interface"]:
1555
2031
service.interface = (if_nametoindex
1556
(str(server_settings[u"interface"])))
2032
(str(server_settings["interface"])))
2033
2034
global multiprocessing_manager
2035
multiprocessing_manager = multiprocessing.Manager()
1557
2036
1558
2037
client_class = Client
1559
2038
if use_dbus:
1560
client_class = functools.partial(ClientDBus, bus = bus)
2039
client_class = functools.partial(ClientDBusTransitional,
2040
bus = bus)
2041
def client_config_items(config, section):
2042
special_settings = {
2043
"approved_by_default":
2044
lambda: config.getboolean(section,
2045
"approved_by_default"),
2046
}
2047
for name, value in config.items(section):
2048
try:
2049
yield (name, special_settings[name]())
2050
except KeyError:
2051
yield (name, value)
2052
1561
2053
tcp_server.clients.update(set(
1562
2054
client_class(name = section,
1563
config= dict(client_config.items(section)))
2055
config= dict(client_config_items(
2056
client_config, section)))
1564
2057
for section in client_config.sections()))
1565
2058
if not tcp_server.clients:
1566
logger.warning(u"No clients defined")
1567
1568
if debug:
1569
# Redirect stdin so all checkers get /dev/null
1570
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1571
os.dup2(null, sys.stdin.fileno())
1572
if null > 2:
1573
os.close(null)
1574
else:
1575
# No console logging
1576
logger.removeHandler(console)
1577
# Close all input and output, do double fork, etc.
1578
daemon()
1579
1580
try:
1581
with closing(pidfile):
1582
pid = os.getpid()
1583
pidfile.write(str(pid) + "\n")
1584
del pidfile
1585
except IOError:
1586
logger.error(u"Could not write to file %r with PID %d",
1587
pidfilename, pid)
1588
except NameError:
1589
# "pidfile" was never created
1590
pass
1591
del pidfilename
1592
1593
def cleanup():
1594
"Cleanup function; run on exit"
1595
service.cleanup()
2059
logger.warning("No clients defined")
1596
2060
1597
while tcp_server.clients:
1598
client = tcp_server.clients.pop()
1599
client.disable_hook = None
1600
client.disable()
1601
1602
atexit.register(cleanup)
1603
1604
2061
if not debug:
2062
try:
2063
with pidfile:
2064
pid = os.getpid()
2065
pidfile.write(str(pid) + "\n".encode("utf-8"))
2066
del pidfile
2067
except IOError:
2068
logger.error("Could not write to file %r with PID %d",
2069
pidfilename, pid)
2070
except NameError:
2071
# "pidfile" was never created
2072
pass
2073
del pidfilename
2074
1605
2075
signal.signal(signal.SIGINT, signal.SIG_IGN)
2076
1606
2077
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1607
2078
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1608
2079
1610
2081
class MandosDBusService(dbus.service.Object):
1611
2082
"""A D-Bus proxy object"""
1612
2083
def __init__(self):
1613
dbus.service.Object.__init__(self, bus, u"/")
1614
_interface = u"se.bsnet.fukt.Mandos"
1615
1616
@dbus.service.signal(_interface, signature=u"oa{sv}")
1617
def ClientAdded(self, objpath, properties):
1618
"D-Bus signal"
1619
pass
1620
1621
@dbus.service.signal(_interface, signature=u"s")
1622
def ClientNotFound(self, fingerprint):
1623
"D-Bus signal"
1624
pass
1625
1626
@dbus.service.signal(_interface, signature=u"os")
2084
dbus.service.Object.__init__(self, bus, "/")
2085
_interface = "se.recompile.Mandos"
2086
2087
@dbus.service.signal(_interface, signature="o")
2088
def ClientAdded(self, objpath):
2089
"D-Bus signal"
2090
pass
2091
2092
@dbus.service.signal(_interface, signature="ss")
2093
def ClientNotFound(self, fingerprint, address):
2094
"D-Bus signal"
2095
pass
2096
2097
@dbus.service.signal(_interface, signature="os")
1627
2098
def ClientRemoved(self, objpath, name):
1628
2099
"D-Bus signal"
1629
2100
pass
1630
2101
1631
@dbus.service.method(_interface, out_signature=u"ao")
2102
@dbus.service.method(_interface, out_signature="ao")
1632
2103
def GetAllClients(self):
1633
2104
"D-Bus method"
1634
2105
return dbus.Array(c.dbus_object_path
1635
2106
for c in tcp_server.clients)
1636
2107
1637
2108
@dbus.service.method(_interface,
1638
out_signature=u"a{oa{sv}}")
2109
out_signature="a{oa{sv}}")
1639
2110
def GetAllClientsWithProperties(self):
1640
2111
"D-Bus method"
1641
2112
return dbus.Dictionary(
1642
((c.dbus_object_path, c.GetAll(u""))
2113
((c.dbus_object_path, c.GetAll(""))
1643
2114
for c in tcp_server.clients),
1644
signature=u"oa{sv}")
2115
signature="oa{sv}")
1645
2116
1646
@dbus.service.method(_interface, in_signature=u"o")
2117
@dbus.service.method(_interface, in_signature="o")
1647
2118
def RemoveClient(self, object_path):
1648
2119
"D-Bus method"
1649
2120
for c in tcp_server.clients:
1651
2122
tcp_server.clients.remove(c)
1652
2123
c.remove_from_connection()
1653
2124
# Don't signal anything except ClientRemoved
1654
c.disable(signal=False)
2125
c.disable(quiet=True)
1655
2126
# Emit D-Bus signal
1656
2127
self.ClientRemoved(object_path, c.name)
1657
2128
return
1658
raise KeyError
2129
raise KeyError(object_path)
1659
2130
1660
2131
del _interface
1661
2132
1662
mandos_dbus_service = MandosDBusService()
2133
class MandosDBusServiceTransitional(MandosDBusService):
2134
__metaclass__ = AlternateDBusNamesMetaclass
2135
mandos_dbus_service = MandosDBusServiceTransitional()
2136
2137
def cleanup():
2138
"Cleanup function; run on exit"
2139
service.cleanup()
2140
2141
multiprocessing.active_children()
2142
while tcp_server.clients:
2143
client = tcp_server.clients.pop()
2144
if use_dbus:
2145
client.remove_from_connection()
2146
client.disable_hook = None
2147
# Don't signal anything except ClientRemoved
2148
client.disable(quiet=True)
2149
if use_dbus:
2150
# Emit D-Bus signal
2151
mandos_dbus_service.ClientRemoved(client
2152
.dbus_object_path,
2153
client.name)
2154
2155
atexit.register(cleanup)
1663
2156
1664
2157
for client in tcp_server.clients:
1665
2158
if use_dbus:
1666
2159
# Emit D-Bus signal
1667
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1668
client.GetAll(u""))
2160
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1669
2161
client.enable()
1670
2162
1671
2163
tcp_server.enable()
1674
2166
# Find out what port we got
1675
2167
service.port = tcp_server.socket.getsockname()[1]
1676
2168
if use_ipv6:
1677
logger.info(u"Now listening on address %r, port %d,"
2169
logger.info("Now listening on address %r, port %d,"
1678
2170
" flowinfo %d, scope_id %d"
1679
2171
% tcp_server.socket.getsockname())
1680
2172
else: # IPv4
1681
logger.info(u"Now listening on address %r, port %d"
2173
logger.info("Now listening on address %r, port %d"
1682
2174
% tcp_server.socket.getsockname())
1683
2175
1684
2176
#service.interface = tcp_server.socket.getsockname()[3]
1687
2179
# From the Avahi example code
1688
2180
try:
1689
2181
service.activate()
1690
except dbus.exceptions.DBusException, error:
1691
logger.critical(u"DBusException: %s", error)
2182
except dbus.exceptions.DBusException as error:
2183
logger.critical("DBusException: %s", error)
2184
cleanup()
1692
2185
sys.exit(1)
1693
2186
# End of Avahi example code
1694
2187
1697
2190
(tcp_server.handle_request
1698
2191
(*args[2:], **kwargs) or True))
1699
2192
1700
logger.debug(u"Starting main loop")
2193
logger.debug("Starting main loop")
1701
2194
main_loop.run()
1702
except AvahiError, error:
1703
logger.critical(u"AvahiError: %s", error)
2195
except AvahiError as error:
2196
logger.critical("AvahiError: %s", error)
2197
cleanup()
1704
2198
sys.exit(1)
1705
2199
except KeyboardInterrupt:
1706
2200
if debug:
1707
print >> sys.stderr
1708
logger.debug(u"Server received KeyboardInterrupt")
1709
logger.debug(u"Server exiting")
2201
print("", file=sys.stderr)
2202
logger.debug("Server received KeyboardInterrupt")
2203
logger.debug("Server exiting")
2204
# Must run before the D-Bus bus name gets deregistered
2205
cleanup()
2206
1710
2207
1711
2208
if __name__ == '__main__':
1712
2209
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0