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 515
- compare with another revision
- download diff
- download tarball
- view history from revision 515
- Committer: Teddy Hogeborn
- Date: 2011-10-10 20:30:55 UTC
- mfrom: (505.1.13 teddy)
- Revision ID: teddy@recompile.se-20111010203055-a4crqy7gw2ln252r
Miscellaneous fixes prompted by lintian:
* debian/control (Conflicts): Changed to "Breaks:".
* debian/copyright: Updated format.
* debian/mandos-client.postinst: Use "set -e" instead of "#!/bin/sh -e".
* debian/mandos-client.postrm: - '' -
* debian/mandos.postinst: - '' -
* debian/mandos.prerm: Consistent magic.
* mandos: Small comment change.
* mandos-clients.conf.xml (OPTIONS/extended_timeout): Fix spelling.
* debian/control (Conflicts): Changed to "Breaks:".
* debian/copyright: Updated format.
* debian/mandos-client.postinst: Use "set -e" instead of "#!/bin/sh -e".
* debian/mandos-client.postrm: - '' -
* debian/mandos.postinst: - '' -
* debian/mandos.prerm: Consistent magic.
* mandos: Small comment change.
* mandos-clients.conf.xml (OPTIONS/extended_timeout): Fix spelling.
- files added:
- DBUS-API
- debian/source
- files modified:
- .bzrignore
added
removed
mandos
6
6
# This program is partly derived from an example program for an Avahi
7
7
# service publisher, downloaded from
8
8
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
9
# methods "add" and "remove" in the "AvahiService" class, the
10
# "server_state_changed" and "entry_group_state_changed" functions,
11
# and some lines in "main".
9
# methods "add", "remove", "server_state_changed",
10
# "entry_group_state_changed", "cleanup", and "activate" in the
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
14
# Copyright © 2008-2011 Teddy Hogeborn
15
# Copyright © 2008-2011 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
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@fukt.bsnet.se>.
31
# Contact the authors at <mandos@recompile.se>.
32
32
#
33
33
34
from __future__ import division, with_statement, absolute_import
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
35
36
36
import SocketServer
37
import SocketServer as socketserver
37
38
import socket
38
import optparse
39
import argparse
39
40
import datetime
40
41
import errno
41
42
import gnutls.crypto
44
45
import gnutls.library.functions
45
46
import gnutls.library.constants
46
47
import gnutls.library.types
47
import ConfigParser
48
import ConfigParser as configparser
48
49
import sys
49
50
import re
50
51
import os
51
52
import signal
52
from sets import Set
53
53
import subprocess
54
54
import atexit
55
55
import stat
56
56
import logging
57
57
import logging.handlers
58
58
import pwd
59
from contextlib import closing
59
import contextlib
60
import struct
61
import fcntl
62
import functools
63
import cPickle as pickle
64
import multiprocessing
65
import types
60
66
61
67
import dbus
62
68
import dbus.service
65
71
from dbus.mainloop.glib import DBusGMainLoop
66
72
import ctypes
67
73
import ctypes.util
68
69
version = "1.0.8"
70
74
import xml.dom.minidom
75
import inspect
76
77
try:
78
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
79
except AttributeError:
80
try:
81
from IN import SO_BINDTODEVICE
82
except ImportError:
83
SO_BINDTODEVICE = None
84
85
86
version = "1.4.0"
87
88
#logger = logging.getLogger('mandos')
71
89
logger = logging.Logger('mandos')
72
90
syslogger = (logging.handlers.SysLogHandler
73
91
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
74
address = "/dev/log"))
92
address = str("/dev/log")))
75
93
syslogger.setFormatter(logging.Formatter
76
94
('Mandos [%(process)d]: %(levelname)s:'
77
95
' %(message)s'))
79
97
80
98
console = logging.StreamHandler()
81
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
82
' %(levelname)s: %(message)s'))
100
' %(levelname)s:'
101
' %(message)s'))
83
102
logger.addHandler(console)
84
103
85
104
class AvahiError(Exception):
98
117
99
118
class AvahiService(object):
100
119
"""An Avahi (Zeroconf) service.
120
101
121
Attributes:
102
122
interface: integer; avahi.IF_UNSPEC or an interface index.
103
123
Used to optionally bind to the specified interface.
111
131
max_renames: integer; maximum number of renames
112
132
rename_count: integer; counter so we only rename after collisions
113
133
a sensible number of times
134
group: D-Bus Entry Group
135
server: D-Bus Server
136
bus: dbus.SystemBus()
114
137
"""
115
138
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
116
139
servicetype = None, port = None, TXT = None,
117
140
domain = "", host = "", max_renames = 32768,
118
protocol = avahi.PROTO_UNSPEC):
141
protocol = avahi.PROTO_UNSPEC, bus = None):
119
142
self.interface = interface
120
143
self.name = name
121
144
self.type = servicetype
126
149
self.rename_count = 0
127
150
self.max_renames = max_renames
128
151
self.protocol = protocol
152
self.group = None # our entry group
153
self.server = None
154
self.bus = bus
155
self.entry_group_state_changed_match = None
129
156
def rename(self):
130
157
"""Derived from the Avahi example code"""
131
158
if self.rename_count >= self.max_renames:
132
logger.critical(u"No suitable Zeroconf service name found"
133
u" after %i retries, exiting.",
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
134
161
self.rename_count)
135
raise AvahiServiceError(u"Too many renames")
136
self.name = server.GetAlternativeServiceName(self.name)
137
logger.info(u"Changing Zeroconf service name to %r ...",
138
str(self.name))
162
raise AvahiServiceError("Too many renames")
163
self.name = unicode(self.server
164
.GetAlternativeServiceName(self.name))
165
logger.info("Changing Zeroconf service name to %r ...",
166
self.name)
139
167
syslogger.setFormatter(logging.Formatter
140
('Mandos (%s): %%(levelname)s:'
141
' %%(message)s' % self.name))
168
('Mandos (%s) [%%(process)d]:'
169
' %%(levelname)s: %%(message)s'
170
% self.name))
142
171
self.remove()
143
self.add()
172
try:
173
self.add()
174
except dbus.exceptions.DBusException as error:
175
logger.critical("DBusException: %s", error)
176
self.cleanup()
177
os._exit(1)
144
178
self.rename_count += 1
145
179
def remove(self):
146
180
"""Derived from the Avahi example code"""
147
if group is not None:
148
group.Reset()
181
if self.entry_group_state_changed_match is not None:
182
self.entry_group_state_changed_match.remove()
183
self.entry_group_state_changed_match = None
184
if self.group is not None:
185
self.group.Reset()
149
186
def add(self):
150
187
"""Derived from the Avahi example code"""
151
global group
152
if group is None:
153
group = dbus.Interface(bus.get_object
154
(avahi.DBUS_NAME,
155
server.EntryGroupNew()),
156
avahi.DBUS_INTERFACE_ENTRY_GROUP)
157
group.connect_to_signal('StateChanged',
158
entry_group_state_changed)
159
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
160
service.name, service.type)
161
group.AddService(
162
self.interface, # interface
163
self.protocol, # protocol
164
dbus.UInt32(0), # flags
165
self.name, self.type,
166
self.domain, self.host,
167
dbus.UInt16(self.port),
168
avahi.string_array_to_txt_array(self.TXT))
169
group.Commit()
170
171
# From the Avahi example code:
172
group = None # our entry group
173
# End of Avahi example code
174
175
176
def _datetime_to_dbus(dt, variant_level=0):
177
"""Convert a UTC datetime.datetime() to a D-Bus type."""
178
return dbus.String(dt.isoformat(), variant_level=variant_level)
179
180
181
class Client(dbus.service.Object):
188
self.remove()
189
if self.group is None:
190
self.group = dbus.Interface(
191
self.bus.get_object(avahi.DBUS_NAME,
192
self.server.EntryGroupNew()),
193
avahi.DBUS_INTERFACE_ENTRY_GROUP)
194
self.entry_group_state_changed_match = (
195
self.group.connect_to_signal(
196
'StateChanged', self .entry_group_state_changed))
197
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
198
self.name, self.type)
199
self.group.AddService(
200
self.interface,
201
self.protocol,
202
dbus.UInt32(0), # flags
203
self.name, self.type,
204
self.domain, self.host,
205
dbus.UInt16(self.port),
206
avahi.string_array_to_txt_array(self.TXT))
207
self.group.Commit()
208
def entry_group_state_changed(self, state, error):
209
"""Derived from the Avahi example code"""
210
logger.debug("Avahi entry group state change: %i", state)
211
212
if state == avahi.ENTRY_GROUP_ESTABLISHED:
213
logger.debug("Zeroconf service established.")
214
elif state == avahi.ENTRY_GROUP_COLLISION:
215
logger.info("Zeroconf service name collision.")
216
self.rename()
217
elif state == avahi.ENTRY_GROUP_FAILURE:
218
logger.critical("Avahi: Error in group state changed %s",
219
unicode(error))
220
raise AvahiGroupError("State changed: %s"
221
% unicode(error))
222
def cleanup(self):
223
"""Derived from the Avahi example code"""
224
if self.group is not None:
225
try:
226
self.group.Free()
227
except (dbus.exceptions.UnknownMethodException,
228
dbus.exceptions.DBusException) as e:
229
pass
230
self.group = None
231
self.remove()
232
def server_state_changed(self, state, error=None):
233
"""Derived from the Avahi example code"""
234
logger.debug("Avahi server state change: %i", state)
235
bad_states = { avahi.SERVER_INVALID:
236
"Zeroconf server invalid",
237
avahi.SERVER_REGISTERING: None,
238
avahi.SERVER_COLLISION:
239
"Zeroconf server name collision",
240
avahi.SERVER_FAILURE:
241
"Zeroconf server failure" }
242
if state in bad_states:
243
if bad_states[state] is not None:
244
if error is None:
245
logger.error(bad_states[state])
246
else:
247
logger.error(bad_states[state] + ": %r", error)
248
self.cleanup()
249
elif state == avahi.SERVER_RUNNING:
250
self.add()
251
else:
252
if error is None:
253
logger.debug("Unknown state: %r", state)
254
else:
255
logger.debug("Unknown state: %r: %r", state, error)
256
def activate(self):
257
"""Derived from the Avahi example code"""
258
if self.server is None:
259
self.server = dbus.Interface(
260
self.bus.get_object(avahi.DBUS_NAME,
261
avahi.DBUS_PATH_SERVER,
262
follow_name_owner_changes=True),
263
avahi.DBUS_INTERFACE_SERVER)
264
self.server.connect_to_signal("StateChanged",
265
self.server_state_changed)
266
self.server_state_changed(self.server.GetState())
267
268
269
def _timedelta_to_milliseconds(td):
270
"Convert a datetime.timedelta() to milliseconds"
271
return ((td.days * 24 * 60 * 60 * 1000)
272
+ (td.seconds * 1000)
273
+ (td.microseconds // 1000))
274
275
class Client(object):
182
276
"""A representation of a client host served by this server.
277
183
278
Attributes:
184
name: string; from the config file, used in log messages and
185
D-Bus identifiers
186
fingerprint: string (40 or 32 hexadecimal digits); used to
187
uniquely identify the client
188
secret: bytestring; sent verbatim (over TLS) to client
189
host: string; available for use by the checker command
190
created: datetime.datetime(); (UTC) object creation
191
last_enabled: datetime.datetime(); (UTC)
192
enabled: bool()
193
last_checked_ok: datetime.datetime(); (UTC) or None
194
timeout: datetime.timedelta(); How long from last_checked_ok
195
until this client is invalid
196
interval: datetime.timedelta(); How often to start a new checker
197
disable_hook: If set, called by disable() as disable_hook(self)
279
_approved: bool(); 'None' if not yet approved/disapproved
280
approval_delay: datetime.timedelta(); Time to wait for approval
281
approval_duration: datetime.timedelta(); Duration of one approval
198
282
checker: subprocess.Popen(); a running checker process used
199
283
to see if the client lives.
200
284
'None' if no process is running.
201
checker_initiator_tag: a gobject event source tag, or None
202
disable_initiator_tag: - '' -
203
checker_callback_tag: - '' -
204
checker_command: string; External command which is run to check if
205
client lives. %() expansions are done at
285
checker_callback_tag: a gobject event source tag, or None
286
checker_command: string; External command which is run to check
287
if client lives. %() expansions are done at
206
288
runtime with vars(self) as dict, so that for
207
289
instance %(name)s can be used in the command.
290
checker_initiator_tag: a gobject event source tag, or None
291
created: datetime.datetime(); (UTC) object creation
208
292
current_checker_command: string; current running checker_command
209
use_dbus: bool(); Whether to provide D-Bus interface and signals
210
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
293
disable_hook: If set, called by disable() as disable_hook(self)
294
disable_initiator_tag: a gobject event source tag, or None
295
enabled: bool()
296
fingerprint: string (40 or 32 hexadecimal digits); used to
297
uniquely identify the client
298
host: string; available for use by the checker command
299
interval: datetime.timedelta(); How often to start a new checker
300
last_approval_request: datetime.datetime(); (UTC) or None
301
last_checked_ok: datetime.datetime(); (UTC) or None
302
last_enabled: datetime.datetime(); (UTC)
303
name: string; from the config file, used in log messages and
304
D-Bus identifiers
305
secret: bytestring; sent verbatim (over TLS) to client
306
timeout: datetime.timedelta(); How long from last_checked_ok
307
until this client is disabled
308
extended_timeout: extra long timeout when password has been sent
309
runtime_expansions: Allowed attributes for runtime expansion.
310
expires: datetime.datetime(); time (UTC) when a client will be
311
disabled, or None
211
312
"""
313
314
runtime_expansions = ("approval_delay", "approval_duration",
315
"created", "enabled", "fingerprint",
316
"host", "interval", "last_checked_ok",
317
"last_enabled", "name", "timeout")
318
212
319
def timeout_milliseconds(self):
213
320
"Return the 'timeout' attribute in milliseconds"
214
return ((self.timeout.days * 24 * 60 * 60 * 1000)
215
+ (self.timeout.seconds * 1000)
216
+ (self.timeout.microseconds // 1000))
321
return _timedelta_to_milliseconds(self.timeout)
322
323
def extended_timeout_milliseconds(self):
324
"Return the 'extended_timeout' attribute in milliseconds"
325
return _timedelta_to_milliseconds(self.extended_timeout)
217
326
218
327
def interval_milliseconds(self):
219
328
"Return the 'interval' attribute in milliseconds"
220
return ((self.interval.days * 24 * 60 * 60 * 1000)
221
+ (self.interval.seconds * 1000)
222
+ (self.interval.microseconds // 1000))
223
224
def __init__(self, name = None, disable_hook=None, config=None,
225
use_dbus=True):
329
return _timedelta_to_milliseconds(self.interval)
330
331
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
333
334
def __init__(self, name = None, disable_hook=None, config=None):
226
335
"""Note: the 'checker' key in 'config' sets the
227
336
'checker_command' attribute and *not* the 'checker'
228
337
attribute."""
229
338
self.name = name
230
339
if config is None:
231
340
config = {}
232
logger.debug(u"Creating client %r", self.name)
233
self.use_dbus = False # During __init__
341
logger.debug("Creating client %r", self.name)
234
342
# Uppercase and remove spaces from fingerprint for later
235
343
# comparison purposes with return value from the fingerprint()
236
344
# function
237
345
self.fingerprint = (config["fingerprint"].upper()
238
.replace(u" ", u""))
239
logger.debug(u" Fingerprint: %s", self.fingerprint)
346
.replace(" ", ""))
347
logger.debug(" Fingerprint: %s", self.fingerprint)
240
348
if "secret" in config:
241
self.secret = config["secret"].decode(u"base64")
349
self.secret = config["secret"].decode("base64")
242
350
elif "secfile" in config:
243
with closing(open(os.path.expanduser
244
(os.path.expandvars
245
(config["secfile"])))) as secfile:
351
with open(os.path.expanduser(os.path.expandvars
352
(config["secfile"])),
353
"rb") as secfile:
246
354
self.secret = secfile.read()
247
355
else:
248
raise TypeError(u"No secret or secfile for client %s"
356
raise TypeError("No secret or secfile for client %s"
249
357
% self.name)
250
358
self.host = config.get("host", "")
251
359
self.created = datetime.datetime.utcnow()
252
360
self.enabled = False
361
self.last_approval_request = None
253
362
self.last_enabled = None
254
363
self.last_checked_ok = None
255
364
self.timeout = string_to_delta(config["timeout"])
365
self.extended_timeout = string_to_delta(config
366
["extended_timeout"])
256
367
self.interval = string_to_delta(config["interval"])
257
368
self.disable_hook = disable_hook
258
369
self.checker = None
259
370
self.checker_initiator_tag = None
260
371
self.disable_initiator_tag = None
372
self.expires = None
261
373
self.checker_callback_tag = None
262
374
self.checker_command = config["checker"]
263
375
self.current_checker_command = None
264
376
self.last_connect = None
265
# Only now, when this client is initialized, can it show up on
266
# the D-Bus
267
self.use_dbus = use_dbus
268
if self.use_dbus:
269
self.dbus_object_path = (dbus.ObjectPath
270
("/clients/"
271
+ self.name.replace(".", "_")))
272
dbus.service.Object.__init__(self, bus,
273
self.dbus_object_path)
377
self._approved = None
378
self.approved_by_default = config.get("approved_by_default",
379
True)
380
self.approvals_pending = 0
381
self.approval_delay = string_to_delta(
382
config["approval_delay"])
383
self.approval_duration = string_to_delta(
384
config["approval_duration"])
385
self.changedstate = (multiprocessing_manager
386
.Condition(multiprocessing_manager
387
.Lock()))
388
389
def send_changedstate(self):
390
self.changedstate.acquire()
391
self.changedstate.notify_all()
392
self.changedstate.release()
274
393
275
394
def enable(self):
276
395
"""Start this client's checker and timeout hooks"""
277
self.last_enabled = datetime.datetime.utcnow()
396
if getattr(self, "enabled", False):
397
# Already enabled
398
return
399
self.send_changedstate()
278
400
# Schedule a new checker to be started an 'interval' from now,
279
401
# and every interval from then on.
280
402
self.checker_initiator_tag = (gobject.timeout_add
281
403
(self.interval_milliseconds(),
282
404
self.start_checker))
283
# Also start a new checker *right now*.
284
self.start_checker()
285
405
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
286
407
self.disable_initiator_tag = (gobject.timeout_add
287
408
(self.timeout_milliseconds(),
288
409
self.disable))
289
410
self.enabled = True
290
if self.use_dbus:
291
# Emit D-Bus signals
292
self.PropertyChanged(dbus.String(u"enabled"),
293
dbus.Boolean(True, variant_level=1))
294
self.PropertyChanged(dbus.String(u"last_enabled"),
295
(_datetime_to_dbus(self.last_enabled,
296
variant_level=1)))
411
self.last_enabled = datetime.datetime.utcnow()
412
# Also start a new checker *right now*.
413
self.start_checker()
297
414
298
def disable(self):
415
def disable(self, quiet=True):
299
416
"""Disable this client."""
300
417
if not getattr(self, "enabled", False):
301
418
return False
302
logger.info(u"Disabling client %s", self.name)
419
if not quiet:
420
self.send_changedstate()
421
if not quiet:
422
logger.info("Disabling client %s", self.name)
303
423
if getattr(self, "disable_initiator_tag", False):
304
424
gobject.source_remove(self.disable_initiator_tag)
305
425
self.disable_initiator_tag = None
426
self.expires = None
306
427
if getattr(self, "checker_initiator_tag", False):
307
428
gobject.source_remove(self.checker_initiator_tag)
308
429
self.checker_initiator_tag = None
310
431
if self.disable_hook:
311
432
self.disable_hook(self)
312
433
self.enabled = False
313
if self.use_dbus:
314
# Emit D-Bus signal
315
self.PropertyChanged(dbus.String(u"enabled"),
316
dbus.Boolean(False, variant_level=1))
317
434
# Do not run this again if called by a gobject.timeout_add
318
435
return False
319
436
325
442
"""The checker has completed, so take appropriate actions."""
326
443
self.checker_callback_tag = None
327
444
self.checker = None
328
if self.use_dbus:
329
# Emit D-Bus signal
330
self.PropertyChanged(dbus.String(u"checker_running"),
331
dbus.Boolean(False, variant_level=1))
332
445
if os.WIFEXITED(condition):
333
446
exitstatus = os.WEXITSTATUS(condition)
334
447
if exitstatus == 0:
335
logger.info(u"Checker for %(name)s succeeded",
448
logger.info("Checker for %(name)s succeeded",
336
449
vars(self))
337
450
self.checked_ok()
338
451
else:
339
logger.info(u"Checker for %(name)s failed",
452
logger.info("Checker for %(name)s failed",
340
453
vars(self))
341
if self.use_dbus:
342
# Emit D-Bus signal
343
self.CheckerCompleted(dbus.Int16(exitstatus),
344
dbus.Int64(condition),
345
dbus.String(command))
346
454
else:
347
logger.warning(u"Checker for %(name)s crashed?",
455
logger.warning("Checker for %(name)s crashed?",
348
456
vars(self))
349
if self.use_dbus:
350
# Emit D-Bus signal
351
self.CheckerCompleted(dbus.Int16(-1),
352
dbus.Int64(condition),
353
dbus.String(command))
354
457
355
def checked_ok(self):
458
def checked_ok(self, timeout=None):
356
459
"""Bump up the timeout for this client.
460
357
461
This should only be called when the client has been seen,
358
462
alive and well.
359
463
"""
464
if timeout is None:
465
timeout = self.timeout
360
466
self.last_checked_ok = datetime.datetime.utcnow()
361
467
gobject.source_remove(self.disable_initiator_tag)
362
468
self.disable_initiator_tag = (gobject.timeout_add
363
(self.timeout_milliseconds(),
364
self.disable))
365
if self.use_dbus:
366
# Emit D-Bus signal
367
self.PropertyChanged(
368
dbus.String(u"last_checked_ok"),
369
(_datetime_to_dbus(self.last_checked_ok,
370
variant_level=1)))
469
(_timedelta_to_milliseconds
470
(timeout), self.disable))
471
self.expires = datetime.datetime.utcnow() + timeout
472
473
def need_approval(self):
474
self.last_approval_request = datetime.datetime.utcnow()
371
475
372
476
def start_checker(self):
373
477
"""Start a new checker subprocess if one is not running.
478
374
479
If a checker already exists, leave it running and do
375
480
nothing."""
376
481
# The reason for not killing a running checker is that if we
379
484
# client would inevitably timeout, since no checker would get
380
485
# a chance to run to completion. If we instead leave running
381
486
# checkers alone, the checker would have to take more time
382
# than 'timeout' for the client to be declared invalid, which
383
# is as it should be.
487
# than 'timeout' for the client to be disabled, which is as it
488
# should be.
384
489
385
490
# If a checker exists, make sure it is not a zombie
386
if self.checker is not None:
491
try:
387
492
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
493
except (AttributeError, OSError) as error:
494
if (isinstance(error, OSError)
495
and error.errno != errno.ECHILD):
496
raise error
497
else:
388
498
if pid:
389
499
logger.warning("Checker was a zombie")
390
500
gobject.source_remove(self.checker_callback_tag)
397
507
command = self.checker_command % self.host
398
508
except TypeError:
399
509
# Escape attributes for the shell
400
escaped_attrs = dict((key, re.escape(str(val)))
401
for key, val in
402
vars(self).iteritems())
510
escaped_attrs = dict(
511
(attr,
512
re.escape(unicode(str(getattr(self, attr, "")),
513
errors=
514
'replace')))
515
for attr in
516
self.runtime_expansions)
517
403
518
try:
404
519
command = self.checker_command % escaped_attrs
405
except TypeError, error:
406
logger.error(u'Could not format string "%s":'
407
u' %s', self.checker_command, error)
520
except TypeError as error:
521
logger.error('Could not format string "%s":'
522
' %s', self.checker_command, error)
408
523
return True # Try again later
409
self.current_checker_command = command
524
self.current_checker_command = command
410
525
try:
411
logger.info(u"Starting checker %r for %s",
526
logger.info("Starting checker %r for %s",
412
527
command, self.name)
413
528
# We don't need to redirect stdout and stderr, since
414
529
# in normal mode, that is already done by daemon(),
417
532
self.checker = subprocess.Popen(command,
418
533
close_fds=True,
419
534
shell=True, cwd="/")
420
if self.use_dbus:
421
# Emit D-Bus signal
422
self.CheckerStarted(command)
423
self.PropertyChanged(
424
dbus.String("checker_running"),
425
dbus.Boolean(True, variant_level=1))
426
535
self.checker_callback_tag = (gobject.child_watch_add
427
536
(self.checker.pid,
428
537
self.checker_callback,
433
542
if pid:
434
543
gobject.source_remove(self.checker_callback_tag)
435
544
self.checker_callback(pid, status, command)
436
except OSError, error:
437
logger.error(u"Failed to start subprocess: %s",
545
except OSError as error:
546
logger.error("Failed to start subprocess: %s",
438
547
error)
439
548
# Re-run this periodically if run by gobject.timeout_add
440
549
return True
446
555
self.checker_callback_tag = None
447
556
if getattr(self, "checker", None) is None:
448
557
return
449
logger.debug(u"Stopping checker for %(name)s", vars(self))
558
logger.debug("Stopping checker for %(name)s", vars(self))
450
559
try:
451
560
os.kill(self.checker.pid, signal.SIGTERM)
452
#os.sleep(0.5)
561
#time.sleep(0.5)
453
562
#if self.checker.poll() is None:
454
563
# os.kill(self.checker.pid, signal.SIGKILL)
455
except OSError, error:
564
except OSError as error:
456
565
if error.errno != errno.ESRCH: # No such process
457
566
raise
458
567
self.checker = None
459
if self.use_dbus:
460
self.PropertyChanged(dbus.String(u"checker_running"),
461
dbus.Boolean(False, variant_level=1))
462
463
def still_valid(self):
464
"""Has the timeout not yet passed for this client?"""
465
if not getattr(self, "enabled", False):
466
return False
467
now = datetime.datetime.utcnow()
468
if self.last_checked_ok is None:
469
return now < (self.created + self.timeout)
470
else:
471
return now < (self.last_checked_ok + self.timeout)
472
473
## D-Bus methods & signals
474
_interface = u"se.bsnet.fukt.Mandos.Client"
475
476
# CheckedOK - method
477
CheckedOK = dbus.service.method(_interface)(checked_ok)
478
CheckedOK.__name__ = "CheckedOK"
568
569
570
def dbus_service_property(dbus_interface, signature="v",
571
access="readwrite", byte_arrays=False):
572
"""Decorators for marking methods of a DBusObjectWithProperties to
573
become properties on the D-Bus.
574
575
The decorated method will be called with no arguments by "Get"
576
and with one argument by "Set".
577
578
The parameters, where they are supported, are the same as
579
dbus.service.method, except there is only "signature", since the
580
type from Get() and the type sent to Set() is the same.
581
"""
582
# Encoding deeply encoded byte arrays is not supported yet by the
583
# "Set" method, so we fail early here:
584
if byte_arrays and signature != "ay":
585
raise ValueError("Byte arrays not supported for non-'ay'"
586
" signature %r" % signature)
587
def decorator(func):
588
func._dbus_is_property = True
589
func._dbus_interface = dbus_interface
590
func._dbus_signature = signature
591
func._dbus_access = access
592
func._dbus_name = func.__name__
593
if func._dbus_name.endswith("_dbus_property"):
594
func._dbus_name = func._dbus_name[:-14]
595
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
596
return func
597
return decorator
598
599
600
class DBusPropertyException(dbus.exceptions.DBusException):
601
"""A base class for D-Bus property-related exceptions
602
"""
603
def __unicode__(self):
604
return unicode(str(self))
605
606
607
class DBusPropertyAccessException(DBusPropertyException):
608
"""A property's access permissions disallows an operation.
609
"""
610
pass
611
612
613
class DBusPropertyNotFound(DBusPropertyException):
614
"""An attempt was made to access a non-existing property.
615
"""
616
pass
617
618
619
class DBusObjectWithProperties(dbus.service.Object):
620
"""A D-Bus object with properties.
621
622
Classes inheriting from this can use the dbus_service_property
623
decorator to expose methods as D-Bus properties. It exposes the
624
standard Get(), Set(), and GetAll() methods on the D-Bus.
625
"""
626
627
@staticmethod
628
def _is_dbus_property(obj):
629
return getattr(obj, "_dbus_is_property", False)
630
631
def _get_all_dbus_properties(self):
632
"""Returns a generator of (name, attribute) pairs
633
"""
634
return ((prop.__get__(self)._dbus_name, prop.__get__(self))
635
for cls in self.__class__.__mro__
636
for name, prop in
637
inspect.getmembers(cls, self._is_dbus_property))
638
639
def _get_dbus_property(self, interface_name, property_name):
640
"""Returns a bound method if one exists which is a D-Bus
641
property with the specified name and interface.
642
"""
643
for cls in self.__class__.__mro__:
644
for name, value in (inspect.getmembers
645
(cls, self._is_dbus_property)):
646
if (value._dbus_name == property_name
647
and value._dbus_interface == interface_name):
648
return value.__get__(self)
649
650
# No such property
651
raise DBusPropertyNotFound(self.dbus_object_path + ":"
652
+ interface_name + "."
653
+ property_name)
654
655
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
656
out_signature="v")
657
def Get(self, interface_name, property_name):
658
"""Standard D-Bus property Get() method, see D-Bus standard.
659
"""
660
prop = self._get_dbus_property(interface_name, property_name)
661
if prop._dbus_access == "write":
662
raise DBusPropertyAccessException(property_name)
663
value = prop()
664
if not hasattr(value, "variant_level"):
665
return value
666
return type(value)(value, variant_level=value.variant_level+1)
667
668
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
669
def Set(self, interface_name, property_name, value):
670
"""Standard D-Bus property Set() method, see D-Bus standard.
671
"""
672
prop = self._get_dbus_property(interface_name, property_name)
673
if prop._dbus_access == "read":
674
raise DBusPropertyAccessException(property_name)
675
if prop._dbus_get_args_options["byte_arrays"]:
676
# The byte_arrays option is not supported yet on
677
# signatures other than "ay".
678
if prop._dbus_signature != "ay":
679
raise ValueError
680
value = dbus.ByteArray(''.join(unichr(byte)
681
for byte in value))
682
prop(value)
683
684
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
685
out_signature="a{sv}")
686
def GetAll(self, interface_name):
687
"""Standard D-Bus property GetAll() method, see D-Bus
688
standard.
689
690
Note: Will not include properties with access="write".
691
"""
692
all = {}
693
for name, prop in self._get_all_dbus_properties():
694
if (interface_name
695
and interface_name != prop._dbus_interface):
696
# Interface non-empty but did not match
697
continue
698
# Ignore write-only properties
699
if prop._dbus_access == "write":
700
continue
701
value = prop()
702
if not hasattr(value, "variant_level"):
703
all[name] = value
704
continue
705
all[name] = type(value)(value, variant_level=
706
value.variant_level+1)
707
return dbus.Dictionary(all, signature="sv")
708
709
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
710
out_signature="s",
711
path_keyword='object_path',
712
connection_keyword='connection')
713
def Introspect(self, object_path, connection):
714
"""Standard D-Bus method, overloaded to insert property tags.
715
"""
716
xmlstring = dbus.service.Object.Introspect(self, object_path,
717
connection)
718
try:
719
document = xml.dom.minidom.parseString(xmlstring)
720
def make_tag(document, name, prop):
721
e = document.createElement("property")
722
e.setAttribute("name", name)
723
e.setAttribute("type", prop._dbus_signature)
724
e.setAttribute("access", prop._dbus_access)
725
return e
726
for if_tag in document.getElementsByTagName("interface"):
727
for tag in (make_tag(document, name, prop)
728
for name, prop
729
in self._get_all_dbus_properties()
730
if prop._dbus_interface
731
== if_tag.getAttribute("name")):
732
if_tag.appendChild(tag)
733
# Add the names to the return values for the
734
# "org.freedesktop.DBus.Properties" methods
735
if (if_tag.getAttribute("name")
736
== "org.freedesktop.DBus.Properties"):
737
for cn in if_tag.getElementsByTagName("method"):
738
if cn.getAttribute("name") == "Get":
739
for arg in cn.getElementsByTagName("arg"):
740
if (arg.getAttribute("direction")
741
== "out"):
742
arg.setAttribute("name", "value")
743
elif cn.getAttribute("name") == "GetAll":
744
for arg in cn.getElementsByTagName("arg"):
745
if (arg.getAttribute("direction")
746
== "out"):
747
arg.setAttribute("name", "props")
748
xmlstring = document.toxml("utf-8")
749
document.unlink()
750
except (AttributeError, xml.dom.DOMException,
751
xml.parsers.expat.ExpatError) as error:
752
logger.error("Failed to override Introspection method",
753
error)
754
return xmlstring
755
756
757
def datetime_to_dbus (dt, variant_level=0):
758
"""Convert a UTC datetime.datetime() to a D-Bus type."""
759
if dt is None:
760
return dbus.String("", variant_level = variant_level)
761
return dbus.String(dt.isoformat(),
762
variant_level=variant_level)
763
764
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
765
.__metaclass__):
766
"""Applied to an empty subclass of a D-Bus object, this metaclass
767
will add additional D-Bus attributes matching a certain pattern.
768
"""
769
def __new__(mcs, name, bases, attr):
770
# Go through all the base classes which could have D-Bus
771
# methods, signals, or properties in them
772
for base in (b for b in bases
773
if issubclass(b, dbus.service.Object)):
774
# Go though all attributes of the base class
775
for attrname, attribute in inspect.getmembers(base):
776
# Ignore non-D-Bus attributes, and D-Bus attributes
777
# with the wrong interface name
778
if (not hasattr(attribute, "_dbus_interface")
779
or not attribute._dbus_interface
780
.startswith("se.recompile.Mandos")):
781
continue
782
# Create an alternate D-Bus interface name based on
783
# the current name
784
alt_interface = (attribute._dbus_interface
785
.replace("se.recompile.Mandos",
786
"se.bsnet.fukt.Mandos"))
787
# Is this a D-Bus signal?
788
if getattr(attribute, "_dbus_is_signal", False):
789
# Extract the original non-method function by
790
# black magic
791
nonmethod_func = (dict(
792
zip(attribute.func_code.co_freevars,
793
attribute.__closure__))["func"]
794
.cell_contents)
795
# Create a new, but exactly alike, function
796
# object, and decorate it to be a new D-Bus signal
797
# with the alternate D-Bus interface name
798
new_function = (dbus.service.signal
799
(alt_interface,
800
attribute._dbus_signature)
801
(types.FunctionType(
802
nonmethod_func.func_code,
803
nonmethod_func.func_globals,
804
nonmethod_func.func_name,
805
nonmethod_func.func_defaults,
806
nonmethod_func.func_closure)))
807
# Define a creator of a function to call both the
808
# old and new functions, so both the old and new
809
# signals gets sent when the function is called
810
def fixscope(func1, func2):
811
"""This function is a scope container to pass
812
func1 and func2 to the "call_both" function
813
outside of its arguments"""
814
def call_both(*args, **kwargs):
815
"""This function will emit two D-Bus
816
signals by calling func1 and func2"""
817
func1(*args, **kwargs)
818
func2(*args, **kwargs)
819
return call_both
820
# Create the "call_both" function and add it to
821
# the class
822
attr[attrname] = fixscope(attribute,
823
new_function)
824
# Is this a D-Bus method?
825
elif getattr(attribute, "_dbus_is_method", False):
826
# Create a new, but exactly alike, function
827
# object. Decorate it to be a new D-Bus method
828
# with the alternate D-Bus interface name. Add it
829
# to the class.
830
attr[attrname] = (dbus.service.method
831
(alt_interface,
832
attribute._dbus_in_signature,
833
attribute._dbus_out_signature)
834
(types.FunctionType
835
(attribute.func_code,
836
attribute.func_globals,
837
attribute.func_name,
838
attribute.func_defaults,
839
attribute.func_closure)))
840
# Is this a D-Bus property?
841
elif getattr(attribute, "_dbus_is_property", False):
842
# Create a new, but exactly alike, function
843
# object, and decorate it to be a new D-Bus
844
# property with the alternate D-Bus interface
845
# name. Add it to the class.
846
attr[attrname] = (dbus_service_property
847
(alt_interface,
848
attribute._dbus_signature,
849
attribute._dbus_access,
850
attribute
851
._dbus_get_args_options
852
["byte_arrays"])
853
(types.FunctionType
854
(attribute.func_code,
855
attribute.func_globals,
856
attribute.func_name,
857
attribute.func_defaults,
858
attribute.func_closure)))
859
return type.__new__(mcs, name, bases, attr)
860
861
class ClientDBus(Client, DBusObjectWithProperties):
862
"""A Client class using D-Bus
863
864
Attributes:
865
dbus_object_path: dbus.ObjectPath
866
bus: dbus.SystemBus()
867
"""
868
869
runtime_expansions = (Client.runtime_expansions
870
+ ("dbus_object_path",))
871
872
# dbus.service.Object doesn't use super(), so we can't either.
873
874
def __init__(self, bus = None, *args, **kwargs):
875
self._approvals_pending = 0
876
self.bus = bus
877
Client.__init__(self, *args, **kwargs)
878
# Only now, when this client is initialized, can it show up on
879
# the D-Bus
880
client_object_name = unicode(self.name).translate(
881
{ord("."): ord("_"),
882
ord("-"): ord("_")})
883
self.dbus_object_path = (dbus.ObjectPath
884
("/clients/" + client_object_name))
885
DBusObjectWithProperties.__init__(self, self.bus,
886
self.dbus_object_path)
887
888
def notifychangeproperty(transform_func,
889
dbus_name, type_func=lambda x: x,
890
variant_level=1):
891
""" Modify a variable so that it's a property which announces
892
its changes to DBus.
893
894
transform_fun: Function that takes a value and transforms it
895
to a D-Bus type.
896
dbus_name: D-Bus name of the variable
897
type_func: Function that transform the value before sending it
898
to the D-Bus. Default: no transform
899
variant_level: D-Bus variant level. Default: 1
900
"""
901
attrname = "_{0}".format(dbus_name)
902
def setter(self, value):
903
if hasattr(self, "dbus_object_path"):
904
if (not hasattr(self, attrname) or
905
type_func(getattr(self, attrname, None))
906
!= type_func(value)):
907
dbus_value = transform_func(type_func(value),
908
variant_level)
909
self.PropertyChanged(dbus.String(dbus_name),
910
dbus_value)
911
setattr(self, attrname, value)
912
913
return property(lambda self: getattr(self, attrname), setter)
914
915
916
expires = notifychangeproperty(datetime_to_dbus, "Expires")
917
approvals_pending = notifychangeproperty(dbus.Boolean,
918
"ApprovalPending",
919
type_func = bool)
920
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
921
last_enabled = notifychangeproperty(datetime_to_dbus,
922
"LastEnabled")
923
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
924
type_func = lambda checker:
925
checker is not None)
926
last_checked_ok = notifychangeproperty(datetime_to_dbus,
927
"LastCheckedOK")
928
last_approval_request = notifychangeproperty(
929
datetime_to_dbus, "LastApprovalRequest")
930
approved_by_default = notifychangeproperty(dbus.Boolean,
931
"ApprovedByDefault")
932
approval_delay = notifychangeproperty(dbus.UInt16,
933
"ApprovalDelay",
934
type_func =
935
_timedelta_to_milliseconds)
936
approval_duration = notifychangeproperty(
937
dbus.UInt16, "ApprovalDuration",
938
type_func = _timedelta_to_milliseconds)
939
host = notifychangeproperty(dbus.String, "Host")
940
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
941
type_func =
942
_timedelta_to_milliseconds)
943
extended_timeout = notifychangeproperty(
944
dbus.UInt16, "ExtendedTimeout",
945
type_func = _timedelta_to_milliseconds)
946
interval = notifychangeproperty(dbus.UInt16,
947
"Interval",
948
type_func =
949
_timedelta_to_milliseconds)
950
checker_command = notifychangeproperty(dbus.String, "Checker")
951
952
del notifychangeproperty
953
954
def __del__(self, *args, **kwargs):
955
try:
956
self.remove_from_connection()
957
except LookupError:
958
pass
959
if hasattr(DBusObjectWithProperties, "__del__"):
960
DBusObjectWithProperties.__del__(self, *args, **kwargs)
961
Client.__del__(self, *args, **kwargs)
962
963
def checker_callback(self, pid, condition, command,
964
*args, **kwargs):
965
self.checker_callback_tag = None
966
self.checker = None
967
if os.WIFEXITED(condition):
968
exitstatus = os.WEXITSTATUS(condition)
969
# Emit D-Bus signal
970
self.CheckerCompleted(dbus.Int16(exitstatus),
971
dbus.Int64(condition),
972
dbus.String(command))
973
else:
974
# Emit D-Bus signal
975
self.CheckerCompleted(dbus.Int16(-1),
976
dbus.Int64(condition),
977
dbus.String(command))
978
979
return Client.checker_callback(self, pid, condition, command,
980
*args, **kwargs)
981
982
def start_checker(self, *args, **kwargs):
983
old_checker = self.checker
984
if self.checker is not None:
985
old_checker_pid = self.checker.pid
986
else:
987
old_checker_pid = None
988
r = Client.start_checker(self, *args, **kwargs)
989
# Only if new checker process was started
990
if (self.checker is not None
991
and old_checker_pid != self.checker.pid):
992
# Emit D-Bus signal
993
self.CheckerStarted(self.current_checker_command)
994
return r
995
996
def _reset_approved(self):
997
self._approved = None
998
return False
999
1000
def approve(self, value=True):
1001
self.send_changedstate()
1002
self._approved = value
1003
gobject.timeout_add(_timedelta_to_milliseconds
1004
(self.approval_duration),
1005
self._reset_approved)
1006
1007
1008
## D-Bus methods, signals & properties
1009
_interface = "se.recompile.Mandos.Client"
1010
1011
## Signals
479
1012
480
1013
# CheckerCompleted - signal
481
1014
@dbus.service.signal(_interface, signature="nxs")
489
1022
"D-Bus signal"
490
1023
pass
491
1024
492
# GetAllProperties - method
493
@dbus.service.method(_interface, out_signature="a{sv}")
494
def GetAllProperties(self):
495
"D-Bus method"
496
return dbus.Dictionary({
497
dbus.String("name"):
498
dbus.String(self.name, variant_level=1),
499
dbus.String("fingerprint"):
500
dbus.String(self.fingerprint, variant_level=1),
501
dbus.String("host"):
502
dbus.String(self.host, variant_level=1),
503
dbus.String("created"):
504
_datetime_to_dbus(self.created, variant_level=1),
505
dbus.String("last_enabled"):
506
(_datetime_to_dbus(self.last_enabled,
507
variant_level=1)
508
if self.last_enabled is not None
509
else dbus.Boolean(False, variant_level=1)),
510
dbus.String("enabled"):
511
dbus.Boolean(self.enabled, variant_level=1),
512
dbus.String("last_checked_ok"):
513
(_datetime_to_dbus(self.last_checked_ok,
514
variant_level=1)
515
if self.last_checked_ok is not None
516
else dbus.Boolean (False, variant_level=1)),
517
dbus.String("timeout"):
518
dbus.UInt64(self.timeout_milliseconds(),
519
variant_level=1),
520
dbus.String("interval"):
521
dbus.UInt64(self.interval_milliseconds(),
522
variant_level=1),
523
dbus.String("checker"):
524
dbus.String(self.checker_command,
525
variant_level=1),
526
dbus.String("checker_running"):
527
dbus.Boolean(self.checker is not None,
528
variant_level=1),
529
dbus.String("object_path"):
530
dbus.ObjectPath(self.dbus_object_path,
531
variant_level=1)
532
}, signature="sv")
533
534
# IsStillValid - method
535
IsStillValid = (dbus.service.method(_interface, out_signature="b")
536
(still_valid))
537
IsStillValid.__name__ = "IsStillValid"
538
539
1025
# PropertyChanged - signal
540
1026
@dbus.service.signal(_interface, signature="sv")
541
1027
def PropertyChanged(self, property, value):
542
1028
"D-Bus signal"
543
1029
pass
544
1030
545
# SetChecker - method
546
@dbus.service.method(_interface, in_signature="s")
547
def SetChecker(self, checker):
548
"D-Bus setter method"
549
self.checker_command = checker
550
# Emit D-Bus signal
551
self.PropertyChanged(dbus.String(u"checker"),
552
dbus.String(self.checker_command,
553
variant_level=1))
554
555
# SetHost - method
556
@dbus.service.method(_interface, in_signature="s")
557
def SetHost(self, host):
558
"D-Bus setter method"
559
self.host = host
560
# Emit D-Bus signal
561
self.PropertyChanged(dbus.String(u"host"),
562
dbus.String(self.host, variant_level=1))
563
564
# SetInterval - method
565
@dbus.service.method(_interface, in_signature="t")
566
def SetInterval(self, milliseconds):
567
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
568
# Emit D-Bus signal
569
self.PropertyChanged(dbus.String(u"interval"),
570
(dbus.UInt64(self.interval_milliseconds(),
571
variant_level=1)))
572
573
# SetSecret - method
574
@dbus.service.method(_interface, in_signature="ay",
575
byte_arrays=True)
576
def SetSecret(self, secret):
577
"D-Bus setter method"
578
self.secret = str(secret)
579
580
# SetTimeout - method
581
@dbus.service.method(_interface, in_signature="t")
582
def SetTimeout(self, milliseconds):
583
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
584
# Emit D-Bus signal
585
self.PropertyChanged(dbus.String(u"timeout"),
586
(dbus.UInt64(self.timeout_milliseconds(),
587
variant_level=1)))
1031
# GotSecret - signal
1032
@dbus.service.signal(_interface)
1033
def GotSecret(self):
1034
"""D-Bus signal
1035
Is sent after a successful transfer of secret from the Mandos
1036
server to mandos-client
1037
"""
1038
pass
1039
1040
# Rejected - signal
1041
@dbus.service.signal(_interface, signature="s")
1042
def Rejected(self, reason):
1043
"D-Bus signal"
1044
pass
1045
1046
# NeedApproval - signal
1047
@dbus.service.signal(_interface, signature="tb")
1048
def NeedApproval(self, timeout, default):
1049
"D-Bus signal"
1050
return self.need_approval()
1051
1052
## Methods
1053
1054
# Approve - method
1055
@dbus.service.method(_interface, in_signature="b")
1056
def Approve(self, value):
1057
self.approve(value)
1058
1059
# CheckedOK - method
1060
@dbus.service.method(_interface)
1061
def CheckedOK(self):
1062
self.checked_ok()
588
1063
589
1064
# Enable - method
590
Enable = dbus.service.method(_interface)(enable)
591
Enable.__name__ = "Enable"
1065
@dbus.service.method(_interface)
1066
def Enable(self):
1067
"D-Bus method"
1068
self.enable()
592
1069
593
1070
# StartChecker - method
594
1071
@dbus.service.method(_interface)
603
1080
self.disable()
604
1081
605
1082
# StopChecker - method
606
StopChecker = dbus.service.method(_interface)(stop_checker)
607
StopChecker.__name__ = "StopChecker"
1083
@dbus.service.method(_interface)
1084
def StopChecker(self):
1085
self.stop_checker()
1086
1087
## Properties
1088
1089
# ApprovalPending - property
1090
@dbus_service_property(_interface, signature="b", access="read")
1091
def ApprovalPending_dbus_property(self):
1092
return dbus.Boolean(bool(self.approvals_pending))
1093
1094
# ApprovedByDefault - property
1095
@dbus_service_property(_interface, signature="b",
1096
access="readwrite")
1097
def ApprovedByDefault_dbus_property(self, value=None):
1098
if value is None: # get
1099
return dbus.Boolean(self.approved_by_default)
1100
self.approved_by_default = bool(value)
1101
1102
# ApprovalDelay - property
1103
@dbus_service_property(_interface, signature="t",
1104
access="readwrite")
1105
def ApprovalDelay_dbus_property(self, value=None):
1106
if value is None: # get
1107
return dbus.UInt64(self.approval_delay_milliseconds())
1108
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1109
1110
# ApprovalDuration - property
1111
@dbus_service_property(_interface, signature="t",
1112
access="readwrite")
1113
def ApprovalDuration_dbus_property(self, value=None):
1114
if value is None: # get
1115
return dbus.UInt64(_timedelta_to_milliseconds(
1116
self.approval_duration))
1117
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1118
1119
# Name - property
1120
@dbus_service_property(_interface, signature="s", access="read")
1121
def Name_dbus_property(self):
1122
return dbus.String(self.name)
1123
1124
# Fingerprint - property
1125
@dbus_service_property(_interface, signature="s", access="read")
1126
def Fingerprint_dbus_property(self):
1127
return dbus.String(self.fingerprint)
1128
1129
# Host - property
1130
@dbus_service_property(_interface, signature="s",
1131
access="readwrite")
1132
def Host_dbus_property(self, value=None):
1133
if value is None: # get
1134
return dbus.String(self.host)
1135
self.host = value
1136
1137
# Created - property
1138
@dbus_service_property(_interface, signature="s", access="read")
1139
def Created_dbus_property(self):
1140
return dbus.String(datetime_to_dbus(self.created))
1141
1142
# LastEnabled - property
1143
@dbus_service_property(_interface, signature="s", access="read")
1144
def LastEnabled_dbus_property(self):
1145
return datetime_to_dbus(self.last_enabled)
1146
1147
# Enabled - property
1148
@dbus_service_property(_interface, signature="b",
1149
access="readwrite")
1150
def Enabled_dbus_property(self, value=None):
1151
if value is None: # get
1152
return dbus.Boolean(self.enabled)
1153
if value:
1154
self.enable()
1155
else:
1156
self.disable()
1157
1158
# LastCheckedOK - property
1159
@dbus_service_property(_interface, signature="s",
1160
access="readwrite")
1161
def LastCheckedOK_dbus_property(self, value=None):
1162
if value is not None:
1163
self.checked_ok()
1164
return
1165
return datetime_to_dbus(self.last_checked_ok)
1166
1167
# Expires - property
1168
@dbus_service_property(_interface, signature="s", access="read")
1169
def Expires_dbus_property(self):
1170
return datetime_to_dbus(self.expires)
1171
1172
# LastApprovalRequest - property
1173
@dbus_service_property(_interface, signature="s", access="read")
1174
def LastApprovalRequest_dbus_property(self):
1175
return datetime_to_dbus(self.last_approval_request)
1176
1177
# Timeout - property
1178
@dbus_service_property(_interface, signature="t",
1179
access="readwrite")
1180
def Timeout_dbus_property(self, value=None):
1181
if value is None: # get
1182
return dbus.UInt64(self.timeout_milliseconds())
1183
self.timeout = datetime.timedelta(0, 0, 0, value)
1184
if getattr(self, "disable_initiator_tag", None) is None:
1185
return
1186
# Reschedule timeout
1187
gobject.source_remove(self.disable_initiator_tag)
1188
self.disable_initiator_tag = None
1189
self.expires = None
1190
time_to_die = (self.
1191
_timedelta_to_milliseconds((self
1192
.last_checked_ok
1193
+ self.timeout)
1194
- datetime.datetime
1195
.utcnow()))
1196
if time_to_die <= 0:
1197
# The timeout has passed
1198
self.disable()
1199
else:
1200
self.expires = (datetime.datetime.utcnow()
1201
+ datetime.timedelta(milliseconds =
1202
time_to_die))
1203
self.disable_initiator_tag = (gobject.timeout_add
1204
(time_to_die, self.disable))
1205
1206
# ExtendedTimeout - property
1207
@dbus_service_property(_interface, signature="t",
1208
access="readwrite")
1209
def ExtendedTimeout_dbus_property(self, value=None):
1210
if value is None: # get
1211
return dbus.UInt64(self.extended_timeout_milliseconds())
1212
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1213
1214
# Interval - property
1215
@dbus_service_property(_interface, signature="t",
1216
access="readwrite")
1217
def Interval_dbus_property(self, value=None):
1218
if value is None: # get
1219
return dbus.UInt64(self.interval_milliseconds())
1220
self.interval = datetime.timedelta(0, 0, 0, value)
1221
if getattr(self, "checker_initiator_tag", None) is None:
1222
return
1223
# Reschedule checker run
1224
gobject.source_remove(self.checker_initiator_tag)
1225
self.checker_initiator_tag = (gobject.timeout_add
1226
(value, self.start_checker))
1227
self.start_checker() # Start one now, too
1228
1229
# Checker - property
1230
@dbus_service_property(_interface, signature="s",
1231
access="readwrite")
1232
def Checker_dbus_property(self, value=None):
1233
if value is None: # get
1234
return dbus.String(self.checker_command)
1235
self.checker_command = value
1236
1237
# CheckerRunning - property
1238
@dbus_service_property(_interface, signature="b",
1239
access="readwrite")
1240
def CheckerRunning_dbus_property(self, value=None):
1241
if value is None: # get
1242
return dbus.Boolean(self.checker is not None)
1243
if value:
1244
self.start_checker()
1245
else:
1246
self.stop_checker()
1247
1248
# ObjectPath - property
1249
@dbus_service_property(_interface, signature="o", access="read")
1250
def ObjectPath_dbus_property(self):
1251
return self.dbus_object_path # is already a dbus.ObjectPath
1252
1253
# Secret = property
1254
@dbus_service_property(_interface, signature="ay",
1255
access="write", byte_arrays=True)
1256
def Secret_dbus_property(self, value):
1257
self.secret = str(value)
608
1258
609
1259
del _interface
610
1260
611
1261
612
def peer_certificate(session):
613
"Return the peer's OpenPGP certificate as a bytestring"
614
# If not an OpenPGP certificate...
615
if (gnutls.library.functions
616
.gnutls_certificate_type_get(session._c_object)
617
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
618
# ...do the normal thing
619
return session.peer_certificate
620
list_size = ctypes.c_uint(1)
621
cert_list = (gnutls.library.functions
622
.gnutls_certificate_get_peers
623
(session._c_object, ctypes.byref(list_size)))
624
if not bool(cert_list) and list_size.value != 0:
625
raise gnutls.errors.GNUTLSError("error getting peer"
626
" certificate")
627
if list_size.value == 0:
628
return None
629
cert = cert_list[0]
630
return ctypes.string_at(cert.data, cert.size)
631
632
633
def fingerprint(openpgp):
634
"Convert an OpenPGP bytestring to a hexdigit fingerprint string"
635
# New GnuTLS "datum" with the OpenPGP public key
636
datum = (gnutls.library.types
637
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
638
ctypes.POINTER
639
(ctypes.c_ubyte)),
640
ctypes.c_uint(len(openpgp))))
641
# New empty GnuTLS certificate
642
crt = gnutls.library.types.gnutls_openpgp_crt_t()
643
(gnutls.library.functions
644
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
645
# Import the OpenPGP public key into the certificate
646
(gnutls.library.functions
647
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
648
gnutls.library.constants
649
.GNUTLS_OPENPGP_FMT_RAW))
650
# Verify the self signature in the key
651
crtverify = ctypes.c_uint()
652
(gnutls.library.functions
653
.gnutls_openpgp_crt_verify_self(crt, 0, ctypes.byref(crtverify)))
654
if crtverify.value != 0:
655
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
656
raise gnutls.errors.CertificateSecurityError("Verify failed")
657
# New buffer for the fingerprint
658
buf = ctypes.create_string_buffer(20)
659
buf_len = ctypes.c_size_t()
660
# Get the fingerprint from the certificate into the buffer
661
(gnutls.library.functions
662
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
663
ctypes.byref(buf_len)))
664
# Deinit the certificate
665
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
666
# Convert the buffer to a Python bytestring
667
fpr = ctypes.string_at(buf, buf_len.value)
668
# Convert the bytestring to hexadecimal notation
669
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
670
return hex_fpr
671
672
673
class TCP_handler(SocketServer.BaseRequestHandler, object):
674
"""A TCP request handler class.
675
Instantiated by IPv6_TCPServer for each request to handle it.
1262
class ProxyClient(object):
1263
def __init__(self, child_pipe, fpr, address):
1264
self._pipe = child_pipe
1265
self._pipe.send(('init', fpr, address))
1266
if not self._pipe.recv():
1267
raise KeyError()
1268
1269
def __getattribute__(self, name):
1270
if(name == '_pipe'):
1271
return super(ProxyClient, self).__getattribute__(name)
1272
self._pipe.send(('getattr', name))
1273
data = self._pipe.recv()
1274
if data[0] == 'data':
1275
return data[1]
1276
if data[0] == 'function':
1277
def func(*args, **kwargs):
1278
self._pipe.send(('funcall', name, args, kwargs))
1279
return self._pipe.recv()[1]
1280
return func
1281
1282
def __setattr__(self, name, value):
1283
if(name == '_pipe'):
1284
return super(ProxyClient, self).__setattr__(name, value)
1285
self._pipe.send(('setattr', name, value))
1286
1287
class ClientDBusTransitional(ClientDBus):
1288
__metaclass__ = AlternateDBusNamesMetaclass
1289
1290
class ClientHandler(socketserver.BaseRequestHandler, object):
1291
"""A class to handle client connections.
1292
1293
Instantiated once for each connection to handle it.
676
1294
Note: This will run in its own forked process."""
677
1295
678
1296
def handle(self):
679
logger.info(u"TCP connection from: %s",
680
unicode(self.client_address))
681
logger.debug(u"Pipe: %d", self.server.pipe[1])
682
# Open IPC pipe to parent process
683
with closing(os.fdopen(self.server.pipe[1], "w", 1)) as ipc:
1297
with contextlib.closing(self.server.child_pipe) as child_pipe:
1298
logger.info("TCP connection from: %s",
1299
unicode(self.client_address))
1300
logger.debug("Pipe FD: %d",
1301
self.server.child_pipe.fileno())
1302
684
1303
session = (gnutls.connection
685
1304
.ClientSession(self.request,
686
1305
gnutls.connection
687
1306
.X509Credentials()))
688
1307
689
line = self.request.makefile().readline()
690
logger.debug(u"Protocol version: %r", line)
691
try:
692
if int(line.strip().split()[0]) > 1:
693
raise RuntimeError
694
except (ValueError, IndexError, RuntimeError), error:
695
logger.error(u"Unknown protocol version: %s", error)
696
return
697
698
1308
# Note: gnutls.connection.X509Credentials is really a
699
1309
# generic GnuTLS certificate credentials object so long as
700
1310
# no X.509 keys are added to it. Therefore, we can use it
701
1311
# here despite using OpenPGP certificates.
702
1312
703
1313
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
704
# "+AES-256-CBC", "+SHA1",
705
# "+COMP-NULL", "+CTYPE-OPENPGP",
706
# "+DHE-DSS"))
1314
# "+AES-256-CBC", "+SHA1",
1315
# "+COMP-NULL", "+CTYPE-OPENPGP",
1316
# "+DHE-DSS"))
707
1317
# Use a fallback default, since this MUST be set.
708
priority = self.server.settings.get("priority", "NORMAL")
1318
priority = self.server.gnutls_priority
1319
if priority is None:
1320
priority = "NORMAL"
709
1321
(gnutls.library.functions
710
1322
.gnutls_priority_set_direct(session._c_object,
711
1323
priority, None))
712
1324
1325
# Start communication using the Mandos protocol
1326
# Get protocol number
1327
line = self.request.makefile().readline()
1328
logger.debug("Protocol version: %r", line)
1329
try:
1330
if int(line.strip().split()[0]) > 1:
1331
raise RuntimeError
1332
except (ValueError, IndexError, RuntimeError) as error:
1333
logger.error("Unknown protocol version: %s", error)
1334
return
1335
1336
# Start GnuTLS connection
713
1337
try:
714
1338
session.handshake()
715
except gnutls.errors.GNUTLSError, error:
716
logger.warning(u"Handshake failed: %s", error)
1339
except gnutls.errors.GNUTLSError as error:
1340
logger.warning("Handshake failed: %s", error)
717
1341
# Do not run session.bye() here: the session is not
718
1342
# established. Just abandon the request.
719
1343
return
720
logger.debug(u"Handshake succeeded")
1344
logger.debug("Handshake succeeded")
1345
1346
approval_required = False
721
1347
try:
722
fpr = fingerprint(peer_certificate(session))
723
except (TypeError, gnutls.errors.GNUTLSError), error:
724
logger.warning(u"Bad certificate: %s", error)
725
session.bye()
726
return
727
logger.debug(u"Fingerprint: %s", fpr)
1348
try:
1349
fpr = self.fingerprint(self.peer_certificate
1350
(session))
1351
except (TypeError,
1352
gnutls.errors.GNUTLSError) as error:
1353
logger.warning("Bad certificate: %s", error)
1354
return
1355
logger.debug("Fingerprint: %s", fpr)
1356
1357
try:
1358
client = ProxyClient(child_pipe, fpr,
1359
self.client_address)
1360
except KeyError:
1361
return
1362
1363
if client.approval_delay:
1364
delay = client.approval_delay
1365
client.approvals_pending += 1
1366
approval_required = True
1367
1368
while True:
1369
if not client.enabled:
1370
logger.info("Client %s is disabled",
1371
client.name)
1372
if self.server.use_dbus:
1373
# Emit D-Bus signal
1374
client.Rejected("Disabled")
1375
return
1376
1377
if client._approved or not client.approval_delay:
1378
#We are approved or approval is disabled
1379
break
1380
elif client._approved is None:
1381
logger.info("Client %s needs approval",
1382
client.name)
1383
if self.server.use_dbus:
1384
# Emit D-Bus signal
1385
client.NeedApproval(
1386
client.approval_delay_milliseconds(),
1387
client.approved_by_default)
1388
else:
1389
logger.warning("Client %s was not approved",
1390
client.name)
1391
if self.server.use_dbus:
1392
# Emit D-Bus signal
1393
client.Rejected("Denied")
1394
return
1395
1396
#wait until timeout or approved
1397
time = datetime.datetime.now()
1398
client.changedstate.acquire()
1399
(client.changedstate.wait
1400
(float(client._timedelta_to_milliseconds(delay)
1401
/ 1000)))
1402
client.changedstate.release()
1403
time2 = datetime.datetime.now()
1404
if (time2 - time) >= delay:
1405
if not client.approved_by_default:
1406
logger.warning("Client %s timed out while"
1407
" waiting for approval",
1408
client.name)
1409
if self.server.use_dbus:
1410
# Emit D-Bus signal
1411
client.Rejected("Approval timed out")
1412
return
1413
else:
1414
break
1415
else:
1416
delay -= time2 - time
1417
1418
sent_size = 0
1419
while sent_size < len(client.secret):
1420
try:
1421
sent = session.send(client.secret[sent_size:])
1422
except gnutls.errors.GNUTLSError as error:
1423
logger.warning("gnutls send failed")
1424
return
1425
logger.debug("Sent: %d, remaining: %d",
1426
sent, len(client.secret)
1427
- (sent_size + sent))
1428
sent_size += sent
1429
1430
logger.info("Sending secret to %s", client.name)
1431
# bump the timeout using extended_timeout
1432
client.checked_ok(client.extended_timeout)
1433
if self.server.use_dbus:
1434
# Emit D-Bus signal
1435
client.GotSecret()
728
1436
729
for c in self.server.clients:
730
if c.fingerprint == fpr:
731
client = c
732
break
733
else:
734
logger.warning(u"Client not found for fingerprint: %s",
735
fpr)
736
ipc.write("NOTFOUND %s\n" % fpr)
737
session.bye()
738
return
739
# Have to check if client.still_valid(), since it is
740
# possible that the client timed out while establishing
741
# the GnuTLS session.
742
if not client.still_valid():
743
logger.warning(u"Client %(name)s is invalid",
744
vars(client))
745
ipc.write("INVALID %s\n" % client.name)
746
session.bye()
747
return
748
ipc.write("SENDING %s\n" % client.name)
749
sent_size = 0
750
while sent_size < len(client.secret):
751
sent = session.send(client.secret[sent_size:])
752
logger.debug(u"Sent: %d, remaining: %d",
753
sent, len(client.secret)
754
- (sent_size + sent))
755
sent_size += sent
756
session.bye()
757
758
759
class ForkingMixInWithPipe(SocketServer.ForkingMixIn, object):
760
"""Like SocketServer.ForkingMixIn, but also pass a pipe.
761
Assumes a gobject.MainLoop event loop.
762
"""
1437
finally:
1438
if approval_required:
1439
client.approvals_pending -= 1
1440
try:
1441
session.bye()
1442
except gnutls.errors.GNUTLSError as error:
1443
logger.warning("GnuTLS bye failed")
1444
1445
@staticmethod
1446
def peer_certificate(session):
1447
"Return the peer's OpenPGP certificate as a bytestring"
1448
# If not an OpenPGP certificate...
1449
if (gnutls.library.functions
1450
.gnutls_certificate_type_get(session._c_object)
1451
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1452
# ...do the normal thing
1453
return session.peer_certificate
1454
list_size = ctypes.c_uint(1)
1455
cert_list = (gnutls.library.functions
1456
.gnutls_certificate_get_peers
1457
(session._c_object, ctypes.byref(list_size)))
1458
if not bool(cert_list) and list_size.value != 0:
1459
raise gnutls.errors.GNUTLSError("error getting peer"
1460
" certificate")
1461
if list_size.value == 0:
1462
return None
1463
cert = cert_list[0]
1464
return ctypes.string_at(cert.data, cert.size)
1465
1466
@staticmethod
1467
def fingerprint(openpgp):
1468
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1469
# New GnuTLS "datum" with the OpenPGP public key
1470
datum = (gnutls.library.types
1471
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1472
ctypes.POINTER
1473
(ctypes.c_ubyte)),
1474
ctypes.c_uint(len(openpgp))))
1475
# New empty GnuTLS certificate
1476
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1477
(gnutls.library.functions
1478
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1479
# Import the OpenPGP public key into the certificate
1480
(gnutls.library.functions
1481
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1482
gnutls.library.constants
1483
.GNUTLS_OPENPGP_FMT_RAW))
1484
# Verify the self signature in the key
1485
crtverify = ctypes.c_uint()
1486
(gnutls.library.functions
1487
.gnutls_openpgp_crt_verify_self(crt, 0,
1488
ctypes.byref(crtverify)))
1489
if crtverify.value != 0:
1490
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1491
raise (gnutls.errors.CertificateSecurityError
1492
("Verify failed"))
1493
# New buffer for the fingerprint
1494
buf = ctypes.create_string_buffer(20)
1495
buf_len = ctypes.c_size_t()
1496
# Get the fingerprint from the certificate into the buffer
1497
(gnutls.library.functions
1498
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1499
ctypes.byref(buf_len)))
1500
# Deinit the certificate
1501
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1502
# Convert the buffer to a Python bytestring
1503
fpr = ctypes.string_at(buf, buf_len.value)
1504
# Convert the bytestring to hexadecimal notation
1505
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
1506
return hex_fpr
1507
1508
1509
class MultiprocessingMixIn(object):
1510
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1511
def sub_process_main(self, request, address):
1512
try:
1513
self.finish_request(request, address)
1514
except:
1515
self.handle_error(request, address)
1516
self.close_request(request)
1517
1518
def process_request(self, request, address):
1519
"""Start a new process to process the request."""
1520
proc = multiprocessing.Process(target = self.sub_process_main,
1521
args = (request,
1522
address))
1523
proc.start()
1524
return proc
1525
1526
1527
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1528
""" adds a pipe to the MixIn """
763
1529
def process_request(self, request, client_address):
764
"""This overrides and wraps the original process_request().
765
This function creates a new pipe in self.pipe
1530
"""Overrides and wraps the original process_request().
1531
1532
This function creates a new pipe in self.pipe
766
1533
"""
767
self.pipe = os.pipe()
768
super(ForkingMixInWithPipe,
769
self).process_request(request, client_address)
770
os.close(self.pipe[1]) # close write end
771
# Call "handle_ipc" for both data and EOF events
772
gobject.io_add_watch(self.pipe[0],
773
gobject.IO_IN | gobject.IO_HUP,
774
self.handle_ipc)
775
def handle_ipc(source, condition):
1534
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1535
1536
proc = MultiprocessingMixIn.process_request(self, request,
1537
client_address)
1538
self.child_pipe.close()
1539
self.add_pipe(parent_pipe, proc)
1540
1541
def add_pipe(self, parent_pipe, proc):
776
1542
"""Dummy function; override as necessary"""
777
os.close(source)
778
return False
779
780
781
class IPv6_TCPServer(ForkingMixInWithPipe,
782
SocketServer.TCPServer, object):
1543
raise NotImplementedError
1544
1545
1546
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1547
socketserver.TCPServer, object):
783
1548
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
1549
784
1550
Attributes:
785
settings: Server settings
786
clients: Set() of Client objects
787
1551
enabled: Boolean; whether this server is activated yet
1552
interface: None or a network interface name (string)
1553
use_ipv6: Boolean; to use IPv6 or not
788
1554
"""
789
address_family = socket.AF_INET6
790
def __init__(self, *args, **kwargs):
791
if "settings" in kwargs:
792
self.settings = kwargs["settings"]
793
del kwargs["settings"]
794
if "clients" in kwargs:
795
self.clients = kwargs["clients"]
796
del kwargs["clients"]
797
if "use_ipv6" in kwargs:
798
if not kwargs["use_ipv6"]:
799
self.address_family = socket.AF_INET
800
del kwargs["use_ipv6"]
801
self.enabled = False
802
super(IPv6_TCPServer, self).__init__(*args, **kwargs)
1555
def __init__(self, server_address, RequestHandlerClass,
1556
interface=None, use_ipv6=True):
1557
self.interface = interface
1558
if use_ipv6:
1559
self.address_family = socket.AF_INET6
1560
socketserver.TCPServer.__init__(self, server_address,
1561
RequestHandlerClass)
803
1562
def server_bind(self):
804
1563
"""This overrides the normal server_bind() function
805
1564
to bind to an interface if one was specified, and also NOT to
806
1565
bind to an address or port if they were not specified."""
807
if self.settings["interface"]:
808
# 25 is from /usr/include/asm-i486/socket.h
809
SO_BINDTODEVICE = getattr(socket, "SO_BINDTODEVICE", 25)
810
try:
811
self.socket.setsockopt(socket.SOL_SOCKET,
812
SO_BINDTODEVICE,
813
self.settings["interface"])
814
except socket.error, error:
815
if error[0] == errno.EPERM:
816
logger.error(u"No permission to"
817
u" bind to interface %s",
818
self.settings["interface"])
819
else:
820
raise
1566
if self.interface is not None:
1567
if SO_BINDTODEVICE is None:
1568
logger.error("SO_BINDTODEVICE does not exist;"
1569
" cannot bind to interface %s",
1570
self.interface)
1571
else:
1572
try:
1573
self.socket.setsockopt(socket.SOL_SOCKET,
1574
SO_BINDTODEVICE,
1575
str(self.interface
1576
+ '\0'))
1577
except socket.error as error:
1578
if error[0] == errno.EPERM:
1579
logger.error("No permission to"
1580
" bind to interface %s",
1581
self.interface)
1582
elif error[0] == errno.ENOPROTOOPT:
1583
logger.error("SO_BINDTODEVICE not available;"
1584
" cannot bind to interface %s",
1585
self.interface)
1586
else:
1587
raise
821
1588
# Only bind(2) the socket if we really need to.
822
1589
if self.server_address[0] or self.server_address[1]:
823
1590
if not self.server_address[0]:
830
1597
elif not self.server_address[1]:
831
1598
self.server_address = (self.server_address[0],
832
1599
0)
833
# if self.settings["interface"]:
1600
# if self.interface:
834
1601
# self.server_address = (self.server_address[0],
835
1602
# 0, # port
836
1603
# 0, # flowinfo
837
1604
# if_nametoindex
838
# (self.settings
839
# ["interface"]))
840
return super(IPv6_TCPServer, self).server_bind()
1605
# (self.interface))
1606
return socketserver.TCPServer.server_bind(self)
1607
1608
1609
class MandosServer(IPv6_TCPServer):
1610
"""Mandos server.
1611
1612
Attributes:
1613
clients: set of Client objects
1614
gnutls_priority GnuTLS priority string
1615
use_dbus: Boolean; to emit D-Bus signals or not
1616
1617
Assumes a gobject.MainLoop event loop.
1618
"""
1619
def __init__(self, server_address, RequestHandlerClass,
1620
interface=None, use_ipv6=True, clients=None,
1621
gnutls_priority=None, use_dbus=True):
1622
self.enabled = False
1623
self.clients = clients
1624
if self.clients is None:
1625
self.clients = set()
1626
self.use_dbus = use_dbus
1627
self.gnutls_priority = gnutls_priority
1628
IPv6_TCPServer.__init__(self, server_address,
1629
RequestHandlerClass,
1630
interface = interface,
1631
use_ipv6 = use_ipv6)
841
1632
def server_activate(self):
842
1633
if self.enabled:
843
return super(IPv6_TCPServer, self).server_activate()
1634
return socketserver.TCPServer.server_activate(self)
1635
844
1636
def enable(self):
845
1637
self.enabled = True
846
def handle_ipc(self, source, condition, file_objects={}):
847
logger.debug("Handling IPC: %r : %r", source, condition)
848
849
# Turn a file descriptor into a Python file object
850
if source not in file_objects:
851
file_objects[source] = os.fdopen(source, "r", 1)
852
853
# Read a line from the file object
854
cmdline = file_objects[source].readline()
855
if not cmdline: # Empty line means end of file
856
# close the IPC pipe
857
logger.debug("Closing: %r", source)
858
file_objects[source].close()
859
del file_objects[source]
860
861
# Stop calling this function
862
return False
863
864
logger.debug("IPC command: %r\n" % cmdline)
865
866
# Parse and act on command
867
cmd, args = cmdline.split(None, 1)
868
if cmd == "NOTFOUND":
869
pass # xxx
870
elif cmd == "INVALID":
871
pass # xxx
872
elif cmd == "SENDING":
873
pass # xxx
874
# client.checked_ok()
875
else:
876
logger.error("Unknown IPC command: %r", cmdline)
877
878
# Keep calling this function
1638
1639
def add_pipe(self, parent_pipe, proc):
1640
# Call "handle_ipc" for both data and EOF events
1641
gobject.io_add_watch(parent_pipe.fileno(),
1642
gobject.IO_IN | gobject.IO_HUP,
1643
functools.partial(self.handle_ipc,
1644
parent_pipe =
1645
parent_pipe,
1646
proc = proc))
1647
1648
def handle_ipc(self, source, condition, parent_pipe=None,
1649
proc = None, client_object=None):
1650
condition_names = {
1651
gobject.IO_IN: "IN", # There is data to read.
1652
gobject.IO_OUT: "OUT", # Data can be written (without
1653
# blocking).
1654
gobject.IO_PRI: "PRI", # There is urgent data to read.
1655
gobject.IO_ERR: "ERR", # Error condition.
1656
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1657
# broken, usually for pipes and
1658
# sockets).
1659
}
1660
conditions_string = ' | '.join(name
1661
for cond, name in
1662
condition_names.iteritems()
1663
if cond & condition)
1664
# error, or the other end of multiprocessing.Pipe has closed
1665
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1666
# Wait for other process to exit
1667
proc.join()
1668
return False
1669
1670
# Read a request from the child
1671
request = parent_pipe.recv()
1672
command = request[0]
1673
1674
if command == 'init':
1675
fpr = request[1]
1676
address = request[2]
1677
1678
for c in self.clients:
1679
if c.fingerprint == fpr:
1680
client = c
1681
break
1682
else:
1683
logger.info("Client not found for fingerprint: %s, ad"
1684
"dress: %s", fpr, address)
1685
if self.use_dbus:
1686
# Emit D-Bus signal
1687
mandos_dbus_service.ClientNotFound(fpr,
1688
address[0])
1689
parent_pipe.send(False)
1690
return False
1691
1692
gobject.io_add_watch(parent_pipe.fileno(),
1693
gobject.IO_IN | gobject.IO_HUP,
1694
functools.partial(self.handle_ipc,
1695
parent_pipe =
1696
parent_pipe,
1697
proc = proc,
1698
client_object =
1699
client))
1700
parent_pipe.send(True)
1701
# remove the old hook in favor of the new above hook on
1702
# same fileno
1703
return False
1704
if command == 'funcall':
1705
funcname = request[1]
1706
args = request[2]
1707
kwargs = request[3]
1708
1709
parent_pipe.send(('data', getattr(client_object,
1710
funcname)(*args,
1711
**kwargs)))
1712
1713
if command == 'getattr':
1714
attrname = request[1]
1715
if callable(client_object.__getattribute__(attrname)):
1716
parent_pipe.send(('function',))
1717
else:
1718
parent_pipe.send(('data', client_object
1719
.__getattribute__(attrname)))
1720
1721
if command == 'setattr':
1722
attrname = request[1]
1723
value = request[2]
1724
setattr(client_object, attrname, value)
1725
879
1726
return True
880
1727
881
1728
890
1737
datetime.timedelta(0, 3600)
891
1738
>>> string_to_delta('24h')
892
1739
datetime.timedelta(1)
893
>>> string_to_delta(u'1w')
1740
>>> string_to_delta('1w')
894
1741
datetime.timedelta(7)
895
1742
>>> string_to_delta('5m 30s')
896
1743
datetime.timedelta(0, 330)
900
1747
try:
901
1748
suffix = unicode(s[-1])
902
1749
value = int(s[:-1])
903
if suffix == u"d":
1750
if suffix == "d":
904
1751
delta = datetime.timedelta(value)
905
elif suffix == u"s":
1752
elif suffix == "s":
906
1753
delta = datetime.timedelta(0, value)
907
elif suffix == u"m":
1754
elif suffix == "m":
908
1755
delta = datetime.timedelta(0, 0, 0, 0, value)
909
elif suffix == u"h":
1756
elif suffix == "h":
910
1757
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
911
elif suffix == u"w":
1758
elif suffix == "w":
912
1759
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
913
1760
else:
914
raise ValueError
915
except (ValueError, IndexError):
916
raise ValueError
1761
raise ValueError("Unknown suffix %r" % suffix)
1762
except (ValueError, IndexError) as e:
1763
raise ValueError(*(e.args))
917
1764
timevalue += delta
918
1765
return timevalue
919
1766
920
1767
921
def server_state_changed(state):
922
"""Derived from the Avahi example code"""
923
if state == avahi.SERVER_COLLISION:
924
logger.error(u"Zeroconf server name collision")
925
service.remove()
926
elif state == avahi.SERVER_RUNNING:
927
service.add()
928
929
930
def entry_group_state_changed(state, error):
931
"""Derived from the Avahi example code"""
932
logger.debug(u"Avahi state change: %i", state)
933
934
if state == avahi.ENTRY_GROUP_ESTABLISHED:
935
logger.debug(u"Zeroconf service established.")
936
elif state == avahi.ENTRY_GROUP_COLLISION:
937
logger.warning(u"Zeroconf service name collision.")
938
service.rename()
939
elif state == avahi.ENTRY_GROUP_FAILURE:
940
logger.critical(u"Avahi: Error in group state changed %s",
941
unicode(error))
942
raise AvahiGroupError(u"State changed: %s" % unicode(error))
943
944
1768
def if_nametoindex(interface):
945
"""Call the C function if_nametoindex(), or equivalent"""
1769
"""Call the C function if_nametoindex(), or equivalent
1770
1771
Note: This function cannot accept a unicode string."""
946
1772
global if_nametoindex
947
1773
try:
948
1774
if_nametoindex = (ctypes.cdll.LoadLibrary
949
1775
(ctypes.util.find_library("c"))
950
1776
.if_nametoindex)
951
1777
except (OSError, AttributeError):
952
if "struct" not in sys.modules:
953
import struct
954
if "fcntl" not in sys.modules:
955
import fcntl
1778
logger.warning("Doing if_nametoindex the hard way")
956
1779
def if_nametoindex(interface):
957
1780
"Get an interface index the hard way, i.e. using fcntl()"
958
1781
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
959
with closing(socket.socket()) as s:
1782
with contextlib.closing(socket.socket()) as s:
960
1783
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
961
struct.pack("16s16x", interface))
962
interface_index = struct.unpack("I", ifreq[16:20])[0]
1784
struct.pack(str("16s16x"),
1785
interface))
1786
interface_index = struct.unpack(str("I"),
1787
ifreq[16:20])[0]
963
1788
return interface_index
964
1789
return if_nametoindex(interface)
965
1790
966
1791
967
1792
def daemon(nochdir = False, noclose = False):
968
1793
"""See daemon(3). Standard BSD Unix function.
1794
969
1795
This should really exist as os.daemon, but it doesn't (yet)."""
970
1796
if os.fork():
971
1797
sys.exit()
979
1805
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
980
1806
if not stat.S_ISCHR(os.fstat(null).st_mode):
981
1807
raise OSError(errno.ENODEV,
982
"/dev/null not a character device")
1808
"%s not a character device"
1809
% os.path.devnull)
983
1810
os.dup2(null, sys.stdin.fileno())
984
1811
os.dup2(null, sys.stdout.fileno())
985
1812
os.dup2(null, sys.stderr.fileno())
988
1815
989
1816
990
1817
def main():
991
parser = optparse.OptionParser(version = "%%prog %s" % version)
992
parser.add_option("-i", "--interface", type="string",
993
metavar="IF", help="Bind to interface IF")
994
parser.add_option("-a", "--address", type="string",
995
help="Address to listen for requests on")
996
parser.add_option("-p", "--port", type="int",
997
help="Port number to receive requests on")
998
parser.add_option("--check", action="store_true",
999
help="Run self-test")
1000
parser.add_option("--debug", action="store_true",
1001
help="Debug mode; run in foreground and log to"
1002
" terminal")
1003
parser.add_option("--priority", type="string", help="GnuTLS"
1004
" priority string (see GnuTLS documentation)")
1005
parser.add_option("--servicename", type="string", metavar="NAME",
1006
help="Zeroconf service name")
1007
parser.add_option("--configdir", type="string",
1008
default="/etc/mandos", metavar="DIR",
1009
help="Directory to search for configuration"
1010
" files")
1011
parser.add_option("--no-dbus", action="store_false",
1012
dest="use_dbus",
1013
help="Do not provide D-Bus system bus"
1014
" interface")
1015
parser.add_option("--no-ipv6", action="store_false",
1016
dest="use_ipv6", help="Do not use IPv6")
1017
options = parser.parse_args()[0]
1818
1819
##################################################################
1820
# Parsing of options, both command line and config file
1821
1822
parser = argparse.ArgumentParser()
1823
parser.add_argument("-v", "--version", action="version",
1824
version = "%%(prog)s %s" % version,
1825
help="show version number and exit")
1826
parser.add_argument("-i", "--interface", metavar="IF",
1827
help="Bind to interface IF")
1828
parser.add_argument("-a", "--address",
1829
help="Address to listen for requests on")
1830
parser.add_argument("-p", "--port", type=int,
1831
help="Port number to receive requests on")
1832
parser.add_argument("--check", action="store_true",
1833
help="Run self-test")
1834
parser.add_argument("--debug", action="store_true",
1835
help="Debug mode; run in foreground and log"
1836
" to terminal")
1837
parser.add_argument("--debuglevel", metavar="LEVEL",
1838
help="Debug level for stdout output")
1839
parser.add_argument("--priority", help="GnuTLS"
1840
" priority string (see GnuTLS documentation)")
1841
parser.add_argument("--servicename",
1842
metavar="NAME", help="Zeroconf service name")
1843
parser.add_argument("--configdir",
1844
default="/etc/mandos", metavar="DIR",
1845
help="Directory to search for configuration"
1846
" files")
1847
parser.add_argument("--no-dbus", action="store_false",
1848
dest="use_dbus", help="Do not provide D-Bus"
1849
" system bus interface")
1850
parser.add_argument("--no-ipv6", action="store_false",
1851
dest="use_ipv6", help="Do not use IPv6")
1852
options = parser.parse_args()
1018
1853
1019
1854
if options.check:
1020
1855
import doctest
1031
1866
"servicename": "Mandos",
1032
1867
"use_dbus": "True",
1033
1868
"use_ipv6": "True",
1869
"debuglevel": "",
1034
1870
}
1035
1871
1036
1872
# Parse config file for server-global settings
1037
server_config = ConfigParser.SafeConfigParser(server_defaults)
1873
server_config = configparser.SafeConfigParser(server_defaults)
1038
1874
del server_defaults
1039
server_config.read(os.path.join(options.configdir, "mandos.conf"))
1875
server_config.read(os.path.join(options.configdir,
1876
"mandos.conf"))
1040
1877
# Convert the SafeConfigParser object to a dict
1041
1878
server_settings = server_config.defaults()
1042
1879
# Use the appropriate methods on the non-string config options
1043
server_settings["debug"] = server_config.getboolean("DEFAULT",
1044
"debug")
1045
server_settings["use_dbus"] = server_config.getboolean("DEFAULT",
1046
"use_dbus")
1047
server_settings["use_ipv6"] = server_config.getboolean("DEFAULT",
1048
"use_ipv6")
1880
for option in ("debug", "use_dbus", "use_ipv6"):
1881
server_settings[option] = server_config.getboolean("DEFAULT",
1882
option)
1049
1883
if server_settings["port"]:
1050
1884
server_settings["port"] = server_config.getint("DEFAULT",
1051
1885
"port")
1055
1889
# options, if set.
1056
1890
for option in ("interface", "address", "port", "debug",
1057
1891
"priority", "servicename", "configdir",
1058
"use_dbus", "use_ipv6"):
1892
"use_dbus", "use_ipv6", "debuglevel"):
1059
1893
value = getattr(options, option)
1060
1894
if value is not None:
1061
1895
server_settings[option] = value
1062
1896
del options
1897
# Force all strings to be unicode
1898
for option in server_settings.keys():
1899
if type(server_settings[option]) is str:
1900
server_settings[option] = unicode(server_settings[option])
1063
1901
# Now we have our good server settings in "server_settings"
1064
1902
1903
##################################################################
1904
1065
1905
# For convenience
1066
1906
debug = server_settings["debug"]
1907
debuglevel = server_settings["debuglevel"]
1067
1908
use_dbus = server_settings["use_dbus"]
1068
1909
use_ipv6 = server_settings["use_ipv6"]
1069
1910
1070
if not debug:
1071
syslogger.setLevel(logging.WARNING)
1072
console.setLevel(logging.WARNING)
1073
1074
1911
if server_settings["servicename"] != "Mandos":
1075
1912
syslogger.setFormatter(logging.Formatter
1076
('Mandos (%s): %%(levelname)s:'
1077
' %%(message)s'
1913
('Mandos (%s) [%%(process)d]:'
1914
' %%(levelname)s: %%(message)s'
1078
1915
% server_settings["servicename"]))
1079
1916
1080
1917
# Parse config file with clients
1081
client_defaults = { "timeout": "1h",
1082
"interval": "5m",
1918
client_defaults = { "timeout": "5m",
1919
"extended_timeout": "15m",
1920
"interval": "2m",
1083
1921
"checker": "fping -q -- %%(host)s",
1084
1922
"host": "",
1923
"approval_delay": "0s",
1924
"approval_duration": "1s",
1085
1925
}
1086
client_config = ConfigParser.SafeConfigParser(client_defaults)
1926
client_config = configparser.SafeConfigParser(client_defaults)
1087
1927
client_config.read(os.path.join(server_settings["configdir"],
1088
1928
"clients.conf"))
1089
1929
1090
clients = Set()
1091
tcp_server = IPv6_TCPServer((server_settings["address"],
1092
server_settings["port"]),
1093
TCP_handler,
1094
settings=server_settings,
1095
clients=clients, use_ipv6=use_ipv6)
1096
pidfilename = "/var/run/mandos.pid"
1097
try:
1098
pidfile = open(pidfilename, "w")
1099
except IOError:
1100
logger.error("Could not open file %r", pidfilename)
1930
global mandos_dbus_service
1931
mandos_dbus_service = None
1932
1933
tcp_server = MandosServer((server_settings["address"],
1934
server_settings["port"]),
1935
ClientHandler,
1936
interface=(server_settings["interface"]
1937
or None),
1938
use_ipv6=use_ipv6,
1939
gnutls_priority=
1940
server_settings["priority"],
1941
use_dbus=use_dbus)
1942
if not debug:
1943
pidfilename = "/var/run/mandos.pid"
1944
try:
1945
pidfile = open(pidfilename, "w")
1946
except IOError:
1947
logger.error("Could not open file %r", pidfilename)
1101
1948
1102
1949
try:
1103
1950
uid = pwd.getpwnam("_mandos").pw_uid
1109
1956
except KeyError:
1110
1957
try:
1111
1958
uid = pwd.getpwnam("nobody").pw_uid
1112
gid = pwd.getpwnam("nogroup").pw_gid
1959
gid = pwd.getpwnam("nobody").pw_gid
1113
1960
except KeyError:
1114
1961
uid = 65534
1115
1962
gid = 65534
1116
1963
try:
1117
1964
os.setgid(gid)
1118
1965
os.setuid(uid)
1119
except OSError, error:
1966
except OSError as error:
1120
1967
if error[0] != errno.EPERM:
1121
1968
raise error
1122
1969
1123
# Enable all possible GnuTLS debugging
1970
if not debug and not debuglevel:
1971
syslogger.setLevel(logging.WARNING)
1972
console.setLevel(logging.WARNING)
1973
if debuglevel:
1974
level = getattr(logging, debuglevel.upper())
1975
syslogger.setLevel(level)
1976
console.setLevel(level)
1977
1124
1978
if debug:
1979
# Enable all possible GnuTLS debugging
1980
1125
1981
# "Use a log level over 10 to enable all debugging options."
1126
1982
# - GnuTLS manual
1127
1983
gnutls.library.functions.gnutls_global_set_log_level(11)
1132
1988
1133
1989
(gnutls.library.functions
1134
1990
.gnutls_global_set_log_function(debug_gnutls))
1991
1992
# Redirect stdin so all checkers get /dev/null
1993
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1994
os.dup2(null, sys.stdin.fileno())
1995
if null > 2:
1996
os.close(null)
1997
else:
1998
# No console logging
1999
logger.removeHandler(console)
1135
2000
1136
global service
1137
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1138
service = AvahiService(name = server_settings["servicename"],
1139
servicetype = "_mandos._tcp",
1140
protocol = protocol)
1141
if server_settings["interface"]:
1142
service.interface = (if_nametoindex
1143
(server_settings["interface"]))
2001
# Need to fork before connecting to D-Bus
2002
if not debug:
2003
# Close all input and output, do double fork, etc.
2004
daemon()
1144
2005
1145
2006
global main_loop
1146
global bus
1147
global server
1148
2007
# From the Avahi example code
1149
2008
DBusGMainLoop(set_as_default=True )
1150
2009
main_loop = gobject.MainLoop()
1151
2010
bus = dbus.SystemBus()
1152
server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1153
avahi.DBUS_PATH_SERVER),
1154
avahi.DBUS_INTERFACE_SERVER)
1155
2011
# End of Avahi example code
1156
2012
if use_dbus:
1157
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
1158
1159
clients.update(Set(Client(name = section,
1160
config
1161
= dict(client_config.items(section)),
1162
use_dbus = use_dbus)
1163
for section in client_config.sections()))
1164
if not clients:
1165
logger.warning(u"No clients defined")
1166
1167
if debug:
1168
# Redirect stdin so all checkers get /dev/null
1169
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1170
os.dup2(null, sys.stdin.fileno())
1171
if null > 2:
1172
os.close(null)
1173
else:
1174
# No console logging
1175
logger.removeHandler(console)
1176
# Close all input and output, do double fork, etc.
1177
daemon()
1178
1179
try:
1180
pid = os.getpid()
1181
pidfile.write(str(pid) + "\n")
1182
pidfile.close()
1183
del pidfile
1184
except IOError:
1185
logger.error(u"Could not write to file %r with PID %d",
1186
pidfilename, pid)
1187
except NameError:
1188
# "pidfile" was never created
1189
pass
1190
del pidfilename
1191
1192
def cleanup():
1193
"Cleanup function; run on exit"
1194
global group
1195
# From the Avahi example code
1196
if not group is None:
1197
group.Free()
1198
group = None
1199
# End of Avahi example code
2013
try:
2014
bus_name = dbus.service.BusName("se.recompile.Mandos",
2015
bus, do_not_queue=True)
2016
old_bus_name = (dbus.service.BusName
2017
("se.bsnet.fukt.Mandos", bus,
2018
do_not_queue=True))
2019
except dbus.exceptions.NameExistsException as e:
2020
logger.error(unicode(e) + ", disabling D-Bus")
2021
use_dbus = False
2022
server_settings["use_dbus"] = False
2023
tcp_server.use_dbus = False
2024
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2025
service = AvahiService(name = server_settings["servicename"],
2026
servicetype = "_mandos._tcp",
2027
protocol = protocol, bus = bus)
2028
if server_settings["interface"]:
2029
service.interface = (if_nametoindex
2030
(str(server_settings["interface"])))
2031
2032
global multiprocessing_manager
2033
multiprocessing_manager = multiprocessing.Manager()
2034
2035
client_class = Client
2036
if use_dbus:
2037
client_class = functools.partial(ClientDBusTransitional,
2038
bus = bus)
2039
def client_config_items(config, section):
2040
special_settings = {
2041
"approved_by_default":
2042
lambda: config.getboolean(section,
2043
"approved_by_default"),
2044
}
2045
for name, value in config.items(section):
2046
try:
2047
yield (name, special_settings[name]())
2048
except KeyError:
2049
yield (name, value)
2050
2051
tcp_server.clients.update(set(
2052
client_class(name = section,
2053
config= dict(client_config_items(
2054
client_config, section)))
2055
for section in client_config.sections()))
2056
if not tcp_server.clients:
2057
logger.warning("No clients defined")
1200
2058
1201
while clients:
1202
client = clients.pop()
1203
client.disable_hook = None
1204
client.disable()
1205
1206
atexit.register(cleanup)
1207
1208
2059
if not debug:
2060
try:
2061
with pidfile:
2062
pid = os.getpid()
2063
pidfile.write(str(pid) + "\n".encode("utf-8"))
2064
del pidfile
2065
except IOError:
2066
logger.error("Could not write to file %r with PID %d",
2067
pidfilename, pid)
2068
except NameError:
2069
# "pidfile" was never created
2070
pass
2071
del pidfilename
2072
1209
2073
signal.signal(signal.SIGINT, signal.SIG_IGN)
2074
1210
2075
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1211
2076
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1212
2077
1213
2078
if use_dbus:
1214
class MandosServer(dbus.service.Object):
2079
class MandosDBusService(dbus.service.Object):
1215
2080
"""A D-Bus proxy object"""
1216
2081
def __init__(self):
1217
2082
dbus.service.Object.__init__(self, bus, "/")
1218
_interface = u"se.bsnet.fukt.Mandos"
1219
1220
@dbus.service.signal(_interface, signature="oa{sv}")
1221
def ClientAdded(self, objpath, properties):
2083
_interface = "se.recompile.Mandos"
2084
2085
@dbus.service.signal(_interface, signature="o")
2086
def ClientAdded(self, objpath):
2087
"D-Bus signal"
2088
pass
2089
2090
@dbus.service.signal(_interface, signature="ss")
2091
def ClientNotFound(self, fingerprint, address):
1222
2092
"D-Bus signal"
1223
2093
pass
1224
2094
1230
2100
@dbus.service.method(_interface, out_signature="ao")
1231
2101
def GetAllClients(self):
1232
2102
"D-Bus method"
1233
return dbus.Array(c.dbus_object_path for c in clients)
2103
return dbus.Array(c.dbus_object_path
2104
for c in tcp_server.clients)
1234
2105
1235
@dbus.service.method(_interface, out_signature="a{oa{sv}}")
2106
@dbus.service.method(_interface,
2107
out_signature="a{oa{sv}}")
1236
2108
def GetAllClientsWithProperties(self):
1237
2109
"D-Bus method"
1238
2110
return dbus.Dictionary(
1239
((c.dbus_object_path, c.GetAllProperties())
1240
for c in clients),
2111
((c.dbus_object_path, c.GetAll(""))
2112
for c in tcp_server.clients),
1241
2113
signature="oa{sv}")
1242
2114
1243
2115
@dbus.service.method(_interface, in_signature="o")
1244
2116
def RemoveClient(self, object_path):
1245
2117
"D-Bus method"
1246
for c in clients:
2118
for c in tcp_server.clients:
1247
2119
if c.dbus_object_path == object_path:
1248
clients.remove(c)
2120
tcp_server.clients.remove(c)
2121
c.remove_from_connection()
1249
2122
# Don't signal anything except ClientRemoved
1250
c.use_dbus = False
1251
c.disable()
2123
c.disable(quiet=True)
1252
2124
# Emit D-Bus signal
1253
2125
self.ClientRemoved(object_path, c.name)
1254
2126
return
1255
raise KeyError
2127
raise KeyError(object_path)
1256
2128
1257
2129
del _interface
1258
2130
1259
mandos_server = MandosServer()
1260
1261
for client in clients:
2131
class MandosDBusServiceTransitional(MandosDBusService):
2132
__metaclass__ = AlternateDBusNamesMetaclass
2133
mandos_dbus_service = MandosDBusServiceTransitional()
2134
2135
def cleanup():
2136
"Cleanup function; run on exit"
2137
service.cleanup()
2138
2139
multiprocessing.active_children()
2140
while tcp_server.clients:
2141
client = tcp_server.clients.pop()
2142
if use_dbus:
2143
client.remove_from_connection()
2144
client.disable_hook = None
2145
# Don't signal anything except ClientRemoved
2146
client.disable(quiet=True)
2147
if use_dbus:
2148
# Emit D-Bus signal
2149
mandos_dbus_service.ClientRemoved(client
2150
.dbus_object_path,
2151
client.name)
2152
2153
atexit.register(cleanup)
2154
2155
for client in tcp_server.clients:
1262
2156
if use_dbus:
1263
2157
# Emit D-Bus signal
1264
mandos_server.ClientAdded(client.dbus_object_path,
1265
client.GetAllProperties())
2158
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1266
2159
client.enable()
1267
2160
1268
2161
tcp_server.enable()
1271
2164
# Find out what port we got
1272
2165
service.port = tcp_server.socket.getsockname()[1]
1273
2166
if use_ipv6:
1274
logger.info(u"Now listening on address %r, port %d,"
2167
logger.info("Now listening on address %r, port %d,"
1275
2168
" flowinfo %d, scope_id %d"
1276
2169
% tcp_server.socket.getsockname())
1277
2170
else: # IPv4
1278
logger.info(u"Now listening on address %r, port %d"
2171
logger.info("Now listening on address %r, port %d"
1279
2172
% tcp_server.socket.getsockname())
1280
2173
1281
2174
#service.interface = tcp_server.socket.getsockname()[3]
1282
2175
1283
2176
try:
1284
2177
# From the Avahi example code
1285
server.connect_to_signal("StateChanged", server_state_changed)
1286
2178
try:
1287
server_state_changed(server.GetState())
1288
except dbus.exceptions.DBusException, error:
1289
logger.critical(u"DBusException: %s", error)
2179
service.activate()
2180
except dbus.exceptions.DBusException as error:
2181
logger.critical("DBusException: %s", error)
2182
cleanup()
1290
2183
sys.exit(1)
1291
2184
# End of Avahi example code
1292
2185
1295
2188
(tcp_server.handle_request
1296
2189
(*args[2:], **kwargs) or True))
1297
2190
1298
logger.debug(u"Starting main loop")
2191
logger.debug("Starting main loop")
1299
2192
main_loop.run()
1300
except AvahiError, error:
1301
logger.critical(u"AvahiError: %s", error)
2193
except AvahiError as error:
2194
logger.critical("AvahiError: %s", error)
2195
cleanup()
1302
2196
sys.exit(1)
1303
2197
except KeyboardInterrupt:
1304
2198
if debug:
1305
print >> sys.stderr
2199
print("", file=sys.stderr)
1306
2200
logger.debug("Server received KeyboardInterrupt")
1307
2201
logger.debug("Server exiting")
2202
# Must run before the D-Bus bus name gets deregistered
2203
cleanup()
2204
1308
2205
1309
2206
if __name__ == '__main__':
1310
2207
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0