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