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