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