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