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