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