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