To get this branch, use:
bzr branch
http://bzr.recompile.se/loggerhead/mandos/trunk
« back to all changes in this revision
Viewing changes to mandos
- browse files at revision 441
- compare with another revision
- download diff
- download tarball
- view history from revision 441
- Committer: Teddy Hogeborn
- Date: 2010-09-25 23:52:17 UTC
- Revision ID: teddy@fukt.bsnet.se-20100925235217-4hhqfryz1ste6uw3
* mandos (ClientDBus.__init__): Bug fix: Translate "-" in client names
to "_" in D-Bus object paths.
(MandosServer.handle_ipc): Bug fix: Send only address string to
D-Bus signal, not whole tuple.
* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
"--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.
* mandos-monitor (MandosClientWidget.update): Fix spelling.
to "_" in D-Bus object paths.
(MandosServer.handle_ipc): Bug fix: Send only address string to
D-Bus signal, not whole tuple.
* mandos-ctl: New options "--approve-by-default", "--deny-by-default",
"--approval-delay", and "--approval-duration".
* mandos-ctl.xml (SYNOPSIS, OPTIONS): Document new options.
* mandos-monitor (MandosClientWidget.update): Fix spelling.
- files removed:
- debian/source
- network-hooks.d
- files modified:
- .bzrignore
added
removed
mandos
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008,2009 Teddy Hogeborn
15
# Copyright © 2008,2009 Björn Påhlsson
16
16
#
17
17
# This program is free software: you can redistribute it and/or modify
18
18
# it under the terms of the GNU General Public License as published by
28
28
# along with this program. If not, see
29
29
# <http://www.gnu.org/licenses/>.
30
30
#
31
# Contact the authors at <mandos@recompile.se>.
31
# Contact the authors at <mandos@fukt.bsnet.se>.
32
32
#
33
33
34
from __future__ import (division, absolute_import, print_function,
35
unicode_literals)
34
from __future__ import division, with_statement, absolute_import
36
35
37
36
import SocketServer as socketserver
38
37
import socket
39
import argparse
38
import optparse
40
39
import datetime
41
40
import errno
42
41
import gnutls.crypto
62
61
import functools
63
62
import cPickle as pickle
64
63
import multiprocessing
65
import types
66
import binascii
67
import tempfile
68
import itertools
69
64
70
65
import dbus
71
66
import dbus.service
76
71
import ctypes.util
77
72
import xml.dom.minidom
78
73
import inspect
79
import GnuPGInterface
80
74
81
75
try:
82
76
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
80
except ImportError:
87
81
SO_BINDTODEVICE = None
88
82
89
version = "1.5.3"
90
stored_state_file = "clients.pickle"
91
92
logger = logging.getLogger()
83
84
version = "1.0.14"
85
86
#logger = logging.getLogger(u'mandos')
87
logger = logging.Logger(u'mandos')
93
88
syslogger = (logging.handlers.SysLogHandler
94
89
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
96
97
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
101
except (OSError, AttributeError):
102
def if_nametoindex(interface):
103
"Get an interface index the hard way, i.e. using fcntl()"
104
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
with contextlib.closing(socket.socket()) as s:
106
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
111
return interface_index
112
113
114
def initlogger(debug, level=logging.WARNING):
115
"""init logger and add loglevel"""
116
117
syslogger.setFormatter(logging.Formatter
118
('Mandos [%(process)d]: %(levelname)s:'
119
' %(message)s'))
120
logger.addHandler(syslogger)
121
122
if debug:
123
console = logging.StreamHandler()
124
console.setFormatter(logging.Formatter('%(asctime)s %(name)s'
125
' [%(process)d]:'
126
' %(levelname)s:'
127
' %(message)s'))
128
logger.addHandler(console)
129
logger.setLevel(level)
130
131
132
class PGPError(Exception):
133
"""Exception if encryption/decryption fails"""
134
pass
135
136
137
class PGPEngine(object):
138
"""A simple class for OpenPGP symmetric encryption & decryption"""
139
def __init__(self):
140
self.gnupg = GnuPGInterface.GnuPG()
141
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.gnupg.options.meta_interactive = False
144
self.gnupg.options.homedir = self.tempdir
145
self.gnupg.options.extra_args.extend(['--force-mdc',
146
'--quiet',
147
'--no-use-agent'])
148
149
def __enter__(self):
150
return self
151
152
def __exit__ (self, exc_type, exc_value, traceback):
153
self._cleanup()
154
return False
155
156
def __del__(self):
157
self._cleanup()
158
159
def _cleanup(self):
160
if self.tempdir is not None:
161
# Delete contents of tempdir
162
for root, dirs, files in os.walk(self.tempdir,
163
topdown = False):
164
for filename in files:
165
os.remove(os.path.join(root, filename))
166
for dirname in dirs:
167
os.rmdir(os.path.join(root, dirname))
168
# Remove tempdir
169
os.rmdir(self.tempdir)
170
self.tempdir = None
171
172
def password_encode(self, password):
173
# Passphrase can not be empty and can not contain newlines or
174
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
176
177
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
180
try:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
185
f.write(data)
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
188
proc.wait()
189
except IOError as e:
190
raise PGPError(e)
191
self.gnupg.passphrase = None
192
return ciphertext
193
194
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
197
try:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
202
f.write(data)
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
205
proc.wait()
206
except IOError as e:
207
raise PGPError(e)
208
self.gnupg.passphrase = None
209
return decrypted_plaintext
210
211
90
address = "/dev/log"))
91
syslogger.setFormatter(logging.Formatter
92
(u'Mandos [%(process)d]: %(levelname)s:'
93
u' %(message)s'))
94
logger.addHandler(syslogger)
95
96
console = logging.StreamHandler()
97
console.setFormatter(logging.Formatter(u'%(name)s [%(process)d]:'
98
u' %(levelname)s:'
99
u' %(message)s'))
100
logger.addHandler(console)
212
101
213
102
class AvahiError(Exception):
214
103
def __init__(self, value, *args, **kwargs):
230
119
Attributes:
231
120
interface: integer; avahi.IF_UNSPEC or an interface index.
232
121
Used to optionally bind to the specified interface.
233
name: string; Example: 'Mandos'
234
type: string; Example: '_mandos._tcp'.
122
name: string; Example: u'Mandos'
123
type: string; Example: u'_mandos._tcp'.
235
124
See <http://www.dns-sd.org/ServiceTypes.html>
236
125
port: integer; what port to announce
237
126
TXT: list of strings; TXT record for the service
246
135
"""
247
136
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
137
servicetype = None, port = None, TXT = None,
249
domain = "", host = "", max_renames = 32768,
138
domain = u"", host = u"", max_renames = 32768,
250
139
protocol = avahi.PROTO_UNSPEC, bus = None):
251
140
self.interface = interface
252
141
self.name = name
261
150
self.group = None # our entry group
262
151
self.server = None
263
152
self.bus = bus
264
self.entry_group_state_changed_match = None
265
153
def rename(self):
266
154
"""Derived from the Avahi example code"""
267
155
if self.rename_count >= self.max_renames:
268
logger.critical("No suitable Zeroconf service name found"
269
" after %i retries, exiting.",
156
logger.critical(u"No suitable Zeroconf service name found"
157
u" after %i retries, exiting.",
270
158
self.rename_count)
271
raise AvahiServiceError("Too many renames")
272
self.name = unicode(self.server
273
.GetAlternativeServiceName(self.name))
274
logger.info("Changing Zeroconf service name to %r ...",
159
raise AvahiServiceError(u"Too many renames")
160
self.name = unicode(self.server.GetAlternativeServiceName(self.name))
161
logger.info(u"Changing Zeroconf service name to %r ...",
275
162
self.name)
163
syslogger.setFormatter(logging.Formatter
164
(u'Mandos (%s) [%%(process)d]:'
165
u' %%(levelname)s: %%(message)s'
166
% self.name))
276
167
self.remove()
277
168
try:
278
169
self.add()
279
except dbus.exceptions.DBusException as error:
280
logger.critical("D-Bus Exception", exc_info=error)
170
except dbus.exceptions.DBusException, error:
171
logger.critical(u"DBusException: %s", error)
281
172
self.cleanup()
282
173
os._exit(1)
283
174
self.rename_count += 1
284
175
def remove(self):
285
176
"""Derived from the Avahi example code"""
286
if self.entry_group_state_changed_match is not None:
287
self.entry_group_state_changed_match.remove()
288
self.entry_group_state_changed_match = None
289
177
if self.group is not None:
290
178
self.group.Reset()
291
179
def add(self):
292
180
"""Derived from the Avahi example code"""
293
self.remove()
294
181
if self.group is None:
295
182
self.group = dbus.Interface(
296
183
self.bus.get_object(avahi.DBUS_NAME,
297
184
self.server.EntryGroupNew()),
298
185
avahi.DBUS_INTERFACE_ENTRY_GROUP)
299
self.entry_group_state_changed_match = (
300
self.group.connect_to_signal(
301
'StateChanged', self.entry_group_state_changed))
302
logger.debug("Adding Zeroconf service '%s' of type '%s' ...",
186
self.group.connect_to_signal('StateChanged',
187
self
188
.entry_group_state_changed)
189
logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
303
190
self.name, self.type)
304
191
self.group.AddService(
305
192
self.interface,
312
199
self.group.Commit()
313
200
def entry_group_state_changed(self, state, error):
314
201
"""Derived from the Avahi example code"""
315
logger.debug("Avahi entry group state change: %i", state)
202
logger.debug(u"Avahi entry group state change: %i", state)
316
203
317
204
if state == avahi.ENTRY_GROUP_ESTABLISHED:
318
logger.debug("Zeroconf service established.")
205
logger.debug(u"Zeroconf service established.")
319
206
elif state == avahi.ENTRY_GROUP_COLLISION:
320
logger.info("Zeroconf service name collision.")
207
logger.warning(u"Zeroconf service name collision.")
321
208
self.rename()
322
209
elif state == avahi.ENTRY_GROUP_FAILURE:
323
logger.critical("Avahi: Error in group state changed %s",
210
logger.critical(u"Avahi: Error in group state changed %s",
324
211
unicode(error))
325
raise AvahiGroupError("State changed: {0!s}"
326
.format(error))
212
raise AvahiGroupError(u"State changed: %s"
213
% unicode(error))
327
214
def cleanup(self):
328
215
"""Derived from the Avahi example code"""
329
216
if self.group is not None:
330
try:
331
self.group.Free()
332
except (dbus.exceptions.UnknownMethodException,
333
dbus.exceptions.DBusException):
334
pass
217
self.group.Free()
335
218
self.group = None
336
self.remove()
337
def server_state_changed(self, state, error=None):
219
def server_state_changed(self, state):
338
220
"""Derived from the Avahi example code"""
339
logger.debug("Avahi server state change: %i", state)
340
bad_states = { avahi.SERVER_INVALID:
341
"Zeroconf server invalid",
342
avahi.SERVER_REGISTERING: None,
343
avahi.SERVER_COLLISION:
344
"Zeroconf server name collision",
345
avahi.SERVER_FAILURE:
346
"Zeroconf server failure" }
347
if state in bad_states:
348
if bad_states[state] is not None:
349
if error is None:
350
logger.error(bad_states[state])
351
else:
352
logger.error(bad_states[state] + ": %r", error)
353
self.cleanup()
221
logger.debug(u"Avahi server state change: %i", state)
222
if state == avahi.SERVER_COLLISION:
223
logger.error(u"Zeroconf server name collision")
224
self.remove()
354
225
elif state == avahi.SERVER_RUNNING:
355
226
self.add()
356
else:
357
if error is None:
358
logger.debug("Unknown state: %r", state)
359
else:
360
logger.debug("Unknown state: %r: %r", state, error)
361
227
def activate(self):
362
228
"""Derived from the Avahi example code"""
363
229
if self.server is None:
364
230
self.server = dbus.Interface(
365
231
self.bus.get_object(avahi.DBUS_NAME,
366
avahi.DBUS_PATH_SERVER,
367
follow_name_owner_changes=True),
232
avahi.DBUS_PATH_SERVER),
368
233
avahi.DBUS_INTERFACE_SERVER)
369
self.server.connect_to_signal("StateChanged",
234
self.server.connect_to_signal(u"StateChanged",
370
235
self.server_state_changed)
371
236
self.server_state_changed(self.server.GetState())
372
237
373
class AvahiServiceToSyslog(AvahiService):
374
def rename(self):
375
"""Add the new name to the syslog messages"""
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos ({0}) [%(process)d]:'
379
' %(levelname)s: %(message)s'
380
.format(self.name)))
381
return ret
382
238
383
def timedelta_to_milliseconds(td):
384
"Convert a datetime.timedelta() to milliseconds"
385
return ((td.days * 24 * 60 * 60 * 1000)
386
+ (td.seconds * 1000)
387
+ (td.microseconds // 1000))
388
389
239
class Client(object):
390
240
"""A representation of a client host served by this server.
391
241
392
242
Attributes:
393
approved: bool(); 'None' if not yet approved/disapproved
243
_approved: bool(); 'None' if not yet approved/disapproved
394
244
approval_delay: datetime.timedelta(); Time to wait for approval
395
245
approval_duration: datetime.timedelta(); Duration of one approval
396
246
checker: subprocess.Popen(); a running checker process used
397
247
to see if the client lives.
398
248
'None' if no process is running.
399
checker_callback_tag: a gobject event source tag, or None
249
checker_callback_tag: - '' -
400
250
checker_command: string; External command which is run to check
401
251
if client lives. %() expansions are done at
402
252
runtime with vars(self) as dict, so that for
403
253
instance %(name)s can be used in the command.
404
254
checker_initiator_tag: a gobject event source tag, or None
405
255
created: datetime.datetime(); (UTC) object creation
406
client_structure: Object describing what attributes a client has
407
and is used for storing the client at exit
408
256
current_checker_command: string; current running checker_command
409
disable_initiator_tag: a gobject event source tag, or None
257
disable_hook: If set, called by disable() as disable_hook(self)
258
disable_initiator_tag: - '' -
410
259
enabled: bool()
411
260
fingerprint: string (40 or 32 hexadecimal digits); used to
412
261
uniquely identify the client
413
262
host: string; available for use by the checker command
414
263
interval: datetime.timedelta(); How often to start a new checker
415
last_approval_request: datetime.datetime(); (UTC) or None
416
264
last_checked_ok: datetime.datetime(); (UTC) or None
417
last_checker_status: integer between 0 and 255 reflecting exit
418
status of last checker. -1 reflects crashed
419
checker, -2 means no checker completed yet.
420
last_enabled: datetime.datetime(); (UTC) or None
265
last_enabled: datetime.datetime(); (UTC)
421
266
name: string; from the config file, used in log messages and
422
267
D-Bus identifiers
423
268
secret: bytestring; sent verbatim (over TLS) to client
424
269
timeout: datetime.timedelta(); How long from last_checked_ok
425
270
until this client is disabled
426
extended_timeout: extra long timeout when secret has been sent
427
271
runtime_expansions: Allowed attributes for runtime expansion.
428
expires: datetime.datetime(); time (UTC) when a client will be
429
disabled, or None
430
272
"""
431
273
432
runtime_expansions = ("approval_delay", "approval_duration",
433
"created", "enabled", "fingerprint",
434
"host", "interval", "last_checked_ok",
435
"last_enabled", "name", "timeout")
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
438
"interval": "2m",
439
"checker": "fping -q -- %%(host)s",
440
"host": "",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
444
"enabled": "True",
445
}
274
runtime_expansions = (u"approval_delay", u"approval_duration",
275
u"created", u"enabled", u"fingerprint",
276
u"host", u"interval", u"last_checked_ok",
277
u"last_enabled", u"name", u"timeout")
278
279
@staticmethod
280
def _timedelta_to_milliseconds(td):
281
"Convert a datetime.timedelta() to milliseconds"
282
return ((td.days * 24 * 60 * 60 * 1000)
283
+ (td.seconds * 1000)
284
+ (td.microseconds // 1000))
446
285
447
286
def timeout_milliseconds(self):
448
287
"Return the 'timeout' attribute in milliseconds"
449
return timedelta_to_milliseconds(self.timeout)
450
451
def extended_timeout_milliseconds(self):
452
"Return the 'extended_timeout' attribute in milliseconds"
453
return timedelta_to_milliseconds(self.extended_timeout)
288
return self._timedelta_to_milliseconds(self.timeout)
454
289
455
290
def interval_milliseconds(self):
456
291
"Return the 'interval' attribute in milliseconds"
457
return timedelta_to_milliseconds(self.interval)
458
292
return self._timedelta_to_milliseconds(self.interval)
293
459
294
def approval_delay_milliseconds(self):
460
return timedelta_to_milliseconds(self.approval_delay)
461
462
@staticmethod
463
def config_parser(config):
464
"""Construct a new dict of client settings of this form:
465
{ client_name: {setting_name: value, ...}, ...}
466
with exceptions for any special settings as defined above.
467
NOTE: Must be a pure function. Must return the same result
468
value given the same arguments.
469
"""
470
settings = {}
471
for client_name in config.sections():
472
section = dict(config.items(client_name))
473
client = settings[client_name] = {}
474
475
client["host"] = section["host"]
476
# Reformat values from string types to Python types
477
client["approved_by_default"] = config.getboolean(
478
client_name, "approved_by_default")
479
client["enabled"] = config.getboolean(client_name,
480
"enabled")
481
482
client["fingerprint"] = (section["fingerprint"].upper()
483
.replace(" ", ""))
484
if "secret" in section:
485
client["secret"] = section["secret"].decode("base64")
486
elif "secfile" in section:
487
with open(os.path.expanduser(os.path.expandvars
488
(section["secfile"])),
489
"rb") as secfile:
490
client["secret"] = secfile.read()
491
else:
492
raise TypeError("No secret or secfile for section {0}"
493
.format(section))
494
client["timeout"] = string_to_delta(section["timeout"])
495
client["extended_timeout"] = string_to_delta(
496
section["extended_timeout"])
497
client["interval"] = string_to_delta(section["interval"])
498
client["approval_delay"] = string_to_delta(
499
section["approval_delay"])
500
client["approval_duration"] = string_to_delta(
501
section["approval_duration"])
502
client["checker_command"] = section["checker"]
503
client["last_approval_request"] = None
504
client["last_checked_ok"] = None
505
client["last_checker_status"] = -2
506
507
return settings
508
509
510
def __init__(self, settings, name = None):
295
return self._timedelta_to_milliseconds(self.approval_delay)
296
297
def __init__(self, name = None, disable_hook=None, config=None):
511
298
"""Note: the 'checker' key in 'config' sets the
512
299
'checker_command' attribute and *not* the 'checker'
513
300
attribute."""
514
301
self.name = name
515
# adding all client settings
516
for setting, value in settings.iteritems():
517
setattr(self, setting, value)
518
519
if self.enabled:
520
if not hasattr(self, "last_enabled"):
521
self.last_enabled = datetime.datetime.utcnow()
522
if not hasattr(self, "expires"):
523
self.expires = (datetime.datetime.utcnow()
524
+ self.timeout)
525
else:
526
self.last_enabled = None
527
self.expires = None
528
529
logger.debug("Creating client %r", self.name)
302
if config is None:
303
config = {}
304
logger.debug(u"Creating client %r", self.name)
530
305
# Uppercase and remove spaces from fingerprint for later
531
306
# comparison purposes with return value from the fingerprint()
532
307
# function
533
logger.debug(" Fingerprint: %s", self.fingerprint)
534
self.created = settings.get("created",
535
datetime.datetime.utcnow())
536
537
# attributes specific for this server instance
308
self.fingerprint = (config[u"fingerprint"].upper()
309
.replace(u" ", u""))
310
logger.debug(u" Fingerprint: %s", self.fingerprint)
311
if u"secret" in config:
312
self.secret = config[u"secret"].decode(u"base64")
313
elif u"secfile" in config:
314
with open(os.path.expanduser(os.path.expandvars
315
(config[u"secfile"])),
316
"rb") as secfile:
317
self.secret = secfile.read()
318
else:
319
raise TypeError(u"No secret or secfile for client %s"
320
% self.name)
321
self.host = config.get(u"host", u"")
322
self.created = datetime.datetime.utcnow()
323
self.enabled = False
324
self.last_enabled = None
325
self.last_checked_ok = None
326
self.timeout = string_to_delta(config[u"timeout"])
327
self.interval = string_to_delta(config[u"interval"])
328
self.disable_hook = disable_hook
538
329
self.checker = None
539
330
self.checker_initiator_tag = None
540
331
self.disable_initiator_tag = None
541
332
self.checker_callback_tag = None
333
self.checker_command = config[u"checker"]
542
334
self.current_checker_command = None
543
self.approved = None
335
self.last_connect = None
336
self._approved = None
337
self.approved_by_default = config.get(u"approved_by_default",
338
True)
544
339
self.approvals_pending = 0
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
547
.Lock()))
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
550
if not attr.startswith("_")]
551
self.client_structure.append("client_structure")
552
553
for name, t in inspect.getmembers(type(self),
554
lambda obj:
555
isinstance(obj,
556
property)):
557
if not name.startswith("_"):
558
self.client_structure.append(name)
340
self.approval_delay = string_to_delta(
341
config[u"approval_delay"])
342
self.approval_duration = string_to_delta(
343
config[u"approval_duration"])
344
self.changedstate = multiprocessing_manager.Condition(multiprocessing_manager.Lock())
559
345
560
# Send notice to process children that client state has changed
561
346
def send_changedstate(self):
562
with self.changedstate:
563
self.changedstate.notify_all()
564
347
self.changedstate.acquire()
348
self.changedstate.notify_all()
349
self.changedstate.release()
350
565
351
def enable(self):
566
352
"""Start this client's checker and timeout hooks"""
567
if getattr(self, "enabled", False):
353
if getattr(self, u"enabled", False):
568
354
# Already enabled
569
355
return
570
356
self.send_changedstate()
571
self.expires = datetime.datetime.utcnow() + self.timeout
572
self.enabled = True
573
357
self.last_enabled = datetime.datetime.utcnow()
574
self.init_checker()
575
576
def disable(self, quiet=True):
577
"""Disable this client."""
578
if not getattr(self, "enabled", False):
579
return False
580
if not quiet:
581
self.send_changedstate()
582
if not quiet:
583
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
585
gobject.source_remove(self.disable_initiator_tag)
586
self.disable_initiator_tag = None
587
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
589
gobject.source_remove(self.checker_initiator_tag)
590
self.checker_initiator_tag = None
591
self.stop_checker()
592
self.enabled = False
593
# Do not run this again if called by a gobject.timeout_add
594
return False
595
596
def __del__(self):
597
self.disable()
598
599
def init_checker(self):
600
358
# Schedule a new checker to be started an 'interval' from now,
601
359
# and every interval from then on.
602
360
self.checker_initiator_tag = (gobject.timeout_add
606
364
self.disable_initiator_tag = (gobject.timeout_add
607
365
(self.timeout_milliseconds(),
608
366
self.disable))
367
self.enabled = True
609
368
# Also start a new checker *right now*.
610
369
self.start_checker()
611
370
371
def disable(self, quiet=True):
372
"""Disable this client."""
373
if not getattr(self, "enabled", False):
374
return False
375
if not quiet:
376
self.send_changedstate()
377
if not quiet:
378
logger.info(u"Disabling client %s", self.name)
379
if getattr(self, u"disable_initiator_tag", False):
380
gobject.source_remove(self.disable_initiator_tag)
381
self.disable_initiator_tag = None
382
if getattr(self, u"checker_initiator_tag", False):
383
gobject.source_remove(self.checker_initiator_tag)
384
self.checker_initiator_tag = None
385
self.stop_checker()
386
if self.disable_hook:
387
self.disable_hook(self)
388
self.enabled = False
389
# Do not run this again if called by a gobject.timeout_add
390
return False
391
392
def __del__(self):
393
self.disable_hook = None
394
self.disable()
395
612
396
def checker_callback(self, pid, condition, command):
613
397
"""The checker has completed, so take appropriate actions."""
614
398
self.checker_callback_tag = None
615
399
self.checker = None
616
400
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
618
if self.last_checker_status == 0:
619
logger.info("Checker for %(name)s succeeded",
401
exitstatus = os.WEXITSTATUS(condition)
402
if exitstatus == 0:
403
logger.info(u"Checker for %(name)s succeeded",
620
404
vars(self))
621
405
self.checked_ok()
622
406
else:
623
logger.info("Checker for %(name)s failed",
407
logger.info(u"Checker for %(name)s failed",
624
408
vars(self))
625
409
else:
626
self.last_checker_status = -1
627
logger.warning("Checker for %(name)s crashed?",
410
logger.warning(u"Checker for %(name)s crashed?",
628
411
vars(self))
629
412
630
413
def checked_ok(self):
631
"""Assert that the client has been seen, alive and well."""
414
"""Bump up the timeout for this client.
415
416
This should only be called when the client has been seen,
417
alive and well.
418
"""
632
419
self.last_checked_ok = datetime.datetime.utcnow()
633
self.last_checker_status = 0
634
self.bump_timeout()
635
636
def bump_timeout(self, timeout=None):
637
"""Bump up the timeout for this client."""
638
if timeout is None:
639
timeout = self.timeout
640
if self.disable_initiator_tag is not None:
641
gobject.source_remove(self.disable_initiator_tag)
642
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
646
self.expires = datetime.datetime.utcnow() + timeout
647
648
def need_approval(self):
649
self.last_approval_request = datetime.datetime.utcnow()
420
gobject.source_remove(self.disable_initiator_tag)
421
self.disable_initiator_tag = (gobject.timeout_add
422
(self.timeout_milliseconds(),
423
self.disable))
650
424
651
425
def start_checker(self):
652
426
"""Start a new checker subprocess if one is not running.
665
439
# If a checker exists, make sure it is not a zombie
666
440
try:
667
441
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
except (AttributeError, OSError) as error:
442
except (AttributeError, OSError), error:
669
443
if (isinstance(error, OSError)
670
444
and error.errno != errno.ECHILD):
671
445
raise error
672
446
else:
673
447
if pid:
674
logger.warning("Checker was a zombie")
448
logger.warning(u"Checker was a zombie")
675
449
gobject.source_remove(self.checker_callback_tag)
676
450
self.checker_callback(pid, status,
677
451
self.current_checker_command)
684
458
# Escape attributes for the shell
685
459
escaped_attrs = dict(
686
460
(attr,
687
re.escape(unicode(str(getattr(self, attr, "")),
461
re.escape(unicode(str(getattr(self, attr, u"")),
688
462
errors=
689
'replace')))
463
u'replace')))
690
464
for attr in
691
465
self.runtime_expansions)
692
466
693
467
try:
694
468
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
469
except TypeError, error:
470
logger.error(u'Could not format string "%s":'
471
u' %s', self.checker_command, error)
698
472
return True # Try again later
699
473
self.current_checker_command = command
700
474
try:
701
logger.info("Starting checker %r for %s",
475
logger.info(u"Starting checker %r for %s",
702
476
command, self.name)
703
477
# We don't need to redirect stdout and stderr, since
704
478
# in normal mode, that is already done by daemon(),
706
480
# always replaced by /dev/null.)
707
481
self.checker = subprocess.Popen(command,
708
482
close_fds=True,
709
shell=True, cwd="/")
483
shell=True, cwd=u"/")
710
484
self.checker_callback_tag = (gobject.child_watch_add
711
485
(self.checker.pid,
712
486
self.checker_callback,
717
491
if pid:
718
492
gobject.source_remove(self.checker_callback_tag)
719
493
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess",
722
exc_info=error)
494
except OSError, error:
495
logger.error(u"Failed to start subprocess: %s",
496
error)
723
497
# Re-run this periodically if run by gobject.timeout_add
724
498
return True
725
499
728
502
if self.checker_callback_tag:
729
503
gobject.source_remove(self.checker_callback_tag)
730
504
self.checker_callback_tag = None
731
if getattr(self, "checker", None) is None:
505
if getattr(self, u"checker", None) is None:
732
506
return
733
logger.debug("Stopping checker for %(name)s", vars(self))
507
logger.debug(u"Stopping checker for %(name)s", vars(self))
734
508
try:
735
self.checker.terminate()
509
os.kill(self.checker.pid, signal.SIGTERM)
736
510
#time.sleep(0.5)
737
511
#if self.checker.poll() is None:
738
# self.checker.kill()
739
except OSError as error:
512
# os.kill(self.checker.pid, signal.SIGKILL)
513
except OSError, error:
740
514
if error.errno != errno.ESRCH: # No such process
741
515
raise
742
516
self.checker = None
743
517
744
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
518
def dbus_service_property(dbus_interface, signature=u"v",
519
access=u"readwrite", byte_arrays=False):
747
520
"""Decorators for marking methods of a DBusObjectWithProperties to
748
521
become properties on the D-Bus.
749
522
756
529
"""
757
530
# Encoding deeply encoded byte arrays is not supported yet by the
758
531
# "Set" method, so we fail early here:
759
if byte_arrays and signature != "ay":
760
raise ValueError("Byte arrays not supported for non-'ay'"
761
" signature {0!r}".format(signature))
532
if byte_arrays and signature != u"ay":
533
raise ValueError(u"Byte arrays not supported for non-'ay'"
534
u" signature %r" % signature)
762
535
def decorator(func):
763
536
func._dbus_is_property = True
764
537
func._dbus_interface = dbus_interface
765
538
func._dbus_signature = signature
766
539
func._dbus_access = access
767
540
func._dbus_name = func.__name__
768
if func._dbus_name.endswith("_dbus_property"):
541
if func._dbus_name.endswith(u"_dbus_property"):
769
542
func._dbus_name = func._dbus_name[:-14]
770
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
771
return func
772
return decorator
773
774
775
def dbus_interface_annotations(dbus_interface):
776
"""Decorator for marking functions returning interface annotations.
777
778
Usage:
779
780
@dbus_interface_annotations("org.example.Interface")
781
def _foo(self): # Function name does not matter
782
return {"org.freedesktop.DBus.Deprecated": "true",
783
"org.freedesktop.DBus.Property.EmitsChangedSignal":
784
"false"}
785
"""
786
def decorator(func):
787
func._dbus_is_interface = True
788
func._dbus_interface = dbus_interface
789
func._dbus_name = dbus_interface
790
return func
791
return decorator
792
793
794
def dbus_annotations(annotations):
795
"""Decorator to annotate D-Bus methods, signals or properties
796
Usage:
797
798
@dbus_service_property("org.example.Interface", signature="b",
799
access="r")
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
803
def Property_dbus_property(self):
804
return dbus.Boolean(False)
805
"""
806
def decorator(func):
807
func._dbus_annotations = annotations
543
func._dbus_get_args_options = {u'byte_arrays': byte_arrays }
808
544
return func
809
545
return decorator
810
546
830
566
831
567
class DBusObjectWithProperties(dbus.service.Object):
832
568
"""A D-Bus object with properties.
833
569
834
570
Classes inheriting from this can use the dbus_service_property
835
571
decorator to expose methods as D-Bus properties. It exposes the
836
572
standard Get(), Set(), and GetAll() methods on the D-Bus.
837
573
"""
838
574
839
575
@staticmethod
840
def _is_dbus_thing(thing):
841
"""Returns a function testing if an attribute is a D-Bus thing
842
843
If called like _is_dbus_thing("method") it returns a function
844
suitable for use as predicate to inspect.getmembers().
845
"""
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
847
False)
576
def _is_dbus_property(obj):
577
return getattr(obj, u"_dbus_is_property", False)
848
578
849
def _get_all_dbus_things(self, thing):
579
def _get_all_dbus_properties(self):
850
580
"""Returns a generator of (name, attribute) pairs
851
581
"""
852
return ((getattr(athing.__get__(self), "_dbus_name",
853
name),
854
athing.__get__(self))
855
for cls in self.__class__.__mro__
856
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
582
return ((prop._dbus_name, prop)
583
for name, prop in
584
inspect.getmembers(self, self._is_dbus_property))
859
585
860
586
def _get_dbus_property(self, interface_name, property_name):
861
587
"""Returns a bound method if one exists which is a D-Bus
862
588
property with the specified name and interface.
863
589
"""
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
866
(cls,
867
self._is_dbus_thing("property"))):
868
if (value._dbus_name == property_name
869
and value._dbus_interface == interface_name):
870
return value.__get__(self)
871
590
for name in (property_name,
591
property_name + u"_dbus_property"):
592
prop = getattr(self, name, None)
593
if (prop is None
594
or not self._is_dbus_property(prop)
595
or prop._dbus_name != property_name
596
or (interface_name and prop._dbus_interface
597
and interface_name != prop._dbus_interface)):
598
continue
599
return prop
872
600
# No such property
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
601
raise DBusPropertyNotFound(self.dbus_object_path + u":"
602
+ interface_name + u"."
875
603
+ property_name)
876
604
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
878
out_signature="v")
605
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ss",
606
out_signature=u"v")
879
607
def Get(self, interface_name, property_name):
880
608
"""Standard D-Bus property Get() method, see D-Bus standard.
881
609
"""
882
610
prop = self._get_dbus_property(interface_name, property_name)
883
if prop._dbus_access == "write":
611
if prop._dbus_access == u"write":
884
612
raise DBusPropertyAccessException(property_name)
885
613
value = prop()
886
if not hasattr(value, "variant_level"):
614
if not hasattr(value, u"variant_level"):
887
615
return value
888
616
return type(value)(value, variant_level=value.variant_level+1)
889
617
890
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv")
618
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"ssv")
891
619
def Set(self, interface_name, property_name, value):
892
620
"""Standard D-Bus property Set() method, see D-Bus standard.
893
621
"""
894
622
prop = self._get_dbus_property(interface_name, property_name)
895
if prop._dbus_access == "read":
623
if prop._dbus_access == u"read":
896
624
raise DBusPropertyAccessException(property_name)
897
if prop._dbus_get_args_options["byte_arrays"]:
625
if prop._dbus_get_args_options[u"byte_arrays"]:
898
626
# The byte_arrays option is not supported yet on
899
627
# signatures other than "ay".
900
if prop._dbus_signature != "ay":
628
if prop._dbus_signature != u"ay":
901
629
raise ValueError
902
value = dbus.ByteArray(b''.join(chr(byte)
903
for byte in value))
630
value = dbus.ByteArray(''.join(unichr(byte)
631
for byte in value))
904
632
prop(value)
905
633
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
907
out_signature="a{sv}")
634
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature=u"s",
635
out_signature=u"a{sv}")
908
636
def GetAll(self, interface_name):
909
637
"""Standard D-Bus property GetAll() method, see D-Bus
910
638
standard.
911
639
912
640
Note: Will not include properties with access="write".
913
641
"""
914
properties = {}
915
for name, prop in self._get_all_dbus_things("property"):
642
all = {}
643
for name, prop in self._get_all_dbus_properties():
916
644
if (interface_name
917
645
and interface_name != prop._dbus_interface):
918
646
# Interface non-empty but did not match
919
647
continue
920
648
# Ignore write-only properties
921
if prop._dbus_access == "write":
649
if prop._dbus_access == u"write":
922
650
continue
923
651
value = prop()
924
if not hasattr(value, "variant_level"):
925
properties[name] = value
652
if not hasattr(value, u"variant_level"):
653
all[name] = value
926
654
continue
927
properties[name] = type(value)(value, variant_level=
928
value.variant_level+1)
929
return dbus.Dictionary(properties, signature="sv")
655
all[name] = type(value)(value, variant_level=
656
value.variant_level+1)
657
return dbus.Dictionary(all, signature=u"sv")
930
658
931
659
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
932
out_signature="s",
660
out_signature=u"s",
933
661
path_keyword='object_path',
934
662
connection_keyword='connection')
935
663
def Introspect(self, object_path, connection):
936
"""Overloading of standard D-Bus method.
937
938
Inserts property tags and interface annotation tags.
664
"""Standard D-Bus method, overloaded to insert property tags.
939
665
"""
940
666
xmlstring = dbus.service.Object.Introspect(self, object_path,
941
667
connection)
942
668
try:
943
669
document = xml.dom.minidom.parseString(xmlstring)
944
670
def make_tag(document, name, prop):
945
e = document.createElement("property")
946
e.setAttribute("name", name)
947
e.setAttribute("type", prop._dbus_signature)
948
e.setAttribute("access", prop._dbus_access)
671
e = document.createElement(u"property")
672
e.setAttribute(u"name", name)
673
e.setAttribute(u"type", prop._dbus_signature)
674
e.setAttribute(u"access", prop._dbus_access)
949
675
return e
950
for if_tag in document.getElementsByTagName("interface"):
951
# Add property tags
676
for if_tag in document.getElementsByTagName(u"interface"):
952
677
for tag in (make_tag(document, name, prop)
953
678
for name, prop
954
in self._get_all_dbus_things("property")
679
in self._get_all_dbus_properties()
955
680
if prop._dbus_interface
956
== if_tag.getAttribute("name")):
681
== if_tag.getAttribute(u"name")):
957
682
if_tag.appendChild(tag)
958
# Add annotation tags
959
for typ in ("method", "signal", "property"):
960
for tag in if_tag.getElementsByTagName(typ):
961
annots = dict()
962
for name, prop in (self.
963
_get_all_dbus_things(typ)):
964
if (name == tag.getAttribute("name")
965
and prop._dbus_interface
966
== if_tag.getAttribute("name")):
967
annots.update(getattr
968
(prop,
969
"_dbus_annotations",
970
{}))
971
for name, value in annots.iteritems():
972
ann_tag = document.createElement(
973
"annotation")
974
ann_tag.setAttribute("name", name)
975
ann_tag.setAttribute("value", value)
976
tag.appendChild(ann_tag)
977
# Add interface annotation tags
978
for annotation, value in dict(
979
itertools.chain(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
984
))).iteritems():
985
ann_tag = document.createElement("annotation")
986
ann_tag.setAttribute("name", annotation)
987
ann_tag.setAttribute("value", value)
988
if_tag.appendChild(ann_tag)
989
683
# Add the names to the return values for the
990
684
# "org.freedesktop.DBus.Properties" methods
991
if (if_tag.getAttribute("name")
992
== "org.freedesktop.DBus.Properties"):
993
for cn in if_tag.getElementsByTagName("method"):
994
if cn.getAttribute("name") == "Get":
995
for arg in cn.getElementsByTagName("arg"):
996
if (arg.getAttribute("direction")
997
== "out"):
998
arg.setAttribute("name", "value")
999
elif cn.getAttribute("name") == "GetAll":
1000
for arg in cn.getElementsByTagName("arg"):
1001
if (arg.getAttribute("direction")
1002
== "out"):
1003
arg.setAttribute("name", "props")
1004
xmlstring = document.toxml("utf-8")
685
if (if_tag.getAttribute(u"name")
686
== u"org.freedesktop.DBus.Properties"):
687
for cn in if_tag.getElementsByTagName(u"method"):
688
if cn.getAttribute(u"name") == u"Get":
689
for arg in cn.getElementsByTagName(u"arg"):
690
if (arg.getAttribute(u"direction")
691
== u"out"):
692
arg.setAttribute(u"name", u"value")
693
elif cn.getAttribute(u"name") == u"GetAll":
694
for arg in cn.getElementsByTagName(u"arg"):
695
if (arg.getAttribute(u"direction")
696
== u"out"):
697
arg.setAttribute(u"name", u"props")
698
xmlstring = document.toxml(u"utf-8")
1005
699
document.unlink()
1006
700
except (AttributeError, xml.dom.DOMException,
1007
xml.parsers.expat.ExpatError) as error:
1008
logger.error("Failed to override Introspection method",
1009
exc_info=error)
701
xml.parsers.expat.ExpatError), error:
702
logger.error(u"Failed to override Introspection method",
703
error)
1010
704
return xmlstring
1011
705
1012
706
1013
def datetime_to_dbus (dt, variant_level=0):
1014
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1015
if dt is None:
1016
return dbus.String("", variant_level = variant_level)
1017
return dbus.String(dt.isoformat(),
1018
variant_level=variant_level)
1019
1020
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
.__metaclass__):
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1025
"""
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1034
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
# with the wrong interface name
1036
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1039
continue
1040
# Create an alternate D-Bus interface name based on
1041
# the current name
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1047
# Is this a D-Bus signal?
1048
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1050
# black magic
1051
nonmethod_func = (dict(
1052
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1054
.cell_contents)
1055
# Create a new, but exactly alike, function
1056
# object, and decorate it to be a new D-Bus signal
1057
# with the alternate D-Bus interface name
1058
new_function = (dbus.service.signal
1059
(alt_interface,
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1067
# Copy annotations, if any
1068
try:
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1071
except AttributeError:
1072
pass
1073
# Define a creator of a function to call both the
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1076
def fixscope(func1, func2):
1077
"""This function is a scope container to pass
1078
func1 and func2 to the "call_both" function
1079
outside of its arguments"""
1080
def call_both(*args, **kwargs):
1081
"""This function will emit two D-Bus
1082
signals by calling func1 and func2"""
1083
func1(*args, **kwargs)
1084
func2(*args, **kwargs)
1085
return call_both
1086
# Create the "call_both" function and add it to
1087
# the class
1088
attr[attrname] = fixscope(attribute,
1089
new_function)
1090
# Is this a D-Bus method?
1091
elif getattr(attribute, "_dbus_is_method", False):
1092
# Create a new, but exactly alike, function
1093
# object. Decorate it to be a new D-Bus method
1094
# with the alternate D-Bus interface name. Add it
1095
# to the class.
1096
attr[attrname] = (dbus.service.method
1097
(alt_interface,
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1100
(types.FunctionType
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1106
# Copy annotations, if any
1107
try:
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1110
except AttributeError:
1111
pass
1112
# Is this a D-Bus property?
1113
elif getattr(attribute, "_dbus_is_property", False):
1114
# Create a new, but exactly alike, function
1115
# object, and decorate it to be a new D-Bus
1116
# property with the alternate D-Bus interface
1117
# name. Add it to the class.
1118
attr[attrname] = (dbus_service_property
1119
(alt_interface,
1120
attribute._dbus_signature,
1121
attribute._dbus_access,
1122
attribute
1123
._dbus_get_args_options
1124
["byte_arrays"])
1125
(types.FunctionType
1126
(attribute.func_code,
1127
attribute.func_globals,
1128
attribute.func_name,
1129
attribute.func_defaults,
1130
attribute.func_closure)))
1131
# Copy annotations, if any
1132
try:
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1135
except AttributeError:
1136
pass
1137
# Is this a D-Bus interface?
1138
elif getattr(attribute, "_dbus_is_interface", False):
1139
# Create a new, but exactly alike, function
1140
# object. Decorate it to be a new D-Bus interface
1141
# with the alternate D-Bus interface name. Add it
1142
# to the class.
1143
attr[attrname] = (dbus_interface_annotations
1144
(alt_interface)
1145
(types.FunctionType
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1155
def func(self):
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1159
itertools.count()):
1160
if aname not in attr:
1161
attr[aname] = func
1162
break
1163
return type.__new__(mcs, name, bases, attr)
1164
1165
1166
707
class ClientDBus(Client, DBusObjectWithProperties):
1167
708
"""A Client class using D-Bus
1168
709
1172
713
"""
1173
714
1174
715
runtime_expansions = (Client.runtime_expansions
1175
+ ("dbus_object_path",))
716
+ (u"dbus_object_path",))
1176
717
1177
718
# dbus.service.Object doesn't use super(), so we can't either.
1178
719
1179
720
def __init__(self, bus = None, *args, **kwargs):
721
self._approvals_pending = 0
1180
722
self.bus = bus
1181
723
Client.__init__(self, *args, **kwargs)
1182
724
# Only now, when this client is initialized, can it show up on
1183
725
# the D-Bus
1184
726
client_object_name = unicode(self.name).translate(
1185
{ord("."): ord("_"),
1186
ord("-"): ord("_")})
727
{ord(u"."): ord(u"_"),
728
ord(u"-"): ord(u"_")})
1187
729
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
730
(u"/clients/" + client_object_name))
1189
731
DBusObjectWithProperties.__init__(self, self.bus,
1190
732
self.dbus_object_path)
1191
733
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1194
variant_level=1):
1195
""" Modify a variable so that it's a property which announces
1196
its changes to DBus.
1197
1198
transform_fun: Function that takes a value and a variant_level
1199
and transforms it to a D-Bus type.
1200
dbus_name: D-Bus name of the variable
1201
type_func: Function that transform the value before sending it
1202
to the D-Bus. Default: no transform
1203
variant_level: D-Bus variant level. Default: 1
1204
"""
1205
attrname = "_{0}".format(dbus_name)
1206
def setter(self, value):
1207
if hasattr(self, "dbus_object_path"):
1208
if (not hasattr(self, attrname) or
1209
type_func(getattr(self, attrname, None))
1210
!= type_func(value)):
1211
dbus_value = transform_func(type_func(value),
1212
variant_level
1213
=variant_level)
1214
self.PropertyChanged(dbus.String(dbus_name),
1215
dbus_value)
1216
setattr(self, attrname, value)
1217
1218
return property(lambda self: getattr(self, attrname), setter)
1219
1220
1221
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1222
approvals_pending = notifychangeproperty(dbus.Boolean,
1223
"ApprovalPending",
1224
type_func = bool)
1225
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1226
last_enabled = notifychangeproperty(datetime_to_dbus,
1227
"LastEnabled")
1228
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1229
type_func = lambda checker:
1230
checker is not None)
1231
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1232
"LastCheckedOK")
1233
last_checker_status = notifychangeproperty(dbus.Int16,
1234
"LastCheckerStatus")
1235
last_approval_request = notifychangeproperty(
1236
datetime_to_dbus, "LastApprovalRequest")
1237
approved_by_default = notifychangeproperty(dbus.Boolean,
1238
"ApprovedByDefault")
1239
approval_delay = notifychangeproperty(dbus.UInt64,
1240
"ApprovalDelay",
1241
type_func =
1242
timedelta_to_milliseconds)
1243
approval_duration = notifychangeproperty(
1244
dbus.UInt64, "ApprovalDuration",
1245
type_func = timedelta_to_milliseconds)
1246
host = notifychangeproperty(dbus.String, "Host")
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
type_func =
1249
timedelta_to_milliseconds)
1250
extended_timeout = notifychangeproperty(
1251
dbus.UInt64, "ExtendedTimeout",
1252
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
1254
"Interval",
1255
type_func =
1256
timedelta_to_milliseconds)
1257
checker_command = notifychangeproperty(dbus.String, "Checker")
1258
1259
del notifychangeproperty
734
def _get_approvals_pending(self):
735
return self._approvals_pending
736
def _set_approvals_pending(self, value):
737
old_value = self._approvals_pending
738
self._approvals_pending = value
739
bval = bool(value)
740
if (hasattr(self, "dbus_object_path")
741
and bval is not bool(old_value)):
742
dbus_bool = dbus.Boolean(bval, variant_level=1)
743
self.PropertyChanged(dbus.String(u"ApprovalPending"),
744
dbus_bool)
745
746
approvals_pending = property(_get_approvals_pending,
747
_set_approvals_pending)
748
del _get_approvals_pending, _set_approvals_pending
749
750
@staticmethod
751
def _datetime_to_dbus(dt, variant_level=0):
752
"""Convert a UTC datetime.datetime() to a D-Bus type."""
753
return dbus.String(dt.isoformat(),
754
variant_level=variant_level)
755
756
def enable(self):
757
oldstate = getattr(self, u"enabled", False)
758
r = Client.enable(self)
759
if oldstate != self.enabled:
760
# Emit D-Bus signals
761
self.PropertyChanged(dbus.String(u"Enabled"),
762
dbus.Boolean(True, variant_level=1))
763
self.PropertyChanged(
764
dbus.String(u"LastEnabled"),
765
self._datetime_to_dbus(self.last_enabled,
766
variant_level=1))
767
return r
768
769
def disable(self, quiet = False):
770
oldstate = getattr(self, u"enabled", False)
771
r = Client.disable(self, quiet=quiet)
772
if not quiet and oldstate != self.enabled:
773
# Emit D-Bus signal
774
self.PropertyChanged(dbus.String(u"Enabled"),
775
dbus.Boolean(False, variant_level=1))
776
return r
1260
777
1261
778
def __del__(self, *args, **kwargs):
1262
779
try:
1263
780
self.remove_from_connection()
1264
781
except LookupError:
1265
782
pass
1266
if hasattr(DBusObjectWithProperties, "__del__"):
783
if hasattr(DBusObjectWithProperties, u"__del__"):
1267
784
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1268
785
Client.__del__(self, *args, **kwargs)
1269
786
1271
788
*args, **kwargs):
1272
789
self.checker_callback_tag = None
1273
790
self.checker = None
791
# Emit D-Bus signal
792
self.PropertyChanged(dbus.String(u"CheckerRunning"),
793
dbus.Boolean(False, variant_level=1))
1274
794
if os.WIFEXITED(condition):
1275
795
exitstatus = os.WEXITSTATUS(condition)
1276
796
# Emit D-Bus signal
1286
806
return Client.checker_callback(self, pid, condition, command,
1287
807
*args, **kwargs)
1288
808
809
def checked_ok(self, *args, **kwargs):
810
r = Client.checked_ok(self, *args, **kwargs)
811
# Emit D-Bus signal
812
self.PropertyChanged(
813
dbus.String(u"LastCheckedOK"),
814
(self._datetime_to_dbus(self.last_checked_ok,
815
variant_level=1)))
816
return r
817
1289
818
def start_checker(self, *args, **kwargs):
1290
819
old_checker = self.checker
1291
820
if self.checker is not None:
1298
827
and old_checker_pid != self.checker.pid):
1299
828
# Emit D-Bus signal
1300
829
self.CheckerStarted(self.current_checker_command)
830
self.PropertyChanged(
831
dbus.String(u"CheckerRunning"),
832
dbus.Boolean(True, variant_level=1))
1301
833
return r
1302
834
835
def stop_checker(self, *args, **kwargs):
836
old_checker = getattr(self, u"checker", None)
837
r = Client.stop_checker(self, *args, **kwargs)
838
if (old_checker is not None
839
and getattr(self, u"checker", None) is None):
840
self.PropertyChanged(dbus.String(u"CheckerRunning"),
841
dbus.Boolean(False, variant_level=1))
842
return r
843
1303
844
def _reset_approved(self):
1304
self.approved = None
845
self._approved = None
1305
846
return False
1306
847
1307
848
def approve(self, value=True):
1308
849
self.send_changedstate()
1309
self.approved = value
1310
gobject.timeout_add(timedelta_to_milliseconds
850
self._approved = value
851
gobject.timeout_add(self._timedelta_to_milliseconds
1311
852
(self.approval_duration),
1312
853
self._reset_approved)
1313
854
1314
855
1315
856
## D-Bus methods, signals & properties
1316
_interface = "se.recompile.Mandos.Client"
1317
1318
## Interfaces
1319
1320
@dbus_interface_annotations(_interface)
1321
def _foo(self):
1322
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
"false"}
857
_interface = u"se.bsnet.fukt.Mandos.Client"
1324
858
1325
859
## Signals
1326
860
1327
861
# CheckerCompleted - signal
1328
@dbus.service.signal(_interface, signature="nxs")
862
@dbus.service.signal(_interface, signature=u"nxs")
1329
863
def CheckerCompleted(self, exitcode, waitstatus, command):
1330
864
"D-Bus signal"
1331
865
pass
1332
866
1333
867
# CheckerStarted - signal
1334
@dbus.service.signal(_interface, signature="s")
868
@dbus.service.signal(_interface, signature=u"s")
1335
869
def CheckerStarted(self, command):
1336
870
"D-Bus signal"
1337
871
pass
1338
872
1339
873
# PropertyChanged - signal
1340
@dbus.service.signal(_interface, signature="sv")
874
@dbus.service.signal(_interface, signature=u"sv")
1341
875
def PropertyChanged(self, property, value):
1342
876
"D-Bus signal"
1343
877
pass
1352
886
pass
1353
887
1354
888
# Rejected - signal
1355
@dbus.service.signal(_interface, signature="s")
889
@dbus.service.signal(_interface, signature=u"s")
1356
890
def Rejected(self, reason):
1357
891
"D-Bus signal"
1358
892
pass
1359
893
1360
894
# NeedApproval - signal
1361
@dbus.service.signal(_interface, signature="tb")
895
@dbus.service.signal(_interface, signature=u"tb")
1362
896
def NeedApproval(self, timeout, default):
1363
897
"D-Bus signal"
1364
return self.need_approval()
898
pass
1365
899
1366
900
## Methods
1367
901
1368
902
# Approve - method
1369
@dbus.service.method(_interface, in_signature="b")
903
@dbus.service.method(_interface, in_signature=u"b")
1370
904
def Approve(self, value):
1371
905
self.approve(value)
1372
906
1373
907
# CheckedOK - method
1374
908
@dbus.service.method(_interface)
1375
909
def CheckedOK(self):
1376
self.checked_ok()
910
return self.checked_ok()
1377
911
1378
912
# Enable - method
1379
913
@dbus.service.method(_interface)
1401
935
## Properties
1402
936
1403
937
# ApprovalPending - property
1404
@dbus_service_property(_interface, signature="b", access="read")
938
@dbus_service_property(_interface, signature=u"b", access=u"read")
1405
939
def ApprovalPending_dbus_property(self):
1406
940
return dbus.Boolean(bool(self.approvals_pending))
1407
941
1408
942
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
1410
access="readwrite")
943
@dbus_service_property(_interface, signature=u"b",
944
access=u"readwrite")
1411
945
def ApprovedByDefault_dbus_property(self, value=None):
1412
946
if value is None: # get
1413
947
return dbus.Boolean(self.approved_by_default)
1414
948
self.approved_by_default = bool(value)
949
# Emit D-Bus signal
950
self.PropertyChanged(dbus.String(u"ApprovedByDefault"),
951
dbus.Boolean(value, variant_level=1))
1415
952
1416
953
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
1418
access="readwrite")
954
@dbus_service_property(_interface, signature=u"t",
955
access=u"readwrite")
1419
956
def ApprovalDelay_dbus_property(self, value=None):
1420
957
if value is None: # get
1421
958
return dbus.UInt64(self.approval_delay_milliseconds())
1422
959
self.approval_delay = datetime.timedelta(0, 0, 0, value)
960
# Emit D-Bus signal
961
self.PropertyChanged(dbus.String(u"ApprovalDelay"),
962
dbus.UInt64(value, variant_level=1))
1423
963
1424
964
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
1426
access="readwrite")
965
@dbus_service_property(_interface, signature=u"t",
966
access=u"readwrite")
1427
967
def ApprovalDuration_dbus_property(self, value=None):
1428
968
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
969
return dbus.UInt64(self._timedelta_to_milliseconds(
1430
970
self.approval_duration))
1431
971
self.approval_duration = datetime.timedelta(0, 0, 0, value)
972
# Emit D-Bus signal
973
self.PropertyChanged(dbus.String(u"ApprovalDuration"),
974
dbus.UInt64(value, variant_level=1))
1432
975
1433
976
# Name - property
1434
@dbus_service_property(_interface, signature="s", access="read")
977
@dbus_service_property(_interface, signature=u"s", access=u"read")
1435
978
def Name_dbus_property(self):
1436
979
return dbus.String(self.name)
1437
980
1438
981
# Fingerprint - property
1439
@dbus_service_property(_interface, signature="s", access="read")
982
@dbus_service_property(_interface, signature=u"s", access=u"read")
1440
983
def Fingerprint_dbus_property(self):
1441
984
return dbus.String(self.fingerprint)
1442
985
1443
986
# Host - property
1444
@dbus_service_property(_interface, signature="s",
1445
access="readwrite")
987
@dbus_service_property(_interface, signature=u"s",
988
access=u"readwrite")
1446
989
def Host_dbus_property(self, value=None):
1447
990
if value is None: # get
1448
991
return dbus.String(self.host)
1449
self.host = unicode(value)
992
self.host = value
993
# Emit D-Bus signal
994
self.PropertyChanged(dbus.String(u"Host"),
995
dbus.String(value, variant_level=1))
1450
996
1451
997
# Created - property
1452
@dbus_service_property(_interface, signature="s", access="read")
998
@dbus_service_property(_interface, signature=u"s", access=u"read")
1453
999
def Created_dbus_property(self):
1454
return datetime_to_dbus(self.created)
1000
return dbus.String(self._datetime_to_dbus(self.created))
1455
1001
1456
1002
# LastEnabled - property
1457
@dbus_service_property(_interface, signature="s", access="read")
1003
@dbus_service_property(_interface, signature=u"s", access=u"read")
1458
1004
def LastEnabled_dbus_property(self):
1459
return datetime_to_dbus(self.last_enabled)
1005
if self.last_enabled is None:
1006
return dbus.String(u"")
1007
return dbus.String(self._datetime_to_dbus(self.last_enabled))
1460
1008
1461
1009
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
1463
access="readwrite")
1010
@dbus_service_property(_interface, signature=u"b",
1011
access=u"readwrite")
1464
1012
def Enabled_dbus_property(self, value=None):
1465
1013
if value is None: # get
1466
1014
return dbus.Boolean(self.enabled)
1470
1018
self.disable()
1471
1019
1472
1020
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
1474
access="readwrite")
1021
@dbus_service_property(_interface, signature=u"s",
1022
access=u"readwrite")
1475
1023
def LastCheckedOK_dbus_property(self, value=None):
1476
1024
if value is not None:
1477
1025
self.checked_ok()
1478
1026
return
1479
return datetime_to_dbus(self.last_checked_ok)
1480
1481
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
1483
access="read")
1484
def LastCheckerStatus_dbus_property(self):
1485
return dbus.Int16(self.last_checker_status)
1486
1487
# Expires - property
1488
@dbus_service_property(_interface, signature="s", access="read")
1489
def Expires_dbus_property(self):
1490
return datetime_to_dbus(self.expires)
1491
1492
# LastApprovalRequest - property
1493
@dbus_service_property(_interface, signature="s", access="read")
1494
def LastApprovalRequest_dbus_property(self):
1495
return datetime_to_dbus(self.last_approval_request)
1027
if self.last_checked_ok is None:
1028
return dbus.String(u"")
1029
return dbus.String(self._datetime_to_dbus(self
1030
.last_checked_ok))
1496
1031
1497
1032
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
1499
access="readwrite")
1033
@dbus_service_property(_interface, signature=u"t",
1034
access=u"readwrite")
1500
1035
def Timeout_dbus_property(self, value=None):
1501
1036
if value is None: # get
1502
1037
return dbus.UInt64(self.timeout_milliseconds())
1503
1038
self.timeout = datetime.timedelta(0, 0, 0, value)
1039
# Emit D-Bus signal
1040
self.PropertyChanged(dbus.String(u"Timeout"),
1041
dbus.UInt64(value, variant_level=1))
1042
if getattr(self, u"disable_initiator_tag", None) is None:
1043
return
1504
1044
# Reschedule timeout
1505
if self.enabled:
1506
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1510
# The timeout has passed
1511
self.disable()
1512
else:
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1515
time_to_die))
1516
if (getattr(self, "disable_initiator_tag", None)
1517
is None):
1518
return
1519
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1521
(time_to_die,
1522
self.disable))
1523
1524
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
1526
access="readwrite")
1527
def ExtendedTimeout_dbus_property(self, value=None):
1528
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
1530
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1045
gobject.source_remove(self.disable_initiator_tag)
1046
self.disable_initiator_tag = None
1047
time_to_die = (self.
1048
_timedelta_to_milliseconds((self
1049
.last_checked_ok
1050
+ self.timeout)
1051
- datetime.datetime
1052
.utcnow()))
1053
if time_to_die <= 0:
1054
# The timeout has passed
1055
self.disable()
1056
else:
1057
self.disable_initiator_tag = (gobject.timeout_add
1058
(time_to_die, self.disable))
1531
1059
1532
1060
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
1534
access="readwrite")
1061
@dbus_service_property(_interface, signature=u"t",
1062
access=u"readwrite")
1535
1063
def Interval_dbus_property(self, value=None):
1536
1064
if value is None: # get
1537
1065
return dbus.UInt64(self.interval_milliseconds())
1538
1066
self.interval = datetime.timedelta(0, 0, 0, value)
1539
if getattr(self, "checker_initiator_tag", None) is None:
1067
# Emit D-Bus signal
1068
self.PropertyChanged(dbus.String(u"Interval"),
1069
dbus.UInt64(value, variant_level=1))
1070
if getattr(self, u"checker_initiator_tag", None) is None:
1540
1071
return
1541
if self.enabled:
1542
# Reschedule checker run
1543
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
1547
1072
# Reschedule checker run
1073
gobject.source_remove(self.checker_initiator_tag)
1074
self.checker_initiator_tag = (gobject.timeout_add
1075
(value, self.start_checker))
1076
self.start_checker() # Start one now, too
1077
1548
1078
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
1550
access="readwrite")
1079
@dbus_service_property(_interface, signature=u"s",
1080
access=u"readwrite")
1551
1081
def Checker_dbus_property(self, value=None):
1552
1082
if value is None: # get
1553
1083
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
1084
self.checker_command = value
1085
# Emit D-Bus signal
1086
self.PropertyChanged(dbus.String(u"Checker"),
1087
dbus.String(self.checker_command,
1088
variant_level=1))
1555
1089
1556
1090
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
1558
access="readwrite")
1091
@dbus_service_property(_interface, signature=u"b",
1092
access=u"readwrite")
1559
1093
def CheckerRunning_dbus_property(self, value=None):
1560
1094
if value is None: # get
1561
1095
return dbus.Boolean(self.checker is not None)
1565
1099
self.stop_checker()
1566
1100
1567
1101
# ObjectPath - property
1568
@dbus_service_property(_interface, signature="o", access="read")
1102
@dbus_service_property(_interface, signature=u"o", access=u"read")
1569
1103
def ObjectPath_dbus_property(self):
1570
1104
return self.dbus_object_path # is already a dbus.ObjectPath
1571
1105
1572
1106
# Secret = property
1573
@dbus_service_property(_interface, signature="ay",
1574
access="write", byte_arrays=True)
1107
@dbus_service_property(_interface, signature=u"ay",
1108
access=u"write", byte_arrays=True)
1575
1109
def Secret_dbus_property(self, value):
1576
1110
self.secret = str(value)
1577
1111
1584
1118
self._pipe.send(('init', fpr, address))
1585
1119
if not self._pipe.recv():
1586
1120
raise KeyError()
1587
1121
1588
1122
def __getattribute__(self, name):
1589
if name == '_pipe':
1123
if(name == '_pipe'):
1590
1124
return super(ProxyClient, self).__getattribute__(name)
1591
1125
self._pipe.send(('getattr', name))
1592
1126
data = self._pipe.recv()
1597
1131
self._pipe.send(('funcall', name, args, kwargs))
1598
1132
return self._pipe.recv()[1]
1599
1133
return func
1600
1134
1601
1135
def __setattr__(self, name, value):
1602
if name == '_pipe':
1136
if(name == '_pipe'):
1603
1137
return super(ProxyClient, self).__setattr__(name, value)
1604
1138
self._pipe.send(('setattr', name, value))
1605
1139
1606
1140
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1609
1610
1611
1141
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1142
"""A class to handle client connections.
1613
1143
1616
1146
1617
1147
def handle(self):
1618
1148
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
logger.info("TCP connection from: %s",
1149
logger.info(u"TCP connection from: %s",
1620
1150
unicode(self.client_address))
1621
logger.debug("Pipe FD: %d",
1151
logger.debug(u"Pipe FD: %d",
1622
1152
self.server.child_pipe.fileno())
1623
1153
1624
1154
session = (gnutls.connection
1625
1155
.ClientSession(self.request,
1626
1156
gnutls.connection
1627
1157
.X509Credentials()))
1628
1158
1629
1159
# Note: gnutls.connection.X509Credentials is really a
1630
1160
# generic GnuTLS certificate credentials object so long as
1631
1161
# no X.509 keys are added to it. Therefore, we can use it
1632
1162
# here despite using OpenPGP certificates.
1633
1634
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
1635
# "+AES-256-CBC", "+SHA1",
1636
# "+COMP-NULL", "+CTYPE-OPENPGP",
1637
# "+DHE-DSS"))
1163
1164
#priority = u':'.join((u"NONE", u"+VERS-TLS1.1",
1165
# u"+AES-256-CBC", u"+SHA1",
1166
# u"+COMP-NULL", u"+CTYPE-OPENPGP",
1167
# u"+DHE-DSS"))
1638
1168
# Use a fallback default, since this MUST be set.
1639
1169
priority = self.server.gnutls_priority
1640
1170
if priority is None:
1641
priority = "NORMAL"
1171
priority = u"NORMAL"
1642
1172
(gnutls.library.functions
1643
1173
.gnutls_priority_set_direct(session._c_object,
1644
1174
priority, None))
1645
1175
1646
1176
# Start communication using the Mandos protocol
1647
1177
# Get protocol number
1648
1178
line = self.request.makefile().readline()
1649
logger.debug("Protocol version: %r", line)
1179
logger.debug(u"Protocol version: %r", line)
1650
1180
try:
1651
1181
if int(line.strip().split()[0]) > 1:
1652
1182
raise RuntimeError
1653
except (ValueError, IndexError, RuntimeError) as error:
1654
logger.error("Unknown protocol version: %s", error)
1183
except (ValueError, IndexError, RuntimeError), error:
1184
logger.error(u"Unknown protocol version: %s", error)
1655
1185
return
1656
1186
1657
1187
# Start GnuTLS connection
1658
1188
try:
1659
1189
session.handshake()
1660
except gnutls.errors.GNUTLSError as error:
1661
logger.warning("Handshake failed: %s", error)
1190
except gnutls.errors.GNUTLSError, error:
1191
logger.warning(u"Handshake failed: %s", error)
1662
1192
# Do not run session.bye() here: the session is not
1663
1193
# established. Just abandon the request.
1664
1194
return
1665
logger.debug("Handshake succeeded")
1666
1195
logger.debug(u"Handshake succeeded")
1196
1667
1197
approval_required = False
1668
1198
try:
1669
1199
try:
1670
1200
fpr = self.fingerprint(self.peer_certificate
1671
1201
(session))
1672
except (TypeError,
1673
gnutls.errors.GNUTLSError) as error:
1674
logger.warning("Bad certificate: %s", error)
1202
except (TypeError, gnutls.errors.GNUTLSError), error:
1203
logger.warning(u"Bad certificate: %s", error)
1675
1204
return
1676
logger.debug("Fingerprint: %s", fpr)
1677
1205
logger.debug(u"Fingerprint: %s", fpr)
1206
1678
1207
try:
1679
1208
client = ProxyClient(child_pipe, fpr,
1680
1209
self.client_address)
1688
1217
1689
1218
while True:
1690
1219
if not client.enabled:
1691
logger.info("Client %s is disabled",
1220
logger.warning(u"Client %s is disabled",
1692
1221
client.name)
1693
1222
if self.server.use_dbus:
1694
1223
# Emit D-Bus signal
1695
client.Rejected("Disabled")
1224
client.Rejected("Disabled")
1696
1225
return
1697
1226
1698
if client.approved or not client.approval_delay:
1227
if client._approved or not client.approval_delay:
1699
1228
#We are approved or approval is disabled
1700
1229
break
1701
elif client.approved is None:
1702
logger.info("Client %s needs approval",
1230
elif client._approved is None:
1231
logger.info(u"Client %s needs approval",
1703
1232
client.name)
1704
1233
if self.server.use_dbus:
1705
1234
# Emit D-Bus signal
1707
1236
client.approval_delay_milliseconds(),
1708
1237
client.approved_by_default)
1709
1238
else:
1710
logger.warning("Client %s was not approved",
1239
logger.warning(u"Client %s was not approved",
1711
1240
client.name)
1712
1241
if self.server.use_dbus:
1713
1242
# Emit D-Bus signal
1715
1244
return
1716
1245
1717
1246
#wait until timeout or approved
1247
#x = float(client._timedelta_to_milliseconds(delay))
1718
1248
time = datetime.datetime.now()
1719
1249
client.changedstate.acquire()
1720
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1722
/ 1000)))
1250
client.changedstate.wait(float(client._timedelta_to_milliseconds(delay) / 1000))
1723
1251
client.changedstate.release()
1724
1252
time2 = datetime.datetime.now()
1725
1253
if (time2 - time) >= delay:
1740
1268
while sent_size < len(client.secret):
1741
1269
try:
1742
1270
sent = session.send(client.secret[sent_size:])
1743
except gnutls.errors.GNUTLSError as error:
1271
except (gnutls.errors.GNUTLSError), error:
1744
1272
logger.warning("gnutls send failed")
1745
1273
return
1746
logger.debug("Sent: %d, remaining: %d",
1274
logger.debug(u"Sent: %d, remaining: %d",
1747
1275
sent, len(client.secret)
1748
1276
- (sent_size + sent))
1749
1277
sent_size += sent
1750
1751
logger.info("Sending secret to %s", client.name)
1752
# bump the timeout using extended_timeout
1753
client.bump_timeout(client.extended_timeout)
1278
1279
logger.info(u"Sending secret to %s", client.name)
1280
# bump the timeout as if seen
1281
client.checked_ok()
1754
1282
if self.server.use_dbus:
1755
1283
# Emit D-Bus signal
1756
1284
client.GotSecret()
1760
1288
client.approvals_pending -= 1
1761
1289
try:
1762
1290
session.bye()
1763
except gnutls.errors.GNUTLSError as error:
1291
except (gnutls.errors.GNUTLSError), error:
1764
1292
logger.warning("GnuTLS bye failed")
1765
1293
1766
1294
@staticmethod
1777
1305
.gnutls_certificate_get_peers
1778
1306
(session._c_object, ctypes.byref(list_size)))
1779
1307
if not bool(cert_list) and list_size.value != 0:
1780
raise gnutls.errors.GNUTLSError("error getting peer"
1781
" certificate")
1308
raise gnutls.errors.GNUTLSError(u"error getting peer"
1309
u" certificate")
1782
1310
if list_size.value == 0:
1783
1311
return None
1784
1312
cert = cert_list[0]
1810
1338
if crtverify.value != 0:
1811
1339
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
1340
raise (gnutls.errors.CertificateSecurityError
1813
("Verify failed"))
1341
(u"Verify failed"))
1814
1342
# New buffer for the fingerprint
1815
1343
buf = ctypes.create_string_buffer(20)
1816
1344
buf_len = ctypes.c_size_t()
1823
1351
# Convert the buffer to a Python bytestring
1824
1352
fpr = ctypes.string_at(buf, buf_len.value)
1825
1353
# Convert the bytestring to hexadecimal notation
1826
hex_fpr = binascii.hexlify(fpr).upper()
1354
hex_fpr = u''.join(u"%02X" % ord(char) for char in fpr)
1827
1355
return hex_fpr
1828
1356
1829
1357
1832
1360
def sub_process_main(self, request, address):
1833
1361
try:
1834
1362
self.finish_request(request, address)
1835
except Exception:
1363
except:
1836
1364
self.handle_error(request, address)
1837
1365
self.close_request(request)
1838
1366
1839
1367
def process_request(self, request, address):
1840
1368
"""Start a new process to process the request."""
1841
proc = multiprocessing.Process(target = self.sub_process_main,
1842
args = (request,
1843
address))
1844
proc.start()
1845
return proc
1846
1369
multiprocessing.Process(target = self.sub_process_main,
1370
args = (request, address)).start()
1847
1371
1848
1372
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1849
1373
""" adds a pipe to the MixIn """
1853
1377
This function creates a new pipe in self.pipe
1854
1378
"""
1855
1379
parent_pipe, self.child_pipe = multiprocessing.Pipe()
1856
1857
proc = MultiprocessingMixIn.process_request(self, request,
1858
client_address)
1380
1381
super(MultiprocessingMixInWithPipe,
1382
self).process_request(request, client_address)
1859
1383
self.child_pipe.close()
1860
self.add_pipe(parent_pipe, proc)
1861
1862
def add_pipe(self, parent_pipe, proc):
1384
self.add_pipe(parent_pipe)
1385
1386
def add_pipe(self, parent_pipe):
1863
1387
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
1865
1388
pass
1866
1389
1867
1390
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1868
1391
socketserver.TCPServer, object):
1886
1409
bind to an address or port if they were not specified."""
1887
1410
if self.interface is not None:
1888
1411
if SO_BINDTODEVICE is None:
1889
logger.error("SO_BINDTODEVICE does not exist;"
1890
" cannot bind to interface %s",
1412
logger.error(u"SO_BINDTODEVICE does not exist;"
1413
u" cannot bind to interface %s",
1891
1414
self.interface)
1892
1415
else:
1893
1416
try:
1894
1417
self.socket.setsockopt(socket.SOL_SOCKET,
1895
1418
SO_BINDTODEVICE,
1896
1419
str(self.interface
1897
+ '\0'))
1898
except socket.error as error:
1420
+ u'\0'))
1421
except socket.error, error:
1899
1422
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1423
logger.error(u"No permission to"
1424
u" bind to interface %s",
1902
1425
self.interface)
1903
1426
elif error[0] == errno.ENOPROTOOPT:
1904
logger.error("SO_BINDTODEVICE not available;"
1905
" cannot bind to interface %s",
1427
logger.error(u"SO_BINDTODEVICE not available;"
1428
u" cannot bind to interface %s",
1906
1429
self.interface)
1907
1430
else:
1908
1431
raise
1910
1433
if self.server_address[0] or self.server_address[1]:
1911
1434
if not self.server_address[0]:
1912
1435
if self.address_family == socket.AF_INET6:
1913
any_address = "::" # in6addr_any
1436
any_address = u"::" # in6addr_any
1914
1437
else:
1915
1438
any_address = socket.INADDR_ANY
1916
1439
self.server_address = (any_address,
1943
1466
self.enabled = False
1944
1467
self.clients = clients
1945
1468
if self.clients is None:
1946
self.clients = {}
1469
self.clients = set()
1947
1470
self.use_dbus = use_dbus
1948
1471
self.gnutls_priority = gnutls_priority
1949
1472
IPv6_TCPServer.__init__(self, server_address,
1953
1476
def server_activate(self):
1954
1477
if self.enabled:
1955
1478
return socketserver.TCPServer.server_activate(self)
1956
1957
1479
def enable(self):
1958
1480
self.enabled = True
1959
1960
def add_pipe(self, parent_pipe, proc):
1481
def add_pipe(self, parent_pipe):
1961
1482
# Call "handle_ipc" for both data and EOF events
1962
1483
gobject.io_add_watch(parent_pipe.fileno(),
1963
1484
gobject.IO_IN | gobject.IO_HUP,
1964
1485
functools.partial(self.handle_ipc,
1965
parent_pipe =
1966
parent_pipe,
1967
proc = proc))
1968
1486
parent_pipe = parent_pipe))
1487
1969
1488
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1489
client_object=None):
1971
1490
condition_names = {
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1491
gobject.IO_IN: u"IN", # There is data to read.
1492
gobject.IO_OUT: u"OUT", # Data can be written (without
1974
1493
# blocking).
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1494
gobject.IO_PRI: u"PRI", # There is urgent data to read.
1495
gobject.IO_ERR: u"ERR", # Error condition.
1496
gobject.IO_HUP: u"HUP" # Hung up (the connection has been
1978
1497
# broken, usually for pipes and
1979
1498
# sockets).
1980
1499
}
1982
1501
for cond, name in
1983
1502
condition_names.iteritems()
1984
1503
if cond & condition)
1985
# error, or the other end of multiprocessing.Pipe has closed
1504
# error or the other end of multiprocessing.Pipe has closed
1986
1505
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
1987
# Wait for other process to exit
1988
proc.join()
1989
1506
return False
1990
1507
1991
1508
# Read a request from the child
1996
1513
fpr = request[1]
1997
1514
address = request[2]
1998
1515
1999
for c in self.clients.itervalues():
1516
for c in self.clients:
2000
1517
if c.fingerprint == fpr:
2001
1518
client = c
2002
1519
break
2003
1520
else:
2004
logger.info("Client not found for fingerprint: %s, ad"
2005
"dress: %s", fpr, address)
1521
logger.warning(u"Client not found for fingerprint: %s, ad"
1522
u"dress: %s", fpr, address)
2006
1523
if self.use_dbus:
2007
1524
# Emit D-Bus signal
2008
mandos_dbus_service.ClientNotFound(fpr,
2009
address[0])
1525
mandos_dbus_service.ClientNotFound(fpr, address[0])
2010
1526
parent_pipe.send(False)
2011
1527
return False
2012
1528
2013
1529
gobject.io_add_watch(parent_pipe.fileno(),
2014
1530
gobject.IO_IN | gobject.IO_HUP,
2015
1531
functools.partial(self.handle_ipc,
2016
parent_pipe =
2017
parent_pipe,
2018
proc = proc,
2019
client_object =
2020
client))
1532
parent_pipe = parent_pipe,
1533
client_object = client))
2021
1534
parent_pipe.send(True)
2022
# remove the old hook in favor of the new above hook on
2023
# same fileno
1535
# remove the old hook in favor of the new above hook on same fileno
2024
1536
return False
2025
1537
if command == 'funcall':
2026
1538
funcname = request[1]
2027
1539
args = request[2]
2028
1540
kwargs = request[3]
2029
1541
2030
parent_pipe.send(('data', getattr(client_object,
2031
funcname)(*args,
2032
**kwargs)))
2033
1542
parent_pipe.send(('data', getattr(client_object, funcname)(*args, **kwargs)))
1543
2034
1544
if command == 'getattr':
2035
1545
attrname = request[1]
2036
1546
if callable(client_object.__getattribute__(attrname)):
2037
1547
parent_pipe.send(('function',))
2038
1548
else:
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
1549
parent_pipe.send(('data', client_object.__getattribute__(attrname)))
2041
1550
2042
1551
if command == 'setattr':
2043
1552
attrname = request[1]
2044
1553
value = request[2]
2045
1554
setattr(client_object, attrname, value)
2046
1555
2047
1556
return True
2048
1557
2049
1558
2050
1559
def string_to_delta(interval):
2051
1560
"""Parse a string and return a datetime.timedelta
2052
1561
2053
>>> string_to_delta('7d')
1562
>>> string_to_delta(u'7d')
2054
1563
datetime.timedelta(7)
2055
>>> string_to_delta('60s')
1564
>>> string_to_delta(u'60s')
2056
1565
datetime.timedelta(0, 60)
2057
>>> string_to_delta('60m')
1566
>>> string_to_delta(u'60m')
2058
1567
datetime.timedelta(0, 3600)
2059
>>> string_to_delta('24h')
1568
>>> string_to_delta(u'24h')
2060
1569
datetime.timedelta(1)
2061
>>> string_to_delta('1w')
1570
>>> string_to_delta(u'1w')
2062
1571
datetime.timedelta(7)
2063
>>> string_to_delta('5m 30s')
1572
>>> string_to_delta(u'5m 30s')
2064
1573
datetime.timedelta(0, 330)
2065
1574
"""
2066
1575
timevalue = datetime.timedelta(0)
2068
1577
try:
2069
1578
suffix = unicode(s[-1])
2070
1579
value = int(s[:-1])
2071
if suffix == "d":
1580
if suffix == u"d":
2072
1581
delta = datetime.timedelta(value)
2073
elif suffix == "s":
1582
elif suffix == u"s":
2074
1583
delta = datetime.timedelta(0, value)
2075
elif suffix == "m":
1584
elif suffix == u"m":
2076
1585
delta = datetime.timedelta(0, 0, 0, 0, value)
2077
elif suffix == "h":
1586
elif suffix == u"h":
2078
1587
delta = datetime.timedelta(0, 0, 0, 0, 0, value)
2079
elif suffix == "w":
1588
elif suffix == u"w":
2080
1589
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
1590
else:
2082
raise ValueError("Unknown suffix {0!r}"
2083
.format(suffix))
2084
except (ValueError, IndexError) as e:
2085
raise ValueError(*(e.args))
1591
raise ValueError(u"Unknown suffix %r" % suffix)
1592
except (ValueError, IndexError), e:
1593
raise ValueError(e.message)
2086
1594
timevalue += delta
2087
1595
return timevalue
2088
1596
2089
1597
1598
def if_nametoindex(interface):
1599
"""Call the C function if_nametoindex(), or equivalent
1600
1601
Note: This function cannot accept a unicode string."""
1602
global if_nametoindex
1603
try:
1604
if_nametoindex = (ctypes.cdll.LoadLibrary
1605
(ctypes.util.find_library(u"c"))
1606
.if_nametoindex)
1607
except (OSError, AttributeError):
1608
logger.warning(u"Doing if_nametoindex the hard way")
1609
def if_nametoindex(interface):
1610
"Get an interface index the hard way, i.e. using fcntl()"
1611
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
1612
with contextlib.closing(socket.socket()) as s:
1613
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
1614
struct.pack(str(u"16s16x"),
1615
interface))
1616
interface_index = struct.unpack(str(u"I"),
1617
ifreq[16:20])[0]
1618
return interface_index
1619
return if_nametoindex(interface)
1620
1621
2090
1622
def daemon(nochdir = False, noclose = False):
2091
1623
"""See daemon(3). Standard BSD Unix function.
2092
1624
2095
1627
sys.exit()
2096
1628
os.setsid()
2097
1629
if not nochdir:
2098
os.chdir("/")
1630
os.chdir(u"/")
2099
1631
if os.fork():
2100
1632
sys.exit()
2101
1633
if not noclose:
2102
1634
# Close all standard open file descriptors
2103
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1635
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2104
1636
if not stat.S_ISCHR(os.fstat(null).st_mode):
2105
1637
raise OSError(errno.ENODEV,
2106
"{0} not a character device"
2107
.format(os.devnull))
1638
u"%s not a character device"
1639
% os.path.devnull)
2108
1640
os.dup2(null, sys.stdin.fileno())
2109
1641
os.dup2(null, sys.stdout.fileno())
2110
1642
os.dup2(null, sys.stderr.fileno())
2117
1649
##################################################################
2118
1650
# Parsing of options, both command line and config file
2119
1651
2120
parser = argparse.ArgumentParser()
2121
parser.add_argument("-v", "--version", action="version",
2122
version = "%(prog)s {0}".format(version),
2123
help="show version number and exit")
2124
parser.add_argument("-i", "--interface", metavar="IF",
2125
help="Bind to interface IF")
2126
parser.add_argument("-a", "--address",
2127
help="Address to listen for requests on")
2128
parser.add_argument("-p", "--port", type=int,
2129
help="Port number to receive requests on")
2130
parser.add_argument("--check", action="store_true",
2131
help="Run self-test")
2132
parser.add_argument("--debug", action="store_true",
2133
help="Debug mode; run in foreground and log"
2134
" to terminal")
2135
parser.add_argument("--debuglevel", metavar="LEVEL",
2136
help="Debug level for stdout output")
2137
parser.add_argument("--priority", help="GnuTLS"
2138
" priority string (see GnuTLS documentation)")
2139
parser.add_argument("--servicename",
2140
metavar="NAME", help="Zeroconf service name")
2141
parser.add_argument("--configdir",
2142
default="/etc/mandos", metavar="DIR",
2143
help="Directory to search for configuration"
2144
" files")
2145
parser.add_argument("--no-dbus", action="store_false",
2146
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
2148
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
2150
parser.add_argument("--no-restore", action="store_false",
2151
dest="restore", help="Do not restore stored"
2152
" state")
2153
parser.add_argument("--statedir", metavar="DIR",
2154
help="Directory to save/restore state in")
2155
2156
options = parser.parse_args()
1652
parser = optparse.OptionParser(version = "%%prog %s" % version)
1653
parser.add_option("-i", u"--interface", type=u"string",
1654
metavar="IF", help=u"Bind to interface IF")
1655
parser.add_option("-a", u"--address", type=u"string",
1656
help=u"Address to listen for requests on")
1657
parser.add_option("-p", u"--port", type=u"int",
1658
help=u"Port number to receive requests on")
1659
parser.add_option("--check", action=u"store_true",
1660
help=u"Run self-test")
1661
parser.add_option("--debug", action=u"store_true",
1662
help=u"Debug mode; run in foreground and log to"
1663
u" terminal")
1664
parser.add_option("--debuglevel", type=u"string", metavar="Level",
1665
help=u"Debug level for stdout output")
1666
parser.add_option("--priority", type=u"string", help=u"GnuTLS"
1667
u" priority string (see GnuTLS documentation)")
1668
parser.add_option("--servicename", type=u"string",
1669
metavar=u"NAME", help=u"Zeroconf service name")
1670
parser.add_option("--configdir", type=u"string",
1671
default=u"/etc/mandos", metavar=u"DIR",
1672
help=u"Directory to search for configuration"
1673
u" files")
1674
parser.add_option("--no-dbus", action=u"store_false",
1675
dest=u"use_dbus", help=u"Do not provide D-Bus"
1676
u" system bus interface")
1677
parser.add_option("--no-ipv6", action=u"store_false",
1678
dest=u"use_ipv6", help=u"Do not use IPv6")
1679
options = parser.parse_args()[0]
2157
1680
2158
1681
if options.check:
2159
1682
import doctest
2161
1684
sys.exit()
2162
1685
2163
1686
# Default values for config file for server-global settings
2164
server_defaults = { "interface": "",
2165
"address": "",
2166
"port": "",
2167
"debug": "False",
2168
"priority":
2169
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2170
"servicename": "Mandos",
2171
"use_dbus": "True",
2172
"use_ipv6": "True",
2173
"debuglevel": "",
2174
"restore": "True",
2175
"statedir": "/var/lib/mandos"
1687
server_defaults = { u"interface": u"",
1688
u"address": u"",
1689
u"port": u"",
1690
u"debug": u"False",
1691
u"priority":
1692
u"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
1693
u"servicename": u"Mandos",
1694
u"use_dbus": u"True",
1695
u"use_ipv6": u"True",
1696
u"debuglevel": u"",
2176
1697
}
2177
1698
2178
1699
# Parse config file for server-global settings
2179
1700
server_config = configparser.SafeConfigParser(server_defaults)
2180
1701
del server_defaults
2181
1702
server_config.read(os.path.join(options.configdir,
2182
"mandos.conf"))
1703
u"mandos.conf"))
2183
1704
# Convert the SafeConfigParser object to a dict
2184
1705
server_settings = server_config.defaults()
2185
1706
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
2187
server_settings[option] = server_config.getboolean("DEFAULT",
1707
for option in (u"debug", u"use_dbus", u"use_ipv6"):
1708
server_settings[option] = server_config.getboolean(u"DEFAULT",
2188
1709
option)
2189
1710
if server_settings["port"]:
2190
server_settings["port"] = server_config.getint("DEFAULT",
2191
"port")
1711
server_settings["port"] = server_config.getint(u"DEFAULT",
1712
u"port")
2192
1713
del server_config
2193
1714
2194
1715
# Override the settings from the config file with command line
2195
1716
# options, if set.
2196
for option in ("interface", "address", "port", "debug",
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
2199
"statedir"):
1717
for option in (u"interface", u"address", u"port", u"debug",
1718
u"priority", u"servicename", u"configdir",
1719
u"use_dbus", u"use_ipv6", u"debuglevel"):
2200
1720
value = getattr(options, option)
2201
1721
if value is not None:
2202
1722
server_settings[option] = value
2210
1730
##################################################################
2211
1731
2212
1732
# For convenience
2213
debug = server_settings["debug"]
2214
debuglevel = server_settings["debuglevel"]
2215
use_dbus = server_settings["use_dbus"]
2216
use_ipv6 = server_settings["use_ipv6"]
2217
stored_state_path = os.path.join(server_settings["statedir"],
2218
stored_state_file)
2219
2220
if debug:
2221
initlogger(debug, logging.DEBUG)
2222
else:
2223
if not debuglevel:
2224
initlogger(debug)
2225
else:
2226
level = getattr(logging, debuglevel.upper())
2227
initlogger(debug, level)
2228
2229
if server_settings["servicename"] != "Mandos":
1733
debug = server_settings[u"debug"]
1734
debuglevel = server_settings[u"debuglevel"]
1735
use_dbus = server_settings[u"use_dbus"]
1736
use_ipv6 = server_settings[u"use_ipv6"]
1737
1738
if server_settings[u"servicename"] != u"Mandos":
2230
1739
syslogger.setFormatter(logging.Formatter
2231
('Mandos ({0}) [%(process)d]:'
2232
' %(levelname)s: %(message)s'
2233
.format(server_settings
2234
["servicename"])))
1740
(u'Mandos (%s) [%%(process)d]:'
1741
u' %%(levelname)s: %%(message)s'
1742
% server_settings[u"servicename"]))
2235
1743
2236
1744
# Parse config file with clients
2237
client_config = configparser.SafeConfigParser(Client
2238
.client_defaults)
2239
client_config.read(os.path.join(server_settings["configdir"],
2240
"clients.conf"))
1745
client_defaults = { u"timeout": u"1h",
1746
u"interval": u"5m",
1747
u"checker": u"fping -q -- %%(host)s",
1748
u"host": u"",
1749
u"approval_delay": u"0s",
1750
u"approval_duration": u"1s",
1751
}
1752
client_config = configparser.SafeConfigParser(client_defaults)
1753
client_config.read(os.path.join(server_settings[u"configdir"],
1754
u"clients.conf"))
2241
1755
2242
1756
global mandos_dbus_service
2243
1757
mandos_dbus_service = None
2244
1758
2245
tcp_server = MandosServer((server_settings["address"],
2246
server_settings["port"]),
1759
tcp_server = MandosServer((server_settings[u"address"],
1760
server_settings[u"port"]),
2247
1761
ClientHandler,
2248
interface=(server_settings["interface"]
1762
interface=(server_settings[u"interface"]
2249
1763
or None),
2250
1764
use_ipv6=use_ipv6,
2251
1765
gnutls_priority=
2252
server_settings["priority"],
1766
server_settings[u"priority"],
2253
1767
use_dbus=use_dbus)
2254
1768
if not debug:
2255
pidfilename = "/var/run/mandos.pid"
1769
pidfilename = u"/var/run/mandos.pid"
2256
1770
try:
2257
pidfile = open(pidfilename, "w")
1771
pidfile = open(pidfilename, u"w")
2258
1772
except IOError:
2259
logger.error("Could not open file %r", pidfilename)
1773
logger.error(u"Could not open file %r", pidfilename)
2260
1774
2261
for name in ("_mandos", "mandos", "nobody"):
1775
try:
1776
uid = pwd.getpwnam(u"_mandos").pw_uid
1777
gid = pwd.getpwnam(u"_mandos").pw_gid
1778
except KeyError:
2262
1779
try:
2263
uid = pwd.getpwnam(name).pw_uid
2264
gid = pwd.getpwnam(name).pw_gid
2265
break
1780
uid = pwd.getpwnam(u"mandos").pw_uid
1781
gid = pwd.getpwnam(u"mandos").pw_gid
2266
1782
except KeyError:
2267
continue
2268
else:
2269
uid = 65534
2270
gid = 65534
1783
try:
1784
uid = pwd.getpwnam(u"nobody").pw_uid
1785
gid = pwd.getpwnam(u"nobody").pw_gid
1786
except KeyError:
1787
uid = 65534
1788
gid = 65534
2271
1789
try:
2272
1790
os.setgid(gid)
2273
1791
os.setuid(uid)
2274
except OSError as error:
1792
except OSError, error:
2275
1793
if error[0] != errno.EPERM:
2276
1794
raise error
2277
1795
1796
if not debug and not debuglevel:
1797
syslogger.setLevel(logging.WARNING)
1798
console.setLevel(logging.WARNING)
1799
if debuglevel:
1800
level = getattr(logging, debuglevel.upper())
1801
syslogger.setLevel(level)
1802
console.setLevel(level)
1803
2278
1804
if debug:
2279
1805
# Enable all possible GnuTLS debugging
2280
1806
2284
1810
2285
1811
@gnutls.library.types.gnutls_log_func
2286
1812
def debug_gnutls(level, string):
2287
logger.debug("GnuTLS: %s", string[:-1])
1813
logger.debug(u"GnuTLS: %s", string[:-1])
2288
1814
2289
1815
(gnutls.library.functions
2290
1816
.gnutls_global_set_log_function(debug_gnutls))
2291
1817
2292
1818
# Redirect stdin so all checkers get /dev/null
2293
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
1819
null = os.open(os.path.devnull, os.O_NOCTTY | os.O_RDWR)
2294
1820
os.dup2(null, sys.stdin.fileno())
2295
1821
if null > 2:
2296
1822
os.close(null)
2297
2298
# Need to fork before connecting to D-Bus
2299
if not debug:
2300
# Close all input and output, do double fork, etc.
2301
daemon()
2302
2303
gobject.threads_init()
1823
else:
1824
# No console logging
1825
logger.removeHandler(console)
1826
2304
1827
2305
1828
global main_loop
2306
1829
# From the Avahi example code
2307
DBusGMainLoop(set_as_default=True)
1830
DBusGMainLoop(set_as_default=True )
2308
1831
main_loop = gobject.MainLoop()
2309
1832
bus = dbus.SystemBus()
2310
1833
# End of Avahi example code
2311
1834
if use_dbus:
2312
1835
try:
2313
bus_name = dbus.service.BusName("se.recompile.Mandos",
1836
bus_name = dbus.service.BusName(u"se.bsnet.fukt.Mandos",
2314
1837
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2317
do_not_queue=True))
2318
except dbus.exceptions.NameExistsException as e:
2319
logger.error(unicode(e) + ", disabling D-Bus")
1838
except dbus.exceptions.NameExistsException, e:
1839
logger.error(unicode(e) + u", disabling D-Bus")
2320
1840
use_dbus = False
2321
server_settings["use_dbus"] = False
1841
server_settings[u"use_dbus"] = False
2322
1842
tcp_server.use_dbus = False
2323
1843
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
1844
service = AvahiService(name = server_settings[u"servicename"],
1845
servicetype = u"_mandos._tcp",
1846
protocol = protocol, bus = bus)
2328
1847
if server_settings["interface"]:
2329
1848
service.interface = (if_nametoindex
2330
(str(server_settings["interface"])))
2331
1849
(str(server_settings[u"interface"])))
1850
1851
if not debug:
1852
# Close all input and output, do double fork, etc.
1853
daemon()
1854
2332
1855
global multiprocessing_manager
2333
1856
multiprocessing_manager = multiprocessing.Manager()
2334
1857
2335
1858
client_class = Client
2336
1859
if use_dbus:
2337
client_class = functools.partial(ClientDBusTransitional,
2338
bus = bus)
2339
2340
client_settings = Client.config_parser(client_config)
2341
old_client_settings = {}
2342
clients_data = {}
2343
2344
# Get client data and settings from last running state.
2345
if server_settings["restore"]:
2346
try:
2347
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
2349
(stored_state))
2350
os.remove(stored_state_path)
2351
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2353
.format(e))
2354
if e.errno != errno.ENOENT:
2355
raise
2356
except EOFError as e:
2357
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2359
2360
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
2362
# Decide which value to use after restoring saved state.
2363
# We have three different values: Old config file,
2364
# new config file, and saved state.
2365
# New config value takes precedence if it differs from old
2366
# config value, otherwise use saved state.
2367
for name, value in client_settings[client_name].items():
2368
try:
2369
# For each value in new config, check if it
2370
# differs from the old config value (Except for
2371
# the "secret" attribute)
2372
if (name != "secret" and
2373
value != old_client_settings[client_name]
2374
[name]):
2375
client[name] = value
2376
except KeyError:
2377
pass
2378
2379
# Clients who has passed its expire date can still be
2380
# enabled if its last checker was successful. Clients
2381
# whose checker succeeded before we stored its state is
2382
# assumed to have successfully run all checkers during
2383
# downtime.
2384
if client["enabled"]:
2385
if datetime.datetime.utcnow() >= client["expires"]:
2386
if not client["last_checked_ok"]:
2387
logger.warning(
2388
"disabling client {0} - Client never "
2389
"performed a successful checker"
2390
.format(client_name))
2391
client["enabled"] = False
2392
elif client["last_checker_status"] != 0:
2393
logger.warning(
2394
"disabling client {0} - Client "
2395
"last checker failed with error code {1}"
2396
.format(client_name,
2397
client["last_checker_status"]))
2398
client["enabled"] = False
2399
else:
2400
client["expires"] = (datetime.datetime
2401
.utcnow()
2402
+ client["timeout"])
2403
logger.debug("Last checker succeeded,"
2404
" keeping {0} enabled"
2405
.format(client_name))
1860
client_class = functools.partial(ClientDBus, bus = bus)
1861
def client_config_items(config, section):
1862
special_settings = {
1863
"approved_by_default":
1864
lambda: config.getboolean(section,
1865
"approved_by_default"),
1866
}
1867
for name, value in config.items(section):
2406
1868
try:
2407
client["secret"] = (
2408
pgp.decrypt(client["encrypted_secret"],
2409
client_settings[client_name]
2410
["secret"]))
2411
except PGPError:
2412
# If decryption fails, we use secret from new settings
2413
logger.debug("Failed to decrypt {0} old secret"
2414
.format(client_name))
2415
client["secret"] = (
2416
client_settings[client_name]["secret"])
2417
2418
2419
# Add/remove clients based on new changes made to config
2420
for client_name in (set(old_client_settings)
2421
- set(client_settings)):
2422
del clients_data[client_name]
2423
for client_name in (set(client_settings)
2424
- set(old_client_settings)):
2425
clients_data[client_name] = client_settings[client_name]
2426
2427
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
2429
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
2431
1869
yield (name, special_settings[name]())
1870
except KeyError:
1871
yield (name, value)
1872
1873
tcp_server.clients.update(set(
1874
client_class(name = section,
1875
config= dict(client_config_items(
1876
client_config, section)))
1877
for section in client_config.sections()))
2432
1878
if not tcp_server.clients:
2433
logger.warning("No clients defined")
1879
logger.warning(u"No clients defined")
2434
1880
2435
1881
if not debug:
2436
1882
try:
2437
1883
with pidfile:
2438
1884
pid = os.getpid()
2439
pidfile.write(str(pid) + "\n".encode("utf-8"))
1885
pidfile.write(str(pid) + "\n")
2440
1886
del pidfile
2441
1887
except IOError:
2442
logger.error("Could not write to file %r with PID %d",
1888
logger.error(u"Could not write to file %r with PID %d",
2443
1889
pidfilename, pid)
2444
1890
except NameError:
2445
1891
# "pidfile" was never created
2446
1892
pass
2447
1893
del pidfilename
1894
2448
1895
signal.signal(signal.SIGINT, signal.SIG_IGN)
2449
1896
2450
1897
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
1898
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2452
1899
2453
1900
if use_dbus:
2454
class MandosDBusService(DBusObjectWithProperties):
1901
class MandosDBusService(dbus.service.Object):
2455
1902
"""A D-Bus proxy object"""
2456
1903
def __init__(self):
2457
dbus.service.Object.__init__(self, bus, "/")
2458
_interface = "se.recompile.Mandos"
2459
2460
@dbus_interface_annotations(_interface)
2461
def _foo(self):
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2464
"false"}
2465
2466
@dbus.service.signal(_interface, signature="o")
1904
dbus.service.Object.__init__(self, bus, u"/")
1905
_interface = u"se.bsnet.fukt.Mandos"
1906
1907
@dbus.service.signal(_interface, signature=u"o")
2467
1908
def ClientAdded(self, objpath):
2468
1909
"D-Bus signal"
2469
1910
pass
2470
1911
2471
@dbus.service.signal(_interface, signature="ss")
1912
@dbus.service.signal(_interface, signature=u"ss")
2472
1913
def ClientNotFound(self, fingerprint, address):
2473
1914
"D-Bus signal"
2474
1915
pass
2475
1916
2476
@dbus.service.signal(_interface, signature="os")
1917
@dbus.service.signal(_interface, signature=u"os")
2477
1918
def ClientRemoved(self, objpath, name):
2478
1919
"D-Bus signal"
2479
1920
pass
2480
1921
2481
@dbus.service.method(_interface, out_signature="ao")
1922
@dbus.service.method(_interface, out_signature=u"ao")
2482
1923
def GetAllClients(self):
2483
1924
"D-Bus method"
2484
1925
return dbus.Array(c.dbus_object_path
2485
for c in
2486
tcp_server.clients.itervalues())
1926
for c in tcp_server.clients)
2487
1927
2488
1928
@dbus.service.method(_interface,
2489
out_signature="a{oa{sv}}")
1929
out_signature=u"a{oa{sv}}")
2490
1930
def GetAllClientsWithProperties(self):
2491
1931
"D-Bus method"
2492
1932
return dbus.Dictionary(
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
2495
signature="oa{sv}")
1933
((c.dbus_object_path, c.GetAll(u""))
1934
for c in tcp_server.clients),
1935
signature=u"oa{sv}")
2496
1936
2497
@dbus.service.method(_interface, in_signature="o")
1937
@dbus.service.method(_interface, in_signature=u"o")
2498
1938
def RemoveClient(self, object_path):
2499
1939
"D-Bus method"
2500
for c in tcp_server.clients.itervalues():
1940
for c in tcp_server.clients:
2501
1941
if c.dbus_object_path == object_path:
2502
del tcp_server.clients[c.name]
1942
tcp_server.clients.remove(c)
2503
1943
c.remove_from_connection()
2504
1944
# Don't signal anything except ClientRemoved
2505
1945
c.disable(quiet=True)
2510
1950
2511
1951
del _interface
2512
1952
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
1953
mandos_dbus_service = MandosDBusService()
2516
1954
2517
1955
def cleanup():
2518
1956
"Cleanup function; run on exit"
2519
1957
service.cleanup()
2520
1958
2521
multiprocessing.active_children()
2522
if not (tcp_server.clients or client_settings):
2523
return
2524
2525
# Store client before exiting. Secrets are encrypted with key
2526
# based on what config file has. If config file is
2527
# removed/edited, old secret will thus be unrecovable.
2528
clients = {}
2529
with PGPEngine() as pgp:
2530
for client in tcp_server.clients.itervalues():
2531
key = client_settings[client.name]["secret"]
2532
client.encrypted_secret = pgp.encrypt(client.secret,
2533
key)
2534
client_dict = {}
2535
2536
# A list of attributes that can not be pickled
2537
# + secret.
2538
exclude = set(("bus", "changedstate", "secret",
2539
"checker"))
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
2542
exclude.add(name)
2543
2544
client_dict["encrypted_secret"] = (client
2545
.encrypted_secret)
2546
for attr in client.client_structure:
2547
if attr not in exclude:
2548
client_dict[attr] = getattr(client, attr)
2549
2550
clients[client.name] = client_dict
2551
del client_settings[client.name]["secret"]
2552
2553
try:
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
prefix="clients-",
2556
dir=os.path.dirname
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2559
pickle.dump((clients, client_settings), stored_state)
2560
os.rename(tempname, stored_state_path)
2561
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2563
.format(e))
2564
if not debug:
2565
try:
2566
os.remove(tempname)
2567
except NameError:
2568
pass
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
2570
errno.EEXIST)):
2571
raise e
2572
2573
# Delete all clients, and settings from config
2574
1959
while tcp_server.clients:
2575
name, client = tcp_server.clients.popitem()
1960
client = tcp_server.clients.pop()
2576
1961
if use_dbus:
2577
1962
client.remove_from_connection()
1963
client.disable_hook = None
2578
1964
# Don't signal anything except ClientRemoved
2579
1965
client.disable(quiet=True)
2580
1966
if use_dbus:
2581
1967
# Emit D-Bus signal
2582
mandos_dbus_service.ClientRemoved(client
2583
.dbus_object_path,
1968
mandos_dbus_service.ClientRemoved(client.dbus_object_path,
2584
1969
client.name)
2585
client_settings.clear()
2586
1970
2587
1971
atexit.register(cleanup)
2588
1972
2589
for client in tcp_server.clients.itervalues():
1973
for client in tcp_server.clients:
2590
1974
if use_dbus:
2591
1975
# Emit D-Bus signal
2592
1976
mandos_dbus_service.ClientAdded(client.dbus_object_path)
2593
# Need to initiate checking of clients
2594
if client.enabled:
2595
client.init_checker()
1977
client.enable()
2596
1978
2597
1979
tcp_server.enable()
2598
1980
tcp_server.server_activate()
2600
1982
# Find out what port we got
2601
1983
service.port = tcp_server.socket.getsockname()[1]
2602
1984
if use_ipv6:
2603
logger.info("Now listening on address %r, port %d,"
2604
" flowinfo %d, scope_id %d",
2605
*tcp_server.socket.getsockname())
1985
logger.info(u"Now listening on address %r, port %d,"
1986
" flowinfo %d, scope_id %d"
1987
% tcp_server.socket.getsockname())
2606
1988
else: # IPv4
2607
logger.info("Now listening on address %r, port %d",
2608
*tcp_server.socket.getsockname())
1989
logger.info(u"Now listening on address %r, port %d"
1990
% tcp_server.socket.getsockname())
2609
1991
2610
1992
#service.interface = tcp_server.socket.getsockname()[3]
2611
1993
2613
1995
# From the Avahi example code
2614
1996
try:
2615
1997
service.activate()
2616
except dbus.exceptions.DBusException as error:
2617
logger.critical("D-Bus Exception", exc_info=error)
1998
except dbus.exceptions.DBusException, error:
1999
logger.critical(u"DBusException: %s", error)
2618
2000
cleanup()
2619
2001
sys.exit(1)
2620
2002
# End of Avahi example code
2624
2006
(tcp_server.handle_request
2625
2007
(*args[2:], **kwargs) or True))
2626
2008
2627
logger.debug("Starting main loop")
2009
logger.debug(u"Starting main loop")
2628
2010
main_loop.run()
2629
except AvahiError as error:
2630
logger.critical("Avahi Error", exc_info=error)
2011
except AvahiError, error:
2012
logger.critical(u"AvahiError: %s", error)
2631
2013
cleanup()
2632
2014
sys.exit(1)
2633
2015
except KeyboardInterrupt:
2634
2016
if debug:
2635
print("", file=sys.stderr)
2636
logger.debug("Server received KeyboardInterrupt")
2637
logger.debug("Server exiting")
2017
print >> sys.stderr
2018
logger.debug(u"Server received KeyboardInterrupt")
2019
logger.debug(u"Server exiting")
2638
2020
# Must run before the D-Bus bus name gets deregistered
2639
2021
cleanup()
2640
2022
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0