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