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