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