To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 505.3.7
- compare with another revision
- download diff
- download tarball
- view history from revision 505.3.7
- Committer: teddy at bsnet
- Date: 2011-11-13 20:49:21 UTC
- mto: (505.2.5 mandos-client-network-hooks)
- mto: This revision was merged to the branch mainline in revision 525.
- Revision ID: teddy@fukt.bsnet.se-20111113204921-vbnwtmuq01isvgsc
* initramfs-tools-hook: Install network hooks (and any required files)
in the initramfs image.
* plugins.d/mandos-client.c (main): Also set MANDOSNETHOOKDIR for
network hooks.
* plugins.d/mandos-client.xml (OPTIONS): Use <filename
class="directory">, not
<directory>.
in the initramfs image.
* plugins.d/mandos-client.c (main): Also set MANDOSNETHOOKDIR for
network hooks.
* plugins.d/mandos-client.xml (OPTIONS): Use <filename
class="directory">, not
<directory>.
- 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.14"
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
405
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
329
407
self.disable_initiator_tag = (gobject.timeout_add
330
408
(self.timeout_milliseconds(),
331
409
self.disable))
332
410
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
333
412
# Also start a new checker *right now*.
334
413
self.start_checker()
335
414
338
417
if not getattr(self, "enabled", False):
339
418
return False
340
419
if not quiet:
341
logger.info(u"Disabling client %s", self.name)
342
if getattr(self, u"disable_initiator_tag", False):
420
self.send_changedstate()
421
if not quiet:
422
logger.info("Disabling client %s", self.name)
423
if getattr(self, "disable_initiator_tag", False):
343
424
gobject.source_remove(self.disable_initiator_tag)
344
425
self.disable_initiator_tag = None
345
if getattr(self, u"checker_initiator_tag", False):
426
self.expires = None
427
if getattr(self, "checker_initiator_tag", False):
346
428
gobject.source_remove(self.checker_initiator_tag)
347
429
self.checker_initiator_tag = None
348
430
self.stop_checker()
363
445
if os.WIFEXITED(condition):
364
446
exitstatus = os.WEXITSTATUS(condition)
365
447
if exitstatus == 0:
366
logger.info(u"Checker for %(name)s succeeded",
448
logger.info("Checker for %(name)s succeeded",
367
449
vars(self))
368
450
self.checked_ok()
369
451
else:
370
logger.info(u"Checker for %(name)s failed",
452
logger.info("Checker for %(name)s failed",
371
453
vars(self))
372
454
else:
373
logger.warning(u"Checker for %(name)s crashed?",
455
logger.warning("Checker for %(name)s crashed?",
374
456
vars(self))
375
457
376
def checked_ok(self):
458
def checked_ok(self, timeout=None):
377
459
"""Bump up the timeout for this client.
378
460
379
461
This should only be called when the client has been seen,
380
462
alive and well.
381
463
"""
464
if timeout is None:
465
timeout = self.timeout
382
466
self.last_checked_ok = datetime.datetime.utcnow()
383
gobject.source_remove(self.disable_initiator_tag)
384
self.disable_initiator_tag = (gobject.timeout_add
385
(self.timeout_milliseconds(),
386
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()
387
477
388
478
def start_checker(self):
389
479
"""Start a new checker subprocess if one is not running.
396
486
# client would inevitably timeout, since no checker would get
397
487
# a chance to run to completion. If we instead leave running
398
488
# checkers alone, the checker would have to take more time
399
# than 'timeout' for the client to be declared invalid, which
400
# is as it should be.
489
# than 'timeout' for the client to be disabled, which is as it
490
# should be.
401
491
402
492
# If a checker exists, make sure it is not a zombie
403
493
try:
404
494
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
405
except (AttributeError, OSError), error:
495
except (AttributeError, OSError) as error:
406
496
if (isinstance(error, OSError)
407
497
and error.errno != errno.ECHILD):
408
498
raise error
409
499
else:
410
500
if pid:
411
logger.warning(u"Checker was a zombie")
501
logger.warning("Checker was a zombie")
412
502
gobject.source_remove(self.checker_callback_tag)
413
503
self.checker_callback(pid, status,
414
504
self.current_checker_command)
419
509
command = self.checker_command % self.host
420
510
except TypeError:
421
511
# Escape attributes for the shell
422
escaped_attrs = dict((key,
423
re.escape(unicode(str(val),
424
errors=
425
u'replace')))
426
for key, val in
427
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
428
520
try:
429
521
command = self.checker_command % escaped_attrs
430
except TypeError, error:
431
logger.error(u'Could not format string "%s":'
432
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)
433
525
return True # Try again later
434
526
self.current_checker_command = command
435
527
try:
436
logger.info(u"Starting checker %r for %s",
528
logger.info("Starting checker %r for %s",
437
529
command, self.name)
438
530
# We don't need to redirect stdout and stderr, since
439
531
# in normal mode, that is already done by daemon(),
441
533
# always replaced by /dev/null.)
442
534
self.checker = subprocess.Popen(command,
443
535
close_fds=True,
444
shell=True, cwd=u"/")
536
shell=True, cwd="/")
445
537
self.checker_callback_tag = (gobject.child_watch_add
446
538
(self.checker.pid,
447
539
self.checker_callback,
452
544
if pid:
453
545
gobject.source_remove(self.checker_callback_tag)
454
546
self.checker_callback(pid, status, command)
455
except OSError, error:
456
logger.error(u"Failed to start subprocess: %s",
547
except OSError as error:
548
logger.error("Failed to start subprocess: %s",
457
549
error)
458
550
# Re-run this periodically if run by gobject.timeout_add
459
551
return True
463
555
if self.checker_callback_tag:
464
556
gobject.source_remove(self.checker_callback_tag)
465
557
self.checker_callback_tag = None
466
if getattr(self, u"checker", None) is None:
558
if getattr(self, "checker", None) is None:
467
559
return
468
logger.debug(u"Stopping checker for %(name)s", vars(self))
560
logger.debug("Stopping checker for %(name)s", vars(self))
469
561
try:
470
562
os.kill(self.checker.pid, signal.SIGTERM)
471
563
#time.sleep(0.5)
472
564
#if self.checker.poll() is None:
473
565
# os.kill(self.checker.pid, signal.SIGKILL)
474
except OSError, error:
566
except OSError as error:
475
567
if error.errno != errno.ESRCH: # No such process
476
568
raise
477
569
self.checker = None
478
479
def still_valid(self):
480
"""Has the timeout not yet passed for this client?"""
481
if not getattr(self, u"enabled", False):
482
return False
483
now = datetime.datetime.utcnow()
484
if self.last_checked_ok is None:
485
return now < (self.created + self.timeout)
486
else:
487
return now < (self.last_checked_ok + self.timeout)
488
489
490
def dbus_service_property(dbus_interface, signature=u"v",
491
access=u"readwrite", byte_arrays=False):
570
571
572
def dbus_service_property(dbus_interface, signature="v",
573
access="readwrite", byte_arrays=False):
492
574
"""Decorators for marking methods of a DBusObjectWithProperties to
493
575
become properties on the D-Bus.
494
576
499
581
dbus.service.method, except there is only "signature", since the
500
582
type from Get() and the type sent to Set() is the same.
501
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)
502
589
def decorator(func):
503
590
func._dbus_is_property = True
504
591
func._dbus_interface = dbus_interface
505
592
func._dbus_signature = signature
506
593
func._dbus_access = access
507
594
func._dbus_name = func.__name__
508
if func._dbus_name.endswith(u"_dbus_property"):
595
if func._dbus_name.endswith("_dbus_property"):
509
596
func._dbus_name = func._dbus_name[:-14]
510
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
597
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
511
598
return func
512
599
return decorator
513
600
533
620
534
621
class DBusObjectWithProperties(dbus.service.Object):
535
622
"""A D-Bus object with properties.
536
623
537
624
Classes inheriting from this can use the dbus_service_property
538
625
decorator to expose methods as D-Bus properties. It exposes the
539
626
standard Get(), Set(), and GetAll() methods on the D-Bus.
541
628
542
629
@staticmethod
543
630
def _is_dbus_property(obj):
544
return getattr(obj, u"_dbus_is_property", False)
631
return getattr(obj, "_dbus_is_property", False)
545
632
546
633
def _get_all_dbus_properties(self):
547
634
"""Returns a generator of (name, attribute) pairs
548
635
"""
549
return ((prop._dbus_name, prop)
636
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
637
for cls in self.__class__.__mro__
550
638
for name, prop in
551
inspect.getmembers(self, self._is_dbus_property))
639
inspect.getmembers(cls, self._is_dbus_property))
552
640
553
641
def _get_dbus_property(self, interface_name, property_name):
554
642
"""Returns a bound method if one exists which is a D-Bus
555
643
property with the specified name and interface.
556
644
"""
557
for name in (property_name,
558
property_name + u"_dbus_property"):
559
prop = getattr(self, name, None)
560
if (prop is None
561
or not self._is_dbus_property(prop)
562
or prop._dbus_name != property_name
563
or (interface_name and prop._dbus_interface
564
and interface_name != prop._dbus_interface)):
565
continue
566
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
567
652
# No such property
568
raise DBusPropertyNotFound(self.dbus_object_path + u":"
569
+ interface_name + u"."
653
raise DBusPropertyNotFound(self.dbus_object_path + ":"
654
+ interface_name + "."
570
655
+ property_name)
571
656
572
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
573
out_signature=u"v")
657
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
658
out_signature="v")
574
659
def Get(self, interface_name, property_name):
575
660
"""Standard D-Bus property Get() method, see D-Bus standard.
576
661
"""
577
662
prop = self._get_dbus_property(interface_name, property_name)
578
if prop._dbus_access == u"write":
663
if prop._dbus_access == "write":
579
664
raise DBusPropertyAccessException(property_name)
580
665
value = prop()
581
if not hasattr(value, u"variant_level"):
666
if not hasattr(value, "variant_level"):
582
667
return value
583
668
return type(value)(value, variant_level=value.variant_level+1)
584
669
585
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
670
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
586
671
def Set(self, interface_name, property_name, value):
587
672
"""Standard D-Bus property Set() method, see D-Bus standard.
588
673
"""
589
674
prop = self._get_dbus_property(interface_name, property_name)
590
if prop._dbus_access == u"read":
675
if prop._dbus_access == "read":
591
676
raise DBusPropertyAccessException(property_name)
592
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
593
682
value = dbus.ByteArray(''.join(unichr(byte)
594
683
for byte in value))
595
684
prop(value)
596
685
597
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
598
out_signature=u"a{sv}")
686
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
687
out_signature="a{sv}")
599
688
def GetAll(self, interface_name):
600
689
"""Standard D-Bus property GetAll() method, see D-Bus
601
690
standard.
602
691
603
692
Note: Will not include properties with access="write".
604
693
"""
605
694
all = {}
609
698
# Interface non-empty but did not match
610
699
continue
611
700
# Ignore write-only properties
612
if prop._dbus_access == u"write":
701
if prop._dbus_access == "write":
613
702
continue
614
703
value = prop()
615
if not hasattr(value, u"variant_level"):
704
if not hasattr(value, "variant_level"):
616
705
all[name] = value
617
706
continue
618
707
all[name] = type(value)(value, variant_level=
619
708
value.variant_level+1)
620
return dbus.Dictionary(all, signature=u"sv")
709
return dbus.Dictionary(all, signature="sv")
621
710
622
711
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
623
out_signature=u"s",
712
out_signature="s",
624
713
path_keyword='object_path',
625
714
connection_keyword='connection')
626
715
def Introspect(self, object_path, connection):
631
720
try:
632
721
document = xml.dom.minidom.parseString(xmlstring)
633
722
def make_tag(document, name, prop):
634
e = document.createElement(u"property")
635
e.setAttribute(u"name", name)
636
e.setAttribute(u"type", prop._dbus_signature)
637
e.setAttribute(u"access", prop._dbus_access)
723
e = document.createElement("property")
724
e.setAttribute("name", name)
725
e.setAttribute("type", prop._dbus_signature)
726
e.setAttribute("access", prop._dbus_access)
638
727
return e
639
for if_tag in document.getElementsByTagName(u"interface"):
728
for if_tag in document.getElementsByTagName("interface"):
640
729
for tag in (make_tag(document, name, prop)
641
730
for name, prop
642
731
in self._get_all_dbus_properties()
643
732
if prop._dbus_interface
644
== if_tag.getAttribute(u"name")):
733
== if_tag.getAttribute("name")):
645
734
if_tag.appendChild(tag)
646
735
# Add the names to the return values for the
647
736
# "org.freedesktop.DBus.Properties" methods
648
if (if_tag.getAttribute(u"name")
649
== u"org.freedesktop.DBus.Properties"):
650
for cn in if_tag.getElementsByTagName(u"method"):
651
if cn.getAttribute(u"name") == u"Get":
652
for arg in cn.getElementsByTagName(u"arg"):
653
if (arg.getAttribute(u"direction")
654
== u"out"):
655
arg.setAttribute(u"name", u"value")
656
elif cn.getAttribute(u"name") == u"GetAll":
657
for arg in cn.getElementsByTagName(u"arg"):
658
if (arg.getAttribute(u"direction")
659
== u"out"):
660
arg.setAttribute(u"name", u"props")
661
xmlstring = document.toxml(u"utf-8")
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")
662
751
document.unlink()
663
752
except (AttributeError, xml.dom.DOMException,
664
xml.parsers.expat.ExpatError), error:
665
logger.error(u"Failed to override Introspection method",
753
xml.parsers.expat.ExpatError) as error:
754
logger.error("Failed to override Introspection method",
666
755
error)
667
756
return xmlstring
668
757
669
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
670
863
class ClientDBus(Client, DBusObjectWithProperties):
671
864
"""A Client class using D-Bus
672
865
674
867
dbus_object_path: dbus.ObjectPath
675
868
bus: dbus.SystemBus()
676
869
"""
870
871
runtime_expansions = (Client.runtime_expansions
872
+ ("dbus_object_path",))
873
677
874
# dbus.service.Object doesn't use super(), so we can't either.
678
875
679
876
def __init__(self, bus = None, *args, **kwargs):
877
self._approvals_pending = 0
680
878
self.bus = bus
681
879
Client.__init__(self, *args, **kwargs)
682
880
# Only now, when this client is initialized, can it show up on
683
881
# the D-Bus
882
client_object_name = unicode(self.name).translate(
883
{ord("."): ord("_"),
884
ord("-"): ord("_")})
684
885
self.dbus_object_path = (dbus.ObjectPath
685
(u"/clients/"
686
+ self.name.replace(u".", u"_")))
886
("/clients/" + client_object_name))
687
887
DBusObjectWithProperties.__init__(self, self.bus,
688
888
self.dbus_object_path)
689
690
@staticmethod
691
def _datetime_to_dbus(dt, variant_level=0):
692
"""Convert a UTC datetime.datetime() to a D-Bus type."""
693
return dbus.String(dt.isoformat(),
694
variant_level=variant_level)
695
696
def enable(self):
697
oldstate = getattr(self, u"enabled", False)
698
r = Client.enable(self)
699
if oldstate != self.enabled:
700
# Emit D-Bus signals
701
self.PropertyChanged(dbus.String(u"enabled"),
702
dbus.Boolean(True, variant_level=1))
703
self.PropertyChanged(
704
dbus.String(u"last_enabled"),
705
self._datetime_to_dbus(self.last_enabled,
706
variant_level=1))
707
return r
708
709
def disable(self, quiet = False):
710
oldstate = getattr(self, u"enabled", False)
711
r = Client.disable(self, log=signal)
712
if not quiet and oldstate != self.enabled:
713
# Emit D-Bus signal
714
self.PropertyChanged(dbus.String(u"enabled"),
715
dbus.Boolean(False, variant_level=1))
716
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
717
956
718
957
def __del__(self, *args, **kwargs):
719
958
try:
720
959
self.remove_from_connection()
721
960
except LookupError:
722
961
pass
723
if hasattr(DBusObjectWithProperties, u"__del__"):
962
if hasattr(DBusObjectWithProperties, "__del__"):
724
963
DBusObjectWithProperties.__del__(self, *args, **kwargs)
725
964
Client.__del__(self, *args, **kwargs)
726
965
728
967
*args, **kwargs):
729
968
self.checker_callback_tag = None
730
969
self.checker = None
731
# Emit D-Bus signal
732
self.PropertyChanged(dbus.String(u"checker_running"),
733
dbus.Boolean(False, variant_level=1))
734
970
if os.WIFEXITED(condition):
735
971
exitstatus = os.WEXITSTATUS(condition)
736
972
# Emit D-Bus signal
746
982
return Client.checker_callback(self, pid, condition, command,
747
983
*args, **kwargs)
748
984
749
def checked_ok(self, *args, **kwargs):
750
r = Client.checked_ok(self, *args, **kwargs)
751
# Emit D-Bus signal
752
self.PropertyChanged(
753
dbus.String(u"last_checked_ok"),
754
(self._datetime_to_dbus(self.last_checked_ok,
755
variant_level=1)))
756
return r
757
758
985
def start_checker(self, *args, **kwargs):
759
986
old_checker = self.checker
760
987
if self.checker is not None:
767
994
and old_checker_pid != self.checker.pid):
768
995
# Emit D-Bus signal
769
996
self.CheckerStarted(self.current_checker_command)
770
self.PropertyChanged(
771
dbus.String(u"checker_running"),
772
dbus.Boolean(True, variant_level=1))
773
return r
774
775
def stop_checker(self, *args, **kwargs):
776
old_checker = getattr(self, u"checker", None)
777
r = Client.stop_checker(self, *args, **kwargs)
778
if (old_checker is not None
779
and getattr(self, u"checker", None) is None):
780
self.PropertyChanged(dbus.String(u"checker_running"),
781
dbus.Boolean(False, variant_level=1))
782
return r
783
784
## D-Bus methods & signals
785
_interface = u"se.bsnet.fukt.Mandos.Client"
786
787
# CheckedOK - method
788
@dbus.service.method(_interface)
789
def CheckedOK(self):
790
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
791
1015
792
1016
# CheckerCompleted - signal
793
@dbus.service.signal(_interface, signature=u"nxs")
1017
@dbus.service.signal(_interface, signature="nxs")
794
1018
def CheckerCompleted(self, exitcode, waitstatus, command):
795
1019
"D-Bus signal"
796
1020
pass
797
1021
798
1022
# CheckerStarted - signal
799
@dbus.service.signal(_interface, signature=u"s")
1023
@dbus.service.signal(_interface, signature="s")
800
1024
def CheckerStarted(self, command):
801
1025
"D-Bus signal"
802
1026
pass
803
1027
804
1028
# PropertyChanged - signal
805
@dbus.service.signal(_interface, signature=u"sv")
1029
@dbus.service.signal(_interface, signature="sv")
806
1030
def PropertyChanged(self, property, value):
807
1031
"D-Bus signal"
808
1032
pass
810
1034
# GotSecret - signal
811
1035
@dbus.service.signal(_interface)
812
1036
def GotSecret(self):
813
"D-Bus signal"
1037
"""D-Bus signal
1038
Is sent after a successful transfer of secret from the Mandos
1039
server to mandos-client
1040
"""
814
1041
pass
815
1042
816
1043
# Rejected - signal
817
@dbus.service.signal(_interface)
818
def Rejected(self):
1044
@dbus.service.signal(_interface, signature="s")
1045
def Rejected(self, reason):
819
1046
"D-Bus signal"
820
1047
pass
821
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
822
1067
# Enable - method
823
1068
@dbus.service.method(_interface)
824
1069
def Enable(self):
842
1087
def StopChecker(self):
843
1088
self.stop_checker()
844
1089
845
# name - property
846
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
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):
848
1125
return dbus.String(self.name)
849
1126
850
# fingerprint - property
851
@dbus_service_property(_interface, signature=u"s", access=u"read")
852
def fingerprint_dbus_property(self):
1127
# Fingerprint - property
1128
@dbus_service_property(_interface, signature="s", access="read")
1129
def Fingerprint_dbus_property(self):
853
1130
return dbus.String(self.fingerprint)
854
1131
855
# host - property
856
@dbus_service_property(_interface, signature=u"s",
857
access=u"readwrite")
858
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):
859
1136
if value is None: # get
860
1137
return dbus.String(self.host)
861
1138
self.host = value
862
# Emit D-Bus signal
863
self.PropertyChanged(dbus.String(u"host"),
864
dbus.String(value, variant_level=1))
865
866
# created - property
867
@dbus_service_property(_interface, signature=u"s", access=u"read")
868
def created_dbus_property(self):
869
return dbus.String(self._datetime_to_dbus(self.created))
870
871
# last_enabled - property
872
@dbus_service_property(_interface, signature=u"s", access=u"read")
873
def last_enabled_dbus_property(self):
874
if self.last_enabled is None:
875
return dbus.String(u"")
876
return dbus.String(self._datetime_to_dbus(self.last_enabled))
877
878
# enabled - property
879
@dbus_service_property(_interface, signature=u"b",
880
access=u"readwrite")
881
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):
882
1154
if value is None: # get
883
1155
return dbus.Boolean(self.enabled)
884
1156
if value:
886
1158
else:
887
1159
self.disable()
888
1160
889
# last_checked_ok - property
890
@dbus_service_property(_interface, signature=u"s",
891
access=u"readwrite")
892
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):
893
1165
if value is not None:
894
1166
self.checked_ok()
895
1167
return
896
if self.last_checked_ok is None:
897
return dbus.String(u"")
898
return dbus.String(self._datetime_to_dbus(self
899
.last_checked_ok))
900
901
# timeout - property
902
@dbus_service_property(_interface, signature=u"t",
903
access=u"readwrite")
904
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):
905
1184
if value is None: # get
906
1185
return dbus.UInt64(self.timeout_milliseconds())
907
1186
self.timeout = datetime.timedelta(0, 0, 0, value)
908
# Emit D-Bus signal
909
self.PropertyChanged(dbus.String(u"timeout"),
910
dbus.UInt64(value, variant_level=1))
911
if getattr(self, u"disable_initiator_tag", None) is None:
1187
if getattr(self, "disable_initiator_tag", None) is None:
912
1188
return
913
1189
# Reschedule timeout
914
1190
gobject.source_remove(self.disable_initiator_tag)
915
1191
self.disable_initiator_tag = None
916
time_to_die = (self.
917
_timedelta_to_milliseconds((self
918
.last_checked_ok
919
+ self.timeout)
920
- datetime.datetime
921
.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())
922
1198
if time_to_die <= 0:
923
1199
# The timeout has passed
924
1200
self.disable()
925
1201
else:
1202
self.expires = (datetime.datetime.utcnow()
1203
+ datetime.timedelta(milliseconds =
1204
time_to_die))
926
1205
self.disable_initiator_tag = (gobject.timeout_add
927
1206
(time_to_die, self.disable))
928
1207
929
# interval - property
930
@dbus_service_property(_interface, signature=u"t",
931
access=u"readwrite")
932
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):
933
1220
if value is None: # get
934
1221
return dbus.UInt64(self.interval_milliseconds())
935
1222
self.interval = datetime.timedelta(0, 0, 0, value)
936
# Emit D-Bus signal
937
self.PropertyChanged(dbus.String(u"interval"),
938
dbus.UInt64(value, variant_level=1))
939
if getattr(self, u"checker_initiator_tag", None) is None:
1223
if getattr(self, "checker_initiator_tag", None) is None:
940
1224
return
941
1225
# Reschedule checker run
942
1226
gobject.source_remove(self.checker_initiator_tag)
943
1227
self.checker_initiator_tag = (gobject.timeout_add
944
1228
(value, self.start_checker))
945
1229
self.start_checker() # Start one now, too
946
947
# checker - property
948
@dbus_service_property(_interface, signature=u"s",
949
access=u"readwrite")
950
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):
951
1235
if value is None: # get
952
1236
return dbus.String(self.checker_command)
953
1237
self.checker_command = value
954
# Emit D-Bus signal
955
self.PropertyChanged(dbus.String(u"checker"),
956
dbus.String(self.checker_command,
957
variant_level=1))
958
1238
959
# checker_running - property
960
@dbus_service_property(_interface, signature=u"b",
961
access=u"readwrite")
962
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):
963
1243
if value is None: # get
964
1244
return dbus.Boolean(self.checker is not None)
965
1245
if value:
967
1247
else:
968
1248
self.stop_checker()
969
1249
970
# object_path - property
971
@dbus_service_property(_interface, signature=u"o", access=u"read")
972
def object_path_dbus_property(self):
1250
# ObjectPath - property
1251
@dbus_service_property(_interface, signature="o", access="read")
1252
def ObjectPath_dbus_property(self):
973
1253
return self.dbus_object_path # is already a dbus.ObjectPath
974
1254
975
# secret = property
976
@dbus_service_property(_interface, signature=u"ay",
977
access=u"write", byte_arrays=True)
978
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):
979
1259
self.secret = str(value)
980
1260
981
1261
del _interface
982
1262
983
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
984
1292
class ClientHandler(socketserver.BaseRequestHandler, object):
985
1293
"""A class to handle client connections.
986
1294
988
1296
Note: This will run in its own forked process."""
989
1297
990
1298
def handle(self):
991
logger.info(u"TCP connection from: %s",
992
unicode(self.client_address))
993
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
994
# Open IPC pipe to parent process
995
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
996
1305
session = (gnutls.connection
997
1306
.ClientSession(self.request,
998
1307
gnutls.connection
999
1308
.X509Credentials()))
1000
1309
1001
line = self.request.makefile().readline()
1002
logger.debug(u"Protocol version: %r", line)
1003
try:
1004
if int(line.strip().split()[0]) > 1:
1005
raise RuntimeError
1006
except (ValueError, IndexError, RuntimeError), error:
1007
logger.error(u"Unknown protocol version: %s", error)
1008
return
1009
1010
1310
# Note: gnutls.connection.X509Credentials is really a
1011
1311
# generic GnuTLS certificate credentials object so long as
1012
1312
# no X.509 keys are added to it. Therefore, we can use it
1013
1313
# here despite using OpenPGP certificates.
1014
1314
1015
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1016
# u"+AES-256-CBC", u"+SHA1",
1017
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1018
# u"+DHE-DSS"))
1315
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1316
# "+AES-256-CBC", "+SHA1",
1317
# "+COMP-NULL", "+CTYPE-OPENPGP",
1318
# "+DHE-DSS"))
1019
1319
# Use a fallback default, since this MUST be set.
1020
1320
priority = self.server.gnutls_priority
1021
1321
if priority is None:
1022
priority = u"NORMAL"
1322
priority = "NORMAL"
1023
1323
(gnutls.library.functions
1024
1324
.gnutls_priority_set_direct(session._c_object,
1025
1325
priority, None))
1026
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
1027
1339
try:
1028
1340
session.handshake()
1029
except gnutls.errors.GNUTLSError, error:
1030
logger.warning(u"Handshake failed: %s", error)
1341
except gnutls.errors.GNUTLSError as error:
1342
logger.warning("Handshake failed: %s", error)
1031
1343
# Do not run session.bye() here: the session is not
1032
1344
# established. Just abandon the request.
1033
1345
return
1034
logger.debug(u"Handshake succeeded")
1346
logger.debug("Handshake succeeded")
1347
1348
approval_required = False
1035
1349
try:
1036
fpr = self.fingerprint(self.peer_certificate(session))
1037
except (TypeError, gnutls.errors.GNUTLSError), error:
1038
logger.warning(u"Bad certificate: %s", error)
1039
session.bye()
1040
return
1041
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()
1042
1438
1043
for c in self.server.clients:
1044
if c.fingerprint == fpr:
1045
client = c
1046
break
1047
else:
1048
ipc.write(u"NOTFOUND %s %s\n"
1049
% (fpr, unicode(self.client_address)))
1050
session.bye()
1051
return
1052
# Have to check if client.still_valid(), since it is
1053
# possible that the client timed out while establishing
1054
# the GnuTLS session.
1055
if not client.still_valid():
1056
ipc.write(u"INVALID %s\n" % client.name)
1057
session.bye()
1058
return
1059
ipc.write(u"SENDING %s\n" % client.name)
1060
sent_size = 0
1061
while sent_size < len(client.secret):
1062
sent = session.send(client.secret[sent_size:])
1063
logger.debug(u"Sent: %d, remaining: %d",
1064
sent, len(client.secret)
1065
- (sent_size + sent))
1066
sent_size += sent
1067
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")
1068
1446
1069
1447
@staticmethod
1070
1448
def peer_certificate(session):
1080
1458
.gnutls_certificate_get_peers
1081
1459
(session._c_object, ctypes.byref(list_size)))
1082
1460
if not bool(cert_list) and list_size.value != 0:
1083
raise gnutls.errors.GNUTLSError(u"error getting peer"
1084
u" certificate")
1461
raise gnutls.errors.GNUTLSError("error getting peer"
1462
" certificate")
1085
1463
if list_size.value == 0:
1086
1464
return None
1087
1465
cert = cert_list[0]
1113
1491
if crtverify.value != 0:
1114
1492
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1115
1493
raise (gnutls.errors.CertificateSecurityError
1116
(u"Verify failed"))
1494
("Verify failed"))
1117
1495
# New buffer for the fingerprint
1118
1496
buf = ctypes.create_string_buffer(20)
1119
1497
buf_len = ctypes.c_size_t()
1126
1504
# Convert the buffer to a Python bytestring
1127
1505
fpr = ctypes.string_at(buf, buf_len.value)
1128
1506
# Convert the bytestring to hexadecimal notation
1129
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1507
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1130
1508
return hex_fpr
1131
1509
1132
1510
1133
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1134
"""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 """
1135
1531
def process_request(self, request, client_address):
1136
1532
"""Overrides and wraps the original process_request().
1137
1533
1138
1534
This function creates a new pipe in self.pipe
1139
1535
"""
1140
self.pipe = os.pipe()
1141
super(ForkingMixInWithPipe,
1142
self).process_request(request, client_address)
1143
os.close(self.pipe[1]) # close write end
1144
self.add_pipe(self.pipe[0])
1145
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):
1146
1544
"""Dummy function; override as necessary"""
1147
os.close(pipe)
1148
1149
1150
class IPv6_TCPServer(ForkingMixInWithPipe,
1545
raise NotImplementedError
1546
1547
1548
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1151
1549
socketserver.TCPServer, object):
1152
1550
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1153
1551
1169
1567
bind to an address or port if they were not specified."""
1170
1568
if self.interface is not None:
1171
1569
if SO_BINDTODEVICE is None:
1172
logger.error(u"SO_BINDTODEVICE does not exist;"
1173
u" cannot bind to interface %s",
1570
logger.error("SO_BINDTODEVICE does not exist;"
1571
" cannot bind to interface %s",
1174
1572
self.interface)
1175
1573
else:
1176
1574
try:
1177
1575
self.socket.setsockopt(socket.SOL_SOCKET,
1178
1576
SO_BINDTODEVICE,
1179
1577
str(self.interface
1180
+ u'\0'))
1181
except socket.error, error:
1578
+ '\0'))
1579
except socket.error as error:
1182
1580
if error[0] == errno.EPERM:
1183
logger.error(u"No permission to"
1184
u" bind to interface %s",
1581
logger.error("No permission to"
1582
" bind to interface %s",
1185
1583
self.interface)
1186
1584
elif error[0] == errno.ENOPROTOOPT:
1187
logger.error(u"SO_BINDTODEVICE not available;"
1188
u" cannot bind to interface %s",
1585
logger.error("SO_BINDTODEVICE not available;"
1586
" cannot bind to interface %s",
1189
1587
self.interface)
1190
1588
else:
1191
1589
raise
1193
1591
if self.server_address[0] or self.server_address[1]:
1194
1592
if not self.server_address[0]:
1195
1593
if self.address_family == socket.AF_INET6:
1196
any_address = u"::" # in6addr_any
1594
any_address = "::" # in6addr_any
1197
1595
else:
1198
1596
any_address = socket.INADDR_ANY
1199
1597
self.server_address = (any_address,
1236
1634
def server_activate(self):
1237
1635
if self.enabled:
1238
1636
return socketserver.TCPServer.server_activate(self)
1637
1239
1638
def enable(self):
1240
1639
self.enabled = True
1241
def add_pipe(self, pipe):
1640
1641
def add_pipe(self, parent_pipe, proc):
1242
1642
# Call "handle_ipc" for both data and EOF events
1243
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1244
self.handle_ipc)
1245
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):
1246
1652
condition_names = {
1247
gobject.IO_IN: u"IN", # There is data to read.
1248
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
1249
1655
# blocking).
1250
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1251
gobject.IO_ERR: u"ERR", # Error condition.
1252
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
1253
1659
# broken, usually for pipes and
1254
1660
# sockets).
1255
1661
}
1257
1663
for cond, name in
1258
1664
condition_names.iteritems()
1259
1665
if cond & condition)
1260
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1261
conditions_string)
1262
1263
# Turn the pipe file descriptor into a Python file object
1264
if source not in file_objects:
1265
file_objects[source] = os.fdopen(source, u"r", 1)
1266
1267
# Read a line from the file object
1268
cmdline = file_objects[source].readline()
1269
if not cmdline: # Empty line means end of file
1270
# close the IPC pipe
1271
file_objects[source].close()
1272
del file_objects[source]
1273
1274
# Stop calling this function
1275
return False
1276
1277
logger.debug(u"IPC command: %r", cmdline)
1278
1279
# Parse and act on command
1280
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1281
1282
if cmd == u"NOTFOUND":
1283
logger.warning(u"Client not found for fingerprint: %s",
1284
args)
1285
if self.use_dbus:
1286
# Emit D-Bus signal
1287
mandos_dbus_service.ClientNotFound(args)
1288
elif cmd == u"INVALID":
1289
for client in self.clients:
1290
if client.name == args:
1291
logger.warning(u"Client %s is invalid", args)
1292
if self.use_dbus:
1293
# Emit D-Bus signal
1294
client.Rejected()
1295
break
1296
else:
1297
logger.error(u"Unknown client %s is invalid", args)
1298
elif cmd == u"SENDING":
1299
for client in self.clients:
1300
if client.name == args:
1301
logger.info(u"Sending secret to %s", client.name)
1302
client.checked_ok()
1303
if self.use_dbus:
1304
# Emit D-Bus signal
1305
client.GotSecret()
1306
break
1307
else:
1308
logger.error(u"Sending secret to unknown client %s",
1309
args)
1310
else:
1311
logger.error(u"Unknown IPC command: %r", cmdline)
1312
1313
# 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
1314
1728
return True
1315
1729
1316
1730
1317
1731
def string_to_delta(interval):
1318
1732
"""Parse a string and return a datetime.timedelta
1319
1733
1320
>>> string_to_delta(u'7d')
1734
>>> string_to_delta('7d')
1321
1735
datetime.timedelta(7)
1322
>>> string_to_delta(u'60s')
1736
>>> string_to_delta('60s')
1323
1737
datetime.timedelta(0, 60)
1324
>>> string_to_delta(u'60m')
1738
>>> string_to_delta('60m')
1325
1739
datetime.timedelta(0, 3600)
1326
>>> string_to_delta(u'24h')
1740
>>> string_to_delta('24h')
1327
1741
datetime.timedelta(1)
1328
>>> string_to_delta(u'1w')
1742
>>> string_to_delta('1w')
1329
1743
datetime.timedelta(7)
1330
>>> string_to_delta(u'5m 30s')
1744
>>> string_to_delta('5m 30s')
1331
1745
datetime.timedelta(0, 330)
1332
1746
"""
1333
1747
timevalue = datetime.timedelta(0)
1335
1749
try:
1336
1750
suffix = unicode(s[-1])
1337
1751
value = int(s[:-1])
1338
if suffix == u"d":
1752
if suffix == "d":
1339
1753
delta = datetime.timedelta(value)
1340
elif suffix == u"s":
1754
elif suffix == "s":
1341
1755
delta = datetime.timedelta(0, value)
1342
elif suffix == u"m":
1756
elif suffix == "m":
1343
1757
delta = datetime.timedelta(0, 0, 0, 0, value)
1344
elif suffix == u"h":
1758
elif suffix == "h":
1345
1759
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1346
elif suffix == u"w":
1760
elif suffix == "w":
1347
1761
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1348
1762
else:
1349
raise ValueError(u"Unknown suffix %r" % suffix)
1350
except (ValueError, IndexError), e:
1351
raise ValueError(e.message)
1763
raise ValueError("Unknown suffix %r" % suffix)
1764
except (ValueError, IndexError) as e:
1765
raise ValueError(*(e.args))
1352
1766
timevalue += delta
1353
1767
return timevalue
1354
1768
1360
1774
global if_nametoindex
1361
1775
try:
1362
1776
if_nametoindex = (ctypes.cdll.LoadLibrary
1363
(ctypes.util.find_library(u"c"))
1777
(ctypes.util.find_library("c"))
1364
1778
.if_nametoindex)
1365
1779
except (OSError, AttributeError):
1366
logger.warning(u"Doing if_nametoindex the hard way")
1780
logger.warning("Doing if_nametoindex the hard way")
1367
1781
def if_nametoindex(interface):
1368
1782
"Get an interface index the hard way, i.e. using fcntl()"
1369
1783
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1370
with closing(socket.socket()) as s:
1784
with contextlib.closing(socket.socket()) as s:
1371
1785
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1372
struct.pack(str(u"16s16x"),
1786
struct.pack(str("16s16x"),
1373
1787
interface))
1374
interface_index = struct.unpack(str(u"I"),
1788
interface_index = struct.unpack(str("I"),
1375
1789
ifreq[16:20])[0]
1376
1790
return interface_index
1377
1791
return if_nametoindex(interface)
1385
1799
sys.exit()
1386
1800
os.setsid()
1387
1801
if not nochdir:
1388
os.chdir(u"/")
1802
os.chdir("/")
1389
1803
if os.fork():
1390
1804
sys.exit()
1391
1805
if not noclose:
1393
1807
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1394
1808
if not stat.S_ISCHR(os.fstat(null).st_mode):
1395
1809
raise OSError(errno.ENODEV,
1396
u"%s not a character device"
1810
"%s not a character device"
1397
1811
% os.path.devnull)
1398
1812
os.dup2(null, sys.stdin.fileno())
1399
1813
os.dup2(null, sys.stdout.fileno())
1407
1821
##################################################################
1408
1822
# Parsing of options, both command line and config file
1409
1823
1410
parser = optparse.OptionParser(version = "%%prog %s" % version)
1411
parser.add_option("-i", u"--interface", type=u"string",
1412
metavar="IF", help=u"Bind to interface IF")
1413
parser.add_option("-a", u"--address", type=u"string",
1414
help=u"Address to listen for requests on")
1415
parser.add_option("-p", u"--port", type=u"int",
1416
help=u"Port number to receive requests on")
1417
parser.add_option("--check", action=u"store_true",
1418
help=u"Run self-test")
1419
parser.add_option("--debug", action=u"store_true",
1420
help=u"Debug mode; run in foreground and log to"
1421
u" terminal")
1422
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1423
u" priority string (see GnuTLS documentation)")
1424
parser.add_option("--servicename", type=u"string",
1425
metavar=u"NAME", help=u"Zeroconf service name")
1426
parser.add_option("--configdir", type=u"string",
1427
default=u"/etc/mandos", metavar=u"DIR",
1428
help=u"Directory to search for configuration"
1429
u" files")
1430
parser.add_option("--no-dbus", action=u"store_false",
1431
dest=u"use_dbus", help=u"Do not provide D-Bus"
1432
u" system bus interface")
1433
parser.add_option("--no-ipv6", action=u"store_false",
1434
dest=u"use_ipv6", help=u"Do not use IPv6")
1435
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()
1436
1855
1437
1856
if options.check:
1438
1857
import doctest
1440
1859
sys.exit()
1441
1860
1442
1861
# Default values for config file for server-global settings
1443
server_defaults = { u"interface": u"",
1444
u"address": u"",
1445
u"port": u"",
1446
u"debug": u"False",
1447
u"priority":
1448
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1449
u"servicename": u"Mandos",
1450
u"use_dbus": u"True",
1451
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": "",
1452
1872
}
1453
1873
1454
1874
# Parse config file for server-global settings
1455
1875
server_config = configparser.SafeConfigParser(server_defaults)
1456
1876
del server_defaults
1457
1877
server_config.read(os.path.join(options.configdir,
1458
u"mandos.conf"))
1878
"mandos.conf"))
1459
1879
# Convert the SafeConfigParser object to a dict
1460
1880
server_settings = server_config.defaults()
1461
1881
# Use the appropriate methods on the non-string config options
1462
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1463
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",
1464
1884
option)
1465
1885
if server_settings["port"]:
1466
server_settings["port"] = server_config.getint(u"DEFAULT",
1467
u"port")
1886
server_settings["port"] = server_config.getint("DEFAULT",
1887
"port")
1468
1888
del server_config
1469
1889
1470
1890
# Override the settings from the config file with command line
1471
1891
# options, if set.
1472
for option in (u"interface", u"address", u"port", u"debug",
1473
u"priority", u"servicename", u"configdir",
1474
u"use_dbus", u"use_ipv6"):
1892
for option in ("interface", "address", "port", "debug",
1893
"priority", "servicename", "configdir",
1894
"use_dbus", "use_ipv6", "debuglevel"):
1475
1895
value = getattr(options, option)
1476
1896
if value is not None:
1477
1897
server_settings[option] = value
1485
1905
##################################################################
1486
1906
1487
1907
# For convenience
1488
debug = server_settings[u"debug"]
1489
use_dbus = server_settings[u"use_dbus"]
1490
use_ipv6 = server_settings[u"use_ipv6"]
1491
1492
if not debug:
1493
syslogger.setLevel(logging.WARNING)
1494
console.setLevel(logging.WARNING)
1495
1496
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":
1497
1914
syslogger.setFormatter(logging.Formatter
1498
(u'Mandos (%s) [%%(process)d]:'
1499
u' %%(levelname)s: %%(message)s'
1500
% server_settings[u"servicename"]))
1915
('Mandos (%s) [%%(process)d]:'
1916
' %%(levelname)s: %%(message)s'
1917
% server_settings["servicename"]))
1501
1918
1502
1919
# Parse config file with clients
1503
client_defaults = { u"timeout": u"1h",
1504
u"interval": u"5m",
1505
u"checker": u"fping -q -- %%(host)s",
1506
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",
1507
1927
}
1508
1928
client_config = configparser.SafeConfigParser(client_defaults)
1509
client_config.read(os.path.join(server_settings[u"configdir"],
1510
u"clients.conf"))
1929
client_config.read(os.path.join(server_settings["configdir"],
1930
"clients.conf"))
1511
1931
1512
1932
global mandos_dbus_service
1513
1933
mandos_dbus_service = None
1514
1934
1515
tcp_server = MandosServer((server_settings[u"address"],
1516
server_settings[u"port"]),
1935
tcp_server = MandosServer((server_settings["address"],
1936
server_settings["port"]),
1517
1937
ClientHandler,
1518
interface=server_settings[u"interface"],
1938
interface=(server_settings["interface"]
1939
or None),
1519
1940
use_ipv6=use_ipv6,
1520
1941
gnutls_priority=
1521
server_settings[u"priority"],
1942
server_settings["priority"],
1522
1943
use_dbus=use_dbus)
1523
pidfilename = u"/var/run/mandos.pid"
1524
try:
1525
pidfile = open(pidfilename, u"w")
1526
except IOError:
1527
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)
1528
1950
1529
1951
try:
1530
uid = pwd.getpwnam(u"_mandos").pw_uid
1531
gid = pwd.getpwnam(u"_mandos").pw_gid
1952
uid = pwd.getpwnam("_mandos").pw_uid
1953
gid = pwd.getpwnam("_mandos").pw_gid
1532
1954
except KeyError:
1533
1955
try:
1534
uid = pwd.getpwnam(u"mandos").pw_uid
1535
gid = pwd.getpwnam(u"mandos").pw_gid
1956
uid = pwd.getpwnam("mandos").pw_uid
1957
gid = pwd.getpwnam("mandos").pw_gid
1536
1958
except KeyError:
1537
1959
try:
1538
uid = pwd.getpwnam(u"nobody").pw_uid
1539
gid = pwd.getpwnam(u"nobody").pw_gid
1960
uid = pwd.getpwnam("nobody").pw_uid
1961
gid = pwd.getpwnam("nobody").pw_gid
1540
1962
except KeyError:
1541
1963
uid = 65534
1542
1964
gid = 65534
1543
1965
try:
1544
1966
os.setgid(gid)
1545
1967
os.setuid(uid)
1546
except OSError, error:
1968
except OSError as error:
1547
1969
if error[0] != errno.EPERM:
1548
1970
raise error
1549
1971
1550
# 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
1551
1980
if debug:
1981
# Enable all possible GnuTLS debugging
1982
1552
1983
# "Use a log level over 10 to enable all debugging options."
1553
1984
# - GnuTLS manual
1554
1985
gnutls.library.functions.gnutls_global_set_log_level(11)
1555
1986
1556
1987
@gnutls.library.types.gnutls_log_func
1557
1988
def debug_gnutls(level, string):
1558
logger.debug(u"GnuTLS: %s", string[:-1])
1989
logger.debug("GnuTLS: %s", string[:-1])
1559
1990
1560
1991
(gnutls.library.functions
1561
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()
1562
2007
1563
2008
global main_loop
1564
2009
# From the Avahi example code
1568
2013
# End of Avahi example code
1569
2014
if use_dbus:
1570
2015
try:
1571
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2016
bus_name = dbus.service.BusName("se.recompile.Mandos",
1572
2017
bus, do_not_queue=True)
1573
except dbus.exceptions.NameExistsException, e:
1574
logger.error(unicode(e) + u", disabling D-Bus")
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")
1575
2023
use_dbus = False
1576
server_settings[u"use_dbus"] = False
2024
server_settings["use_dbus"] = False
1577
2025
tcp_server.use_dbus = False
1578
2026
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1579
service = AvahiService(name = server_settings[u"servicename"],
1580
servicetype = u"_mandos._tcp",
2027
service = AvahiService(name = server_settings["servicename"],
2028
servicetype = "_mandos._tcp",
1581
2029
protocol = protocol, bus = bus)
1582
2030
if server_settings["interface"]:
1583
2031
service.interface = (if_nametoindex
1584
(str(server_settings[u"interface"])))
2032
(str(server_settings["interface"])))
2033
2034
global multiprocessing_manager
2035
multiprocessing_manager = multiprocessing.Manager()
1585
2036
1586
2037
client_class = Client
1587
2038
if use_dbus:
1588
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
1589
2053
tcp_server.clients.update(set(
1590
2054
client_class(name = section,
1591
config= dict(client_config.items(section)))
2055
config= dict(client_config_items(
2056
client_config, section)))
1592
2057
for section in client_config.sections()))
1593
2058
if not tcp_server.clients:
1594
logger.warning(u"No clients defined")
1595
1596
if debug:
1597
# Redirect stdin so all checkers get /dev/null
1598
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1599
os.dup2(null, sys.stdin.fileno())
1600
if null > 2:
1601
os.close(null)
1602
else:
1603
# No console logging
1604
logger.removeHandler(console)
1605
# Close all input and output, do double fork, etc.
1606
daemon()
1607
1608
try:
1609
with closing(pidfile):
1610
pid = os.getpid()
1611
pidfile.write(str(pid) + "\n")
1612
del pidfile
1613
except IOError:
1614
logger.error(u"Could not write to file %r with PID %d",
1615
pidfilename, pid)
1616
except NameError:
1617
# "pidfile" was never created
1618
pass
1619
del pidfilename
1620
2059
logger.warning("No clients defined")
2060
1621
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
1622
2075
signal.signal(signal.SIGINT, signal.SIG_IGN)
2076
1623
2077
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1624
2078
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1625
2079
1627
2081
class MandosDBusService(dbus.service.Object):
1628
2082
"""A D-Bus proxy object"""
1629
2083
def __init__(self):
1630
dbus.service.Object.__init__(self, bus, u"/")
1631
_interface = u"se.bsnet.fukt.Mandos"
1632
1633
@dbus.service.signal(_interface, signature=u"oa{sv}")
1634
def ClientAdded(self, objpath, properties):
1635
"D-Bus signal"
1636
pass
1637
1638
@dbus.service.signal(_interface, signature=u"s")
1639
def ClientNotFound(self, fingerprint):
1640
"D-Bus signal"
1641
pass
1642
1643
@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")
1644
2098
def ClientRemoved(self, objpath, name):
1645
2099
"D-Bus signal"
1646
2100
pass
1647
2101
1648
@dbus.service.method(_interface, out_signature=u"ao")
2102
@dbus.service.method(_interface, out_signature="ao")
1649
2103
def GetAllClients(self):
1650
2104
"D-Bus method"
1651
2105
return dbus.Array(c.dbus_object_path
1652
2106
for c in tcp_server.clients)
1653
2107
1654
2108
@dbus.service.method(_interface,
1655
out_signature=u"a{oa{sv}}")
2109
out_signature="a{oa{sv}}")
1656
2110
def GetAllClientsWithProperties(self):
1657
2111
"D-Bus method"
1658
2112
return dbus.Dictionary(
1659
((c.dbus_object_path, c.GetAll(u""))
2113
((c.dbus_object_path, c.GetAll(""))
1660
2114
for c in tcp_server.clients),
1661
signature=u"oa{sv}")
2115
signature="oa{sv}")
1662
2116
1663
@dbus.service.method(_interface, in_signature=u"o")
2117
@dbus.service.method(_interface, in_signature="o")
1664
2118
def RemoveClient(self, object_path):
1665
2119
"D-Bus method"
1666
2120
for c in tcp_server.clients:
1676
2130
1677
2131
del _interface
1678
2132
1679
mandos_dbus_service = MandosDBusService()
2133
class MandosDBusServiceTransitional(MandosDBusService):
2134
__metaclass__ = AlternateDBusNamesMetaclass
2135
mandos_dbus_service = MandosDBusServiceTransitional()
1680
2136
1681
2137
def cleanup():
1682
2138
"Cleanup function; run on exit"
1683
2139
service.cleanup()
1684
2140
2141
multiprocessing.active_children()
1685
2142
while tcp_server.clients:
1686
2143
client = tcp_server.clients.pop()
1687
2144
if use_dbus:
1691
2148
client.disable(quiet=True)
1692
2149
if use_dbus:
1693
2150
# Emit D-Bus signal
1694
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2151
mandos_dbus_service.ClientRemoved(client
2152
.dbus_object_path,
1695
2153
client.name)
1696
2154
1697
2155
atexit.register(cleanup)
1699
2157
for client in tcp_server.clients:
1700
2158
if use_dbus:
1701
2159
# Emit D-Bus signal
1702
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1703
client.GetAll(u""))
2160
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1704
2161
client.enable()
1705
2162
1706
2163
tcp_server.enable()
1709
2166
# Find out what port we got
1710
2167
service.port = tcp_server.socket.getsockname()[1]
1711
2168
if use_ipv6:
1712
logger.info(u"Now listening on address %r, port %d,"
2169
logger.info("Now listening on address %r, port %d,"
1713
2170
" flowinfo %d, scope_id %d"
1714
2171
% tcp_server.socket.getsockname())
1715
2172
else: # IPv4
1716
logger.info(u"Now listening on address %r, port %d"
2173
logger.info("Now listening on address %r, port %d"
1717
2174
% tcp_server.socket.getsockname())
1718
2175
1719
2176
#service.interface = tcp_server.socket.getsockname()[3]
1722
2179
# From the Avahi example code
1723
2180
try:
1724
2181
service.activate()
1725
except dbus.exceptions.DBusException, error:
1726
logger.critical(u"DBusException: %s", error)
2182
except dbus.exceptions.DBusException as error:
2183
logger.critical("DBusException: %s", error)
1727
2184
cleanup()
1728
2185
sys.exit(1)
1729
2186
# End of Avahi example code
1733
2190
(tcp_server.handle_request
1734
2191
(*args[2:], **kwargs) or True))
1735
2192
1736
logger.debug(u"Starting main loop")
2193
logger.debug("Starting main loop")
1737
2194
main_loop.run()
1738
except AvahiError, error:
1739
logger.critical(u"AvahiError: %s", error)
2195
except AvahiError as error:
2196
logger.critical("AvahiError: %s", error)
1740
2197
cleanup()
1741
2198
sys.exit(1)
1742
2199
except KeyboardInterrupt:
1743
2200
if debug:
1744
print >> sys.stderr
1745
logger.debug(u"Server received KeyboardInterrupt")
1746
logger.debug(u"Server exiting")
2201
print("", file=sys.stderr)
2202
logger.debug("Server received KeyboardInterrupt")
2203
logger.debug("Server exiting")
1747
2204
# Must run before the D-Bus bus name gets deregistered
1748
2205
cleanup()
1749
2206
2207
1750
2208
if __name__ == '__main__':
1751
2209
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0