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