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