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