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