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