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