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