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