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