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 382
- compare with another revision
- download diff
- download tarball
- view history from revision 382
- Committer: Teddy Hogeborn
- Date: 2009-09-22 12:48:07 UTC
- Revision ID: teddy@fukt.bsnet.se-20090922124807-i2cr0zv4vxjv38g4
* mandos-ctl: Made work again after D-Bus API changes.
(datetime_to_milliseconds): Renamed to "timedelta_to_milliseconds".
All callers changed.
(milliseconds_to_string): Use clearer mapping string format.
(string_to_delta): Add some comments.
(datetime_to_milliseconds): Renamed to "timedelta_to_milliseconds".
All callers changed.
(milliseconds_to_string): Use clearer mapping string format.
(string_to_delta): Add some comments.
- 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.12"
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"])))) as secfile:
346
296
self.secret = secfile.read()
347
297
else:
348
raise TypeError("No secret or secfile for client %s"
298
raise TypeError(u"No secret or secfile for client %s"
349
299
% self.name)
350
self.host = config.get("host", "")
300
self.host = config.get(u"host", u"")
351
301
self.created = datetime.datetime.utcnow()
352
302
self.enabled = False
353
self.last_approval_request = None
354
303
self.last_enabled = None
355
304
self.last_checked_ok = None
356
self.timeout = string_to_delta(config["timeout"])
357
self.interval = string_to_delta(config["interval"])
305
self.timeout = string_to_delta(config[u"timeout"])
306
self.interval = string_to_delta(config[u"interval"])
358
307
self.disable_hook = disable_hook
359
308
self.checker = None
360
309
self.checker_initiator_tag = None
361
310
self.disable_initiator_tag = None
362
311
self.checker_callback_tag = None
363
self.checker_command = config["checker"]
312
self.checker_command = config[u"checker"]
364
313
self.current_checker_command = None
365
314
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
315
376
def send_changedstate(self):
377
self.changedstate.acquire()
378
self.changedstate.notify_all()
379
self.changedstate.release()
380
381
316
def enable(self):
382
317
"""Start this client's checker and timeout hooks"""
383
if getattr(self, "enabled", False):
318
if getattr(self, u"enabled", False):
384
319
# Already enabled
385
320
return
386
self.send_changedstate()
387
321
self.last_enabled = datetime.datetime.utcnow()
388
322
# Schedule a new checker to be started an 'interval' from now,
389
323
# and every interval from then on.
390
324
self.checker_initiator_tag = (gobject.timeout_add
391
325
(self.interval_milliseconds(),
392
326
self.start_checker))
327
# Also start a new checker *right now*.
328
self.start_checker()
393
329
# Schedule a disable() when 'timeout' has passed
394
330
self.disable_initiator_tag = (gobject.timeout_add
395
331
(self.timeout_milliseconds(),
396
332
self.disable))
397
333
self.enabled = True
398
# Also start a new checker *right now*.
399
self.start_checker()
400
334
401
def disable(self, quiet=True):
335
def disable(self):
402
336
"""Disable this client."""
403
337
if not getattr(self, "enabled", False):
404
338
return False
405
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):
339
logger.info(u"Disabling client %s", self.name)
340
if getattr(self, u"disable_initiator_tag", False):
410
341
gobject.source_remove(self.disable_initiator_tag)
411
342
self.disable_initiator_tag = None
412
if getattr(self, "checker_initiator_tag", False):
343
if getattr(self, u"checker_initiator_tag", False):
413
344
gobject.source_remove(self.checker_initiator_tag)
414
345
self.checker_initiator_tag = None
415
346
self.stop_checker()
430
361
if os.WIFEXITED(condition):
431
362
exitstatus = os.WEXITSTATUS(condition)
432
363
if exitstatus == 0:
433
logger.info("Checker for %(name)s succeeded",
364
logger.info(u"Checker for %(name)s succeeded",
434
365
vars(self))
435
366
self.checked_ok()
436
367
else:
437
logger.info("Checker for %(name)s failed",
368
logger.info(u"Checker for %(name)s failed",
438
369
vars(self))
439
370
else:
440
logger.warning("Checker for %(name)s crashed?",
371
logger.warning(u"Checker for %(name)s crashed?",
441
372
vars(self))
442
373
443
374
def checked_ok(self):
452
383
(self.timeout_milliseconds(),
453
384
self.disable))
454
385
455
def need_approval(self):
456
self.last_approval_request = datetime.datetime.utcnow()
457
458
386
def start_checker(self):
459
387
"""Start a new checker subprocess if one is not running.
460
388
466
394
# client would inevitably timeout, since no checker would get
467
395
# a chance to run to completion. If we instead leave running
468
396
# 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.
397
# than 'timeout' for the client to be declared invalid, which
398
# is as it should be.
471
399
472
400
# If a checker exists, make sure it is not a zombie
473
try:
401
if self.checker is not None:
474
402
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
475
except (AttributeError, OSError) as error:
476
if (isinstance(error, OSError)
477
and error.errno != errno.ECHILD):
478
raise error
479
else:
480
403
if pid:
481
logger.warning("Checker was a zombie")
404
logger.warning(u"Checker was a zombie")
482
405
gobject.source_remove(self.checker_callback_tag)
483
406
self.checker_callback(pid, status,
484
407
self.current_checker_command)
489
412
command = self.checker_command % self.host
490
413
except TypeError:
491
414
# 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
415
escaped_attrs = dict((key,
416
re.escape(unicode(str(val),
417
errors=
418
u'replace')))
419
for key, val in
420
vars(self).iteritems())
500
421
try:
501
422
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)
423
except TypeError, error:
424
logger.error(u'Could not format string "%s":'
425
u' %s', self.checker_command, error)
505
426
return True # Try again later
506
427
self.current_checker_command = command
507
428
try:
508
logger.info("Starting checker %r for %s",
429
logger.info(u"Starting checker %r for %s",
509
430
command, self.name)
510
431
# We don't need to redirect stdout and stderr, since
511
432
# in normal mode, that is already done by daemon(),
513
434
# always replaced by /dev/null.)
514
435
self.checker = subprocess.Popen(command,
515
436
close_fds=True,
516
shell=True, cwd="/")
437
shell=True, cwd=u"/")
517
438
self.checker_callback_tag = (gobject.child_watch_add
518
439
(self.checker.pid,
519
440
self.checker_callback,
524
445
if pid:
525
446
gobject.source_remove(self.checker_callback_tag)
526
447
self.checker_callback(pid, status, command)
527
except OSError as error:
528
logger.error("Failed to start subprocess: %s",
448
except OSError, error:
449
logger.error(u"Failed to start subprocess: %s",
529
450
error)
530
451
# Re-run this periodically if run by gobject.timeout_add
531
452
return True
535
456
if self.checker_callback_tag:
536
457
gobject.source_remove(self.checker_callback_tag)
537
458
self.checker_callback_tag = None
538
if getattr(self, "checker", None) is None:
459
if getattr(self, u"checker", None) is None:
539
460
return
540
logger.debug("Stopping checker for %(name)s", vars(self))
461
logger.debug(u"Stopping checker for %(name)s", vars(self))
541
462
try:
542
463
os.kill(self.checker.pid, signal.SIGTERM)
543
#time.sleep(0.5)
464
#os.sleep(0.5)
544
465
#if self.checker.poll() is None:
545
466
# os.kill(self.checker.pid, signal.SIGKILL)
546
except OSError as error:
467
except OSError, error:
547
468
if error.errno != errno.ESRCH: # No such process
548
469
raise
549
470
self.checker = None
550
551
def dbus_service_property(dbus_interface, signature="v",
552
access="readwrite", byte_arrays=False):
471
472
def still_valid(self):
473
"""Has the timeout not yet passed for this client?"""
474
if not getattr(self, u"enabled", False):
475
return False
476
now = datetime.datetime.utcnow()
477
if self.last_checked_ok is None:
478
return now < (self.created + self.timeout)
479
else:
480
return now < (self.last_checked_ok + self.timeout)
481
482
483
def dbus_service_property(dbus_interface, signature=u"v",
484
access=u"readwrite", byte_arrays=False):
553
485
"""Decorators for marking methods of a DBusObjectWithProperties to
554
486
become properties on the D-Bus.
555
487
560
492
dbus.service.method, except there is only "signature", since the
561
493
type from Get() and the type sent to Set() is the same.
562
494
"""
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
495
def decorator(func):
569
496
func._dbus_is_property = True
570
497
func._dbus_interface = dbus_interface
571
498
func._dbus_signature = signature
572
499
func._dbus_access = access
573
500
func._dbus_name = func.__name__
574
if func._dbus_name.endswith("_dbus_property"):
501
if func._dbus_name.endswith(u"_dbus_property"):
575
502
func._dbus_name = func._dbus_name[:-14]
576
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
503
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
577
504
return func
578
505
return decorator
579
506
607
534
608
535
@staticmethod
609
536
def _is_dbus_property(obj):
610
return getattr(obj, "_dbus_is_property", False)
537
return getattr(obj, u"_dbus_is_property", False)
611
538
612
539
def _get_all_dbus_properties(self):
613
540
"""Returns a generator of (name, attribute) pairs
621
548
property with the specified name and interface.
622
549
"""
623
550
for name in (property_name,
624
property_name + "_dbus_property"):
551
property_name + u"_dbus_property"):
625
552
prop = getattr(self, name, None)
626
553
if (prop is None
627
554
or not self._is_dbus_property(prop)
631
558
continue
632
559
return prop
633
560
# No such property
634
raise DBusPropertyNotFound(self.dbus_object_path + ":"
635
+ interface_name + "."
561
raise DBusPropertyNotFound(self.dbus_object_path + u":"
562
+ interface_name + u"."
636
563
+ property_name)
637
564
638
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
639
out_signature="v")
565
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
566
out_signature=u"v")
640
567
def Get(self, interface_name, property_name):
641
568
"""Standard D-Bus property Get() method, see D-Bus standard.
642
569
"""
643
570
prop = self._get_dbus_property(interface_name, property_name)
644
if prop._dbus_access == "write":
571
if prop._dbus_access == u"write":
645
572
raise DBusPropertyAccessException(property_name)
646
573
value = prop()
647
if not hasattr(value, "variant_level"):
574
if not hasattr(value, u"variant_level"):
648
575
return value
649
576
return type(value)(value, variant_level=value.variant_level+1)
650
577
651
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
578
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
652
579
def Set(self, interface_name, property_name, value):
653
580
"""Standard D-Bus property Set() method, see D-Bus standard.
654
581
"""
655
582
prop = self._get_dbus_property(interface_name, property_name)
656
if prop._dbus_access == "read":
583
if prop._dbus_access == u"read":
657
584
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
585
if prop._dbus_get_args_options[u"byte_arrays"]:
663
586
value = dbus.ByteArray(''.join(unichr(byte)
664
587
for byte in value))
665
588
prop(value)
666
589
667
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
668
out_signature="a{sv}")
590
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
591
out_signature=u"a{sv}")
669
592
def GetAll(self, interface_name):
670
593
"""Standard D-Bus property GetAll() method, see D-Bus
671
594
standard.
679
602
# Interface non-empty but did not match
680
603
continue
681
604
# Ignore write-only properties
682
if prop._dbus_access == "write":
605
if prop._dbus_access == u"write":
683
606
continue
684
607
value = prop()
685
if not hasattr(value, "variant_level"):
608
if not hasattr(value, u"variant_level"):
686
609
all[name] = value
687
610
continue
688
611
all[name] = type(value)(value, variant_level=
689
612
value.variant_level+1)
690
return dbus.Dictionary(all, signature="sv")
613
return dbus.Dictionary(all, signature=u"sv")
691
614
692
615
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
693
out_signature="s",
616
out_signature=u"s",
694
617
path_keyword='object_path',
695
618
connection_keyword='connection')
696
619
def Introspect(self, object_path, connection):
697
620
"""Standard D-Bus method, overloaded to insert property tags.
698
621
"""
699
622
xmlstring = dbus.service.Object.Introspect(self, object_path,
700
connection)
701
try:
702
document = xml.dom.minidom.parseString(xmlstring)
703
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)
708
return e
709
for if_tag in document.getElementsByTagName("interface"):
710
for tag in (make_tag(document, name, prop)
711
for name, prop
712
in self._get_all_dbus_properties()
713
if prop._dbus_interface
714
== if_tag.getAttribute("name")):
715
if_tag.appendChild(tag)
716
# Add the names to the return values for the
717
# "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")
732
document.unlink()
733
except (AttributeError, xml.dom.DOMException,
734
xml.parsers.expat.ExpatError) as error:
735
logger.error("Failed to override Introspection method",
736
error)
623
connection)
624
document = xml.dom.minidom.parseString(xmlstring)
625
del xmlstring
626
def make_tag(document, name, prop):
627
e = document.createElement(u"property")
628
e.setAttribute(u"name", name)
629
e.setAttribute(u"type", prop._dbus_signature)
630
e.setAttribute(u"access", prop._dbus_access)
631
return e
632
for if_tag in document.getElementsByTagName(u"interface"):
633
for tag in (make_tag(document, name, prop)
634
for name, prop
635
in self._get_all_dbus_properties()
636
if prop._dbus_interface
637
== if_tag.getAttribute(u"name")):
638
if_tag.appendChild(tag)
639
xmlstring = document.toxml(u"utf-8")
640
document.unlink()
737
641
return xmlstring
738
642
739
643
744
648
dbus_object_path: dbus.ObjectPath
745
649
bus: dbus.SystemBus()
746
650
"""
747
748
runtime_expansions = (Client.runtime_expansions
749
+ ("dbus_object_path",))
750
751
651
# dbus.service.Object doesn't use super(), so we can't either.
752
652
753
653
def __init__(self, bus = None, *args, **kwargs):
754
self._approvals_pending = 0
755
654
self.bus = bus
756
655
Client.__init__(self, *args, **kwargs)
757
656
# Only now, when this client is initialized, can it show up on
758
657
# the D-Bus
759
client_object_name = unicode(self.name).translate(
760
{ord("."): ord("_"),
761
ord("-"): ord("_")})
762
658
self.dbus_object_path = (dbus.ObjectPath
763
("/clients/" + client_object_name))
659
(u"/clients/"
660
+ self.name.replace(u".", u"_")))
764
661
DBusObjectWithProperties.__init__(self, self.bus,
765
662
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
663
783
664
@staticmethod
784
665
def _datetime_to_dbus(dt, variant_level=0):
787
668
variant_level=variant_level)
788
669
789
670
def enable(self):
790
oldstate = getattr(self, "enabled", False)
671
oldstate = getattr(self, u"enabled", False)
791
672
r = Client.enable(self)
792
673
if oldstate != self.enabled:
793
674
# Emit D-Bus signals
794
self.PropertyChanged(dbus.String("Enabled"),
675
self.PropertyChanged(dbus.String(u"enabled"),
795
676
dbus.Boolean(True, variant_level=1))
796
677
self.PropertyChanged(
797
dbus.String("LastEnabled"),
678
dbus.String(u"last_enabled"),
798
679
self._datetime_to_dbus(self.last_enabled,
799
680
variant_level=1))
800
681
return r
801
682
802
def disable(self, quiet = False):
803
oldstate = getattr(self, "enabled", False)
804
r = Client.disable(self, quiet=quiet)
805
if not quiet and oldstate != self.enabled:
683
def disable(self, signal = True):
684
oldstate = getattr(self, u"enabled", False)
685
r = Client.disable(self)
686
if signal and oldstate != self.enabled:
806
687
# Emit D-Bus signal
807
self.PropertyChanged(dbus.String("Enabled"),
688
self.PropertyChanged(dbus.String(u"enabled"),
808
689
dbus.Boolean(False, variant_level=1))
809
690
return r
810
691
813
694
self.remove_from_connection()
814
695
except LookupError:
815
696
pass
816
if hasattr(DBusObjectWithProperties, "__del__"):
697
if hasattr(DBusObjectWithProperties, u"__del__"):
817
698
DBusObjectWithProperties.__del__(self, *args, **kwargs)
818
699
Client.__del__(self, *args, **kwargs)
819
700
822
703
self.checker_callback_tag = None
823
704
self.checker = None
824
705
# Emit D-Bus signal
825
self.PropertyChanged(dbus.String("CheckerRunning"),
706
self.PropertyChanged(dbus.String(u"checker_running"),
826
707
dbus.Boolean(False, variant_level=1))
827
708
if os.WIFEXITED(condition):
828
709
exitstatus = os.WEXITSTATUS(condition)
840
721
*args, **kwargs)
841
722
842
723
def checked_ok(self, *args, **kwargs):
843
Client.checked_ok(self, *args, **kwargs)
724
r = Client.checked_ok(self, *args, **kwargs)
844
725
# Emit D-Bus signal
845
726
self.PropertyChanged(
846
dbus.String("LastCheckedOK"),
727
dbus.String(u"last_checked_ok"),
847
728
(self._datetime_to_dbus(self.last_checked_ok,
848
729
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
730
return r
858
731
859
732
def start_checker(self, *args, **kwargs):
869
742
# Emit D-Bus signal
870
743
self.CheckerStarted(self.current_checker_command)
871
744
self.PropertyChanged(
872
dbus.String("CheckerRunning"),
745
dbus.String(u"checker_running"),
873
746
dbus.Boolean(True, variant_level=1))
874
747
return r
875
748
876
749
def stop_checker(self, *args, **kwargs):
877
old_checker = getattr(self, "checker", None)
750
old_checker = getattr(self, u"checker", None)
878
751
r = Client.stop_checker(self, *args, **kwargs)
879
752
if (old_checker is not None
880
and getattr(self, "checker", None) is None):
881
self.PropertyChanged(dbus.String("CheckerRunning"),
753
and getattr(self, u"checker", None) is None):
754
self.PropertyChanged(dbus.String(u"checker_running"),
882
755
dbus.Boolean(False, variant_level=1))
883
756
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
757
758
## D-Bus methods & signals
759
_interface = u"se.bsnet.fukt.Mandos.Client"
760
761
# CheckedOK - method
762
@dbus.service.method(_interface)
763
def CheckedOK(self):
764
return self.checked_ok()
901
765
902
766
# CheckerCompleted - signal
903
@dbus.service.signal(_interface, signature="nxs")
767
@dbus.service.signal(_interface, signature=u"nxs")
904
768
def CheckerCompleted(self, exitcode, waitstatus, command):
905
769
"D-Bus signal"
906
770
pass
907
771
908
772
# CheckerStarted - signal
909
@dbus.service.signal(_interface, signature="s")
773
@dbus.service.signal(_interface, signature=u"s")
910
774
def CheckerStarted(self, command):
911
775
"D-Bus signal"
912
776
pass
913
777
914
778
# PropertyChanged - signal
915
@dbus.service.signal(_interface, signature="sv")
779
@dbus.service.signal(_interface, signature=u"sv")
916
780
def PropertyChanged(self, property, value):
917
781
"D-Bus signal"
918
782
pass
919
783
920
# GotSecret - signal
784
# ReceivedSecret - signal
921
785
@dbus.service.signal(_interface)
922
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
"""
786
def ReceivedSecret(self):
787
"D-Bus signal"
927
788
pass
928
789
929
790
# Rejected - signal
930
@dbus.service.signal(_interface, signature="s")
931
def Rejected(self, reason):
791
@dbus.service.signal(_interface)
792
def Rejected(self):
932
793
"D-Bus signal"
933
794
pass
934
795
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
796
# Enable - method
954
797
@dbus.service.method(_interface)
955
798
def Enable(self):
973
816
def StopChecker(self):
974
817
self.stop_checker()
975
818
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):
819
# name - property
820
@dbus_service_property(_interface, signature=u"s", access=u"read")
821
def name_dbus_property(self):
1020
822
return dbus.String(self.name)
1021
823
1022
# Fingerprint - property
1023
@dbus_service_property(_interface, signature="s", access="read")
1024
def Fingerprint_dbus_property(self):
824
# fingerprint - property
825
@dbus_service_property(_interface, signature=u"s", access=u"read")
826
def fingerprint_dbus_property(self):
1025
827
return dbus.String(self.fingerprint)
1026
828
1027
# Host - property
1028
@dbus_service_property(_interface, signature="s",
1029
access="readwrite")
1030
def Host_dbus_property(self, value=None):
829
# host - property
830
@dbus_service_property(_interface, signature=u"s",
831
access=u"readwrite")
832
def host_dbus_property(self, value=None):
1031
833
if value is None: # get
1032
834
return dbus.String(self.host)
1033
835
self.host = value
1034
836
# Emit D-Bus signal
1035
self.PropertyChanged(dbus.String("Host"),
837
self.PropertyChanged(dbus.String(u"host"),
1036
838
dbus.String(value, variant_level=1))
1037
839
1038
# Created - property
1039
@dbus_service_property(_interface, signature="s", access="read")
1040
def Created_dbus_property(self):
840
# created - property
841
@dbus_service_property(_interface, signature=u"s", access=u"read")
842
def created_dbus_property(self):
1041
843
return dbus.String(self._datetime_to_dbus(self.created))
1042
844
1043
# LastEnabled - property
1044
@dbus_service_property(_interface, signature="s", access="read")
1045
def LastEnabled_dbus_property(self):
845
# last_enabled - property
846
@dbus_service_property(_interface, signature=u"s", access=u"read")
847
def last_enabled_dbus_property(self):
1046
848
if self.last_enabled is None:
1047
return dbus.String("")
849
return dbus.String(u"")
1048
850
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1049
851
1050
# Enabled - property
1051
@dbus_service_property(_interface, signature="b",
1052
access="readwrite")
1053
def Enabled_dbus_property(self, value=None):
852
# enabled - property
853
@dbus_service_property(_interface, signature=u"b",
854
access=u"readwrite")
855
def enabled_dbus_property(self, value=None):
1054
856
if value is None: # get
1055
857
return dbus.Boolean(self.enabled)
1056
858
if value:
1058
860
else:
1059
861
self.disable()
1060
862
1061
# LastCheckedOK - property
1062
@dbus_service_property(_interface, signature="s",
1063
access="readwrite")
1064
def LastCheckedOK_dbus_property(self, value=None):
863
# last_checked_ok - property
864
@dbus_service_property(_interface, signature=u"s",
865
access=u"readwrite")
866
def last_checked_ok_dbus_property(self, value=None):
1065
867
if value is not None:
1066
868
self.checked_ok()
1067
869
return
1068
870
if self.last_checked_ok is None:
1069
return dbus.String("")
871
return dbus.String(u"")
1070
872
return dbus.String(self._datetime_to_dbus(self
1071
873
.last_checked_ok))
1072
874
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):
875
# timeout - property
876
@dbus_service_property(_interface, signature=u"t",
877
access=u"readwrite")
878
def timeout_dbus_property(self, value=None):
1086
879
if value is None: # get
1087
880
return dbus.UInt64(self.timeout_milliseconds())
1088
881
self.timeout = datetime.timedelta(0, 0, 0, value)
1089
882
# Emit D-Bus signal
1090
self.PropertyChanged(dbus.String("Timeout"),
883
self.PropertyChanged(dbus.String(u"timeout"),
1091
884
dbus.UInt64(value, variant_level=1))
1092
if getattr(self, "disable_initiator_tag", None) is None:
885
if getattr(self, u"disable_initiator_tag", None) is None:
1093
886
return
1094
887
# Reschedule timeout
1095
888
gobject.source_remove(self.disable_initiator_tag)
1107
900
self.disable_initiator_tag = (gobject.timeout_add
1108
901
(time_to_die, self.disable))
1109
902
1110
# Interval - property
1111
@dbus_service_property(_interface, signature="t",
1112
access="readwrite")
1113
def Interval_dbus_property(self, value=None):
903
# interval - property
904
@dbus_service_property(_interface, signature=u"t",
905
access=u"readwrite")
906
def interval_dbus_property(self, value=None):
1114
907
if value is None: # get
1115
908
return dbus.UInt64(self.interval_milliseconds())
1116
909
self.interval = datetime.timedelta(0, 0, 0, value)
1117
910
# Emit D-Bus signal
1118
self.PropertyChanged(dbus.String("Interval"),
911
self.PropertyChanged(dbus.String(u"interval"),
1119
912
dbus.UInt64(value, variant_level=1))
1120
if getattr(self, "checker_initiator_tag", None) is None:
913
if getattr(self, u"checker_initiator_tag", None) is None:
1121
914
return
1122
915
# Reschedule checker run
1123
916
gobject.source_remove(self.checker_initiator_tag)
1125
918
(value, self.start_checker))
1126
919
self.start_checker() # Start one now, too
1127
920
1128
# Checker - property
1129
@dbus_service_property(_interface, signature="s",
1130
access="readwrite")
1131
def Checker_dbus_property(self, value=None):
921
# checker - property
922
@dbus_service_property(_interface, signature=u"s",
923
access=u"readwrite")
924
def checker_dbus_property(self, value=None):
1132
925
if value is None: # get
1133
926
return dbus.String(self.checker_command)
1134
927
self.checker_command = value
1135
928
# Emit D-Bus signal
1136
self.PropertyChanged(dbus.String("Checker"),
929
self.PropertyChanged(dbus.String(u"checker"),
1137
930
dbus.String(self.checker_command,
1138
931
variant_level=1))
1139
932
1140
# CheckerRunning - property
1141
@dbus_service_property(_interface, signature="b",
1142
access="readwrite")
1143
def CheckerRunning_dbus_property(self, value=None):
933
# checker_running - property
934
@dbus_service_property(_interface, signature=u"b",
935
access=u"readwrite")
936
def checker_running_dbus_property(self, value=None):
1144
937
if value is None: # get
1145
938
return dbus.Boolean(self.checker is not None)
1146
939
if value:
1148
941
else:
1149
942
self.stop_checker()
1150
943
1151
# ObjectPath - property
1152
@dbus_service_property(_interface, signature="o", access="read")
1153
def ObjectPath_dbus_property(self):
944
# object_path - property
945
@dbus_service_property(_interface, signature=u"o", access=u"read")
946
def object_path_dbus_property(self):
1154
947
return self.dbus_object_path # is already a dbus.ObjectPath
1155
948
1156
# Secret = property
1157
@dbus_service_property(_interface, signature="ay",
1158
access="write", byte_arrays=True)
1159
def Secret_dbus_property(self, value):
949
# secret = property
950
@dbus_service_property(_interface, signature=u"ay",
951
access=u"write", byte_arrays=True)
952
def secret_dbus_property(self, value):
1160
953
self.secret = str(value)
1161
954
1162
955
del _interface
1163
956
1164
957
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
958
class ClientHandler(socketserver.BaseRequestHandler, object):
1192
959
"""A class to handle client connections.
1193
960
1195
962
Note: This will run in its own forked process."""
1196
963
1197
964
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
965
logger.info(u"TCP connection from: %s",
966
unicode(self.client_address))
967
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
968
# Open IPC pipe to parent process
969
with closing(os.fdopen(self.server.pipe[1], u"w", 1)) as ipc:
1204
970
session = (gnutls.connection
1205
971
.ClientSession(self.request,
1206
972
gnutls.connection
1207
973
.X509Credentials()))
1208
974
975
line = self.request.makefile().readline()
976
logger.debug(u"Protocol version: %r", line)
977
try:
978
if int(line.strip().split()[0]) > 1:
979
raise RuntimeError
980
except (ValueError, IndexError, RuntimeError), error:
981
logger.error(u"Unknown protocol version: %s", error)
982
return
983
1209
984
# Note: gnutls.connection.X509Credentials is really a
1210
985
# generic GnuTLS certificate credentials object so long as
1211
986
# no X.509 keys are added to it. Therefore, we can use it
1212
987
# 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"))
988
989
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
990
# u"+AES-256-CBC", u"+SHA1",
991
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
992
# u"+DHE-DSS"))
1218
993
# Use a fallback default, since this MUST be set.
1219
994
priority = self.server.gnutls_priority
1220
995
if priority is None:
1221
priority = "NORMAL"
996
priority = u"NORMAL"
1222
997
(gnutls.library.functions
1223
998
.gnutls_priority_set_direct(session._c_object,
1224
999
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
1000
1238
1001
try:
1239
1002
session.handshake()
1240
except gnutls.errors.GNUTLSError as error:
1241
logger.warning("Handshake failed: %s", error)
1003
except gnutls.errors.GNUTLSError, error:
1004
logger.warning(u"Handshake failed: %s", error)
1242
1005
# Do not run session.bye() here: the session is not
1243
1006
# established. Just abandon the request.
1244
1007
return
1245
logger.debug("Handshake succeeded")
1246
1247
approval_required = False
1008
logger.debug(u"Handshake succeeded")
1248
1009
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()
1010
fpr = self.fingerprint(self.peer_certificate(session))
1011
except (TypeError, gnutls.errors.GNUTLSError), error:
1012
logger.warning(u"Bad certificate: %s", error)
1013
session.bye()
1014
return
1015
logger.debug(u"Fingerprint: %s", fpr)
1336
1016
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")
1017
for c in self.server.clients:
1018
if c.fingerprint == fpr:
1019
client = c
1020
break
1021
else:
1022
ipc.write(u"NOTFOUND %s %s\n"
1023
% (fpr, unicode(self.client_address)))
1024
session.bye()
1025
return
1026
# Have to check if client.still_valid(), since it is
1027
# possible that the client timed out while establishing
1028
# the GnuTLS session.
1029
if not client.still_valid():
1030
ipc.write(u"INVALID %s\n" % client.name)
1031
session.bye()
1032
return
1033
ipc.write(u"SENDING %s\n" % client.name)
1034
sent_size = 0
1035
while sent_size < len(client.secret):
1036
sent = session.send(client.secret[sent_size:])
1037
logger.debug(u"Sent: %d, remaining: %d",
1038
sent, len(client.secret)
1039
- (sent_size + sent))
1040
sent_size += sent
1041
session.bye()
1344
1042
1345
1043
@staticmethod
1346
1044
def peer_certificate(session):
1356
1054
.gnutls_certificate_get_peers
1357
1055
(session._c_object, ctypes.byref(list_size)))
1358
1056
if not bool(cert_list) and list_size.value != 0:
1359
raise gnutls.errors.GNUTLSError("error getting peer"
1360
" certificate")
1057
raise gnutls.errors.GNUTLSError(u"error getting peer"
1058
u" certificate")
1361
1059
if list_size.value == 0:
1362
1060
return None
1363
1061
cert = cert_list[0]
1389
1087
if crtverify.value != 0:
1390
1088
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1391
1089
raise (gnutls.errors.CertificateSecurityError
1392
("Verify failed"))
1090
(u"Verify failed"))
1393
1091
# New buffer for the fingerprint
1394
1092
buf = ctypes.create_string_buffer(20)
1395
1093
buf_len = ctypes.c_size_t()
1402
1100
# Convert the buffer to a Python bytestring
1403
1101
fpr = ctypes.string_at(buf, buf_len.value)
1404
1102
# Convert the bytestring to hexadecimal notation
1405
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1103
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1406
1104
return hex_fpr
1407
1105
1408
1106
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 """
1107
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
1108
"""Like socketserver.ForkingMixIn, but also pass a pipe."""
1425
1109
def process_request(self, request, client_address):
1426
1110
"""Overrides and wraps the original process_request().
1427
1111
1428
1112
This function creates a new pipe in self.pipe
1429
1113
"""
1430
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1431
1432
super(MultiprocessingMixInWithPipe,
1114
self.pipe = os.pipe()
1115
super(ForkingMixInWithPipe,
1433
1116
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):
1117
os.close(self.pipe[1]) # close write end
1118
self.add_pipe(self.pipe[0])
1119
def add_pipe(self, pipe):
1438
1120
"""Dummy function; override as necessary"""
1439
raise NotImplementedError
1440
1441
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1121
os.close(pipe)
1122
1123
1124
class IPv6_TCPServer(ForkingMixInWithPipe,
1442
1125
socketserver.TCPServer, object):
1443
1126
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1444
1127
1460
1143
bind to an address or port if they were not specified."""
1461
1144
if self.interface is not None:
1462
1145
if SO_BINDTODEVICE is None:
1463
logger.error("SO_BINDTODEVICE does not exist;"
1464
" cannot bind to interface %s",
1146
logger.error(u"SO_BINDTODEVICE does not exist;"
1147
u" cannot bind to interface %s",
1465
1148
self.interface)
1466
1149
else:
1467
1150
try:
1468
1151
self.socket.setsockopt(socket.SOL_SOCKET,
1469
1152
SO_BINDTODEVICE,
1470
1153
str(self.interface
1471
+ '\0'))
1472
except socket.error as error:
1154
+ u'\0'))
1155
except socket.error, error:
1473
1156
if error[0] == errno.EPERM:
1474
logger.error("No permission to"
1475
" bind to interface %s",
1157
logger.error(u"No permission to"
1158
u" bind to interface %s",
1476
1159
self.interface)
1477
1160
elif error[0] == errno.ENOPROTOOPT:
1478
logger.error("SO_BINDTODEVICE not available;"
1479
" cannot bind to interface %s",
1161
logger.error(u"SO_BINDTODEVICE not available;"
1162
u" cannot bind to interface %s",
1480
1163
self.interface)
1481
1164
else:
1482
1165
raise
1484
1167
if self.server_address[0] or self.server_address[1]:
1485
1168
if not self.server_address[0]:
1486
1169
if self.address_family == socket.AF_INET6:
1487
any_address = "::" # in6addr_any
1170
any_address = u"::" # in6addr_any
1488
1171
else:
1489
1172
any_address = socket.INADDR_ANY
1490
1173
self.server_address = (any_address,
1529
1212
return socketserver.TCPServer.server_activate(self)
1530
1213
def enable(self):
1531
1214
self.enabled = True
1532
def add_pipe(self, parent_pipe):
1215
def add_pipe(self, pipe):
1533
1216
# 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):
1217
gobject.io_add_watch(pipe, gobject.IO_IN | gobject.IO_HUP,
1218
self.handle_ipc)
1219
def handle_ipc(self, source, condition, file_objects={}):
1541
1220
condition_names = {
1542
gobject.IO_IN: "IN", # There is data to read.
1543
gobject.IO_OUT: "OUT", # Data can be written (without
1221
gobject.IO_IN: u"IN", # There is data to read.
1222
gobject.IO_OUT: u"OUT", # Data can be written (without
1544
1223
# 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
1224
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1225
gobject.IO_ERR: u"ERR", # Error condition.
1226
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1548
1227
# broken, usually for pipes and
1549
1228
# sockets).
1550
1229
}
1552
1231
for cond, name in
1553
1232
condition_names.iteritems()
1554
1233
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
1234
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
1235
conditions_string)
1236
1237
# Turn the pipe file descriptor into a Python file object
1238
if source not in file_objects:
1239
file_objects[source] = os.fdopen(source, u"r", 1)
1240
1241
# Read a line from the file object
1242
cmdline = file_objects[source].readline()
1243
if not cmdline: # Empty line means end of file
1244
# close the IPC pipe
1245
file_objects[source].close()
1246
del file_objects[source]
1247
1248
# Stop calling this function
1249
return False
1250
1251
logger.debug(u"IPC command: %r", cmdline)
1252
1253
# Parse and act on command
1254
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
1255
1256
if cmd == u"NOTFOUND":
1257
logger.warning(u"Client not found for fingerprint: %s",
1258
args)
1259
if self.use_dbus:
1260
# Emit D-Bus signal
1261
mandos_dbus_service.ClientNotFound(args)
1262
elif cmd == u"INVALID":
1263
for client in self.clients:
1264
if client.name == args:
1265
logger.warning(u"Client %s is invalid", args)
1266
if self.use_dbus:
1267
# Emit D-Bus signal
1268
client.Rejected()
1269
break
1270
else:
1271
logger.error(u"Unknown client %s is invalid", args)
1272
elif cmd == u"SENDING":
1273
for client in self.clients:
1274
if client.name == args:
1275
logger.info(u"Sending secret to %s", client.name)
1276
client.checked_ok()
1277
if self.use_dbus:
1278
# Emit D-Bus signal
1279
client.ReceivedSecret()
1280
break
1281
else:
1282
logger.error(u"Sending secret to unknown client %s",
1283
args)
1284
else:
1285
logger.error(u"Unknown IPC command: %r", cmdline)
1286
1287
# Keep calling this function
1607
1288
return True
1608
1289
1609
1290
1610
1291
def string_to_delta(interval):
1611
1292
"""Parse a string and return a datetime.timedelta
1612
1293
1613
>>> string_to_delta('7d')
1294
>>> string_to_delta(u'7d')
1614
1295
datetime.timedelta(7)
1615
>>> string_to_delta('60s')
1296
>>> string_to_delta(u'60s')
1616
1297
datetime.timedelta(0, 60)
1617
>>> string_to_delta('60m')
1298
>>> string_to_delta(u'60m')
1618
1299
datetime.timedelta(0, 3600)
1619
>>> string_to_delta('24h')
1300
>>> string_to_delta(u'24h')
1620
1301
datetime.timedelta(1)
1621
>>> string_to_delta('1w')
1302
>>> string_to_delta(u'1w')
1622
1303
datetime.timedelta(7)
1623
>>> string_to_delta('5m 30s')
1304
>>> string_to_delta(u'5m 30s')
1624
1305
datetime.timedelta(0, 330)
1625
1306
"""
1626
1307
timevalue = datetime.timedelta(0)
1628
1309
try:
1629
1310
suffix = unicode(s[-1])
1630
1311
value = int(s[:-1])
1631
if suffix == "d":
1312
if suffix == u"d":
1632
1313
delta = datetime.timedelta(value)
1633
elif suffix == "s":
1314
elif suffix == u"s":
1634
1315
delta = datetime.timedelta(0, value)
1635
elif suffix == "m":
1316
elif suffix == u"m":
1636
1317
delta = datetime.timedelta(0, 0, 0, 0, value)
1637
elif suffix == "h":
1318
elif suffix == u"h":
1638
1319
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1639
elif suffix == "w":
1320
elif suffix == u"w":
1640
1321
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1641
1322
else:
1642
raise ValueError("Unknown suffix %r" % suffix)
1643
except (ValueError, IndexError) as e:
1644
raise ValueError(*(e.args))
1323
raise ValueError
1324
except (ValueError, IndexError):
1325
raise ValueError
1645
1326
timevalue += delta
1646
1327
return timevalue
1647
1328
1653
1334
global if_nametoindex
1654
1335
try:
1655
1336
if_nametoindex = (ctypes.cdll.LoadLibrary
1656
(ctypes.util.find_library("c"))
1337
(ctypes.util.find_library(u"c"))
1657
1338
.if_nametoindex)
1658
1339
except (OSError, AttributeError):
1659
logger.warning("Doing if_nametoindex the hard way")
1340
logger.warning(u"Doing if_nametoindex the hard way")
1660
1341
def if_nametoindex(interface):
1661
1342
"Get an interface index the hard way, i.e. using fcntl()"
1662
1343
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1663
with contextlib.closing(socket.socket()) as s:
1344
with closing(socket.socket()) as s:
1664
1345
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1665
struct.pack(str("16s16x"),
1346
struct.pack(str(u"16s16x"),
1666
1347
interface))
1667
interface_index = struct.unpack(str("I"),
1348
interface_index = struct.unpack(str(u"I"),
1668
1349
ifreq[16:20])[0]
1669
1350
return interface_index
1670
1351
return if_nametoindex(interface)
1678
1359
sys.exit()
1679
1360
os.setsid()
1680
1361
if not nochdir:
1681
os.chdir("/")
1362
os.chdir(u"/")
1682
1363
if os.fork():
1683
1364
sys.exit()
1684
1365
if not noclose:
1686
1367
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1687
1368
if not stat.S_ISCHR(os.fstat(null).st_mode):
1688
1369
raise OSError(errno.ENODEV,
1689
"%s not a character device"
1690
% os.path.devnull)
1370
u"/dev/null not a character device")
1691
1371
os.dup2(null, sys.stdin.fileno())
1692
1372
os.dup2(null, sys.stdout.fileno())
1693
1373
os.dup2(null, sys.stderr.fileno())
1700
1380
##################################################################
1701
1381
# Parsing of options, both command line and config file
1702
1382
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()
1383
parser = optparse.OptionParser(version = "%%prog %s" % version)
1384
parser.add_option("-i", u"--interface", type=u"string",
1385
metavar="IF", help=u"Bind to interface IF")
1386
parser.add_option("-a", u"--address", type=u"string",
1387
help=u"Address to listen for requests on")
1388
parser.add_option("-p", u"--port", type=u"int",
1389
help=u"Port number to receive requests on")
1390
parser.add_option("--check", action=u"store_true",
1391
help=u"Run self-test")
1392
parser.add_option("--debug", action=u"store_true",
1393
help=u"Debug mode; run in foreground and log to"
1394
u" terminal")
1395
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1396
u" priority string (see GnuTLS documentation)")
1397
parser.add_option("--servicename", type=u"string",
1398
metavar=u"NAME", help=u"Zeroconf service name")
1399
parser.add_option("--configdir", type=u"string",
1400
default=u"/etc/mandos", metavar=u"DIR",
1401
help=u"Directory to search for configuration"
1402
u" files")
1403
parser.add_option("--no-dbus", action=u"store_false",
1404
dest=u"use_dbus", help=u"Do not provide D-Bus"
1405
u" system bus interface")
1406
parser.add_option("--no-ipv6", action=u"store_false",
1407
dest=u"use_ipv6", help=u"Do not use IPv6")
1408
options = parser.parse_args()[0]
1734
1409
1735
1410
if options.check:
1736
1411
import doctest
1738
1413
sys.exit()
1739
1414
1740
1415
# 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": "",
1416
server_defaults = { u"interface": u"",
1417
u"address": u"",
1418
u"port": u"",
1419
u"debug": u"False",
1420
u"priority":
1421
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1422
u"servicename": u"Mandos",
1423
u"use_dbus": u"True",
1424
u"use_ipv6": u"True",
1751
1425
}
1752
1426
1753
1427
# Parse config file for server-global settings
1754
1428
server_config = configparser.SafeConfigParser(server_defaults)
1755
1429
del server_defaults
1756
1430
server_config.read(os.path.join(options.configdir,
1757
"mandos.conf"))
1431
u"mandos.conf"))
1758
1432
# Convert the SafeConfigParser object to a dict
1759
1433
server_settings = server_config.defaults()
1760
1434
# 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",
1435
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1436
server_settings[option] = server_config.getboolean(u"DEFAULT",
1763
1437
option)
1764
1438
if server_settings["port"]:
1765
server_settings["port"] = server_config.getint("DEFAULT",
1766
"port")
1439
server_settings["port"] = server_config.getint(u"DEFAULT",
1440
u"port")
1767
1441
del server_config
1768
1442
1769
1443
# Override the settings from the config file with command line
1770
1444
# options, if set.
1771
for option in ("interface", "address", "port", "debug",
1772
"priority", "servicename", "configdir",
1773
"use_dbus", "use_ipv6", "debuglevel"):
1445
for option in (u"interface", u"address", u"port", u"debug",
1446
u"priority", u"servicename", u"configdir",
1447
u"use_dbus", u"use_ipv6"):
1774
1448
value = getattr(options, option)
1775
1449
if value is not None:
1776
1450
server_settings[option] = value
1784
1458
##################################################################
1785
1459
1786
1460
# 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":
1461
debug = server_settings[u"debug"]
1462
use_dbus = server_settings[u"use_dbus"]
1463
use_ipv6 = server_settings[u"use_ipv6"]
1464
1465
if not debug:
1466
syslogger.setLevel(logging.WARNING)
1467
console.setLevel(logging.WARNING)
1468
1469
if server_settings[u"servicename"] != u"Mandos":
1793
1470
syslogger.setFormatter(logging.Formatter
1794
('Mandos (%s) [%%(process)d]:'
1795
' %%(levelname)s: %%(message)s'
1796
% server_settings["servicename"]))
1471
(u'Mandos (%s) [%%(process)d]:'
1472
u' %%(levelname)s: %%(message)s'
1473
% server_settings[u"servicename"]))
1797
1474
1798
1475
# 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",
1476
client_defaults = { u"timeout": u"1h",
1477
u"interval": u"5m",
1478
u"checker": u"fping -q -- %%(host)s",
1479
u"host": u"",
1805
1480
}
1806
1481
client_config = configparser.SafeConfigParser(client_defaults)
1807
client_config.read(os.path.join(server_settings["configdir"],
1808
"clients.conf"))
1482
client_config.read(os.path.join(server_settings[u"configdir"],
1483
u"clients.conf"))
1809
1484
1810
1485
global mandos_dbus_service
1811
1486
mandos_dbus_service = None
1812
1487
1813
tcp_server = MandosServer((server_settings["address"],
1814
server_settings["port"]),
1488
tcp_server = MandosServer((server_settings[u"address"],
1489
server_settings[u"port"]),
1815
1490
ClientHandler,
1816
interface=(server_settings["interface"]
1817
or None),
1491
interface=server_settings[u"interface"],
1818
1492
use_ipv6=use_ipv6,
1819
1493
gnutls_priority=
1820
server_settings["priority"],
1494
server_settings[u"priority"],
1821
1495
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)
1496
pidfilename = u"/var/run/mandos.pid"
1497
try:
1498
pidfile = open(pidfilename, u"w")
1499
except IOError:
1500
logger.error(u"Could not open file %r", pidfilename)
1828
1501
1829
1502
try:
1830
uid = pwd.getpwnam("_mandos").pw_uid
1831
gid = pwd.getpwnam("_mandos").pw_gid
1503
uid = pwd.getpwnam(u"_mandos").pw_uid
1504
gid = pwd.getpwnam(u"_mandos").pw_gid
1832
1505
except KeyError:
1833
1506
try:
1834
uid = pwd.getpwnam("mandos").pw_uid
1835
gid = pwd.getpwnam("mandos").pw_gid
1507
uid = pwd.getpwnam(u"mandos").pw_uid
1508
gid = pwd.getpwnam(u"mandos").pw_gid
1836
1509
except KeyError:
1837
1510
try:
1838
uid = pwd.getpwnam("nobody").pw_uid
1839
gid = pwd.getpwnam("nobody").pw_gid
1511
uid = pwd.getpwnam(u"nobody").pw_uid
1512
gid = pwd.getpwnam(u"nobody").pw_gid
1840
1513
except KeyError:
1841
1514
uid = 65534
1842
1515
gid = 65534
1843
1516
try:
1844
1517
os.setgid(gid)
1845
1518
os.setuid(uid)
1846
except OSError as error:
1519
except OSError, error:
1847
1520
if error[0] != errno.EPERM:
1848
1521
raise error
1849
1522
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
1523
# Enable all possible GnuTLS debugging
1858
1524
if debug:
1859
# Enable all possible GnuTLS debugging
1860
1861
1525
# "Use a log level over 10 to enable all debugging options."
1862
1526
# - GnuTLS manual
1863
1527
gnutls.library.functions.gnutls_global_set_log_level(11)
1864
1528
1865
1529
@gnutls.library.types.gnutls_log_func
1866
1530
def debug_gnutls(level, string):
1867
logger.debug("GnuTLS: %s", string[:-1])
1531
logger.debug(u"GnuTLS: %s", string[:-1])
1868
1532
1869
1533
(gnutls.library.functions
1870
1534
.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
1535
1886
1536
global main_loop
1887
1537
# From the Avahi example code
1890
1540
bus = dbus.SystemBus()
1891
1541
# End of Avahi example code
1892
1542
if use_dbus:
1893
try:
1894
bus_name = dbus.service.BusName("se.bsnet.fukt.Mandos",
1895
bus, do_not_queue=True)
1896
except dbus.exceptions.NameExistsException as e:
1897
logger.error(unicode(e) + ", disabling D-Bus")
1898
use_dbus = False
1899
server_settings["use_dbus"] = False
1900
tcp_server.use_dbus = False
1543
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1901
1544
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1902
service = AvahiService(name = server_settings["servicename"],
1903
servicetype = "_mandos._tcp",
1545
service = AvahiService(name = server_settings[u"servicename"],
1546
servicetype = u"_mandos._tcp",
1904
1547
protocol = protocol, bus = bus)
1905
1548
if server_settings["interface"]:
1906
1549
service.interface = (if_nametoindex
1907
(str(server_settings["interface"])))
1908
1909
global multiprocessing_manager
1910
multiprocessing_manager = multiprocessing.Manager()
1550
(str(server_settings[u"interface"])))
1911
1551
1912
1552
client_class = Client
1913
1553
if use_dbus:
1914
1554
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
1555
tcp_server.clients.update(set(
1928
1556
client_class(name = section,
1929
config= dict(client_config_items(
1930
client_config, section)))
1557
config= dict(client_config.items(section)))
1931
1558
for section in client_config.sections()))
1932
1559
if not tcp_server.clients:
1933
logger.warning("No clients defined")
1560
logger.warning(u"No clients defined")
1561
1562
if debug:
1563
# Redirect stdin so all checkers get /dev/null
1564
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1565
os.dup2(null, sys.stdin.fileno())
1566
if null > 2:
1567
os.close(null)
1568
else:
1569
# No console logging
1570
logger.removeHandler(console)
1571
# Close all input and output, do double fork, etc.
1572
daemon()
1573
1574
try:
1575
with closing(pidfile):
1576
pid = os.getpid()
1577
pidfile.write(str(pid) + "\n")
1578
del pidfile
1579
except IOError:
1580
logger.error(u"Could not write to file %r with PID %d",
1581
pidfilename, pid)
1582
except NameError:
1583
# "pidfile" was never created
1584
pass
1585
del pidfilename
1586
1587
def cleanup():
1588
"Cleanup function; run on exit"
1589
service.cleanup()
1934
1590
1591
while tcp_server.clients:
1592
client = tcp_server.clients.pop()
1593
client.disable_hook = None
1594
client.disable()
1595
1596
atexit.register(cleanup)
1597
1935
1598
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
1599
signal.signal(signal.SIGINT, signal.SIG_IGN)
1950
1951
1600
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1952
1601
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1953
1602
1955
1604
class MandosDBusService(dbus.service.Object):
1956
1605
"""A D-Bus proxy object"""
1957
1606
def __init__(self):
1958
dbus.service.Object.__init__(self, bus, "/")
1959
_interface = "se.bsnet.fukt.Mandos"
1960
1961
@dbus.service.signal(_interface, signature="o")
1962
def ClientAdded(self, objpath):
1963
"D-Bus signal"
1964
pass
1965
1966
@dbus.service.signal(_interface, signature="ss")
1967
def ClientNotFound(self, fingerprint, address):
1968
"D-Bus signal"
1969
pass
1970
1971
@dbus.service.signal(_interface, signature="os")
1607
dbus.service.Object.__init__(self, bus, u"/")
1608
_interface = u"se.bsnet.fukt.Mandos"
1609
1610
@dbus.service.signal(_interface, signature=u"oa{sv}")
1611
def ClientAdded(self, objpath, properties):
1612
"D-Bus signal"
1613
pass
1614
1615
@dbus.service.signal(_interface, signature=u"s")
1616
def ClientNotFound(self, fingerprint):
1617
"D-Bus signal"
1618
pass
1619
1620
@dbus.service.signal(_interface, signature=u"os")
1972
1621
def ClientRemoved(self, objpath, name):
1973
1622
"D-Bus signal"
1974
1623
pass
1975
1624
1976
@dbus.service.method(_interface, out_signature="ao")
1625
@dbus.service.method(_interface, out_signature=u"ao")
1977
1626
def GetAllClients(self):
1978
1627
"D-Bus method"
1979
1628
return dbus.Array(c.dbus_object_path
1980
1629
for c in tcp_server.clients)
1981
1630
1982
1631
@dbus.service.method(_interface,
1983
out_signature="a{oa{sv}}")
1632
out_signature=u"a{oa{sv}}")
1984
1633
def GetAllClientsWithProperties(self):
1985
1634
"D-Bus method"
1986
1635
return dbus.Dictionary(
1987
((c.dbus_object_path, c.GetAll(""))
1636
((c.dbus_object_path, c.GetAll(u""))
1988
1637
for c in tcp_server.clients),
1989
signature="oa{sv}")
1638
signature=u"oa{sv}")
1990
1639
1991
@dbus.service.method(_interface, in_signature="o")
1640
@dbus.service.method(_interface, in_signature=u"o")
1992
1641
def RemoveClient(self, object_path):
1993
1642
"D-Bus method"
1994
1643
for c in tcp_server.clients:
1996
1645
tcp_server.clients.remove(c)
1997
1646
c.remove_from_connection()
1998
1647
# Don't signal anything except ClientRemoved
1999
c.disable(quiet=True)
1648
c.disable(signal=False)
2000
1649
# Emit D-Bus signal
2001
1650
self.ClientRemoved(object_path, c.name)
2002
1651
return
2003
raise KeyError(object_path)
1652
raise KeyError
2004
1653
2005
1654
del _interface
2006
1655
2007
1656
mandos_dbus_service = MandosDBusService()
2008
1657
2009
def cleanup():
2010
"Cleanup function; run on exit"
2011
service.cleanup()
2012
2013
while tcp_server.clients:
2014
client = tcp_server.clients.pop()
2015
if use_dbus:
2016
client.remove_from_connection()
2017
client.disable_hook = None
2018
# Don't signal anything except ClientRemoved
2019
client.disable(quiet=True)
2020
if use_dbus:
2021
# Emit D-Bus signal
2022
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2023
client.name)
2024
2025
atexit.register(cleanup)
2026
2027
1658
for client in tcp_server.clients:
2028
1659
if use_dbus:
2029
1660
# Emit D-Bus signal
2030
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1661
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1662
client.GetAll(u""))
2031
1663
client.enable()
2032
1664
2033
1665
tcp_server.enable()
2036
1668
# Find out what port we got
2037
1669
service.port = tcp_server.socket.getsockname()[1]
2038
1670
if use_ipv6:
2039
logger.info("Now listening on address %r, port %d,"
1671
logger.info(u"Now listening on address %r, port %d,"
2040
1672
" flowinfo %d, scope_id %d"
2041
1673
% tcp_server.socket.getsockname())
2042
1674
else: # IPv4
2043
logger.info("Now listening on address %r, port %d"
1675
logger.info(u"Now listening on address %r, port %d"
2044
1676
% tcp_server.socket.getsockname())
2045
1677
2046
1678
#service.interface = tcp_server.socket.getsockname()[3]
2049
1681
# From the Avahi example code
2050
1682
try:
2051
1683
service.activate()
2052
except dbus.exceptions.DBusException as error:
2053
logger.critical("DBusException: %s", error)
2054
cleanup()
1684
except dbus.exceptions.DBusException, error:
1685
logger.critical(u"DBusException: %s", error)
2055
1686
sys.exit(1)
2056
1687
# End of Avahi example code
2057
1688
2060
1691
(tcp_server.handle_request
2061
1692
(*args[2:], **kwargs) or True))
2062
1693
2063
logger.debug("Starting main loop")
1694
logger.debug(u"Starting main loop")
2064
1695
main_loop.run()
2065
except AvahiError as error:
2066
logger.critical("AvahiError: %s", error)
2067
cleanup()
1696
except AvahiError, error:
1697
logger.critical(u"AvahiError: %s", error)
2068
1698
sys.exit(1)
2069
1699
except KeyboardInterrupt:
2070
1700
if debug:
2071
print("", file=sys.stderr)
2072
logger.debug("Server received KeyboardInterrupt")
2073
logger.debug("Server exiting")
2074
# Must run before the D-Bus bus name gets deregistered
2075
cleanup()
1701
print >> sys.stderr
1702
logger.debug(u"Server received KeyboardInterrupt")
1703
logger.debug(u"Server exiting")
2076
1704
2077
1705
if __name__ == '__main__':
2078
1706
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0