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