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