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