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 24.1.152
- compare with another revision
- download diff
- download tarball
- view history from revision 24.1.152
- Committer: Björn Påhlsson
- Date: 2010-09-01 18:03:03 UTC
- mto: (237.7.1 mandos)
- mto: This revision was merged to the branch mainline in revision 270.
- Revision ID: belorn@fukt.bsnet.se-20100901180303-u47edb73fczu56ob
bug fixes that prevent problems when runing server as root
- files added:
- plugins.d/plymouth
- files removed:
- 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-2010 Teddy Hogeborn
15
# Copyright © 2008-2010 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
31
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
82
81
SO_BINDTODEVICE = None
83
82
84
83
85
version = "1.2.3"
84
version = "1.0.14"
86
85
87
#logger = logging.getLogger('mandos')
88
logger = logging.Logger('mandos')
86
logger = logging.Logger(u'mandos')
89
87
syslogger = (logging.handlers.SysLogHandler
90
88
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
91
address = str("/dev/log")))
89
address = "/dev/log"))
92
90
syslogger.setFormatter(logging.Formatter
93
('Mandos [%(process)d]: %(levelname)s:'
94
' %(message)s'))
91
(u'Mandos [%(process)d]: %(levelname)s:'
92
u' %(message)s'))
95
93
logger.addHandler(syslogger)
96
94
97
95
console = logging.StreamHandler()
98
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
99
' %(levelname)s:'
100
' %(message)s'))
96
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
97
u' %(levelname)s:'
98
u' %(message)s'))
101
99
logger.addHandler(console)
102
100
103
101
class AvahiError(Exception):
120
118
Attributes:
121
119
interface: integer; avahi.IF_UNSPEC or an interface index.
122
120
Used to optionally bind to the specified interface.
123
name: string; Example: 'Mandos'
124
type: string; Example: '_mandos._tcp'.
121
name: string; Example: u'Mandos'
122
type: string; Example: u'_mandos._tcp'.
125
123
See <http://www.dns-sd.org/ServiceTypes.html>
126
124
port: integer; what port to announce
127
125
TXT: list of strings; TXT record for the service
136
134
"""
137
135
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
138
136
servicetype = None, port = None, TXT = None,
139
domain = "", host = "", max_renames = 32768,
137
domain = u"", host = u"", max_renames = 32768,
140
138
protocol = avahi.PROTO_UNSPEC, bus = None):
141
139
self.interface = interface
142
140
self.name = name
154
152
def rename(self):
155
153
"""Derived from the Avahi example code"""
156
154
if self.rename_count >= self.max_renames:
157
logger.critical("No suitable Zeroconf service name found"
158
" after %i retries, exiting.",
155
logger.critical(u"No suitable Zeroconf service name found"
156
u" after %i retries, exiting.",
159
157
self.rename_count)
160
raise AvahiServiceError("Too many renames")
161
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
162
logger.info("Changing Zeroconf service name to %r ...",
163
self.name)
158
raise AvahiServiceError(u"Too many renames")
159
self.name = self.server.GetAlternativeServiceName(self.name)
160
logger.info(u"Changing Zeroconf service name to %r ...",
161
unicode(self.name))
164
162
syslogger.setFormatter(logging.Formatter
165
('Mandos (%s) [%%(process)d]:'
166
' %%(levelname)s: %%(message)s'
163
(u'Mandos (%s) [%%(process)d]:'
164
u' %%(levelname)s: %%(message)s'
167
165
% self.name))
168
166
self.remove()
169
try:
170
self.add()
171
except dbus.exceptions.DBusException, error:
172
logger.critical("DBusException: %s", error)
173
self.cleanup()
174
os._exit(1)
167
self.add()
175
168
self.rename_count += 1
176
169
def remove(self):
177
170
"""Derived from the Avahi example code"""
187
180
self.group.connect_to_signal('StateChanged',
188
181
self
189
182
.entry_group_state_changed)
190
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
183
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
191
184
self.name, self.type)
192
185
self.group.AddService(
193
186
self.interface,
200
193
self.group.Commit()
201
194
def entry_group_state_changed(self, state, error):
202
195
"""Derived from the Avahi example code"""
203
logger.debug("Avahi entry group state change: %i", state)
196
logger.debug(u"Avahi state change: %i", state)
204
197
205
198
if state == avahi.ENTRY_GROUP_ESTABLISHED:
206
logger.debug("Zeroconf service established.")
199
logger.debug(u"Zeroconf service established.")
207
200
elif state == avahi.ENTRY_GROUP_COLLISION:
208
logger.info("Zeroconf service name collision.")
201
logger.warning(u"Zeroconf service name collision.")
209
202
self.rename()
210
203
elif state == avahi.ENTRY_GROUP_FAILURE:
211
logger.critical("Avahi: Error in group state changed %s",
204
logger.critical(u"Avahi: Error in group state changed %s",
212
205
unicode(error))
213
raise AvahiGroupError("State changed: %s"
206
raise AvahiGroupError(u"State changed: %s"
214
207
% unicode(error))
215
208
def cleanup(self):
216
209
"""Derived from the Avahi example code"""
219
212
self.group = None
220
213
def server_state_changed(self, state):
221
214
"""Derived from the Avahi example code"""
222
logger.debug("Avahi server state change: %i", state)
223
215
if state == avahi.SERVER_COLLISION:
224
logger.error("Zeroconf server name collision")
216
logger.error(u"Zeroconf server name collision")
225
217
self.remove()
226
218
elif state == avahi.SERVER_RUNNING:
227
219
self.add()
232
224
self.bus.get_object(avahi.DBUS_NAME,
233
225
avahi.DBUS_PATH_SERVER),
234
226
avahi.DBUS_INTERFACE_SERVER)
235
self.server.connect_to_signal("StateChanged",
227
self.server.connect_to_signal(u"StateChanged",
236
228
self.server_state_changed)
237
229
self.server_state_changed(self.server.GetState())
238
230
241
233
"""A representation of a client host served by this server.
242
234
243
235
Attributes:
244
_approved: bool(); 'None' if not yet approved/disapproved
245
approval_delay: datetime.timedelta(); Time to wait for approval
246
approval_duration: datetime.timedelta(); Duration of one approval
236
name: string; from the config file, used in log messages and
237
D-Bus identifiers
238
fingerprint: string (40 or 32 hexadecimal digits); used to
239
uniquely identify the client
240
secret: bytestring; sent verbatim (over TLS) to client
241
host: string; available for use by the checker command
242
created: datetime.datetime(); (UTC) object creation
243
last_enabled: datetime.datetime(); (UTC)
244
enabled: bool()
245
last_checked_ok: datetime.datetime(); (UTC) or None
246
timeout: datetime.timedelta(); How long from last_checked_ok
247
until this client is disabled
248
interval: datetime.timedelta(); How often to start a new checker
249
disable_hook: If set, called by disable() as disable_hook(self)
247
250
checker: subprocess.Popen(); a running checker process used
248
251
to see if the client lives.
249
252
'None' if no process is running.
250
checker_callback_tag: a gobject event source tag, or None
251
checker_command: string; External command which is run to check
252
if client lives. %() expansions are done at
253
checker_initiator_tag: a gobject event source tag, or None
254
disable_initiator_tag: - '' -
255
checker_callback_tag: - '' -
256
checker_command: string; External command which is run to check if
257
client lives. %() expansions are done at
253
258
runtime with vars(self) as dict, so that for
254
259
instance %(name)s can be used in the command.
255
checker_initiator_tag: a gobject event source tag, or None
256
created: datetime.datetime(); (UTC) object creation
257
260
current_checker_command: string; current running checker_command
258
disable_hook: If set, called by disable() as disable_hook(self)
259
disable_initiator_tag: a gobject event source tag, or None
260
enabled: bool()
261
fingerprint: string (40 or 32 hexadecimal digits); used to
262
uniquely identify the client
263
host: string; available for use by the checker command
264
interval: datetime.timedelta(); How often to start a new checker
265
last_approval_request: datetime.datetime(); (UTC) or None
266
last_checked_ok: datetime.datetime(); (UTC) or None
267
last_enabled: datetime.datetime(); (UTC)
268
name: string; from the config file, used in log messages and
269
D-Bus identifiers
270
secret: bytestring; sent verbatim (over TLS) to client
271
timeout: datetime.timedelta(); How long from last_checked_ok
272
until this client is disabled
273
runtime_expansions: Allowed attributes for runtime expansion.
261
approved_delay: datetime.timedelta(); Time to wait for approval
262
_approved: bool(); 'None' if not yet approved/disapproved
263
approved_duration: datetime.timedelta(); Duration of one approval
274
264
"""
275
265
276
runtime_expansions = ("approval_delay", "approval_duration",
277
"created", "enabled", "fingerprint",
278
"host", "interval", "last_checked_ok",
279
"last_enabled", "name", "timeout")
280
281
266
@staticmethod
282
267
def _timedelta_to_milliseconds(td):
283
268
"Convert a datetime.timedelta() to milliseconds"
293
278
"Return the 'interval' attribute in milliseconds"
294
279
return self._timedelta_to_milliseconds(self.interval)
295
280
296
def approval_delay_milliseconds(self):
297
return self._timedelta_to_milliseconds(self.approval_delay)
281
def approved_delay_milliseconds(self):
282
return self._timedelta_to_milliseconds(self.approved_delay)
298
283
299
284
def __init__(self, name = None, disable_hook=None, config=None):
300
285
"""Note: the 'checker' key in 'config' sets the
303
288
self.name = name
304
289
if config is None:
305
290
config = {}
306
logger.debug("Creating client %r", self.name)
291
logger.debug(u"Creating client %r", self.name)
307
292
# Uppercase and remove spaces from fingerprint for later
308
293
# comparison purposes with return value from the fingerprint()
309
294
# function
310
self.fingerprint = (config["fingerprint"].upper()
311
.replace(" ", ""))
312
logger.debug(" Fingerprint: %s", self.fingerprint)
313
if "secret" in config:
314
self.secret = config["secret"].decode("base64")
315
elif "secfile" in config:
295
self.fingerprint = (config[u"fingerprint"].upper()
296
.replace(u" ", u""))
297
logger.debug(u" Fingerprint: %s", self.fingerprint)
298
if u"secret" in config:
299
self.secret = config[u"secret"].decode(u"base64")
300
elif u"secfile" in config:
316
301
with open(os.path.expanduser(os.path.expandvars
317
(config["secfile"])),
302
(config[u"secfile"])),
318
303
"rb") as secfile:
319
304
self.secret = secfile.read()
320
305
else:
321
raise TypeError("No secret or secfile for client %s"
306
#XXX Need to allow secret on demand!
307
raise TypeError(u"No secret or secfile for client %s"
322
308
% self.name)
323
self.host = config.get("host", "")
309
self.host = config.get(u"host", u"")
324
310
self.created = datetime.datetime.utcnow()
325
311
self.enabled = False
326
self.last_approval_request = None
327
312
self.last_enabled = None
328
313
self.last_checked_ok = None
329
self.timeout = string_to_delta(config["timeout"])
330
self.interval = string_to_delta(config["interval"])
314
self.timeout = string_to_delta(config[u"timeout"])
315
self.interval = string_to_delta(config[u"interval"])
331
316
self.disable_hook = disable_hook
332
317
self.checker = None
333
318
self.checker_initiator_tag = None
334
319
self.disable_initiator_tag = None
335
320
self.checker_callback_tag = None
336
self.checker_command = config["checker"]
321
self.checker_command = config[u"checker"]
337
322
self.current_checker_command = None
338
323
self.last_connect = None
339
self._approved = None
340
self.approved_by_default = config.get("approved_by_default",
341
True)
342
324
self.approvals_pending = 0
343
self.approval_delay = string_to_delta(
344
config["approval_delay"])
345
self.approval_duration = string_to_delta(
346
config["approval_duration"])
325
self._approved = None
326
self.approved_by_default = config.get(u"approved_by_default",
327
False)
328
self.approved_delay = string_to_delta(
329
config[u"approved_delay"])
330
self.approved_duration = string_to_delta(
331
config[u"approved_duration"])
347
332
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
348
333
349
334
def send_changedstate(self):
350
335
self.changedstate.acquire()
351
336
self.changedstate.notify_all()
353
338
354
339
def enable(self):
355
340
"""Start this client's checker and timeout hooks"""
356
if getattr(self, "enabled", False):
341
if getattr(self, u"enabled", False):
357
342
# Already enabled
358
343
return
359
344
self.send_changedstate()
378
363
if not quiet:
379
364
self.send_changedstate()
380
365
if not quiet:
381
logger.info("Disabling client %s", self.name)
382
if getattr(self, "disable_initiator_tag", False):
366
logger.info(u"Disabling client %s", self.name)
367
if getattr(self, u"disable_initiator_tag", False):
383
368
gobject.source_remove(self.disable_initiator_tag)
384
369
self.disable_initiator_tag = None
385
if getattr(self, "checker_initiator_tag", False):
370
if getattr(self, u"checker_initiator_tag", False):
386
371
gobject.source_remove(self.checker_initiator_tag)
387
372
self.checker_initiator_tag = None
388
373
self.stop_checker()
403
388
if os.WIFEXITED(condition):
404
389
exitstatus = os.WEXITSTATUS(condition)
405
390
if exitstatus == 0:
406
logger.info("Checker for %(name)s succeeded",
391
logger.info(u"Checker for %(name)s succeeded",
407
392
vars(self))
408
393
self.checked_ok()
409
394
else:
410
logger.info("Checker for %(name)s failed",
395
logger.info(u"Checker for %(name)s failed",
411
396
vars(self))
412
397
else:
413
logger.warning("Checker for %(name)s crashed?",
398
logger.warning(u"Checker for %(name)s crashed?",
414
399
vars(self))
415
400
416
401
def checked_ok(self):
425
410
(self.timeout_milliseconds(),
426
411
self.disable))
427
412
428
def need_approval(self):
429
self.last_approval_request = datetime.datetime.utcnow()
430
431
413
def start_checker(self):
432
414
"""Start a new checker subprocess if one is not running.
433
415
451
433
raise error
452
434
else:
453
435
if pid:
454
logger.warning("Checker was a zombie")
436
logger.warning(u"Checker was a zombie")
455
437
gobject.source_remove(self.checker_callback_tag)
456
438
self.checker_callback(pid, status,
457
439
self.current_checker_command)
462
444
command = self.checker_command % self.host
463
445
except TypeError:
464
446
# Escape attributes for the shell
465
escaped_attrs = dict(
466
(attr,
467
re.escape(unicode(str(getattr(self, attr, "")),
468
errors=
469
'replace')))
470
for attr in
471
self.runtime_expansions)
472
447
escaped_attrs = dict((key,
448
re.escape(unicode(str(val),
449
errors=
450
u'replace')))
451
for key, val in
452
vars(self).iteritems())
473
453
try:
474
454
command = self.checker_command % escaped_attrs
475
455
except TypeError, error:
476
logger.error('Could not format string "%s":'
477
' %s', self.checker_command, error)
456
logger.error(u'Could not format string "%s":'
457
u' %s', self.checker_command, error)
478
458
return True # Try again later
479
459
self.current_checker_command = command
480
460
try:
481
logger.info("Starting checker %r for %s",
461
logger.info(u"Starting checker %r for %s",
482
462
command, self.name)
483
463
# We don't need to redirect stdout and stderr, since
484
464
# in normal mode, that is already done by daemon(),
486
466
# always replaced by /dev/null.)
487
467
self.checker = subprocess.Popen(command,
488
468
close_fds=True,
489
shell=True, cwd="/")
469
shell=True, cwd=u"/")
490
470
self.checker_callback_tag = (gobject.child_watch_add
491
471
(self.checker.pid,
492
472
self.checker_callback,
498
478
gobject.source_remove(self.checker_callback_tag)
499
479
self.checker_callback(pid, status, command)
500
480
except OSError, error:
501
logger.error("Failed to start subprocess: %s",
481
logger.error(u"Failed to start subprocess: %s",
502
482
error)
503
483
# Re-run this periodically if run by gobject.timeout_add
504
484
return True
508
488
if self.checker_callback_tag:
509
489
gobject.source_remove(self.checker_callback_tag)
510
490
self.checker_callback_tag = None
511
if getattr(self, "checker", None) is None:
491
if getattr(self, u"checker", None) is None:
512
492
return
513
logger.debug("Stopping checker for %(name)s", vars(self))
493
logger.debug(u"Stopping checker for %(name)s", vars(self))
514
494
try:
515
495
os.kill(self.checker.pid, signal.SIGTERM)
516
496
#time.sleep(0.5)
521
501
raise
522
502
self.checker = None
523
503
524
def dbus_service_property(dbus_interface, signature="v",
525
access="readwrite", byte_arrays=False):
504
def dbus_service_property(dbus_interface, signature=u"v",
505
access=u"readwrite", byte_arrays=False):
526
506
"""Decorators for marking methods of a DBusObjectWithProperties to
527
507
become properties on the D-Bus.
528
508
535
515
"""
536
516
# Encoding deeply encoded byte arrays is not supported yet by the
537
517
# "Set" method, so we fail early here:
538
if byte_arrays and signature != "ay":
539
raise ValueError("Byte arrays not supported for non-'ay'"
540
" signature %r" % signature)
518
if byte_arrays and signature != u"ay":
519
raise ValueError(u"Byte arrays not supported for non-'ay'"
520
u" signature %r" % signature)
541
521
def decorator(func):
542
522
func._dbus_is_property = True
543
523
func._dbus_interface = dbus_interface
544
524
func._dbus_signature = signature
545
525
func._dbus_access = access
546
526
func._dbus_name = func.__name__
547
if func._dbus_name.endswith("_dbus_property"):
527
if func._dbus_name.endswith(u"_dbus_property"):
548
528
func._dbus_name = func._dbus_name[:-14]
549
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
529
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
550
530
return func
551
531
return decorator
552
532
580
560
581
561
@staticmethod
582
562
def _is_dbus_property(obj):
583
return getattr(obj, "_dbus_is_property", False)
563
return getattr(obj, u"_dbus_is_property", False)
584
564
585
565
def _get_all_dbus_properties(self):
586
566
"""Returns a generator of (name, attribute) pairs
594
574
property with the specified name and interface.
595
575
"""
596
576
for name in (property_name,
597
property_name + "_dbus_property"):
577
property_name + u"_dbus_property"):
598
578
prop = getattr(self, name, None)
599
579
if (prop is None
600
580
or not self._is_dbus_property(prop)
604
584
continue
605
585
return prop
606
586
# No such property
607
raise DBusPropertyNotFound(self.dbus_object_path + ":"
608
+ interface_name + "."
587
raise DBusPropertyNotFound(self.dbus_object_path + u":"
588
+ interface_name + u"."
609
589
+ property_name)
610
590
611
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
612
out_signature="v")
591
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
592
out_signature=u"v")
613
593
def Get(self, interface_name, property_name):
614
594
"""Standard D-Bus property Get() method, see D-Bus standard.
615
595
"""
616
596
prop = self._get_dbus_property(interface_name, property_name)
617
if prop._dbus_access == "write":
597
if prop._dbus_access == u"write":
618
598
raise DBusPropertyAccessException(property_name)
619
599
value = prop()
620
if not hasattr(value, "variant_level"):
600
if not hasattr(value, u"variant_level"):
621
601
return value
622
602
return type(value)(value, variant_level=value.variant_level+1)
623
603
624
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
604
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
625
605
def Set(self, interface_name, property_name, value):
626
606
"""Standard D-Bus property Set() method, see D-Bus standard.
627
607
"""
628
608
prop = self._get_dbus_property(interface_name, property_name)
629
if prop._dbus_access == "read":
609
if prop._dbus_access == u"read":
630
610
raise DBusPropertyAccessException(property_name)
631
if prop._dbus_get_args_options["byte_arrays"]:
611
if prop._dbus_get_args_options[u"byte_arrays"]:
632
612
# The byte_arrays option is not supported yet on
633
613
# signatures other than "ay".
634
if prop._dbus_signature != "ay":
614
if prop._dbus_signature != u"ay":
635
615
raise ValueError
636
616
value = dbus.ByteArray(''.join(unichr(byte)
637
617
for byte in value))
638
618
prop(value)
639
619
640
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
641
out_signature="a{sv}")
620
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
621
out_signature=u"a{sv}")
642
622
def GetAll(self, interface_name):
643
623
"""Standard D-Bus property GetAll() method, see D-Bus
644
624
standard.
652
632
# Interface non-empty but did not match
653
633
continue
654
634
# Ignore write-only properties
655
if prop._dbus_access == "write":
635
if prop._dbus_access == u"write":
656
636
continue
657
637
value = prop()
658
if not hasattr(value, "variant_level"):
638
if not hasattr(value, u"variant_level"):
659
639
all[name] = value
660
640
continue
661
641
all[name] = type(value)(value, variant_level=
662
642
value.variant_level+1)
663
return dbus.Dictionary(all, signature="sv")
643
return dbus.Dictionary(all, signature=u"sv")
664
644
665
645
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
666
out_signature="s",
646
out_signature=u"s",
667
647
path_keyword='object_path',
668
648
connection_keyword='connection')
669
649
def Introspect(self, object_path, connection):
674
654
try:
675
655
document = xml.dom.minidom.parseString(xmlstring)
676
656
def make_tag(document, name, prop):
677
e = document.createElement("property")
678
e.setAttribute("name", name)
679
e.setAttribute("type", prop._dbus_signature)
680
e.setAttribute("access", prop._dbus_access)
657
e = document.createElement(u"property")
658
e.setAttribute(u"name", name)
659
e.setAttribute(u"type", prop._dbus_signature)
660
e.setAttribute(u"access", prop._dbus_access)
681
661
return e
682
for if_tag in document.getElementsByTagName("interface"):
662
for if_tag in document.getElementsByTagName(u"interface"):
683
663
for tag in (make_tag(document, name, prop)
684
664
for name, prop
685
665
in self._get_all_dbus_properties()
686
666
if prop._dbus_interface
687
== if_tag.getAttribute("name")):
667
== if_tag.getAttribute(u"name")):
688
668
if_tag.appendChild(tag)
689
669
# Add the names to the return values for the
690
670
# "org.freedesktop.DBus.Properties" methods
691
if (if_tag.getAttribute("name")
692
== "org.freedesktop.DBus.Properties"):
693
for cn in if_tag.getElementsByTagName("method"):
694
if cn.getAttribute("name") == "Get":
695
for arg in cn.getElementsByTagName("arg"):
696
if (arg.getAttribute("direction")
697
== "out"):
698
arg.setAttribute("name", "value")
699
elif cn.getAttribute("name") == "GetAll":
700
for arg in cn.getElementsByTagName("arg"):
701
if (arg.getAttribute("direction")
702
== "out"):
703
arg.setAttribute("name", "props")
704
xmlstring = document.toxml("utf-8")
671
if (if_tag.getAttribute(u"name")
672
== u"org.freedesktop.DBus.Properties"):
673
for cn in if_tag.getElementsByTagName(u"method"):
674
if cn.getAttribute(u"name") == u"Get":
675
for arg in cn.getElementsByTagName(u"arg"):
676
if (arg.getAttribute(u"direction")
677
== u"out"):
678
arg.setAttribute(u"name", u"value")
679
elif cn.getAttribute(u"name") == u"GetAll":
680
for arg in cn.getElementsByTagName(u"arg"):
681
if (arg.getAttribute(u"direction")
682
== u"out"):
683
arg.setAttribute(u"name", u"props")
684
xmlstring = document.toxml(u"utf-8")
705
685
document.unlink()
706
686
except (AttributeError, xml.dom.DOMException,
707
687
xml.parsers.expat.ExpatError), error:
708
logger.error("Failed to override Introspection method",
688
logger.error(u"Failed to override Introspection method",
709
689
error)
710
690
return xmlstring
711
691
717
697
dbus_object_path: dbus.ObjectPath
718
698
bus: dbus.SystemBus()
719
699
"""
720
721
runtime_expansions = (Client.runtime_expansions
722
+ ("dbus_object_path",))
723
724
700
# dbus.service.Object doesn't use super(), so we can't either.
725
701
726
702
def __init__(self, bus = None, *args, **kwargs):
727
self._approvals_pending = 0
728
703
self.bus = bus
729
704
Client.__init__(self, *args, **kwargs)
730
705
# Only now, when this client is initialized, can it show up on
731
706
# the D-Bus
732
client_object_name = unicode(self.name).translate(
733
{ord("."): ord("_"),
734
ord("-"): ord("_")})
735
707
self.dbus_object_path = (dbus.ObjectPath
736
("/clients/" + client_object_name))
708
(u"/clients/"
709
+ self.name.replace(u".", u"_")))
737
710
DBusObjectWithProperties.__init__(self, self.bus,
738
711
self.dbus_object_path)
739
740
def _get_approvals_pending(self):
741
return self._approvals_pending
742
def _set_approvals_pending(self, value):
743
old_value = self._approvals_pending
744
self._approvals_pending = value
745
bval = bool(value)
746
if (hasattr(self, "dbus_object_path")
747
and bval is not bool(old_value)):
748
dbus_bool = dbus.Boolean(bval, variant_level=1)
749
self.PropertyChanged(dbus.String("ApprovalPending"),
750
dbus_bool)
751
752
approvals_pending = property(_get_approvals_pending,
753
_set_approvals_pending)
754
del _get_approvals_pending, _set_approvals_pending
755
712
756
713
@staticmethod
757
714
def _datetime_to_dbus(dt, variant_level=0):
760
717
variant_level=variant_level)
761
718
762
719
def enable(self):
763
oldstate = getattr(self, "enabled", False)
720
oldstate = getattr(self, u"enabled", False)
764
721
r = Client.enable(self)
765
722
if oldstate != self.enabled:
766
723
# Emit D-Bus signals
767
self.PropertyChanged(dbus.String("Enabled"),
724
self.PropertyChanged(dbus.String(u"enabled"),
768
725
dbus.Boolean(True, variant_level=1))
769
726
self.PropertyChanged(
770
dbus.String("LastEnabled"),
727
dbus.String(u"last_enabled"),
771
728
self._datetime_to_dbus(self.last_enabled,
772
729
variant_level=1))
773
730
return r
774
731
775
732
def disable(self, quiet = False):
776
oldstate = getattr(self, "enabled", False)
733
oldstate = getattr(self, u"enabled", False)
777
734
r = Client.disable(self, quiet=quiet)
778
735
if not quiet and oldstate != self.enabled:
779
736
# Emit D-Bus signal
780
self.PropertyChanged(dbus.String("Enabled"),
737
self.PropertyChanged(dbus.String(u"enabled"),
781
738
dbus.Boolean(False, variant_level=1))
782
739
return r
783
740
786
743
self.remove_from_connection()
787
744
except LookupError:
788
745
pass
789
if hasattr(DBusObjectWithProperties, "__del__"):
746
if hasattr(DBusObjectWithProperties, u"__del__"):
790
747
DBusObjectWithProperties.__del__(self, *args, **kwargs)
791
748
Client.__del__(self, *args, **kwargs)
792
749
795
752
self.checker_callback_tag = None
796
753
self.checker = None
797
754
# Emit D-Bus signal
798
self.PropertyChanged(dbus.String("CheckerRunning"),
755
self.PropertyChanged(dbus.String(u"checker_running"),
799
756
dbus.Boolean(False, variant_level=1))
800
757
if os.WIFEXITED(condition):
801
758
exitstatus = os.WEXITSTATUS(condition)
816
773
r = Client.checked_ok(self, *args, **kwargs)
817
774
# Emit D-Bus signal
818
775
self.PropertyChanged(
819
dbus.String("LastCheckedOK"),
776
dbus.String(u"last_checked_ok"),
820
777
(self._datetime_to_dbus(self.last_checked_ok,
821
778
variant_level=1)))
822
779
return r
823
780
824
def need_approval(self, *args, **kwargs):
825
r = Client.need_approval(self, *args, **kwargs)
826
# Emit D-Bus signal
827
self.PropertyChanged(
828
dbus.String("LastApprovalRequest"),
829
(self._datetime_to_dbus(self.last_approval_request,
830
variant_level=1)))
831
return r
832
833
781
def start_checker(self, *args, **kwargs):
834
782
old_checker = self.checker
835
783
if self.checker is not None:
843
791
# Emit D-Bus signal
844
792
self.CheckerStarted(self.current_checker_command)
845
793
self.PropertyChanged(
846
dbus.String("CheckerRunning"),
794
dbus.String(u"checker_running"),
847
795
dbus.Boolean(True, variant_level=1))
848
796
return r
849
797
850
798
def stop_checker(self, *args, **kwargs):
851
old_checker = getattr(self, "checker", None)
799
old_checker = getattr(self, u"checker", None)
852
800
r = Client.stop_checker(self, *args, **kwargs)
853
801
if (old_checker is not None
854
and getattr(self, "checker", None) is None):
855
self.PropertyChanged(dbus.String("CheckerRunning"),
802
and getattr(self, u"checker", None) is None):
803
self.PropertyChanged(dbus.String(u"checker_running"),
856
804
dbus.Boolean(False, variant_level=1))
857
805
return r
858
806
861
809
return False
862
810
863
811
def approve(self, value=True):
864
self.send_changedstate()
865
812
self._approved = value
866
gobject.timeout_add(self._timedelta_to_milliseconds
867
(self.approval_duration),
868
self._reset_approved)
869
813
gobject.timeout_add(self._timedelta_to_milliseconds(self.approved_duration, self._reset_approved))
814
815
def approved_pending(self):
816
return self.approvals_pending > 0
817
870
818
871
819
## D-Bus methods, signals & properties
872
_interface = "se.bsnet.fukt.Mandos.Client"
820
_interface = u"se.bsnet.fukt.Mandos.Client"
873
821
874
822
## Signals
875
823
876
824
# CheckerCompleted - signal
877
@dbus.service.signal(_interface, signature="nxs")
825
@dbus.service.signal(_interface, signature=u"nxs")
878
826
def CheckerCompleted(self, exitcode, waitstatus, command):
879
827
"D-Bus signal"
880
828
pass
881
829
882
830
# CheckerStarted - signal
883
@dbus.service.signal(_interface, signature="s")
831
@dbus.service.signal(_interface, signature=u"s")
884
832
def CheckerStarted(self, command):
885
833
"D-Bus signal"
886
834
pass
887
835
888
836
# PropertyChanged - signal
889
@dbus.service.signal(_interface, signature="sv")
837
@dbus.service.signal(_interface, signature=u"sv")
890
838
def PropertyChanged(self, property, value):
891
839
"D-Bus signal"
892
840
pass
894
842
# GotSecret - signal
895
843
@dbus.service.signal(_interface)
896
844
def GotSecret(self):
897
"""D-Bus signal
898
Is sent after a successful transfer of secret from the Mandos
899
server to mandos-client
900
"""
845
"D-Bus signal"
901
846
pass
902
847
903
848
# Rejected - signal
904
@dbus.service.signal(_interface, signature="s")
849
@dbus.service.signal(_interface, signature=u"s")
905
850
def Rejected(self, reason):
906
851
"D-Bus signal"
907
852
pass
908
853
909
854
# NeedApproval - signal
910
@dbus.service.signal(_interface, signature="tb")
855
@dbus.service.signal(_interface, signature=u"db")
911
856
def NeedApproval(self, timeout, default):
912
857
"D-Bus signal"
913
return self.need_approval()
858
pass
914
859
915
860
## Methods
916
861
917
862
# Approve - method
918
@dbus.service.method(_interface, in_signature="b")
863
@dbus.service.method(_interface, in_signature=u"b")
919
864
def Approve(self, value):
920
865
self.approve(value)
921
866
922
867
# CheckedOK - method
923
868
@dbus.service.method(_interface)
924
869
def CheckedOK(self):
949
894
950
895
## Properties
951
896
952
# ApprovalPending - property
953
@dbus_service_property(_interface, signature="b", access="read")
954
def ApprovalPending_dbus_property(self):
955
return dbus.Boolean(bool(self.approvals_pending))
956
957
# ApprovedByDefault - property
958
@dbus_service_property(_interface, signature="b",
959
access="readwrite")
960
def ApprovedByDefault_dbus_property(self, value=None):
961
if value is None: # get
962
return dbus.Boolean(self.approved_by_default)
963
self.approved_by_default = bool(value)
964
# Emit D-Bus signal
965
self.PropertyChanged(dbus.String("ApprovedByDefault"),
966
dbus.Boolean(value, variant_level=1))
967
968
# ApprovalDelay - property
969
@dbus_service_property(_interface, signature="t",
970
access="readwrite")
971
def ApprovalDelay_dbus_property(self, value=None):
972
if value is None: # get
973
return dbus.UInt64(self.approval_delay_milliseconds())
974
self.approval_delay = datetime.timedelta(0, 0, 0, value)
975
# Emit D-Bus signal
976
self.PropertyChanged(dbus.String("ApprovalDelay"),
977
dbus.UInt64(value, variant_level=1))
978
979
# ApprovalDuration - property
980
@dbus_service_property(_interface, signature="t",
981
access="readwrite")
982
def ApprovalDuration_dbus_property(self, value=None):
983
if value is None: # get
984
return dbus.UInt64(self._timedelta_to_milliseconds(
985
self.approval_duration))
986
self.approval_duration = datetime.timedelta(0, 0, 0, value)
987
# Emit D-Bus signal
988
self.PropertyChanged(dbus.String("ApprovalDuration"),
989
dbus.UInt64(value, variant_level=1))
990
991
# Name - property
992
@dbus_service_property(_interface, signature="s", access="read")
993
def Name_dbus_property(self):
897
# approved_pending - property
898
@dbus_service_property(_interface, signature=u"b", access=u"read")
899
def approved_pending_dbus_property(self):
900
return dbus.Boolean(self.approved_pending())
901
902
# approved_by_default - property
903
@dbus_service_property(_interface, signature=u"b",
904
access=u"readwrite")
905
def approved_by_default_dbus_property(self):
906
return dbus.Boolean(self.approved_by_default)
907
908
# approved_delay - property
909
@dbus_service_property(_interface, signature=u"t",
910
access=u"readwrite")
911
def approved_delay_dbus_property(self):
912
return dbus.UInt64(self.approved_delay_milliseconds())
913
914
# approved_duration - property
915
@dbus_service_property(_interface, signature=u"t",
916
access=u"readwrite")
917
def approved_duration_dbus_property(self):
918
return dbus.UInt64(self._timedelta_to_milliseconds(
919
self.approved_duration))
920
921
# name - property
922
@dbus_service_property(_interface, signature=u"s", access=u"read")
923
def name_dbus_property(self):
994
924
return dbus.String(self.name)
995
925
996
# Fingerprint - property
997
@dbus_service_property(_interface, signature="s", access="read")
998
def Fingerprint_dbus_property(self):
926
# fingerprint - property
927
@dbus_service_property(_interface, signature=u"s", access=u"read")
928
def fingerprint_dbus_property(self):
999
929
return dbus.String(self.fingerprint)
1000
930
1001
# Host - property
1002
@dbus_service_property(_interface, signature="s",
1003
access="readwrite")
1004
def Host_dbus_property(self, value=None):
931
# host - property
932
@dbus_service_property(_interface, signature=u"s",
933
access=u"readwrite")
934
def host_dbus_property(self, value=None):
1005
935
if value is None: # get
1006
936
return dbus.String(self.host)
1007
937
self.host = value
1008
938
# Emit D-Bus signal
1009
self.PropertyChanged(dbus.String("Host"),
939
self.PropertyChanged(dbus.String(u"host"),
1010
940
dbus.String(value, variant_level=1))
1011
941
1012
# Created - property
1013
@dbus_service_property(_interface, signature="s", access="read")
1014
def Created_dbus_property(self):
942
# created - property
943
@dbus_service_property(_interface, signature=u"s", access=u"read")
944
def created_dbus_property(self):
1015
945
return dbus.String(self._datetime_to_dbus(self.created))
1016
946
1017
# LastEnabled - property
1018
@dbus_service_property(_interface, signature="s", access="read")
1019
def LastEnabled_dbus_property(self):
947
# last_enabled - property
948
@dbus_service_property(_interface, signature=u"s", access=u"read")
949
def last_enabled_dbus_property(self):
1020
950
if self.last_enabled is None:
1021
return dbus.String("")
951
return dbus.String(u"")
1022
952
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1023
953
1024
# Enabled - property
1025
@dbus_service_property(_interface, signature="b",
1026
access="readwrite")
1027
def Enabled_dbus_property(self, value=None):
954
# enabled - property
955
@dbus_service_property(_interface, signature=u"b",
956
access=u"readwrite")
957
def enabled_dbus_property(self, value=None):
1028
958
if value is None: # get
1029
959
return dbus.Boolean(self.enabled)
1030
960
if value:
1032
962
else:
1033
963
self.disable()
1034
964
1035
# LastCheckedOK - property
1036
@dbus_service_property(_interface, signature="s",
1037
access="readwrite")
1038
def LastCheckedOK_dbus_property(self, value=None):
965
# last_checked_ok - property
966
@dbus_service_property(_interface, signature=u"s",
967
access=u"readwrite")
968
def last_checked_ok_dbus_property(self, value=None):
1039
969
if value is not None:
1040
970
self.checked_ok()
1041
971
return
1042
972
if self.last_checked_ok is None:
1043
return dbus.String("")
973
return dbus.String(u"")
1044
974
return dbus.String(self._datetime_to_dbus(self
1045
975
.last_checked_ok))
1046
976
1047
# LastApprovalRequest - property
1048
@dbus_service_property(_interface, signature="s", access="read")
1049
def LastApprovalRequest_dbus_property(self):
1050
if self.last_approval_request is None:
1051
return dbus.String("")
1052
return dbus.String(self.
1053
_datetime_to_dbus(self
1054
.last_approval_request))
1055
1056
# Timeout - property
1057
@dbus_service_property(_interface, signature="t",
1058
access="readwrite")
1059
def Timeout_dbus_property(self, value=None):
977
# timeout - property
978
@dbus_service_property(_interface, signature=u"t",
979
access=u"readwrite")
980
def timeout_dbus_property(self, value=None):
1060
981
if value is None: # get
1061
982
return dbus.UInt64(self.timeout_milliseconds())
1062
983
self.timeout = datetime.timedelta(0, 0, 0, value)
1063
984
# Emit D-Bus signal
1064
self.PropertyChanged(dbus.String("Timeout"),
985
self.PropertyChanged(dbus.String(u"timeout"),
1065
986
dbus.UInt64(value, variant_level=1))
1066
if getattr(self, "disable_initiator_tag", None) is None:
987
if getattr(self, u"disable_initiator_tag", None) is None:
1067
988
return
1068
989
# Reschedule timeout
1069
990
gobject.source_remove(self.disable_initiator_tag)
1081
1002
self.disable_initiator_tag = (gobject.timeout_add
1082
1003
(time_to_die, self.disable))
1083
1004
1084
# Interval - property
1085
@dbus_service_property(_interface, signature="t",
1086
access="readwrite")
1087
def Interval_dbus_property(self, value=None):
1005
# interval - property
1006
@dbus_service_property(_interface, signature=u"t",
1007
access=u"readwrite")
1008
def interval_dbus_property(self, value=None):
1088
1009
if value is None: # get
1089
1010
return dbus.UInt64(self.interval_milliseconds())
1090
1011
self.interval = datetime.timedelta(0, 0, 0, value)
1091
1012
# Emit D-Bus signal
1092
self.PropertyChanged(dbus.String("Interval"),
1013
self.PropertyChanged(dbus.String(u"interval"),
1093
1014
dbus.UInt64(value, variant_level=1))
1094
if getattr(self, "checker_initiator_tag", None) is None:
1015
if getattr(self, u"checker_initiator_tag", None) is None:
1095
1016
return
1096
1017
# Reschedule checker run
1097
1018
gobject.source_remove(self.checker_initiator_tag)
1099
1020
(value, self.start_checker))
1100
1021
self.start_checker() # Start one now, too
1101
1022
1102
# Checker - property
1103
@dbus_service_property(_interface, signature="s",
1104
access="readwrite")
1105
def Checker_dbus_property(self, value=None):
1023
# checker - property
1024
@dbus_service_property(_interface, signature=u"s",
1025
access=u"readwrite")
1026
def checker_dbus_property(self, value=None):
1106
1027
if value is None: # get
1107
1028
return dbus.String(self.checker_command)
1108
1029
self.checker_command = value
1109
1030
# Emit D-Bus signal
1110
self.PropertyChanged(dbus.String("Checker"),
1031
self.PropertyChanged(dbus.String(u"checker"),
1111
1032
dbus.String(self.checker_command,
1112
1033
variant_level=1))
1113
1034
1114
# CheckerRunning - property
1115
@dbus_service_property(_interface, signature="b",
1116
access="readwrite")
1117
def CheckerRunning_dbus_property(self, value=None):
1035
# checker_running - property
1036
@dbus_service_property(_interface, signature=u"b",
1037
access=u"readwrite")
1038
def checker_running_dbus_property(self, value=None):
1118
1039
if value is None: # get
1119
1040
return dbus.Boolean(self.checker is not None)
1120
1041
if value:
1122
1043
else:
1123
1044
self.stop_checker()
1124
1045
1125
# ObjectPath - property
1126
@dbus_service_property(_interface, signature="o", access="read")
1127
def ObjectPath_dbus_property(self):
1046
# object_path - property
1047
@dbus_service_property(_interface, signature=u"o", access=u"read")
1048
def object_path_dbus_property(self):
1128
1049
return self.dbus_object_path # is already a dbus.ObjectPath
1129
1050
1130
# Secret = property
1131
@dbus_service_property(_interface, signature="ay",
1132
access="write", byte_arrays=True)
1133
def Secret_dbus_property(self, value):
1051
# secret = property
1052
@dbus_service_property(_interface, signature=u"ay",
1053
access=u"write", byte_arrays=True)
1054
def secret_dbus_property(self, value):
1134
1055
self.secret = str(value)
1135
1056
1136
1057
del _interface
1170
1091
1171
1092
def handle(self):
1172
1093
with contextlib.closing(self.server.child_pipe) as child_pipe:
1173
logger.info("TCP connection from: %s",
1094
logger.info(u"TCP connection from: %s",
1174
1095
unicode(self.client_address))
1175
logger.debug("Pipe FD: %d",
1096
logger.debug(u"Pipe FD: %d",
1176
1097
self.server.child_pipe.fileno())
1177
1098
1178
1099
session = (gnutls.connection
1185
1106
# no X.509 keys are added to it. Therefore, we can use it
1186
1107
# here despite using OpenPGP certificates.
1187
1108
1188
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1189
# "+AES-256-CBC", "+SHA1",
1190
# "+COMP-NULL", "+CTYPE-OPENPGP",
1191
# "+DHE-DSS"))
1109
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1110
# u"+AES-256-CBC", u"+SHA1",
1111
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1112
# u"+DHE-DSS"))
1192
1113
# Use a fallback default, since this MUST be set.
1193
1114
priority = self.server.gnutls_priority
1194
1115
if priority is None:
1195
priority = "NORMAL"
1116
priority = u"NORMAL"
1196
1117
(gnutls.library.functions
1197
1118
.gnutls_priority_set_direct(session._c_object,
1198
1119
priority, None))
1200
1121
# Start communication using the Mandos protocol
1201
1122
# Get protocol number
1202
1123
line = self.request.makefile().readline()
1203
logger.debug("Protocol version: %r", line)
1124
logger.debug(u"Protocol version: %r", line)
1204
1125
try:
1205
1126
if int(line.strip().split()[0]) > 1:
1206
1127
raise RuntimeError
1207
1128
except (ValueError, IndexError, RuntimeError), error:
1208
logger.error("Unknown protocol version: %s", error)
1129
logger.error(u"Unknown protocol version: %s", error)
1209
1130
return
1210
1131
1211
1132
# Start GnuTLS connection
1212
1133
try:
1213
1134
session.handshake()
1214
1135
except gnutls.errors.GNUTLSError, error:
1215
logger.warning("Handshake failed: %s", error)
1136
logger.warning(u"Handshake failed: %s", error)
1216
1137
# Do not run session.bye() here: the session is not
1217
1138
# established. Just abandon the request.
1218
1139
return
1219
logger.debug("Handshake succeeded")
1140
logger.debug(u"Handshake succeeded")
1220
1141
1221
1142
approval_required = False
1222
1143
try:
1224
1145
fpr = self.fingerprint(self.peer_certificate
1225
1146
(session))
1226
1147
except (TypeError, gnutls.errors.GNUTLSError), error:
1227
logger.warning("Bad certificate: %s", error)
1148
logger.warning(u"Bad certificate: %s", error)
1228
1149
return
1229
logger.debug("Fingerprint: %s", fpr)
1150
logger.debug(u"Fingerprint: %s", fpr)
1230
1151
1231
1152
try:
1232
1153
client = ProxyClient(child_pipe, fpr,
1234
1155
except KeyError:
1235
1156
return
1236
1157
1237
if client.approval_delay:
1238
delay = client.approval_delay
1158
if client.approved_delay:
1159
delay = client.approved_delay
1239
1160
client.approvals_pending += 1
1240
1161
approval_required = True
1241
1162
1242
1163
while True:
1243
1164
if not client.enabled:
1244
logger.warning("Client %s is disabled",
1165
logger.warning(u"Client %s is disabled",
1245
1166
client.name)
1246
1167
if self.server.use_dbus:
1247
1168
# Emit D-Bus signal
1248
1169
client.Rejected("Disabled")
1249
1170
return
1250
1171
1251
if client._approved or not client.approval_delay:
1172
if client._approved or not client.approved_delay:
1252
1173
#We are approved or approval is disabled
1253
1174
break
1254
1175
elif client._approved is None:
1255
logger.info("Client %s needs approval",
1176
logger.info(u"Client %s need approval",
1256
1177
client.name)
1257
1178
if self.server.use_dbus:
1258
1179
# Emit D-Bus signal
1259
1180
client.NeedApproval(
1260
client.approval_delay_milliseconds(),
1181
client.approved_delay_milliseconds(),
1261
1182
client.approved_by_default)
1262
1183
else:
1263
logger.warning("Client %s was not approved",
1184
logger.warning(u"Client %s was not approved",
1264
1185
client.name)
1265
1186
if self.server.use_dbus:
1266
1187
# Emit D-Bus signal
1267
client.Rejected("Denied")
1188
client.Rejected("Disapproved")
1268
1189
return
1269
1190
1270
1191
#wait until timeout or approved
1281
1202
client.name)
1282
1203
if self.server.use_dbus:
1283
1204
# Emit D-Bus signal
1284
client.Rejected("Approval timed out")
1205
client.Rejected("Time out")
1285
1206
return
1286
1207
else:
1287
1208
break
1290
1211
1291
1212
sent_size = 0
1292
1213
while sent_size < len(client.secret):
1293
try:
1294
sent = session.send(client.secret[sent_size:])
1295
except (gnutls.errors.GNUTLSError), error:
1296
logger.warning("gnutls send failed")
1297
return
1298
logger.debug("Sent: %d, remaining: %d",
1214
# XXX handle session exception
1215
sent = session.send(client.secret[sent_size:])
1216
logger.debug(u"Sent: %d, remaining: %d",
1299
1217
sent, len(client.secret)
1300
1218
- (sent_size + sent))
1301
1219
sent_size += sent
1302
1220
1303
logger.info("Sending secret to %s", client.name)
1221
logger.info(u"Sending secret to %s", client.name)
1304
1222
# bump the timeout as if seen
1305
1223
client.checked_ok()
1306
1224
if self.server.use_dbus:
1310
1228
finally:
1311
1229
if approval_required:
1312
1230
client.approvals_pending -= 1
1313
try:
1314
session.bye()
1315
except (gnutls.errors.GNUTLSError), error:
1316
logger.warning("GnuTLS bye failed")
1231
session.bye()
1317
1232
1318
1233
@staticmethod
1319
1234
def peer_certificate(session):
1329
1244
.gnutls_certificate_get_peers
1330
1245
(session._c_object, ctypes.byref(list_size)))
1331
1246
if not bool(cert_list) and list_size.value != 0:
1332
raise gnutls.errors.GNUTLSError("error getting peer"
1333
" certificate")
1247
raise gnutls.errors.GNUTLSError(u"error getting peer"
1248
u" certificate")
1334
1249
if list_size.value == 0:
1335
1250
return None
1336
1251
cert = cert_list[0]
1362
1277
if crtverify.value != 0:
1363
1278
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1364
1279
raise (gnutls.errors.CertificateSecurityError
1365
("Verify failed"))
1280
(u"Verify failed"))
1366
1281
# New buffer for the fingerprint
1367
1282
buf = ctypes.create_string_buffer(20)
1368
1283
buf_len = ctypes.c_size_t()
1375
1290
# Convert the buffer to a Python bytestring
1376
1291
fpr = ctypes.string_at(buf, buf_len.value)
1377
1292
# Convert the bytestring to hexadecimal notation
1378
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1293
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1379
1294
return hex_fpr
1380
1295
1381
1296
1406
1321
self).process_request(request, client_address)
1407
1322
self.child_pipe.close()
1408
1323
self.add_pipe(parent_pipe)
1409
1324
1410
1325
def add_pipe(self, parent_pipe):
1411
1326
"""Dummy function; override as necessary"""
1412
1327
pass
1433
1348
bind to an address or port if they were not specified."""
1434
1349
if self.interface is not None:
1435
1350
if SO_BINDTODEVICE is None:
1436
logger.error("SO_BINDTODEVICE does not exist;"
1437
" cannot bind to interface %s",
1351
logger.error(u"SO_BINDTODEVICE does not exist;"
1352
u" cannot bind to interface %s",
1438
1353
self.interface)
1439
1354
else:
1440
1355
try:
1441
1356
self.socket.setsockopt(socket.SOL_SOCKET,
1442
1357
SO_BINDTODEVICE,
1443
1358
str(self.interface
1444
+ '\0'))
1359
+ u'\0'))
1445
1360
except socket.error, error:
1446
1361
if error[0] == errno.EPERM:
1447
logger.error("No permission to"
1448
" bind to interface %s",
1362
logger.error(u"No permission to"
1363
u" bind to interface %s",
1449
1364
self.interface)
1450
1365
elif error[0] == errno.ENOPROTOOPT:
1451
logger.error("SO_BINDTODEVICE not available;"
1452
" cannot bind to interface %s",
1366
logger.error(u"SO_BINDTODEVICE not available;"
1367
u" cannot bind to interface %s",
1453
1368
self.interface)
1454
1369
else:
1455
1370
raise
1457
1372
if self.server_address[0] or self.server_address[1]:
1458
1373
if not self.server_address[0]:
1459
1374
if self.address_family == socket.AF_INET6:
1460
any_address = "::" # in6addr_any
1375
any_address = u"::" # in6addr_any
1461
1376
else:
1462
1377
any_address = socket.INADDR_ANY
1463
1378
self.server_address = (any_address,
1512
1427
def handle_ipc(self, source, condition, parent_pipe=None,
1513
1428
client_object=None):
1514
1429
condition_names = {
1515
gobject.IO_IN: "IN", # There is data to read.
1516
gobject.IO_OUT: "OUT", # Data can be written (without
1430
gobject.IO_IN: u"IN", # There is data to read.
1431
gobject.IO_OUT: u"OUT", # Data can be written (without
1517
1432
# blocking).
1518
gobject.IO_PRI: "PRI", # There is urgent data to read.
1519
gobject.IO_ERR: "ERR", # Error condition.
1520
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1433
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1434
gobject.IO_ERR: u"ERR", # Error condition.
1435
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1521
1436
# broken, usually for pipes and
1522
1437
# sockets).
1523
1438
}
1525
1440
for cond, name in
1526
1441
condition_names.iteritems()
1527
1442
if cond & condition)
1443
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1444
conditions_string)
1445
1528
1446
# error or the other end of multiprocessing.Pipe has closed
1529
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1447
if condition & gobject.IO_HUP or condition & gobject.IO_ERR:
1530
1448
return False
1531
1449
1532
1450
# Read a request from the child
1533
1451
request = parent_pipe.recv()
1452
logger.debug(u"IPC request: %s", repr(request))
1534
1453
command = request[0]
1535
1454
1536
1455
if command == 'init':
1542
1461
client = c
1543
1462
break
1544
1463
else:
1545
logger.warning("Client not found for fingerprint: %s, ad"
1546
"dress: %s", fpr, address)
1464
logger.warning(u"Client not found for fingerprint: %s, ad"
1465
u"dress: %s", fpr, address)
1547
1466
if self.use_dbus:
1548
1467
# Emit D-Bus signal
1549
mandos_dbus_service.ClientNotFound(fpr, address[0])
1468
mandos_dbus_service.ClientNotFound(fpr, address)
1550
1469
parent_pipe.send(False)
1551
1470
return False
1552
1471
1571
1490
parent_pipe.send(('function',))
1572
1491
else:
1573
1492
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
1574
1493
1575
1494
if command == 'setattr':
1576
1495
attrname = request[1]
1577
1496
value = request[2]
1578
1497
setattr(client_object, attrname, value)
1579
1498
1580
1499
return True
1581
1500
1582
1501
1583
1502
def string_to_delta(interval):
1584
1503
"""Parse a string and return a datetime.timedelta
1585
1504
1586
>>> string_to_delta('7d')
1505
>>> string_to_delta(u'7d')
1587
1506
datetime.timedelta(7)
1588
>>> string_to_delta('60s')
1507
>>> string_to_delta(u'60s')
1589
1508
datetime.timedelta(0, 60)
1590
>>> string_to_delta('60m')
1509
>>> string_to_delta(u'60m')
1591
1510
datetime.timedelta(0, 3600)
1592
>>> string_to_delta('24h')
1511
>>> string_to_delta(u'24h')
1593
1512
datetime.timedelta(1)
1594
>>> string_to_delta('1w')
1513
>>> string_to_delta(u'1w')
1595
1514
datetime.timedelta(7)
1596
>>> string_to_delta('5m 30s')
1515
>>> string_to_delta(u'5m 30s')
1597
1516
datetime.timedelta(0, 330)
1598
1517
"""
1599
1518
timevalue = datetime.timedelta(0)
1601
1520
try:
1602
1521
suffix = unicode(s[-1])
1603
1522
value = int(s[:-1])
1604
if suffix == "d":
1523
if suffix == u"d":
1605
1524
delta = datetime.timedelta(value)
1606
elif suffix == "s":
1525
elif suffix == u"s":
1607
1526
delta = datetime.timedelta(0, value)
1608
elif suffix == "m":
1527
elif suffix == u"m":
1609
1528
delta = datetime.timedelta(0, 0, 0, 0, value)
1610
elif suffix == "h":
1529
elif suffix == u"h":
1611
1530
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1612
elif suffix == "w":
1531
elif suffix == u"w":
1613
1532
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1614
1533
else:
1615
raise ValueError("Unknown suffix %r" % suffix)
1534
raise ValueError(u"Unknown suffix %r" % suffix)
1616
1535
except (ValueError, IndexError), e:
1617
1536
raise ValueError(e.message)
1618
1537
timevalue += delta
1626
1545
global if_nametoindex
1627
1546
try:
1628
1547
if_nametoindex = (ctypes.cdll.LoadLibrary
1629
(ctypes.util.find_library("c"))
1548
(ctypes.util.find_library(u"c"))
1630
1549
.if_nametoindex)
1631
1550
except (OSError, AttributeError):
1632
logger.warning("Doing if_nametoindex the hard way")
1551
logger.warning(u"Doing if_nametoindex the hard way")
1633
1552
def if_nametoindex(interface):
1634
1553
"Get an interface index the hard way, i.e. using fcntl()"
1635
1554
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1636
1555
with contextlib.closing(socket.socket()) as s:
1637
1556
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1638
struct.pack(str("16s16x"),
1557
struct.pack(str(u"16s16x"),
1639
1558
interface))
1640
interface_index = struct.unpack(str("I"),
1559
interface_index = struct.unpack(str(u"I"),
1641
1560
ifreq[16:20])[0]
1642
1561
return interface_index
1643
1562
return if_nametoindex(interface)
1651
1570
sys.exit()
1652
1571
os.setsid()
1653
1572
if not nochdir:
1654
os.chdir("/")
1573
os.chdir(u"/")
1655
1574
if os.fork():
1656
1575
sys.exit()
1657
1576
if not noclose:
1659
1578
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1660
1579
if not stat.S_ISCHR(os.fstat(null).st_mode):
1661
1580
raise OSError(errno.ENODEV,
1662
"%s not a character device"
1581
u"%s not a character device"
1663
1582
% os.path.devnull)
1664
1583
os.dup2(null, sys.stdin.fileno())
1665
1584
os.dup2(null, sys.stdout.fileno())
1674
1593
# Parsing of options, both command line and config file
1675
1594
1676
1595
parser = optparse.OptionParser(version = "%%prog %s" % version)
1677
parser.add_option("-i", "--interface", type="string",
1678
metavar="IF", help="Bind to interface IF")
1679
parser.add_option("-a", "--address", type="string",
1680
help="Address to listen for requests on")
1681
parser.add_option("-p", "--port", type="int",
1682
help="Port number to receive requests on")
1683
parser.add_option("--check", action="store_true",
1684
help="Run self-test")
1685
parser.add_option("--debug", action="store_true",
1686
help="Debug mode; run in foreground and log to"
1687
" terminal")
1688
parser.add_option("--debuglevel", type="string", metavar="LEVEL",
1689
help="Debug level for stdout output")
1690
parser.add_option("--priority", type="string", help="GnuTLS"
1691
" priority string (see GnuTLS documentation)")
1692
parser.add_option("--servicename", type="string",
1693
metavar="NAME", help="Zeroconf service name")
1694
parser.add_option("--configdir", type="string",
1695
default="/etc/mandos", metavar="DIR",
1696
help="Directory to search for configuration"
1697
" files")
1698
parser.add_option("--no-dbus", action="store_false",
1699
dest="use_dbus", help="Do not provide D-Bus"
1700
" system bus interface")
1701
parser.add_option("--no-ipv6", action="store_false",
1702
dest="use_ipv6", help="Do not use IPv6")
1596
parser.add_option("-i", u"--interface", type=u"string",
1597
metavar="IF", help=u"Bind to interface IF")
1598
parser.add_option("-a", u"--address", type=u"string",
1599
help=u"Address to listen for requests on")
1600
parser.add_option("-p", u"--port", type=u"int",
1601
help=u"Port number to receive requests on")
1602
parser.add_option("--check", action=u"store_true",
1603
help=u"Run self-test")
1604
parser.add_option("--debug", action=u"store_true",
1605
help=u"Debug mode; run in foreground and log to"
1606
u" terminal")
1607
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1608
u" priority string (see GnuTLS documentation)")
1609
parser.add_option("--servicename", type=u"string",
1610
metavar=u"NAME", help=u"Zeroconf service name")
1611
parser.add_option("--configdir", type=u"string",
1612
default=u"/etc/mandos", metavar=u"DIR",
1613
help=u"Directory to search for configuration"
1614
u" files")
1615
parser.add_option("--no-dbus", action=u"store_false",
1616
dest=u"use_dbus", help=u"Do not provide D-Bus"
1617
u" system bus interface")
1618
parser.add_option("--no-ipv6", action=u"store_false",
1619
dest=u"use_ipv6", help=u"Do not use IPv6")
1703
1620
options = parser.parse_args()[0]
1704
1621
1705
1622
if options.check:
1708
1625
sys.exit()
1709
1626
1710
1627
# Default values for config file for server-global settings
1711
server_defaults = { "interface": "",
1712
"address": "",
1713
"port": "",
1714
"debug": "False",
1715
"priority":
1716
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1717
"servicename": "Mandos",
1718
"use_dbus": "True",
1719
"use_ipv6": "True",
1720
"debuglevel": "",
1628
server_defaults = { u"interface": u"",
1629
u"address": u"",
1630
u"port": u"",
1631
u"debug": u"False",
1632
u"priority":
1633
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1634
u"servicename": u"Mandos",
1635
u"use_dbus": u"True",
1636
u"use_ipv6": u"True",
1721
1637
}
1722
1638
1723
1639
# Parse config file for server-global settings
1724
1640
server_config = configparser.SafeConfigParser(server_defaults)
1725
1641
del server_defaults
1726
1642
server_config.read(os.path.join(options.configdir,
1727
"mandos.conf"))
1643
u"mandos.conf"))
1728
1644
# Convert the SafeConfigParser object to a dict
1729
1645
server_settings = server_config.defaults()
1730
1646
# Use the appropriate methods on the non-string config options
1731
for option in ("debug", "use_dbus", "use_ipv6"):
1732
server_settings[option] = server_config.getboolean("DEFAULT",
1647
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1648
server_settings[option] = server_config.getboolean(u"DEFAULT",
1733
1649
option)
1734
1650
if server_settings["port"]:
1735
server_settings["port"] = server_config.getint("DEFAULT",
1736
"port")
1651
server_settings["port"] = server_config.getint(u"DEFAULT",
1652
u"port")
1737
1653
del server_config
1738
1654
1739
1655
# Override the settings from the config file with command line
1740
1656
# options, if set.
1741
for option in ("interface", "address", "port", "debug",
1742
"priority", "servicename", "configdir",
1743
"use_dbus", "use_ipv6", "debuglevel"):
1657
for option in (u"interface", u"address", u"port", u"debug",
1658
u"priority", u"servicename", u"configdir",
1659
u"use_dbus", u"use_ipv6"):
1744
1660
value = getattr(options, option)
1745
1661
if value is not None:
1746
1662
server_settings[option] = value
1754
1670
##################################################################
1755
1671
1756
1672
# For convenience
1757
debug = server_settings["debug"]
1758
debuglevel = server_settings["debuglevel"]
1759
use_dbus = server_settings["use_dbus"]
1760
use_ipv6 = server_settings["use_ipv6"]
1761
1762
if server_settings["servicename"] != "Mandos":
1673
debug = server_settings[u"debug"]
1674
use_dbus = server_settings[u"use_dbus"]
1675
use_ipv6 = server_settings[u"use_ipv6"]
1676
1677
if not debug:
1678
syslogger.setLevel(logging.WARNING)
1679
console.setLevel(logging.WARNING)
1680
1681
if server_settings[u"servicename"] != u"Mandos":
1763
1682
syslogger.setFormatter(logging.Formatter
1764
('Mandos (%s) [%%(process)d]:'
1765
' %%(levelname)s: %%(message)s'
1766
% server_settings["servicename"]))
1683
(u'Mandos (%s) [%%(process)d]:'
1684
u' %%(levelname)s: %%(message)s'
1685
% server_settings[u"servicename"]))
1767
1686
1768
1687
# Parse config file with clients
1769
client_defaults = { "timeout": "1h",
1770
"interval": "5m",
1771
"checker": "fping -q -- %%(host)s",
1772
"host": "",
1773
"approval_delay": "0s",
1774
"approval_duration": "1s",
1688
client_defaults = { u"timeout": u"1h",
1689
u"interval": u"5m",
1690
u"checker": u"fping -q -- %%(host)s",
1691
u"host": u"",
1692
u"approved_delay": u"5m",
1693
u"approved_duration": u"1s",
1775
1694
}
1776
1695
client_config = configparser.SafeConfigParser(client_defaults)
1777
client_config.read(os.path.join(server_settings["configdir"],
1778
"clients.conf"))
1696
client_config.read(os.path.join(server_settings[u"configdir"],
1697
u"clients.conf"))
1779
1698
1780
1699
global mandos_dbus_service
1781
1700
mandos_dbus_service = None
1782
1701
1783
tcp_server = MandosServer((server_settings["address"],
1784
server_settings["port"]),
1702
tcp_server = MandosServer((server_settings[u"address"],
1703
server_settings[u"port"]),
1785
1704
ClientHandler,
1786
interface=(server_settings["interface"]
1787
or None),
1705
interface=server_settings[u"interface"],
1788
1706
use_ipv6=use_ipv6,
1789
1707
gnutls_priority=
1790
server_settings["priority"],
1708
server_settings[u"priority"],
1791
1709
use_dbus=use_dbus)
1792
if not debug:
1793
pidfilename = "/var/run/mandos.pid"
1794
try:
1795
pidfile = open(pidfilename, "w")
1796
except IOError:
1797
logger.error("Could not open file %r", pidfilename)
1710
pidfilename = u"/var/run/mandos.pid"
1711
try:
1712
pidfile = open(pidfilename, u"w")
1713
except IOError:
1714
logger.error(u"Could not open file %r", pidfilename)
1798
1715
1799
1716
try:
1800
uid = pwd.getpwnam("_mandos").pw_uid
1801
gid = pwd.getpwnam("_mandos").pw_gid
1717
uid = pwd.getpwnam(u"_mandos").pw_uid
1718
gid = pwd.getpwnam(u"_mandos").pw_gid
1802
1719
except KeyError:
1803
1720
try:
1804
uid = pwd.getpwnam("mandos").pw_uid
1805
gid = pwd.getpwnam("mandos").pw_gid
1721
uid = pwd.getpwnam(u"mandos").pw_uid
1722
gid = pwd.getpwnam(u"mandos").pw_gid
1806
1723
except KeyError:
1807
1724
try:
1808
uid = pwd.getpwnam("nobody").pw_uid
1809
gid = pwd.getpwnam("nobody").pw_gid
1725
uid = pwd.getpwnam(u"nobody").pw_uid
1726
gid = pwd.getpwnam(u"nobody").pw_gid
1810
1727
except KeyError:
1811
1728
uid = 65534
1812
1729
gid = 65534
1817
1734
if error[0] != errno.EPERM:
1818
1735
raise error
1819
1736
1820
if not debug and not debuglevel:
1821
syslogger.setLevel(logging.WARNING)
1822
console.setLevel(logging.WARNING)
1823
if debuglevel:
1824
level = getattr(logging, debuglevel.upper())
1825
syslogger.setLevel(level)
1826
console.setLevel(level)
1827
1737
# Enable all possible GnuTLS debugging
1828
1738
if debug:
1829
# Enable all possible GnuTLS debugging
1830
1831
1739
# "Use a log level over 10 to enable all debugging options."
1832
1740
# - GnuTLS manual
1833
1741
gnutls.library.functions.gnutls_global_set_log_level(11)
1834
1742
1835
1743
@gnutls.library.types.gnutls_log_func
1836
1744
def debug_gnutls(level, string):
1837
logger.debug("GnuTLS: %s", string[:-1])
1745
logger.debug(u"GnuTLS: %s", string[:-1])
1838
1746
1839
1747
(gnutls.library.functions
1840
1748
.gnutls_global_set_log_function(debug_gnutls))
1841
1842
# Redirect stdin so all checkers get /dev/null
1843
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1844
os.dup2(null, sys.stdin.fileno())
1845
if null > 2:
1846
os.close(null)
1847
else:
1848
# No console logging
1849
logger.removeHandler(console)
1850
1851
# Need to fork before connecting to D-Bus
1852
if not debug:
1853
# Close all input and output, do double fork, etc.
1854
daemon()
1855
1749
1856
1750
global main_loop
1857
1751
# From the Avahi example code
1861
1755
# End of Avahi example code
1862
1756
if use_dbus:
1863
1757
try:
1864
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1758
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
1865
1759
bus, do_not_queue=True)
1866
1760
except dbus.exceptions.NameExistsException, e:
1867
logger.error(unicode(e) + ", disabling D-Bus")
1761
logger.error(unicode(e) + u", disabling D-Bus")
1868
1762
use_dbus = False
1869
server_settings["use_dbus"] = False
1763
server_settings[u"use_dbus"] = False
1870
1764
tcp_server.use_dbus = False
1871
1765
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1872
service = AvahiService(name = server_settings["servicename"],
1873
servicetype = "_mandos._tcp",
1766
service = AvahiService(name = server_settings[u"servicename"],
1767
servicetype = u"_mandos._tcp",
1874
1768
protocol = protocol, bus = bus)
1875
1769
if server_settings["interface"]:
1876
1770
service.interface = (if_nametoindex
1877
(str(server_settings["interface"])))
1878
1771
(str(server_settings[u"interface"])))
1772
1879
1773
global multiprocessing_manager
1880
1774
multiprocessing_manager = multiprocessing.Manager()
1881
1775
1900
1794
client_config, section)))
1901
1795
for section in client_config.sections()))
1902
1796
if not tcp_server.clients:
1903
logger.warning("No clients defined")
1904
1797
logger.warning(u"No clients defined")
1798
1799
if debug:
1800
# Redirect stdin so all checkers get /dev/null
1801
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1802
os.dup2(null, sys.stdin.fileno())
1803
if null > 2:
1804
os.close(null)
1805
else:
1806
# No console logging
1807
logger.removeHandler(console)
1808
# Close all input and output, do double fork, etc.
1809
daemon()
1810
1811
try:
1812
with pidfile:
1813
pid = os.getpid()
1814
pidfile.write(str(pid) + "\n")
1815
del pidfile
1816
except IOError:
1817
logger.error(u"Could not write to file %r with PID %d",
1818
pidfilename, pid)
1819
except NameError:
1820
# "pidfile" was never created
1821
pass
1822
del pidfilename
1823
1905
1824
if not debug:
1906
try:
1907
with pidfile:
1908
pid = os.getpid()
1909
pidfile.write(str(pid) + "\n".encode("utf-8"))
1910
del pidfile
1911
except IOError:
1912
logger.error("Could not write to file %r with PID %d",
1913
pidfilename, pid)
1914
except NameError:
1915
# "pidfile" was never created
1916
pass
1917
del pidfilename
1918
1919
1825
signal.signal(signal.SIGINT, signal.SIG_IGN)
1920
1921
1826
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1922
1827
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1923
1828
1925
1830
class MandosDBusService(dbus.service.Object):
1926
1831
"""A D-Bus proxy object"""
1927
1832
def __init__(self):
1928
dbus.service.Object.__init__(self, bus, "/")
1929
_interface = "se.bsnet.fukt.Mandos"
1833
dbus.service.Object.__init__(self, bus, u"/")
1834
_interface = u"se.bsnet.fukt.Mandos"
1930
1835
1931
@dbus.service.signal(_interface, signature="o")
1836
@dbus.service.signal(_interface, signature=u"o")
1932
1837
def ClientAdded(self, objpath):
1933
1838
"D-Bus signal"
1934
1839
pass
1935
1840
1936
@dbus.service.signal(_interface, signature="ss")
1841
@dbus.service.signal(_interface, signature=u"ss")
1937
1842
def ClientNotFound(self, fingerprint, address):
1938
1843
"D-Bus signal"
1939
1844
pass
1940
1845
1941
@dbus.service.signal(_interface, signature="os")
1846
@dbus.service.signal(_interface, signature=u"os")
1942
1847
def ClientRemoved(self, objpath, name):
1943
1848
"D-Bus signal"
1944
1849
pass
1945
1850
1946
@dbus.service.method(_interface, out_signature="ao")
1851
@dbus.service.method(_interface, out_signature=u"ao")
1947
1852
def GetAllClients(self):
1948
1853
"D-Bus method"
1949
1854
return dbus.Array(c.dbus_object_path
1950
1855
for c in tcp_server.clients)
1951
1856
1952
1857
@dbus.service.method(_interface,
1953
out_signature="a{oa{sv}}")
1858
out_signature=u"a{oa{sv}}")
1954
1859
def GetAllClientsWithProperties(self):
1955
1860
"D-Bus method"
1956
1861
return dbus.Dictionary(
1957
((c.dbus_object_path, c.GetAll(""))
1862
((c.dbus_object_path, c.GetAll(u""))
1958
1863
for c in tcp_server.clients),
1959
signature="oa{sv}")
1864
signature=u"oa{sv}")
1960
1865
1961
@dbus.service.method(_interface, in_signature="o")
1866
@dbus.service.method(_interface, in_signature=u"o")
1962
1867
def RemoveClient(self, object_path):
1963
1868
"D-Bus method"
1964
1869
for c in tcp_server.clients:
2006
1911
# Find out what port we got
2007
1912
service.port = tcp_server.socket.getsockname()[1]
2008
1913
if use_ipv6:
2009
logger.info("Now listening on address %r, port %d,"
1914
logger.info(u"Now listening on address %r, port %d,"
2010
1915
" flowinfo %d, scope_id %d"
2011
1916
% tcp_server.socket.getsockname())
2012
1917
else: # IPv4
2013
logger.info("Now listening on address %r, port %d"
1918
logger.info(u"Now listening on address %r, port %d"
2014
1919
% tcp_server.socket.getsockname())
2015
1920
2016
1921
#service.interface = tcp_server.socket.getsockname()[3]
2020
1925
try:
2021
1926
service.activate()
2022
1927
except dbus.exceptions.DBusException, error:
2023
logger.critical("DBusException: %s", error)
1928
logger.critical(u"DBusException: %s", error)
2024
1929
cleanup()
2025
1930
sys.exit(1)
2026
1931
# End of Avahi example code
2030
1935
(tcp_server.handle_request
2031
1936
(*args[2:], **kwargs) or True))
2032
1937
2033
logger.debug("Starting main loop")
1938
logger.debug(u"Starting main loop")
2034
1939
main_loop.run()
2035
1940
except AvahiError, error:
2036
logger.critical("AvahiError: %s", error)
1941
logger.critical(u"AvahiError: %s", error)
2037
1942
cleanup()
2038
1943
sys.exit(1)
2039
1944
except KeyboardInterrupt:
2040
1945
if debug:
2041
print("", file=sys.stderr)
2042
logger.debug("Server received KeyboardInterrupt")
2043
logger.debug("Server exiting")
1946
print >> sys.stderr
1947
logger.debug(u"Server received KeyboardInterrupt")
1948
logger.debug(u"Server exiting")
2044
1949
# Must run before the D-Bus bus name gets deregistered
2045
1950
cleanup()
2046
1951
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0