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