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