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