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