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