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