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