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