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