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