To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 237.11.16
- compare with another revision
- download diff
- download tarball
- view history from revision 237.11.16
- Committer: Teddy Hogeborn
- Date: 2011-10-14 18:21:46 UTC
- mto: (237.15.5 mandos-client-network-hooks)
- mto: This revision was merged to the branch mainline in revision 288.
- Revision ID: teddy@recompile.se-20111014182146-zwg2uxe7f4tgo2gy
* mandos-ctl (main): Bug fix: Handle empty strings correctly.
- 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
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
55
56
import logging
56
57
import logging.handlers
57
58
import pwd
58
from contextlib import closing
59
import contextlib
59
60
import struct
60
61
import fcntl
62
import functools
63
import cPickle as pickle
64
import multiprocessing
65
import types
61
66
62
67
import dbus
63
68
import dbus.service
66
71
from dbus.mainloop.glib import DBusGMainLoop
67
72
import ctypes
68
73
import ctypes.util
74
import xml.dom.minidom
75
import inspect
69
76
70
77
try:
71
78
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
73
80
try:
74
81
from IN import SO_BINDTODEVICE
75
82
except ImportError:
76
# From /usr/include/asm/socket.h
77
SO_BINDTODEVICE = 25
78
79
80
version = "1.0.8"
81
82
logger = logging.Logger(u'mandos')
83
SO_BINDTODEVICE = None
84
85
86
version = "1.4.0"
87
88
#logger = logging.getLogger('mandos')
89
logger = logging.Logger('mandos')
83
90
syslogger = (logging.handlers.SysLogHandler
84
91
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
85
address = "/dev/log"))
92
address = str("/dev/log")))
86
93
syslogger.setFormatter(logging.Formatter
87
(u'Mandos [%(process)d]: %(levelname)s:'
88
u' %(message)s'))
94
('Mandos [%(process)d]: %(levelname)s:'
95
' %(message)s'))
89
96
logger.addHandler(syslogger)
90
97
91
98
console = logging.StreamHandler()
92
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
93
u' %(levelname)s:'
94
u' %(message)s'))
99
console.setFormatter(logging.Formatter('%(name)s [%(process)d]:'
100
' %(levelname)s:'
101
' %(message)s'))
95
102
logger.addHandler(console)
96
103
97
104
class AvahiError(Exception):
114
121
Attributes:
115
122
interface: integer; avahi.IF_UNSPEC or an interface index.
116
123
Used to optionally bind to the specified interface.
117
name: string; Example: u'Mandos'
118
type: string; Example: u'_mandos._tcp'.
124
name: string; Example: 'Mandos'
125
type: string; Example: '_mandos._tcp'.
119
126
See <http://www.dns-sd.org/ServiceTypes.html>
120
127
port: integer; what port to announce
121
128
TXT: list of strings; TXT record for the service
124
131
max_renames: integer; maximum number of renames
125
132
rename_count: integer; counter so we only rename after collisions
126
133
a sensible number of times
134
group: D-Bus Entry Group
135
server: D-Bus Server
136
bus: dbus.SystemBus()
127
137
"""
128
138
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
129
139
servicetype = None, port = None, TXT = None,
130
domain = u"", host = u"", max_renames = 32768,
131
protocol = avahi.PROTO_UNSPEC):
140
domain = "", host = "", max_renames = 32768,
141
protocol = avahi.PROTO_UNSPEC, bus = None):
132
142
self.interface = interface
133
143
self.name = name
134
144
self.type = servicetype
139
149
self.rename_count = 0
140
150
self.max_renames = max_renames
141
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
142
156
def rename(self):
143
157
"""Derived from the Avahi example code"""
144
158
if self.rename_count >= self.max_renames:
145
logger.critical(u"No suitable Zeroconf service name found"
146
u" after %i retries, exiting.",
159
logger.critical("No suitable Zeroconf service name found"
160
" after %i retries, exiting.",
147
161
self.rename_count)
148
raise AvahiServiceError(u"Too many renames")
149
self.name = server.GetAlternativeServiceName(self.name)
150
logger.info(u"Changing Zeroconf service name to %r ...",
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 ...",
151
166
self.name)
152
167
syslogger.setFormatter(logging.Formatter
153
(u'Mandos (%s) [%%(process)d]:'
154
u' %%(levelname)s: %%(message)s'
168
('Mandos (%s) [%%(process)d]:'
169
' %%(levelname)s: %%(message)s'
155
170
% self.name))
156
171
self.remove()
157
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)
158
178
self.rename_count += 1
159
179
def remove(self):
160
180
"""Derived from the Avahi example code"""
161
if group is not None:
162
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()
163
186
def add(self):
164
187
"""Derived from the Avahi example code"""
165
global group
166
if group is None:
167
group = dbus.Interface(bus.get_object
168
(avahi.DBUS_NAME,
169
server.EntryGroupNew()),
170
avahi.DBUS_INTERFACE_ENTRY_GROUP)
171
group.connect_to_signal('StateChanged',
172
entry_group_state_changed)
173
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
174
service.name, service.type)
175
group.AddService(
176
self.interface, # interface
177
self.protocol, # protocol
178
dbus.UInt32(0), # flags
179
self.name, self.type,
180
self.domain, self.host,
181
dbus.UInt16(self.port),
182
avahi.string_array_to_txt_array(self.TXT))
183
group.Commit()
184
185
# From the Avahi example code:
186
group = None # our entry group
187
# End of Avahi example code
188
189
190
def _datetime_to_dbus(dt, variant_level=0):
191
"""Convert a UTC datetime.datetime() to a D-Bus type."""
192
return dbus.String(dt.isoformat(), variant_level=variant_level)
193
194
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
195
275
class Client(object):
196
276
"""A representation of a client host served by this server.
197
277
198
278
Attributes:
199
name: string; from the config file, used in log messages and
200
D-Bus identifiers
201
fingerprint: string (40 or 32 hexadecimal digits); used to
202
uniquely identify the client
203
secret: bytestring; sent verbatim (over TLS) to client
204
host: string; available for use by the checker command
205
created: datetime.datetime(); (UTC) object creation
206
last_enabled: datetime.datetime(); (UTC)
207
enabled: bool()
208
last_checked_ok: datetime.datetime(); (UTC) or None
209
timeout: datetime.timedelta(); How long from last_checked_ok
210
until this client is invalid
211
interval: datetime.timedelta(); How often to start a new checker
212
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
213
282
checker: subprocess.Popen(); a running checker process used
214
283
to see if the client lives.
215
284
'None' if no process is running.
216
checker_initiator_tag: a gobject event source tag, or None
217
disable_initiator_tag: - '' -
218
checker_callback_tag: - '' -
219
checker_command: string; External command which is run to check if
220
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
221
288
runtime with vars(self) as dict, so that for
222
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
223
292
current_checker_command: string; current running checker_command
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
224
312
"""
225
313
226
@staticmethod
227
def _datetime_to_milliseconds(dt):
228
"Convert a datetime.datetime() to milliseconds"
229
return ((dt.days * 24 * 60 * 60 * 1000)
230
+ (dt.seconds * 1000)
231
+ (dt.microseconds // 1000))
314
runtime_expansions = ("approval_delay", "approval_duration",
315
"created", "enabled", "fingerprint",
316
"host", "interval", "last_checked_ok",
317
"last_enabled", "name", "timeout")
232
318
233
319
def timeout_milliseconds(self):
234
320
"Return the 'timeout' attribute in milliseconds"
235
return self._datetime_to_milliseconds(self.timeout)
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)
236
326
237
327
def interval_milliseconds(self):
238
328
"Return the 'interval' attribute in milliseconds"
239
return self._datetime_to_milliseconds(self.interval)
329
return _timedelta_to_milliseconds(self.interval)
330
331
def approval_delay_milliseconds(self):
332
return _timedelta_to_milliseconds(self.approval_delay)
240
333
241
334
def __init__(self, name = None, disable_hook=None, config=None):
242
335
"""Note: the 'checker' key in 'config' sets the
245
338
self.name = name
246
339
if config is None:
247
340
config = {}
248
logger.debug(u"Creating client %r", self.name)
341
logger.debug("Creating client %r", self.name)
249
342
# Uppercase and remove spaces from fingerprint for later
250
343
# comparison purposes with return value from the fingerprint()
251
344
# function
252
self.fingerprint = (config[u"fingerprint"].upper()
253
.replace(u" ", u""))
254
logger.debug(u" Fingerprint: %s", self.fingerprint)
255
if u"secret" in config:
256
self.secret = config[u"secret"].decode(u"base64")
257
elif u"secfile" in config:
258
with closing(open(os.path.expanduser
259
(os.path.expandvars
260
(config[u"secfile"])))) as secfile:
345
self.fingerprint = (config["fingerprint"].upper()
346
.replace(" ", ""))
347
logger.debug(" Fingerprint: %s", self.fingerprint)
348
if "secret" in config:
349
self.secret = config["secret"].decode("base64")
350
elif "secfile" in config:
351
with open(os.path.expanduser(os.path.expandvars
352
(config["secfile"])),
353
"rb") as secfile:
261
354
self.secret = secfile.read()
262
355
else:
263
raise TypeError(u"No secret or secfile for client %s"
356
raise TypeError("No secret or secfile for client %s"
264
357
% self.name)
265
self.host = config.get(u"host", u"")
358
self.host = config.get("host", "")
266
359
self.created = datetime.datetime.utcnow()
267
360
self.enabled = False
361
self.last_approval_request = None
268
362
self.last_enabled = None
269
363
self.last_checked_ok = None
270
self.timeout = string_to_delta(config[u"timeout"])
271
self.interval = string_to_delta(config[u"interval"])
364
self.timeout = string_to_delta(config["timeout"])
365
self.extended_timeout = string_to_delta(config
366
["extended_timeout"])
367
self.interval = string_to_delta(config["interval"])
272
368
self.disable_hook = disable_hook
273
369
self.checker = None
274
370
self.checker_initiator_tag = None
275
371
self.disable_initiator_tag = None
372
self.expires = None
276
373
self.checker_callback_tag = None
277
self.checker_command = config[u"checker"]
374
self.checker_command = config["checker"]
278
375
self.current_checker_command = None
279
376
self.last_connect = None
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()
280
393
281
394
def enable(self):
282
395
"""Start this client's checker and timeout hooks"""
283
self.last_enabled = datetime.datetime.utcnow()
396
if getattr(self, "enabled", False):
397
# Already enabled
398
return
399
self.send_changedstate()
284
400
# Schedule a new checker to be started an 'interval' from now,
285
401
# and every interval from then on.
286
402
self.checker_initiator_tag = (gobject.timeout_add
287
403
(self.interval_milliseconds(),
288
404
self.start_checker))
289
# Also start a new checker *right now*.
290
self.start_checker()
291
405
# Schedule a disable() when 'timeout' has passed
406
self.expires = datetime.datetime.utcnow() + self.timeout
292
407
self.disable_initiator_tag = (gobject.timeout_add
293
408
(self.timeout_milliseconds(),
294
409
self.disable))
295
410
self.enabled = True
411
self.last_enabled = datetime.datetime.utcnow()
412
# Also start a new checker *right now*.
413
self.start_checker()
296
414
297
def disable(self):
415
def disable(self, quiet=True):
298
416
"""Disable this client."""
299
417
if not getattr(self, "enabled", False):
300
418
return False
301
logger.info(u"Disabling client %s", self.name)
302
if getattr(self, u"disable_initiator_tag", False):
419
if not quiet:
420
self.send_changedstate()
421
if not quiet:
422
logger.info("Disabling client %s", self.name)
423
if getattr(self, "disable_initiator_tag", False):
303
424
gobject.source_remove(self.disable_initiator_tag)
304
425
self.disable_initiator_tag = None
305
if getattr(self, u"checker_initiator_tag", False):
426
self.expires = None
427
if getattr(self, "checker_initiator_tag", False):
306
428
gobject.source_remove(self.checker_initiator_tag)
307
429
self.checker_initiator_tag = None
308
430
self.stop_checker()
323
445
if os.WIFEXITED(condition):
324
446
exitstatus = os.WEXITSTATUS(condition)
325
447
if exitstatus == 0:
326
logger.info(u"Checker for %(name)s succeeded",
448
logger.info("Checker for %(name)s succeeded",
327
449
vars(self))
328
450
self.checked_ok()
329
451
else:
330
logger.info(u"Checker for %(name)s failed",
452
logger.info("Checker for %(name)s failed",
331
453
vars(self))
332
454
else:
333
logger.warning(u"Checker for %(name)s crashed?",
455
logger.warning("Checker for %(name)s crashed?",
334
456
vars(self))
335
457
336
def checked_ok(self):
458
def checked_ok(self, timeout=None):
337
459
"""Bump up the timeout for this client.
338
460
339
461
This should only be called when the client has been seen,
340
462
alive and well.
341
463
"""
464
if timeout is None:
465
timeout = self.timeout
342
466
self.last_checked_ok = datetime.datetime.utcnow()
343
467
gobject.source_remove(self.disable_initiator_tag)
344
468
self.disable_initiator_tag = (gobject.timeout_add
345
(self.timeout_milliseconds(),
346
self.disable))
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()
347
475
348
476
def start_checker(self):
349
477
"""Start a new checker subprocess if one is not running.
356
484
# client would inevitably timeout, since no checker would get
357
485
# a chance to run to completion. If we instead leave running
358
486
# checkers alone, the checker would have to take more time
359
# than 'timeout' for the client to be declared invalid, which
360
# is as it should be.
487
# than 'timeout' for the client to be disabled, which is as it
488
# should be.
361
489
362
490
# If a checker exists, make sure it is not a zombie
363
if self.checker is not None:
491
try:
364
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:
365
498
if pid:
366
logger.warning(u"Checker was a zombie")
499
logger.warning("Checker was a zombie")
367
500
gobject.source_remove(self.checker_callback_tag)
368
501
self.checker_callback(pid, status,
369
502
self.current_checker_command)
374
507
command = self.checker_command % self.host
375
508
except TypeError:
376
509
# Escape attributes for the shell
377
escaped_attrs = dict((key,
378
re.escape(unicode(str(val),
379
errors=
380
u'replace')))
381
for key, val in
382
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
383
518
try:
384
519
command = self.checker_command % escaped_attrs
385
except TypeError, error:
386
logger.error(u'Could not format string "%s":'
387
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)
388
523
return True # Try again later
389
524
self.current_checker_command = command
390
525
try:
391
logger.info(u"Starting checker %r for %s",
526
logger.info("Starting checker %r for %s",
392
527
command, self.name)
393
528
# We don't need to redirect stdout and stderr, since
394
529
# in normal mode, that is already done by daemon(),
396
531
# always replaced by /dev/null.)
397
532
self.checker = subprocess.Popen(command,
398
533
close_fds=True,
399
shell=True, cwd=u"/")
534
shell=True, cwd="/")
400
535
self.checker_callback_tag = (gobject.child_watch_add
401
536
(self.checker.pid,
402
537
self.checker_callback,
407
542
if pid:
408
543
gobject.source_remove(self.checker_callback_tag)
409
544
self.checker_callback(pid, status, command)
410
except OSError, error:
411
logger.error(u"Failed to start subprocess: %s",
545
except OSError as error:
546
logger.error("Failed to start subprocess: %s",
412
547
error)
413
548
# Re-run this periodically if run by gobject.timeout_add
414
549
return True
418
553
if self.checker_callback_tag:
419
554
gobject.source_remove(self.checker_callback_tag)
420
555
self.checker_callback_tag = None
421
if getattr(self, u"checker", None) is None:
556
if getattr(self, "checker", None) is None:
422
557
return
423
logger.debug(u"Stopping checker for %(name)s", vars(self))
558
logger.debug("Stopping checker for %(name)s", vars(self))
424
559
try:
425
560
os.kill(self.checker.pid, signal.SIGTERM)
426
#os.sleep(0.5)
561
#time.sleep(0.5)
427
562
#if self.checker.poll() is None:
428
563
# os.kill(self.checker.pid, signal.SIGKILL)
429
except OSError, error:
564
except OSError as error:
430
565
if error.errno != errno.ESRCH: # No such process
431
566
raise
432
567
self.checker = None
433
434
def still_valid(self):
435
"""Has the timeout not yet passed for this client?"""
436
if not getattr(self, u"enabled", False):
437
return False
438
now = datetime.datetime.utcnow()
439
if self.last_checked_ok is None:
440
return now < (self.created + self.timeout)
441
else:
442
return now < (self.last_checked_ok + self.timeout)
443
444
445
class ClientDBus(Client, dbus.service.Object):
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):
446
862
"""A Client class using D-Bus
447
863
448
864
Attributes:
449
dbus_object_path: dbus.ObjectPath ; only set if self.use_dbus
865
dbus_object_path: dbus.ObjectPath
866
bus: dbus.SystemBus()
450
867
"""
868
869
runtime_expansions = (Client.runtime_expansions
870
+ ("dbus_object_path",))
871
451
872
# dbus.service.Object doesn't use super(), so we can't either.
452
873
453
def __init__(self, *args, **kwargs):
874
def __init__(self, bus = None, *args, **kwargs):
875
self._approvals_pending = 0
876
self.bus = bus
454
877
Client.__init__(self, *args, **kwargs)
455
878
# Only now, when this client is initialized, can it show up on
456
879
# the D-Bus
880
client_object_name = unicode(self.name).translate(
881
{ord("."): ord("_"),
882
ord("-"): ord("_")})
457
883
self.dbus_object_path = (dbus.ObjectPath
458
(u"/clients/"
459
+ self.name.replace(u".", u"_")))
460
dbus.service.Object.__init__(self, bus,
461
self.dbus_object_path)
462
def enable(self):
463
oldstate = getattr(self, u"enabled", False)
464
r = Client.enable(self)
465
if oldstate != self.enabled:
466
# Emit D-Bus signals
467
self.PropertyChanged(dbus.String(u"enabled"),
468
dbus.Boolean(True, variant_level=1))
469
self.PropertyChanged(dbus.String(u"last_enabled"),
470
(_datetime_to_dbus(self.last_enabled,
471
variant_level=1)))
472
return r
473
474
def disable(self, signal = True):
475
oldstate = getattr(self, u"enabled", False)
476
r = Client.disable(self)
477
if signal and oldstate != self.enabled:
478
# Emit D-Bus signal
479
self.PropertyChanged(dbus.String(u"enabled"),
480
dbus.Boolean(False, variant_level=1))
481
return r
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 a variant_level
895
and transforms it 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
=variant_level)
910
self.PropertyChanged(dbus.String(dbus_name),
911
dbus_value)
912
setattr(self, attrname, value)
913
914
return property(lambda self: getattr(self, attrname), setter)
915
916
917
expires = notifychangeproperty(datetime_to_dbus, "Expires")
918
approvals_pending = notifychangeproperty(dbus.Boolean,
919
"ApprovalPending",
920
type_func = bool)
921
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
922
last_enabled = notifychangeproperty(datetime_to_dbus,
923
"LastEnabled")
924
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
925
type_func = lambda checker:
926
checker is not None)
927
last_checked_ok = notifychangeproperty(datetime_to_dbus,
928
"LastCheckedOK")
929
last_approval_request = notifychangeproperty(
930
datetime_to_dbus, "LastApprovalRequest")
931
approved_by_default = notifychangeproperty(dbus.Boolean,
932
"ApprovedByDefault")
933
approval_delay = notifychangeproperty(dbus.UInt16,
934
"ApprovalDelay",
935
type_func =
936
_timedelta_to_milliseconds)
937
approval_duration = notifychangeproperty(
938
dbus.UInt16, "ApprovalDuration",
939
type_func = _timedelta_to_milliseconds)
940
host = notifychangeproperty(dbus.String, "Host")
941
timeout = notifychangeproperty(dbus.UInt16, "Timeout",
942
type_func =
943
_timedelta_to_milliseconds)
944
extended_timeout = notifychangeproperty(
945
dbus.UInt16, "ExtendedTimeout",
946
type_func = _timedelta_to_milliseconds)
947
interval = notifychangeproperty(dbus.UInt16,
948
"Interval",
949
type_func =
950
_timedelta_to_milliseconds)
951
checker_command = notifychangeproperty(dbus.String, "Checker")
952
953
del notifychangeproperty
482
954
483
955
def __del__(self, *args, **kwargs):
484
956
try:
485
957
self.remove_from_connection()
486
958
except LookupError:
487
959
pass
488
if hasattr(dbus.service.Object, u"__del__"):
489
dbus.service.Object.__del__(self, *args, **kwargs)
960
if hasattr(DBusObjectWithProperties, "__del__"):
961
DBusObjectWithProperties.__del__(self, *args, **kwargs)
490
962
Client.__del__(self, *args, **kwargs)
491
963
492
964
def checker_callback(self, pid, condition, command,
493
965
*args, **kwargs):
494
966
self.checker_callback_tag = None
495
967
self.checker = None
496
# Emit D-Bus signal
497
self.PropertyChanged(dbus.String(u"checker_running"),
498
dbus.Boolean(False, variant_level=1))
499
968
if os.WIFEXITED(condition):
500
969
exitstatus = os.WEXITSTATUS(condition)
501
970
# Emit D-Bus signal
511
980
return Client.checker_callback(self, pid, condition, command,
512
981
*args, **kwargs)
513
982
514
def checked_ok(self, *args, **kwargs):
515
r = Client.checked_ok(self, *args, **kwargs)
516
# Emit D-Bus signal
517
self.PropertyChanged(
518
dbus.String(u"last_checked_ok"),
519
(_datetime_to_dbus(self.last_checked_ok,
520
variant_level=1)))
521
return r
522
523
983
def start_checker(self, *args, **kwargs):
524
984
old_checker = self.checker
525
985
if self.checker is not None:
532
992
and old_checker_pid != self.checker.pid):
533
993
# Emit D-Bus signal
534
994
self.CheckerStarted(self.current_checker_command)
535
self.PropertyChanged(
536
dbus.String(u"checker_running"),
537
dbus.Boolean(True, variant_level=1))
538
return r
539
540
def stop_checker(self, *args, **kwargs):
541
old_checker = getattr(self, u"checker", None)
542
r = Client.stop_checker(self, *args, **kwargs)
543
if (old_checker is not None
544
and getattr(self, u"checker", None) is None):
545
self.PropertyChanged(dbus.String(u"checker_running"),
546
dbus.Boolean(False, variant_level=1))
547
return r
548
549
## D-Bus methods & signals
550
_interface = u"se.bsnet.fukt.Mandos.Client"
551
552
# CheckedOK - method
553
@dbus.service.method(_interface)
554
def CheckedOK(self):
555
return self.checked_ok()
995
return r
996
997
def _reset_approved(self):
998
self._approved = None
999
return False
1000
1001
def approve(self, value=True):
1002
self.send_changedstate()
1003
self._approved = value
1004
gobject.timeout_add(_timedelta_to_milliseconds
1005
(self.approval_duration),
1006
self._reset_approved)
1007
1008
1009
## D-Bus methods, signals & properties
1010
_interface = "se.recompile.Mandos.Client"
1011
1012
## Signals
556
1013
557
1014
# CheckerCompleted - signal
558
@dbus.service.signal(_interface, signature=u"nxs")
1015
@dbus.service.signal(_interface, signature="nxs")
559
1016
def CheckerCompleted(self, exitcode, waitstatus, command):
560
1017
"D-Bus signal"
561
1018
pass
562
1019
563
1020
# CheckerStarted - signal
564
@dbus.service.signal(_interface, signature=u"s")
1021
@dbus.service.signal(_interface, signature="s")
565
1022
def CheckerStarted(self, command):
566
1023
"D-Bus signal"
567
1024
pass
568
1025
569
# GetAllProperties - method
570
@dbus.service.method(_interface, out_signature=u"a{sv}")
571
def GetAllProperties(self):
572
"D-Bus method"
573
return dbus.Dictionary({
574
dbus.String(u"name"):
575
dbus.String(self.name, variant_level=1),
576
dbus.String(u"fingerprint"):
577
dbus.String(self.fingerprint, variant_level=1),
578
dbus.String(u"host"):
579
dbus.String(self.host, variant_level=1),
580
dbus.String(u"created"):
581
_datetime_to_dbus(self.created, variant_level=1),
582
dbus.String(u"last_enabled"):
583
(_datetime_to_dbus(self.last_enabled,
584
variant_level=1)
585
if self.last_enabled is not None
586
else dbus.Boolean(False, variant_level=1)),
587
dbus.String(u"enabled"):
588
dbus.Boolean(self.enabled, variant_level=1),
589
dbus.String(u"last_checked_ok"):
590
(_datetime_to_dbus(self.last_checked_ok,
591
variant_level=1)
592
if self.last_checked_ok is not None
593
else dbus.Boolean (False, variant_level=1)),
594
dbus.String(u"timeout"):
595
dbus.UInt64(self.timeout_milliseconds(),
596
variant_level=1),
597
dbus.String(u"interval"):
598
dbus.UInt64(self.interval_milliseconds(),
599
variant_level=1),
600
dbus.String(u"checker"):
601
dbus.String(self.checker_command,
602
variant_level=1),
603
dbus.String(u"checker_running"):
604
dbus.Boolean(self.checker is not None,
605
variant_level=1),
606
dbus.String(u"object_path"):
607
dbus.ObjectPath(self.dbus_object_path,
608
variant_level=1)
609
}, signature=u"sv")
610
611
# IsStillValid - method
612
@dbus.service.method(_interface, out_signature=u"b")
613
def IsStillValid(self):
614
return self.still_valid()
615
616
1026
# PropertyChanged - signal
617
@dbus.service.signal(_interface, signature=u"sv")
1027
@dbus.service.signal(_interface, signature="sv")
618
1028
def PropertyChanged(self, property, value):
619
1029
"D-Bus signal"
620
1030
pass
621
1031
622
# ReceivedSecret - signal
1032
# GotSecret - signal
623
1033
@dbus.service.signal(_interface)
624
def ReceivedSecret(self):
625
"D-Bus signal"
1034
def GotSecret(self):
1035
"""D-Bus signal
1036
Is sent after a successful transfer of secret from the Mandos
1037
server to mandos-client
1038
"""
626
1039
pass
627
1040
628
1041
# Rejected - signal
629
@dbus.service.signal(_interface)
630
def Rejected(self):
1042
@dbus.service.signal(_interface, signature="s")
1043
def Rejected(self, reason):
631
1044
"D-Bus signal"
632
1045
pass
633
1046
634
# SetChecker - method
635
@dbus.service.method(_interface, in_signature=u"s")
636
def SetChecker(self, checker):
637
"D-Bus setter method"
638
self.checker_command = checker
639
# Emit D-Bus signal
640
self.PropertyChanged(dbus.String(u"checker"),
641
dbus.String(self.checker_command,
642
variant_level=1))
643
644
# SetHost - method
645
@dbus.service.method(_interface, in_signature=u"s")
646
def SetHost(self, host):
647
"D-Bus setter method"
648
self.host = host
649
# Emit D-Bus signal
650
self.PropertyChanged(dbus.String(u"host"),
651
dbus.String(self.host, variant_level=1))
652
653
# SetInterval - method
654
@dbus.service.method(_interface, in_signature=u"t")
655
def SetInterval(self, milliseconds):
656
self.interval = datetime.timedelta(0, 0, 0, milliseconds)
657
# Emit D-Bus signal
658
self.PropertyChanged(dbus.String(u"interval"),
659
(dbus.UInt64(self.interval_milliseconds(),
660
variant_level=1)))
661
662
# SetSecret - method
663
@dbus.service.method(_interface, in_signature=u"ay",
664
byte_arrays=True)
665
def SetSecret(self, secret):
666
"D-Bus setter method"
667
self.secret = str(secret)
668
669
# SetTimeout - method
670
@dbus.service.method(_interface, in_signature=u"t")
671
def SetTimeout(self, milliseconds):
672
self.timeout = datetime.timedelta(0, 0, 0, milliseconds)
673
# Emit D-Bus signal
674
self.PropertyChanged(dbus.String(u"timeout"),
675
(dbus.UInt64(self.timeout_milliseconds(),
676
variant_level=1)))
1047
# NeedApproval - signal
1048
@dbus.service.signal(_interface, signature="tb")
1049
def NeedApproval(self, timeout, default):
1050
"D-Bus signal"
1051
return self.need_approval()
1052
1053
## Methods
1054
1055
# Approve - method
1056
@dbus.service.method(_interface, in_signature="b")
1057
def Approve(self, value):
1058
self.approve(value)
1059
1060
# CheckedOK - method
1061
@dbus.service.method(_interface)
1062
def CheckedOK(self):
1063
self.checked_ok()
677
1064
678
1065
# Enable - method
679
1066
@dbus.service.method(_interface)
698
1085
def StopChecker(self):
699
1086
self.stop_checker()
700
1087
1088
## Properties
1089
1090
# ApprovalPending - property
1091
@dbus_service_property(_interface, signature="b", access="read")
1092
def ApprovalPending_dbus_property(self):
1093
return dbus.Boolean(bool(self.approvals_pending))
1094
1095
# ApprovedByDefault - property
1096
@dbus_service_property(_interface, signature="b",
1097
access="readwrite")
1098
def ApprovedByDefault_dbus_property(self, value=None):
1099
if value is None: # get
1100
return dbus.Boolean(self.approved_by_default)
1101
self.approved_by_default = bool(value)
1102
1103
# ApprovalDelay - property
1104
@dbus_service_property(_interface, signature="t",
1105
access="readwrite")
1106
def ApprovalDelay_dbus_property(self, value=None):
1107
if value is None: # get
1108
return dbus.UInt64(self.approval_delay_milliseconds())
1109
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1110
1111
# ApprovalDuration - property
1112
@dbus_service_property(_interface, signature="t",
1113
access="readwrite")
1114
def ApprovalDuration_dbus_property(self, value=None):
1115
if value is None: # get
1116
return dbus.UInt64(_timedelta_to_milliseconds(
1117
self.approval_duration))
1118
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1119
1120
# Name - property
1121
@dbus_service_property(_interface, signature="s", access="read")
1122
def Name_dbus_property(self):
1123
return dbus.String(self.name)
1124
1125
# Fingerprint - property
1126
@dbus_service_property(_interface, signature="s", access="read")
1127
def Fingerprint_dbus_property(self):
1128
return dbus.String(self.fingerprint)
1129
1130
# Host - property
1131
@dbus_service_property(_interface, signature="s",
1132
access="readwrite")
1133
def Host_dbus_property(self, value=None):
1134
if value is None: # get
1135
return dbus.String(self.host)
1136
self.host = value
1137
1138
# Created - property
1139
@dbus_service_property(_interface, signature="s", access="read")
1140
def Created_dbus_property(self):
1141
return dbus.String(datetime_to_dbus(self.created))
1142
1143
# LastEnabled - property
1144
@dbus_service_property(_interface, signature="s", access="read")
1145
def LastEnabled_dbus_property(self):
1146
return datetime_to_dbus(self.last_enabled)
1147
1148
# Enabled - property
1149
@dbus_service_property(_interface, signature="b",
1150
access="readwrite")
1151
def Enabled_dbus_property(self, value=None):
1152
if value is None: # get
1153
return dbus.Boolean(self.enabled)
1154
if value:
1155
self.enable()
1156
else:
1157
self.disable()
1158
1159
# LastCheckedOK - property
1160
@dbus_service_property(_interface, signature="s",
1161
access="readwrite")
1162
def LastCheckedOK_dbus_property(self, value=None):
1163
if value is not None:
1164
self.checked_ok()
1165
return
1166
return datetime_to_dbus(self.last_checked_ok)
1167
1168
# Expires - property
1169
@dbus_service_property(_interface, signature="s", access="read")
1170
def Expires_dbus_property(self):
1171
return datetime_to_dbus(self.expires)
1172
1173
# LastApprovalRequest - property
1174
@dbus_service_property(_interface, signature="s", access="read")
1175
def LastApprovalRequest_dbus_property(self):
1176
return datetime_to_dbus(self.last_approval_request)
1177
1178
# Timeout - property
1179
@dbus_service_property(_interface, signature="t",
1180
access="readwrite")
1181
def Timeout_dbus_property(self, value=None):
1182
if value is None: # get
1183
return dbus.UInt64(self.timeout_milliseconds())
1184
self.timeout = datetime.timedelta(0, 0, 0, value)
1185
if getattr(self, "disable_initiator_tag", None) is None:
1186
return
1187
# Reschedule timeout
1188
gobject.source_remove(self.disable_initiator_tag)
1189
self.disable_initiator_tag = None
1190
self.expires = None
1191
time_to_die = _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)
1258
701
1259
del _interface
702
1260
703
1261
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
704
1290
class ClientHandler(socketserver.BaseRequestHandler, object):
705
1291
"""A class to handle client connections.
706
1292
708
1294
Note: This will run in its own forked process."""
709
1295
710
1296
def handle(self):
711
logger.info(u"TCP connection from: %s",
712
unicode(self.client_address))
713
logger.debug(u"IPC Pipe FD: %d", self.server.pipe[1])
714
# Open IPC pipe to parent process
715
with closing(os.fdopen(self.server.pipe[1], u"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
716
1303
session = (gnutls.connection
717
1304
.ClientSession(self.request,
718
1305
gnutls.connection
719
1306
.X509Credentials()))
720
1307
721
line = self.request.makefile().readline()
722
logger.debug(u"Protocol version: %r", line)
723
try:
724
if int(line.strip().split()[0]) > 1:
725
raise RuntimeError
726
except (ValueError, IndexError, RuntimeError), error:
727
logger.error(u"Unknown protocol version: %s", error)
728
return
729
730
1308
# Note: gnutls.connection.X509Credentials is really a
731
1309
# generic GnuTLS certificate credentials object so long as
732
1310
# no X.509 keys are added to it. Therefore, we can use it
733
1311
# here despite using OpenPGP certificates.
734
1312
735
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
736
# u"+AES-256-CBC", u"+SHA1",
737
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
738
# u"+DHE-DSS"))
1313
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1314
# "+AES-256-CBC", "+SHA1",
1315
# "+COMP-NULL", "+CTYPE-OPENPGP",
1316
# "+DHE-DSS"))
739
1317
# Use a fallback default, since this MUST be set.
740
1318
priority = self.server.gnutls_priority
741
1319
if priority is None:
742
priority = u"NORMAL"
1320
priority = "NORMAL"
743
1321
(gnutls.library.functions
744
1322
.gnutls_priority_set_direct(session._c_object,
745
1323
priority, None))
746
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
747
1337
try:
748
1338
session.handshake()
749
except gnutls.errors.GNUTLSError, error:
750
logger.warning(u"Handshake failed: %s", error)
1339
except gnutls.errors.GNUTLSError as error:
1340
logger.warning("Handshake failed: %s", error)
751
1341
# Do not run session.bye() here: the session is not
752
1342
# established. Just abandon the request.
753
1343
return
754
logger.debug(u"Handshake succeeded")
1344
logger.debug("Handshake succeeded")
1345
1346
approval_required = False
755
1347
try:
756
fpr = self.fingerprint(self.peer_certificate(session))
757
except (TypeError, gnutls.errors.GNUTLSError), error:
758
logger.warning(u"Bad certificate: %s", error)
759
session.bye()
760
return
761
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()
762
1436
763
for c in self.server.clients:
764
if c.fingerprint == fpr:
765
client = c
766
break
767
else:
768
ipc.write(u"NOTFOUND %s\n" % fpr)
769
session.bye()
770
return
771
# Have to check if client.still_valid(), since it is
772
# possible that the client timed out while establishing
773
# the GnuTLS session.
774
if not client.still_valid():
775
ipc.write(u"INVALID %s\n" % client.name)
776
session.bye()
777
return
778
ipc.write(u"SENDING %s\n" % client.name)
779
sent_size = 0
780
while sent_size < len(client.secret):
781
sent = session.send(client.secret[sent_size:])
782
logger.debug(u"Sent: %d, remaining: %d",
783
sent, len(client.secret)
784
- (sent_size + sent))
785
sent_size += sent
786
session.bye()
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")
787
1444
788
1445
@staticmethod
789
1446
def peer_certificate(session):
799
1456
.gnutls_certificate_get_peers
800
1457
(session._c_object, ctypes.byref(list_size)))
801
1458
if not bool(cert_list) and list_size.value != 0:
802
raise gnutls.errors.GNUTLSError(u"error getting peer"
803
u" certificate")
1459
raise gnutls.errors.GNUTLSError("error getting peer"
1460
" certificate")
804
1461
if list_size.value == 0:
805
1462
return None
806
1463
cert = cert_list[0]
832
1489
if crtverify.value != 0:
833
1490
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
834
1491
raise (gnutls.errors.CertificateSecurityError
835
(u"Verify failed"))
1492
("Verify failed"))
836
1493
# New buffer for the fingerprint
837
1494
buf = ctypes.create_string_buffer(20)
838
1495
buf_len = ctypes.c_size_t()
845
1502
# Convert the buffer to a Python bytestring
846
1503
fpr = ctypes.string_at(buf, buf_len.value)
847
1504
# Convert the bytestring to hexadecimal notation
848
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1505
hex_fpr = ''.join("%02X" % ord(char) for char in fpr)
849
1506
return hex_fpr
850
1507
851
1508
852
class ForkingMixInWithPipe(socketserver.ForkingMixIn, object):
853
"""Like socketserver.ForkingMixIn, but also pass a pipe.
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)
854
1517
855
Assumes a gobject.MainLoop event loop.
856
"""
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 """
857
1529
def process_request(self, request, client_address):
858
1530
"""Overrides and wraps the original process_request().
859
1531
860
This function creates a new pipe in self.pipe
1532
This function creates a new pipe in self.pipe
861
1533
"""
862
self.pipe = os.pipe()
863
super(ForkingMixInWithPipe,
864
self).process_request(request, client_address)
865
os.close(self.pipe[1]) # close write end
866
# Call "handle_ipc" for both data and EOF events
867
gobject.io_add_watch(self.pipe[0],
868
gobject.IO_IN | gobject.IO_HUP,
869
self.handle_ipc)
870
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):
871
1542
"""Dummy function; override as necessary"""
872
os.close(source)
873
return False
874
875
876
class IPv6_TCPServer(ForkingMixInWithPipe,
1543
raise NotImplementedError
1544
1545
1546
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
877
1547
socketserver.TCPServer, object):
878
1548
"""IPv6-capable TCP server. Accepts 'None' as address and/or port
879
1549
881
1551
enabled: Boolean; whether this server is activated yet
882
1552
interface: None or a network interface name (string)
883
1553
use_ipv6: Boolean; to use IPv6 or not
884
----
885
clients: set of Client objects
886
gnutls_priority GnuTLS priority string
887
use_dbus: Boolean; to emit D-Bus signals or not
888
1554
"""
889
1555
def __init__(self, server_address, RequestHandlerClass,
890
interface=None, use_ipv6=True, clients=None,
891
gnutls_priority=None, use_dbus=True):
892
self.enabled = False
1556
interface=None, use_ipv6=True):
893
1557
self.interface = interface
894
1558
if use_ipv6:
895
1559
self.address_family = socket.AF_INET6
896
self.clients = clients
897
self.use_dbus = use_dbus
898
self.gnutls_priority = gnutls_priority
899
1560
socketserver.TCPServer.__init__(self, server_address,
900
1561
RequestHandlerClass)
901
1562
def server_bind(self):
903
1564
to bind to an interface if one was specified, and also NOT to
904
1565
bind to an address or port if they were not specified."""
905
1566
if self.interface is not None:
906
try:
907
self.socket.setsockopt(socket.SOL_SOCKET,
908
SO_BINDTODEVICE,
909
str(self.interface + u'\0'))
910
except socket.error, error:
911
if error[0] == errno.EPERM:
912
logger.error(u"No permission to"
913
u" bind to interface %s",
914
self.interface)
915
else:
916
raise
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
917
1588
# Only bind(2) the socket if we really need to.
918
1589
if self.server_address[0] or self.server_address[1]:
919
1590
if not self.server_address[0]:
920
1591
if self.address_family == socket.AF_INET6:
921
any_address = u"::" # in6addr_any
1592
any_address = "::" # in6addr_any
922
1593
else:
923
1594
any_address = socket.INADDR_ANY
924
1595
self.server_address = (any_address,
933
1604
# if_nametoindex
934
1605
# (self.interface))
935
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)
936
1632
def server_activate(self):
937
1633
if self.enabled:
938
1634
return socketserver.TCPServer.server_activate(self)
1635
939
1636
def enable(self):
940
1637
self.enabled = True
941
def handle_ipc(self, source, condition, file_objects={}):
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):
942
1650
condition_names = {
943
gobject.IO_IN: u"IN", # There is data to read.
944
gobject.IO_OUT: u"OUT", # Data can be written (without
1651
gobject.IO_IN: "IN", # There is data to read.
1652
gobject.IO_OUT: "OUT", # Data can be written (without
945
1653
# blocking).
946
gobject.IO_PRI: u"PRI", # There is urgent data to read.
947
gobject.IO_ERR: u"ERR", # Error condition.
948
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
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
949
1657
# broken, usually for pipes and
950
1658
# sockets).
951
1659
}
953
1661
for cond, name in
954
1662
condition_names.iteritems()
955
1663
if cond & condition)
956
logger.debug(u"Handling IPC: FD = %d, condition = %s", source,
957
conditions_string)
958
959
# Turn the pipe file descriptor into a Python file object
960
if source not in file_objects:
961
file_objects[source] = os.fdopen(source, u"r", 1)
962
963
# Read a line from the file object
964
cmdline = file_objects[source].readline()
965
if not cmdline: # Empty line means end of file
966
# close the IPC pipe
967
file_objects[source].close()
968
del file_objects[source]
969
970
# Stop calling this function
971
return False
972
973
logger.debug(u"IPC command: %r", cmdline)
974
975
# Parse and act on command
976
cmd, args = cmdline.rstrip(u"\r\n").split(None, 1)
977
978
if cmd == u"NOTFOUND":
979
logger.warning(u"Client not found for fingerprint: %s",
980
args)
981
if self.use_dbus:
982
# Emit D-Bus signal
983
mandos_dbus_service.ClientNotFound(args)
984
elif cmd == u"INVALID":
985
for client in self.clients:
986
if client.name == args:
987
logger.warning(u"Client %s is invalid", args)
988
if self.use_dbus:
989
# Emit D-Bus signal
990
client.Rejected()
991
break
992
else:
993
logger.error(u"Unknown client %s is invalid", args)
994
elif cmd == u"SENDING":
995
for client in self.clients:
996
if client.name == args:
997
logger.info(u"Sending secret to %s", client.name)
998
client.checked_ok()
999
if self.use_dbus:
1000
# Emit D-Bus signal
1001
client.ReceivedSecret()
1002
break
1003
else:
1004
logger.error(u"Sending secret to unknown client %s",
1005
args)
1006
else:
1007
logger.error(u"Unknown IPC command: %r", cmdline)
1008
1009
# Keep calling this function
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
1010
1726
return True
1011
1727
1012
1728
1013
1729
def string_to_delta(interval):
1014
1730
"""Parse a string and return a datetime.timedelta
1015
1731
1016
>>> string_to_delta(u'7d')
1732
>>> string_to_delta('7d')
1017
1733
datetime.timedelta(7)
1018
>>> string_to_delta(u'60s')
1734
>>> string_to_delta('60s')
1019
1735
datetime.timedelta(0, 60)
1020
>>> string_to_delta(u'60m')
1736
>>> string_to_delta('60m')
1021
1737
datetime.timedelta(0, 3600)
1022
>>> string_to_delta(u'24h')
1738
>>> string_to_delta('24h')
1023
1739
datetime.timedelta(1)
1024
>>> string_to_delta(u'1w')
1740
>>> string_to_delta('1w')
1025
1741
datetime.timedelta(7)
1026
>>> string_to_delta(u'5m 30s')
1742
>>> string_to_delta('5m 30s')
1027
1743
datetime.timedelta(0, 330)
1028
1744
"""
1029
1745
timevalue = datetime.timedelta(0)
1031
1747
try:
1032
1748
suffix = unicode(s[-1])
1033
1749
value = int(s[:-1])
1034
if suffix == u"d":
1750
if suffix == "d":
1035
1751
delta = datetime.timedelta(value)
1036
elif suffix == u"s":
1752
elif suffix == "s":
1037
1753
delta = datetime.timedelta(0, value)
1038
elif suffix == u"m":
1754
elif suffix == "m":
1039
1755
delta = datetime.timedelta(0, 0, 0, 0, value)
1040
elif suffix == u"h":
1756
elif suffix == "h":
1041
1757
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
1042
elif suffix == u"w":
1758
elif suffix == "w":
1043
1759
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
1044
1760
else:
1045
raise ValueError
1046
except (ValueError, IndexError):
1047
raise ValueError
1761
raise ValueError("Unknown suffix %r" % suffix)
1762
except (ValueError, IndexError) as e:
1763
raise ValueError(*(e.args))
1048
1764
timevalue += delta
1049
1765
return timevalue
1050
1766
1051
1767
1052
def server_state_changed(state):
1053
"""Derived from the Avahi example code"""
1054
if state == avahi.SERVER_COLLISION:
1055
logger.error(u"Zeroconf server name collision")
1056
service.remove()
1057
elif state == avahi.SERVER_RUNNING:
1058
service.add()
1059
1060
1061
def entry_group_state_changed(state, error):
1062
"""Derived from the Avahi example code"""
1063
logger.debug(u"Avahi state change: %i", state)
1064
1065
if state == avahi.ENTRY_GROUP_ESTABLISHED:
1066
logger.debug(u"Zeroconf service established.")
1067
elif state == avahi.ENTRY_GROUP_COLLISION:
1068
logger.warning(u"Zeroconf service name collision.")
1069
service.rename()
1070
elif state == avahi.ENTRY_GROUP_FAILURE:
1071
logger.critical(u"Avahi: Error in group state changed %s",
1072
unicode(error))
1073
raise AvahiGroupError(u"State changed: %s" % unicode(error))
1074
1075
1768
def if_nametoindex(interface):
1076
1769
"""Call the C function if_nametoindex(), or equivalent
1077
1770
1079
1772
global if_nametoindex
1080
1773
try:
1081
1774
if_nametoindex = (ctypes.cdll.LoadLibrary
1082
(ctypes.util.find_library(u"c"))
1775
(ctypes.util.find_library("c"))
1083
1776
.if_nametoindex)
1084
1777
except (OSError, AttributeError):
1085
logger.warning(u"Doing if_nametoindex the hard way")
1778
logger.warning("Doing if_nametoindex the hard way")
1086
1779
def if_nametoindex(interface):
1087
1780
"Get an interface index the hard way, i.e. using fcntl()"
1088
1781
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1089
with closing(socket.socket()) as s:
1782
with contextlib.closing(socket.socket()) as s:
1090
1783
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1091
struct.pack(str(u"16s16x"),
1784
struct.pack(str("16s16x"),
1092
1785
interface))
1093
interface_index = struct.unpack(str(u"I"),
1786
interface_index = struct.unpack(str("I"),
1094
1787
ifreq[16:20])[0]
1095
1788
return interface_index
1096
1789
return if_nametoindex(interface)
1104
1797
sys.exit()
1105
1798
os.setsid()
1106
1799
if not nochdir:
1107
os.chdir(u"/")
1800
os.chdir("/")
1108
1801
if os.fork():
1109
1802
sys.exit()
1110
1803
if not noclose:
1112
1805
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1113
1806
if not stat.S_ISCHR(os.fstat(null).st_mode):
1114
1807
raise OSError(errno.ENODEV,
1115
u"/dev/null not a character device")
1808
"%s not a character device"
1809
% os.path.devnull)
1116
1810
os.dup2(null, sys.stdin.fileno())
1117
1811
os.dup2(null, sys.stdout.fileno())
1118
1812
os.dup2(null, sys.stderr.fileno())
1122
1816
1123
1817
def main():
1124
1818
1125
######################################################################
1819
##################################################################
1126
1820
# Parsing of options, both command line and config file
1127
1821
1128
parser = optparse.OptionParser(version = "%%prog %s" % version)
1129
parser.add_option("-i", u"--interface", type=u"string",
1130
metavar="IF", help=u"Bind to interface IF")
1131
parser.add_option("-a", u"--address", type=u"string",
1132
help=u"Address to listen for requests on")
1133
parser.add_option("-p", u"--port", type=u"int",
1134
help=u"Port number to receive requests on")
1135
parser.add_option("--check", action=u"store_true",
1136
help=u"Run self-test")
1137
parser.add_option("--debug", action=u"store_true",
1138
help=u"Debug mode; run in foreground and log to"
1139
u" terminal")
1140
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1141
u" priority string (see GnuTLS documentation)")
1142
parser.add_option("--servicename", type=u"string",
1143
metavar=u"NAME", help=u"Zeroconf service name")
1144
parser.add_option("--configdir", type=u"string",
1145
default=u"/etc/mandos", metavar=u"DIR",
1146
help=u"Directory to search for configuration"
1147
u" files")
1148
parser.add_option("--no-dbus", action=u"store_false",
1149
dest=u"use_dbus", help=u"Do not provide D-Bus"
1150
u" system bus interface")
1151
parser.add_option("--no-ipv6", action=u"store_false",
1152
dest=u"use_ipv6", help=u"Do not use IPv6")
1153
options = parser.parse_args()[0]
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()
1154
1853
1155
1854
if options.check:
1156
1855
import doctest
1158
1857
sys.exit()
1159
1858
1160
1859
# Default values for config file for server-global settings
1161
server_defaults = { u"interface": u"",
1162
u"address": u"",
1163
u"port": u"",
1164
u"debug": u"False",
1165
u"priority":
1166
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1167
u"servicename": u"Mandos",
1168
u"use_dbus": u"True",
1169
u"use_ipv6": u"True",
1860
server_defaults = { "interface": "",
1861
"address": "",
1862
"port": "",
1863
"debug": "False",
1864
"priority":
1865
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1866
"servicename": "Mandos",
1867
"use_dbus": "True",
1868
"use_ipv6": "True",
1869
"debuglevel": "",
1170
1870
}
1171
1871
1172
1872
# Parse config file for server-global settings
1173
1873
server_config = configparser.SafeConfigParser(server_defaults)
1174
1874
del server_defaults
1175
1875
server_config.read(os.path.join(options.configdir,
1176
u"mandos.conf"))
1876
"mandos.conf"))
1177
1877
# Convert the SafeConfigParser object to a dict
1178
1878
server_settings = server_config.defaults()
1179
1879
# Use the appropriate methods on the non-string config options
1180
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1181
server_settings[option] = server_config.getboolean(u"DEFAULT",
1880
for option in ("debug", "use_dbus", "use_ipv6"):
1881
server_settings[option] = server_config.getboolean("DEFAULT",
1182
1882
option)
1183
1883
if server_settings["port"]:
1184
server_settings["port"] = server_config.getint(u"DEFAULT",
1185
u"port")
1884
server_settings["port"] = server_config.getint("DEFAULT",
1885
"port")
1186
1886
del server_config
1187
1887
1188
1888
# Override the settings from the config file with command line
1189
1889
# options, if set.
1190
for option in (u"interface", u"address", u"port", u"debug",
1191
u"priority", u"servicename", u"configdir",
1192
u"use_dbus", u"use_ipv6"):
1890
for option in ("interface", "address", "port", "debug",
1891
"priority", "servicename", "configdir",
1892
"use_dbus", "use_ipv6", "debuglevel"):
1193
1893
value = getattr(options, option)
1194
1894
if value is not None:
1195
1895
server_settings[option] = value
1203
1903
##################################################################
1204
1904
1205
1905
# For convenience
1206
debug = server_settings[u"debug"]
1207
use_dbus = server_settings[u"use_dbus"]
1208
use_ipv6 = server_settings[u"use_ipv6"]
1209
1210
if not debug:
1211
syslogger.setLevel(logging.WARNING)
1212
console.setLevel(logging.WARNING)
1213
1214
if server_settings[u"servicename"] != u"Mandos":
1906
debug = server_settings["debug"]
1907
debuglevel = server_settings["debuglevel"]
1908
use_dbus = server_settings["use_dbus"]
1909
use_ipv6 = server_settings["use_ipv6"]
1910
1911
if server_settings["servicename"] != "Mandos":
1215
1912
syslogger.setFormatter(logging.Formatter
1216
(u'Mandos (%s) [%%(process)d]:'
1217
u' %%(levelname)s: %%(message)s'
1218
% server_settings[u"servicename"]))
1913
('Mandos (%s) [%%(process)d]:'
1914
' %%(levelname)s: %%(message)s'
1915
% server_settings["servicename"]))
1219
1916
1220
1917
# Parse config file with clients
1221
client_defaults = { u"timeout": u"1h",
1222
u"interval": u"5m",
1223
u"checker": u"fping -q -- %%(host)s",
1224
u"host": u"",
1918
client_defaults = { "timeout": "5m",
1919
"extended_timeout": "15m",
1920
"interval": "2m",
1921
"checker": "fping -q -- %%(host)s",
1922
"host": "",
1923
"approval_delay": "0s",
1924
"approval_duration": "1s",
1225
1925
}
1226
1926
client_config = configparser.SafeConfigParser(client_defaults)
1227
client_config.read(os.path.join(server_settings[u"configdir"],
1228
u"clients.conf"))
1927
client_config.read(os.path.join(server_settings["configdir"],
1928
"clients.conf"))
1229
1929
1230
1930
global mandos_dbus_service
1231
1931
mandos_dbus_service = None
1232
1932
1233
clients = set()
1234
tcp_server = IPv6_TCPServer((server_settings[u"address"],
1235
server_settings[u"port"]),
1236
ClientHandler,
1237
interface=
1238
server_settings[u"interface"],
1239
use_ipv6=use_ipv6,
1240
clients=clients,
1241
gnutls_priority=
1242
server_settings[u"priority"],
1243
use_dbus=use_dbus)
1244
pidfilename = u"/var/run/mandos.pid"
1245
try:
1246
pidfile = open(pidfilename, u"w")
1247
except IOError:
1248
logger.error(u"Could not open file %r", pidfilename)
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)
1249
1948
1250
1949
try:
1251
uid = pwd.getpwnam(u"_mandos").pw_uid
1252
gid = pwd.getpwnam(u"_mandos").pw_gid
1950
uid = pwd.getpwnam("_mandos").pw_uid
1951
gid = pwd.getpwnam("_mandos").pw_gid
1253
1952
except KeyError:
1254
1953
try:
1255
uid = pwd.getpwnam(u"mandos").pw_uid
1256
gid = pwd.getpwnam(u"mandos").pw_gid
1954
uid = pwd.getpwnam("mandos").pw_uid
1955
gid = pwd.getpwnam("mandos").pw_gid
1257
1956
except KeyError:
1258
1957
try:
1259
uid = pwd.getpwnam(u"nobody").pw_uid
1260
gid = pwd.getpwnam(u"nobody").pw_gid
1958
uid = pwd.getpwnam("nobody").pw_uid
1959
gid = pwd.getpwnam("nobody").pw_gid
1261
1960
except KeyError:
1262
1961
uid = 65534
1263
1962
gid = 65534
1264
1963
try:
1265
1964
os.setgid(gid)
1266
1965
os.setuid(uid)
1267
except OSError, error:
1966
except OSError as error:
1268
1967
if error[0] != errno.EPERM:
1269
1968
raise error
1270
1969
1271
# 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
1272
1978
if debug:
1979
# Enable all possible GnuTLS debugging
1980
1273
1981
# "Use a log level over 10 to enable all debugging options."
1274
1982
# - GnuTLS manual
1275
1983
gnutls.library.functions.gnutls_global_set_log_level(11)
1276
1984
1277
1985
@gnutls.library.types.gnutls_log_func
1278
1986
def debug_gnutls(level, string):
1279
logger.debug(u"GnuTLS: %s", string[:-1])
1987
logger.debug("GnuTLS: %s", string[:-1])
1280
1988
1281
1989
(gnutls.library.functions
1282
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)
1283
2000
1284
global service
1285
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
1286
service = AvahiService(name = server_settings[u"servicename"],
1287
servicetype = u"_mandos._tcp",
1288
protocol = protocol)
1289
if server_settings["interface"]:
1290
service.interface = (if_nametoindex
1291
(str(server_settings[u"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()
1292
2005
1293
2006
global main_loop
1294
global bus
1295
global server
1296
2007
# From the Avahi example code
1297
2008
DBusGMainLoop(set_as_default=True )
1298
2009
main_loop = gobject.MainLoop()
1299
2010
bus = dbus.SystemBus()
1300
server = dbus.Interface(bus.get_object(avahi.DBUS_NAME,
1301
avahi.DBUS_PATH_SERVER),
1302
avahi.DBUS_INTERFACE_SERVER)
1303
2011
# End of Avahi example code
1304
2012
if use_dbus:
1305
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos", bus)
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()
1306
2034
1307
2035
client_class = Client
1308
2036
if use_dbus:
1309
client_class = ClientDBus
1310
clients.update(set(
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(
1311
2052
client_class(name = section,
1312
config= dict(client_config.items(section)))
2053
config= dict(client_config_items(
2054
client_config, section)))
1313
2055
for section in client_config.sections()))
1314
if not clients:
1315
logger.warning(u"No clients defined")
1316
1317
if debug:
1318
# Redirect stdin so all checkers get /dev/null
1319
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
1320
os.dup2(null, sys.stdin.fileno())
1321
if null > 2:
1322
os.close(null)
1323
else:
1324
# No console logging
1325
logger.removeHandler(console)
1326
# Close all input and output, do double fork, etc.
1327
daemon()
1328
1329
try:
1330
with closing(pidfile):
1331
pid = os.getpid()
1332
pidfile.write(str(pid) + "\n")
1333
del pidfile
1334
except IOError:
1335
logger.error(u"Could not write to file %r with PID %d",
1336
pidfilename, pid)
1337
except NameError:
1338
# "pidfile" was never created
1339
pass
1340
del pidfilename
1341
1342
def cleanup():
1343
"Cleanup function; run on exit"
1344
global group
1345
# From the Avahi example code
1346
if not group is None:
1347
group.Free()
1348
group = None
1349
# End of Avahi example code
2056
if not tcp_server.clients:
2057
logger.warning("No clients defined")
1350
2058
1351
while clients:
1352
client = clients.pop()
1353
client.disable_hook = None
1354
client.disable()
1355
1356
atexit.register(cleanup)
1357
1358
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
1359
2073
signal.signal(signal.SIGINT, signal.SIG_IGN)
2074
1360
2075
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
1361
2076
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
1362
2077
1364
2079
class MandosDBusService(dbus.service.Object):
1365
2080
"""A D-Bus proxy object"""
1366
2081
def __init__(self):
1367
dbus.service.Object.__init__(self, bus, u"/")
1368
_interface = u"se.bsnet.fukt.Mandos"
1369
1370
@dbus.service.signal(_interface, signature=u"oa{sv}")
1371
def ClientAdded(self, objpath, properties):
1372
"D-Bus signal"
1373
pass
1374
1375
@dbus.service.signal(_interface, signature=u"s")
1376
def ClientNotFound(self, fingerprint):
1377
"D-Bus signal"
1378
pass
1379
1380
@dbus.service.signal(_interface, signature=u"os")
2082
dbus.service.Object.__init__(self, bus, "/")
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):
2092
"D-Bus signal"
2093
pass
2094
2095
@dbus.service.signal(_interface, signature="os")
1381
2096
def ClientRemoved(self, objpath, name):
1382
2097
"D-Bus signal"
1383
2098
pass
1384
2099
1385
@dbus.service.method(_interface, out_signature=u"ao")
2100
@dbus.service.method(_interface, out_signature="ao")
1386
2101
def GetAllClients(self):
1387
2102
"D-Bus method"
1388
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)
1389
2105
1390
2106
@dbus.service.method(_interface,
1391
out_signature=u"a{oa{sv}}")
2107
out_signature="a{oa{sv}}")
1392
2108
def GetAllClientsWithProperties(self):
1393
2109
"D-Bus method"
1394
2110
return dbus.Dictionary(
1395
((c.dbus_object_path, c.GetAllProperties())
1396
for c in clients),
1397
signature=u"oa{sv}")
2111
((c.dbus_object_path, c.GetAll(""))
2112
for c in tcp_server.clients),
2113
signature="oa{sv}")
1398
2114
1399
@dbus.service.method(_interface, in_signature=u"o")
2115
@dbus.service.method(_interface, in_signature="o")
1400
2116
def RemoveClient(self, object_path):
1401
2117
"D-Bus method"
1402
for c in clients:
2118
for c in tcp_server.clients:
1403
2119
if c.dbus_object_path == object_path:
1404
clients.remove(c)
2120
tcp_server.clients.remove(c)
1405
2121
c.remove_from_connection()
1406
2122
# Don't signal anything except ClientRemoved
1407
c.disable(signal=False)
2123
c.disable(quiet=True)
1408
2124
# Emit D-Bus signal
1409
2125
self.ClientRemoved(object_path, c.name)
1410
2126
return
1411
raise KeyError
2127
raise KeyError(object_path)
1412
2128
1413
2129
del _interface
1414
2130
1415
mandos_dbus_service = MandosDBusService()
1416
1417
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:
1418
2156
if use_dbus:
1419
2157
# Emit D-Bus signal
1420
mandos_dbus_service.ClientAdded(client.dbus_object_path,
1421
client.GetAllProperties())
2158
mandos_dbus_service.ClientAdded(client.dbus_object_path)
1422
2159
client.enable()
1423
2160
1424
2161
tcp_server.enable()
1427
2164
# Find out what port we got
1428
2165
service.port = tcp_server.socket.getsockname()[1]
1429
2166
if use_ipv6:
1430
logger.info(u"Now listening on address %r, port %d,"
2167
logger.info("Now listening on address %r, port %d,"
1431
2168
" flowinfo %d, scope_id %d"
1432
2169
% tcp_server.socket.getsockname())
1433
2170
else: # IPv4
1434
logger.info(u"Now listening on address %r, port %d"
2171
logger.info("Now listening on address %r, port %d"
1435
2172
% tcp_server.socket.getsockname())
1436
2173
1437
2174
#service.interface = tcp_server.socket.getsockname()[3]
1438
2175
1439
2176
try:
1440
2177
# From the Avahi example code
1441
server.connect_to_signal(u"StateChanged", server_state_changed)
1442
2178
try:
1443
server_state_changed(server.GetState())
1444
except dbus.exceptions.DBusException, error:
1445
logger.critical(u"DBusException: %s", error)
2179
service.activate()
2180
except dbus.exceptions.DBusException as error:
2181
logger.critical("DBusException: %s", error)
2182
cleanup()
1446
2183
sys.exit(1)
1447
2184
# End of Avahi example code
1448
2185
1451
2188
(tcp_server.handle_request
1452
2189
(*args[2:], **kwargs) or True))
1453
2190
1454
logger.debug(u"Starting main loop")
2191
logger.debug("Starting main loop")
1455
2192
main_loop.run()
1456
except AvahiError, error:
1457
logger.critical(u"AvahiError: %s", error)
2193
except AvahiError as error:
2194
logger.critical("AvahiError: %s", error)
2195
cleanup()
1458
2196
sys.exit(1)
1459
2197
except KeyboardInterrupt:
1460
2198
if debug:
1461
print >> sys.stderr
1462
logger.debug(u"Server received KeyboardInterrupt")
1463
logger.debug(u"Server exiting")
2199
print("", file=sys.stderr)
2200
logger.debug("Server received KeyboardInterrupt")
2201
logger.debug("Server exiting")
2202
# Must run before the D-Bus bus name gets deregistered
2203
cleanup()
2204
1464
2205
1465
2206
if __name__ == '__main__':
1466
2207
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0