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