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