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 777
- compare with another revision
- download diff
- download tarball
- view history from revision 777
- Committer: Teddy Hogeborn
- Date: 2015-07-20 03:03:33 UTC
- Revision ID: teddy@recompile.se-20150720030333-203m2aeblypcsfte
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys.
The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string. This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:
SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256
* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
(/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.
The mandos-keygen program in Mandos version 1.6.0 and older generated
2048-bit DSA keys, and when GnuTLS uses these it has trouble
connecting using the Mandos default priority string. This was
previously fixed in Mandos 1.6.2, but the bug reappeared when using
GnuTLS 3, so the default priority string has to change again; this
time also the Mandos client has to change its default, so now the
server and the client should use the same default priority string:
SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA:+SIGN-DSA-SHA256
* mandos (main/server_defaults): Changed default priority string.
* mandos-options.xml (/section/para[id="priority_compat"]): Removed.
(/section/para[id="priority"]): Changed default priority string.
* mandos.conf ([DEFAULT]/priority): - '' -
* mandos.conf.xml (OPTIONS/priority): Refer to the id "priority"
instead of "priority_compat".
* mandos.xml (OPTIONS/--priority): - '' -
* plugins.d/mandos-client.c (main): Changed default priority string.
- files added:
- debian/mandos-client.examples
- debian/upstream
- plugin-helpers
- files modified:
- .bzrignore
added
removed
mandos
1
#!/usr/bin/python
1
#!/usr/bin/python2.7
2
2
# -*- mode: python; coding: utf-8 -*-
3
3
#
4
4
# Mandos server - give out binary blobs to connecting clients.
11
11
# "AvahiService" class, and some lines in "main".
12
12
#
13
13
# Everything else is
14
# Copyright © 2008-2012 Teddy Hogeborn
15
# Copyright © 2008-2012 Björn Påhlsson
14
# Copyright © 2008-2015 Teddy Hogeborn
15
# Copyright © 2008-2015 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
34
34
from __future__ import (division, absolute_import, print_function,
35
35
unicode_literals)
36
36
37
import SocketServer as socketserver
37
from future_builtins import *
38
39
try:
40
import SocketServer as socketserver
41
except ImportError:
42
import socketserver
38
43
import socket
39
44
import argparse
40
45
import datetime
45
50
import gnutls.library.functions
46
51
import gnutls.library.constants
47
52
import gnutls.library.types
48
import ConfigParser as configparser
53
try:
54
import ConfigParser as configparser
55
except ImportError:
56
import configparser
49
57
import sys
50
58
import re
51
59
import os
60
68
import struct
61
69
import fcntl
62
70
import functools
63
import cPickle as pickle
71
try:
72
import cPickle as pickle
73
except ImportError:
74
import pickle
64
75
import multiprocessing
65
76
import types
66
77
import binascii
67
78
import tempfile
68
79
import itertools
80
import collections
81
import codecs
69
82
70
83
import dbus
71
84
import dbus.service
72
import gobject
85
try:
86
import gobject
87
except ImportError:
88
from gi.repository import GObject as gobject
73
89
import avahi
74
90
from dbus.mainloop.glib import DBusGMainLoop
75
91
import ctypes
76
92
import ctypes.util
77
93
import xml.dom.minidom
78
94
import inspect
79
import GnuPGInterface
80
95
81
96
try:
82
97
SO_BINDTODEVICE = socket.SO_BINDTODEVICE
86
101
except ImportError:
87
102
SO_BINDTODEVICE = None
88
103
89
version = "1.5.3"
104
if sys.version_info.major == 2:
105
str = unicode
106
107
version = "1.6.9"
90
108
stored_state_file = "clients.pickle"
91
109
92
110
logger = logging.getLogger()
93
syslogger = (logging.handlers.SysLogHandler
94
(facility = logging.handlers.SysLogHandler.LOG_DAEMON,
95
address = str("/dev/log")))
111
syslogger = None
96
112
97
113
try:
98
if_nametoindex = (ctypes.cdll.LoadLibrary
99
(ctypes.util.find_library("c"))
100
.if_nametoindex)
114
if_nametoindex = ctypes.cdll.LoadLibrary(
115
ctypes.util.find_library("c")).if_nametoindex
101
116
except (OSError, AttributeError):
117
102
118
def if_nametoindex(interface):
103
119
"Get an interface index the hard way, i.e. using fcntl()"
104
120
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h
105
121
with contextlib.closing(socket.socket()) as s:
106
122
ifreq = fcntl.ioctl(s, SIOCGIFINDEX,
107
struct.pack(str("16s16x"),
108
interface))
109
interface_index = struct.unpack(str("I"),
110
ifreq[16:20])[0]
123
struct.pack(b"16s16x", interface))
124
interface_index = struct.unpack("I", ifreq[16:20])[0]
111
125
return interface_index
112
126
113
127
114
128
def initlogger(debug, level=logging.WARNING):
115
129
"""init logger and add loglevel"""
116
130
131
global syslogger
132
syslogger = (logging.handlers.SysLogHandler(
133
facility = logging.handlers.SysLogHandler.LOG_DAEMON,
134
address = "/dev/log"))
117
135
syslogger.setFormatter(logging.Formatter
118
136
('Mandos [%(process)d]: %(levelname)s:'
119
137
' %(message)s'))
136
154
137
155
class PGPEngine(object):
138
156
"""A simple class for OpenPGP symmetric encryption & decryption"""
157
139
158
def __init__(self):
140
self.gnupg = GnuPGInterface.GnuPG()
141
159
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
142
self.gnupg = GnuPGInterface.GnuPG()
143
self.gnupg.options.meta_interactive = False
144
self.gnupg.options.homedir = self.tempdir
145
self.gnupg.options.extra_args.extend(['--force-mdc',
146
'--quiet',
147
'--no-use-agent'])
160
self.gnupgargs = ['--batch',
161
'--home', self.tempdir,
162
'--force-mdc',
163
'--quiet',
164
'--no-use-agent']
148
165
149
166
def __enter__(self):
150
167
return self
151
168
152
def __exit__ (self, exc_type, exc_value, traceback):
169
def __exit__(self, exc_type, exc_value, traceback):
153
170
self._cleanup()
154
171
return False
155
172
172
189
def password_encode(self, password):
173
190
# Passphrase can not be empty and can not contain newlines or
174
191
# NUL bytes. So we prefix it and hex encode it.
175
return b"mandos" + binascii.hexlify(password)
192
encoded = b"mandos" + binascii.hexlify(password)
193
if len(encoded) > 2048:
194
# GnuPG can't handle long passwords, so encode differently
195
encoded = (b"mandos" + password.replace(b"\\", b"\\\\")
196
.replace(b"\n", b"\\n")
197
.replace(b"\0", b"\\x00"))
198
return encoded
176
199
177
200
def encrypt(self, data, password):
178
self.gnupg.passphrase = self.password_encode(password)
179
with open(os.devnull, "w") as devnull:
180
try:
181
proc = self.gnupg.run(['--symmetric'],
182
create_fhs=['stdin', 'stdout'],
183
attach_fhs={'stderr': devnull})
184
with contextlib.closing(proc.handles['stdin']) as f:
185
f.write(data)
186
with contextlib.closing(proc.handles['stdout']) as f:
187
ciphertext = f.read()
188
proc.wait()
189
except IOError as e:
190
raise PGPError(e)
191
self.gnupg.passphrase = None
201
passphrase = self.password_encode(password)
202
with tempfile.NamedTemporaryFile(
203
dir=self.tempdir) as passfile:
204
passfile.write(passphrase)
205
passfile.flush()
206
proc = subprocess.Popen(['gpg', '--symmetric',
207
'--passphrase-file',
208
passfile.name]
209
+ self.gnupgargs,
210
stdin = subprocess.PIPE,
211
stdout = subprocess.PIPE,
212
stderr = subprocess.PIPE)
213
ciphertext, err = proc.communicate(input = data)
214
if proc.returncode != 0:
215
raise PGPError(err)
192
216
return ciphertext
193
217
194
218
def decrypt(self, data, password):
195
self.gnupg.passphrase = self.password_encode(password)
196
with open(os.devnull, "w") as devnull:
197
try:
198
proc = self.gnupg.run(['--decrypt'],
199
create_fhs=['stdin', 'stdout'],
200
attach_fhs={'stderr': devnull})
201
with contextlib.closing(proc.handles['stdin']) as f:
202
f.write(data)
203
with contextlib.closing(proc.handles['stdout']) as f:
204
decrypted_plaintext = f.read()
205
proc.wait()
206
except IOError as e:
207
raise PGPError(e)
208
self.gnupg.passphrase = None
219
passphrase = self.password_encode(password)
220
with tempfile.NamedTemporaryFile(
221
dir = self.tempdir) as passfile:
222
passfile.write(passphrase)
223
passfile.flush()
224
proc = subprocess.Popen(['gpg', '--decrypt',
225
'--passphrase-file',
226
passfile.name]
227
+ self.gnupgargs,
228
stdin = subprocess.PIPE,
229
stdout = subprocess.PIPE,
230
stderr = subprocess.PIPE)
231
decrypted_plaintext, err = proc.communicate(input = data)
232
if proc.returncode != 0:
233
raise PGPError(err)
209
234
return decrypted_plaintext
210
235
211
236
212
213
237
class AvahiError(Exception):
214
238
def __init__(self, value, *args, **kwargs):
215
239
self.value = value
216
super(AvahiError, self).__init__(value, *args, **kwargs)
217
def __unicode__(self):
218
return unicode(repr(self.value))
240
return super(AvahiError, self).__init__(value, *args,
241
**kwargs)
242
219
243
220
244
class AvahiServiceError(AvahiError):
221
245
pass
222
246
247
223
248
class AvahiGroupError(AvahiError):
224
249
pass
225
250
232
257
Used to optionally bind to the specified interface.
233
258
name: string; Example: 'Mandos'
234
259
type: string; Example: '_mandos._tcp'.
235
See <http://www.dns-sd.org/ServiceTypes.html>
260
See <https://www.iana.org/assignments/service-names-port-numbers>
236
261
port: integer; what port to announce
237
262
TXT: list of strings; TXT record for the service
238
263
domain: string; Domain to publish on, default to .local if empty.
244
269
server: D-Bus Server
245
270
bus: dbus.SystemBus()
246
271
"""
247
def __init__(self, interface = avahi.IF_UNSPEC, name = None,
248
servicetype = None, port = None, TXT = None,
249
domain = "", host = "", max_renames = 32768,
250
protocol = avahi.PROTO_UNSPEC, bus = None):
272
273
def __init__(self,
274
interface = avahi.IF_UNSPEC,
275
name = None,
276
servicetype = None,
277
port = None,
278
TXT = None,
279
domain = "",
280
host = "",
281
max_renames = 32768,
282
protocol = avahi.PROTO_UNSPEC,
283
bus = None):
251
284
self.interface = interface
252
285
self.name = name
253
286
self.type = servicetype
262
295
self.server = None
263
296
self.bus = bus
264
297
self.entry_group_state_changed_match = None
265
def rename(self):
298
299
def rename(self, remove=True):
266
300
"""Derived from the Avahi example code"""
267
301
if self.rename_count >= self.max_renames:
268
302
logger.critical("No suitable Zeroconf service name found"
269
303
" after %i retries, exiting.",
270
304
self.rename_count)
271
305
raise AvahiServiceError("Too many renames")
272
self.name = unicode(self.server
273
.GetAlternativeServiceName(self.name))
306
self.name = str(
307
self.server.GetAlternativeServiceName(self.name))
308
self.rename_count += 1
274
309
logger.info("Changing Zeroconf service name to %r ...",
275
310
self.name)
276
self.remove()
311
if remove:
312
self.remove()
277
313
try:
278
314
self.add()
279
315
except dbus.exceptions.DBusException as error:
280
logger.critical("D-Bus Exception", exc_info=error)
281
self.cleanup()
282
os._exit(1)
283
self.rename_count += 1
316
if (error.get_dbus_name()
317
== "org.freedesktop.Avahi.CollisionError"):
318
logger.info("Local Zeroconf service name collision.")
319
return self.rename(remove=False)
320
else:
321
logger.critical("D-Bus Exception", exc_info=error)
322
self.cleanup()
323
os._exit(1)
324
284
325
def remove(self):
285
326
"""Derived from the Avahi example code"""
286
327
if self.entry_group_state_changed_match is not None:
288
329
self.entry_group_state_changed_match = None
289
330
if self.group is not None:
290
331
self.group.Reset()
332
291
333
def add(self):
292
334
"""Derived from the Avahi example code"""
293
335
self.remove()
310
352
dbus.UInt16(self.port),
311
353
avahi.string_array_to_txt_array(self.TXT))
312
354
self.group.Commit()
355
313
356
def entry_group_state_changed(self, state, error):
314
357
"""Derived from the Avahi example code"""
315
358
logger.debug("Avahi entry group state change: %i", state)
321
364
self.rename()
322
365
elif state == avahi.ENTRY_GROUP_FAILURE:
323
366
logger.critical("Avahi: Error in group state changed %s",
324
unicode(error))
325
raise AvahiGroupError("State changed: {0!s}"
326
.format(error))
367
str(error))
368
raise AvahiGroupError("State changed: {!s}".format(error))
369
327
370
def cleanup(self):
328
371
"""Derived from the Avahi example code"""
329
372
if self.group is not None:
334
377
pass
335
378
self.group = None
336
379
self.remove()
380
337
381
def server_state_changed(self, state, error=None):
338
382
"""Derived from the Avahi example code"""
339
383
logger.debug("Avahi server state change: %i", state)
340
bad_states = { avahi.SERVER_INVALID:
341
"Zeroconf server invalid",
342
avahi.SERVER_REGISTERING: None,
343
avahi.SERVER_COLLISION:
344
"Zeroconf server name collision",
345
avahi.SERVER_FAILURE:
346
"Zeroconf server failure" }
384
bad_states = {
385
avahi.SERVER_INVALID: "Zeroconf server invalid",
386
avahi.SERVER_REGISTERING: None,
387
avahi.SERVER_COLLISION: "Zeroconf server name collision",
388
avahi.SERVER_FAILURE: "Zeroconf server failure",
389
}
347
390
if state in bad_states:
348
391
if bad_states[state] is not None:
349
392
if error is None:
352
395
logger.error(bad_states[state] + ": %r", error)
353
396
self.cleanup()
354
397
elif state == avahi.SERVER_RUNNING:
355
self.add()
398
try:
399
self.add()
400
except dbus.exceptions.DBusException as error:
401
if (error.get_dbus_name()
402
== "org.freedesktop.Avahi.CollisionError"):
403
logger.info("Local Zeroconf service name"
404
" collision.")
405
return self.rename(remove=False)
406
else:
407
logger.critical("D-Bus Exception", exc_info=error)
408
self.cleanup()
409
os._exit(1)
356
410
else:
357
411
if error is None:
358
412
logger.debug("Unknown state: %r", state)
359
413
else:
360
414
logger.debug("Unknown state: %r: %r", state, error)
415
361
416
def activate(self):
362
417
"""Derived from the Avahi example code"""
363
418
if self.server is None:
367
422
follow_name_owner_changes=True),
368
423
avahi.DBUS_INTERFACE_SERVER)
369
424
self.server.connect_to_signal("StateChanged",
370
self.server_state_changed)
425
self.server_state_changed)
371
426
self.server_state_changed(self.server.GetState())
372
427
428
373
429
class AvahiServiceToSyslog(AvahiService):
374
def rename(self):
430
def rename(self, *args, **kwargs):
375
431
"""Add the new name to the syslog messages"""
376
ret = AvahiService.rename(self)
377
syslogger.setFormatter(logging.Formatter
378
('Mandos ({0}) [%(process)d]:'
379
' %(levelname)s: %(message)s'
380
.format(self.name)))
432
ret = AvahiService.rename(self, *args, **kwargs)
433
syslogger.setFormatter(logging.Formatter(
434
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s'
435
.format(self.name)))
381
436
return ret
382
437
383
def timedelta_to_milliseconds(td):
384
"Convert a datetime.timedelta() to milliseconds"
385
return ((td.days * 24 * 60 * 60 * 1000)
386
+ (td.seconds * 1000)
387
+ (td.microseconds // 1000))
388
438
def call_pipe(connection, # : multiprocessing.Connection
439
func, *args, **kwargs):
440
"""This function is meant to be called by multiprocessing.Process
441
442
This function runs func(*args, **kwargs), and writes the resulting
443
return value on the provided multiprocessing.Connection.
444
"""
445
connection.send(func(*args, **kwargs))
446
connection.close()
447
389
448
class Client(object):
390
449
"""A representation of a client host served by this server.
391
450
417
476
last_checker_status: integer between 0 and 255 reflecting exit
418
477
status of last checker. -1 reflects crashed
419
478
checker, -2 means no checker completed yet.
479
last_checker_signal: The signal which killed the last checker, if
480
last_checker_status is -1
420
481
last_enabled: datetime.datetime(); (UTC) or None
421
482
name: string; from the config file, used in log messages and
422
483
D-Bus identifiers
427
488
runtime_expansions: Allowed attributes for runtime expansion.
428
489
expires: datetime.datetime(); time (UTC) when a client will be
429
490
disabled, or None
491
server_settings: The server_settings dict from main()
430
492
"""
431
493
432
494
runtime_expansions = ("approval_delay", "approval_duration",
433
"created", "enabled", "fingerprint",
434
"host", "interval", "last_checked_ok",
495
"created", "enabled", "expires",
496
"fingerprint", "host", "interval",
497
"last_approval_request", "last_checked_ok",
435
498
"last_enabled", "name", "timeout")
436
client_defaults = { "timeout": "5m",
437
"extended_timeout": "15m",
438
"interval": "2m",
439
"checker": "fping -q -- %%(host)s",
440
"host": "",
441
"approval_delay": "0s",
442
"approval_duration": "1s",
443
"approved_by_default": "True",
444
"enabled": "True",
445
}
446
447
def timeout_milliseconds(self):
448
"Return the 'timeout' attribute in milliseconds"
449
return timedelta_to_milliseconds(self.timeout)
450
451
def extended_timeout_milliseconds(self):
452
"Return the 'extended_timeout' attribute in milliseconds"
453
return timedelta_to_milliseconds(self.extended_timeout)
454
455
def interval_milliseconds(self):
456
"Return the 'interval' attribute in milliseconds"
457
return timedelta_to_milliseconds(self.interval)
458
459
def approval_delay_milliseconds(self):
460
return timedelta_to_milliseconds(self.approval_delay)
461
499
client_defaults = {
500
"timeout": "PT5M",
501
"extended_timeout": "PT15M",
502
"interval": "PT2M",
503
"checker": "fping -q -- %%(host)s",
504
"host": "",
505
"approval_delay": "PT0S",
506
"approval_duration": "PT1S",
507
"approved_by_default": "True",
508
"enabled": "True",
509
}
510
462
511
@staticmethod
463
512
def config_parser(config):
464
513
"""Construct a new dict of client settings of this form:
479
528
client["enabled"] = config.getboolean(client_name,
480
529
"enabled")
481
530
531
# Uppercase and remove spaces from fingerprint for later
532
# comparison purposes with return value from the
533
# fingerprint() function
482
534
client["fingerprint"] = (section["fingerprint"].upper()
483
535
.replace(" ", ""))
484
536
if "secret" in section:
489
541
"rb") as secfile:
490
542
client["secret"] = secfile.read()
491
543
else:
492
raise TypeError("No secret or secfile for section {0}"
544
raise TypeError("No secret or secfile for section {}"
493
545
.format(section))
494
546
client["timeout"] = string_to_delta(section["timeout"])
495
547
client["extended_timeout"] = string_to_delta(
505
557
client["last_checker_status"] = -2
506
558
507
559
return settings
508
509
510
def __init__(self, settings, name = None):
511
"""Note: the 'checker' key in 'config' sets the
512
'checker_command' attribute and *not* the 'checker'
513
attribute."""
560
561
def __init__(self, settings, name = None, server_settings=None):
514
562
self.name = name
563
if server_settings is None:
564
server_settings = {}
565
self.server_settings = server_settings
515
566
# adding all client settings
516
for setting, value in settings.iteritems():
567
for setting, value in settings.items():
517
568
setattr(self, setting, value)
518
569
519
570
if self.enabled:
525
576
else:
526
577
self.last_enabled = None
527
578
self.expires = None
528
579
529
580
logger.debug("Creating client %r", self.name)
530
# Uppercase and remove spaces from fingerprint for later
531
# comparison purposes with return value from the fingerprint()
532
# function
533
581
logger.debug(" Fingerprint: %s", self.fingerprint)
534
582
self.created = settings.get("created",
535
583
datetime.datetime.utcnow())
536
584
537
585
# attributes specific for this server instance
538
586
self.checker = None
539
587
self.checker_initiator_tag = None
542
590
self.current_checker_command = None
543
591
self.approved = None
544
592
self.approvals_pending = 0
545
self.changedstate = (multiprocessing_manager
546
.Condition(multiprocessing_manager
547
.Lock()))
548
self.client_structure = [attr for attr in
549
self.__dict__.iterkeys()
593
self.changedstate = multiprocessing_manager.Condition(
594
multiprocessing_manager.Lock())
595
self.client_structure = [attr
596
for attr in self.__dict__.iterkeys()
550
597
if not attr.startswith("_")]
551
598
self.client_structure.append("client_structure")
552
599
553
for name, t in inspect.getmembers(type(self),
554
lambda obj:
555
isinstance(obj,
556
property)):
600
for name, t in inspect.getmembers(
601
type(self), lambda obj: isinstance(obj, property)):
557
602
if not name.startswith("_"):
558
603
self.client_structure.append(name)
559
604
567
612
if getattr(self, "enabled", False):
568
613
# Already enabled
569
614
return
570
self.send_changedstate()
571
615
self.expires = datetime.datetime.utcnow() + self.timeout
572
616
self.enabled = True
573
617
self.last_enabled = datetime.datetime.utcnow()
574
618
self.init_checker()
619
self.send_changedstate()
575
620
576
621
def disable(self, quiet=True):
577
622
"""Disable this client."""
578
623
if not getattr(self, "enabled", False):
579
624
return False
580
625
if not quiet:
581
self.send_changedstate()
582
if not quiet:
583
626
logger.info("Disabling client %s", self.name)
584
if getattr(self, "disable_initiator_tag", False):
627
if getattr(self, "disable_initiator_tag", None) is not None:
585
628
gobject.source_remove(self.disable_initiator_tag)
586
629
self.disable_initiator_tag = None
587
630
self.expires = None
588
if getattr(self, "checker_initiator_tag", False):
631
if getattr(self, "checker_initiator_tag", None) is not None:
589
632
gobject.source_remove(self.checker_initiator_tag)
590
633
self.checker_initiator_tag = None
591
634
self.stop_checker()
592
635
self.enabled = False
636
if not quiet:
637
self.send_changedstate()
593
638
# Do not run this again if called by a gobject.timeout_add
594
639
return False
595
640
599
644
def init_checker(self):
600
645
# Schedule a new checker to be started an 'interval' from now,
601
646
# and every interval from then on.
602
self.checker_initiator_tag = (gobject.timeout_add
603
(self.interval_milliseconds(),
604
self.start_checker))
647
if self.checker_initiator_tag is not None:
648
gobject.source_remove(self.checker_initiator_tag)
649
self.checker_initiator_tag = gobject.timeout_add(
650
int(self.interval.total_seconds() * 1000),
651
self.start_checker)
605
652
# Schedule a disable() when 'timeout' has passed
606
self.disable_initiator_tag = (gobject.timeout_add
607
(self.timeout_milliseconds(),
608
self.disable))
653
if self.disable_initiator_tag is not None:
654
gobject.source_remove(self.disable_initiator_tag)
655
self.disable_initiator_tag = gobject.timeout_add(
656
int(self.timeout.total_seconds() * 1000), self.disable)
609
657
# Also start a new checker *right now*.
610
658
self.start_checker()
611
659
612
def checker_callback(self, pid, condition, command):
660
def checker_callback(self, source, condition, connection,
661
command):
613
662
"""The checker has completed, so take appropriate actions."""
614
663
self.checker_callback_tag = None
615
664
self.checker = None
616
if os.WIFEXITED(condition):
617
self.last_checker_status = os.WEXITSTATUS(condition)
665
# Read return code from connection (see call_pipe)
666
returncode = connection.recv()
667
connection.close()
668
669
if returncode >= 0:
670
self.last_checker_status = returncode
671
self.last_checker_signal = None
618
672
if self.last_checker_status == 0:
619
673
logger.info("Checker for %(name)s succeeded",
620
674
vars(self))
621
675
self.checked_ok()
622
676
else:
623
logger.info("Checker for %(name)s failed",
624
vars(self))
677
logger.info("Checker for %(name)s failed", vars(self))
625
678
else:
626
679
self.last_checker_status = -1
680
self.last_checker_signal = -returncode
627
681
logger.warning("Checker for %(name)s crashed?",
628
682
vars(self))
683
return False
629
684
630
685
def checked_ok(self):
631
686
"""Assert that the client has been seen, alive and well."""
632
687
self.last_checked_ok = datetime.datetime.utcnow()
633
688
self.last_checker_status = 0
689
self.last_checker_signal = None
634
690
self.bump_timeout()
635
691
636
692
def bump_timeout(self, timeout=None):
639
695
timeout = self.timeout
640
696
if self.disable_initiator_tag is not None:
641
697
gobject.source_remove(self.disable_initiator_tag)
698
self.disable_initiator_tag = None
642
699
if getattr(self, "enabled", False):
643
self.disable_initiator_tag = (gobject.timeout_add
644
(timedelta_to_milliseconds
645
(timeout), self.disable))
700
self.disable_initiator_tag = gobject.timeout_add(
701
int(timeout.total_seconds() * 1000), self.disable)
646
702
self.expires = datetime.datetime.utcnow() + timeout
647
703
648
704
def need_approval(self):
654
710
If a checker already exists, leave it running and do
655
711
nothing."""
656
712
# The reason for not killing a running checker is that if we
657
# did that, then if a checker (for some reason) started
658
# running slowly and taking more than 'interval' time, the
659
# client would inevitably timeout, since no checker would get
660
# a chance to run to completion. If we instead leave running
713
# did that, and if a checker (for some reason) started running
714
# slowly and taking more than 'interval' time, then the client
715
# would inevitably timeout, since no checker would get a
716
# chance to run to completion. If we instead leave running
661
717
# checkers alone, the checker would have to take more time
662
718
# than 'timeout' for the client to be disabled, which is as it
663
719
# should be.
664
720
665
# If a checker exists, make sure it is not a zombie
666
try:
667
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
668
except (AttributeError, OSError) as error:
669
if (isinstance(error, OSError)
670
and error.errno != errno.ECHILD):
671
raise error
672
else:
673
if pid:
674
logger.warning("Checker was a zombie")
675
gobject.source_remove(self.checker_callback_tag)
676
self.checker_callback(pid, status,
677
self.current_checker_command)
721
if self.checker is not None and not self.checker.is_alive():
722
logger.warning("Checker was not alive; joining")
723
self.checker.join()
724
self.checker = None
678
725
# Start a new checker if needed
679
726
if self.checker is None:
727
# Escape attributes for the shell
728
escaped_attrs = {
729
attr: re.escape(str(getattr(self, attr)))
730
for attr in self.runtime_expansions }
680
731
try:
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
683
except TypeError:
684
# Escape attributes for the shell
685
escaped_attrs = dict(
686
(attr,
687
re.escape(unicode(str(getattr(self, attr, "")),
688
errors=
689
'replace')))
690
for attr in
691
self.runtime_expansions)
692
693
try:
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
698
return True # Try again later
732
command = self.checker_command % escaped_attrs
733
except TypeError as error:
734
logger.error('Could not format string "%s"',
735
self.checker_command,
736
exc_info=error)
737
return True # Try again later
699
738
self.current_checker_command = command
700
try:
701
logger.info("Starting checker %r for %s",
702
command, self.name)
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
self.checker = subprocess.Popen(command,
708
close_fds=True,
709
shell=True, cwd="/")
710
self.checker_callback_tag = (gobject.child_watch_add
711
(self.checker.pid,
712
self.checker_callback,
713
data=command))
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
if pid:
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess",
722
exc_info=error)
739
logger.info("Starting checker %r for %s", command,
740
self.name)
741
# We don't need to redirect stdout and stderr, since
742
# in normal mode, that is already done by daemon(),
743
# and in debug mode we don't want to. (Stdin is
744
# always replaced by /dev/null.)
745
# The exception is when not debugging but nevertheless
746
# running in the foreground; use the previously
747
# created wnull.
748
popen_args = { "close_fds": True,
749
"shell": True,
750
"cwd": "/" }
751
if (not self.server_settings["debug"]
752
and self.server_settings["foreground"]):
753
popen_args.update({"stdout": wnull,
754
"stderr": wnull })
755
pipe = multiprocessing.Pipe(duplex = False)
756
self.checker = multiprocessing.Process(
757
target = call_pipe,
758
args = (pipe[1], subprocess.call, command),
759
kwargs = popen_args)
760
self.checker.start()
761
self.checker_callback_tag = gobject.io_add_watch(
762
pipe[0].fileno(), gobject.IO_IN,
763
self.checker_callback, pipe[0], command)
723
764
# Re-run this periodically if run by gobject.timeout_add
724
765
return True
725
766
731
772
if getattr(self, "checker", None) is None:
732
773
return
733
774
logger.debug("Stopping checker for %(name)s", vars(self))
734
try:
735
self.checker.terminate()
736
#time.sleep(0.5)
737
#if self.checker.poll() is None:
738
# self.checker.kill()
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
741
raise
775
self.checker.terminate()
742
776
self.checker = None
743
777
744
778
745
def dbus_service_property(dbus_interface, signature="v",
746
access="readwrite", byte_arrays=False):
779
def dbus_service_property(dbus_interface,
780
signature="v",
781
access="readwrite",
782
byte_arrays=False):
747
783
"""Decorators for marking methods of a DBusObjectWithProperties to
748
784
become properties on the D-Bus.
749
785
758
794
# "Set" method, so we fail early here:
759
795
if byte_arrays and signature != "ay":
760
796
raise ValueError("Byte arrays not supported for non-'ay'"
761
" signature {0!r}".format(signature))
797
" signature {!r}".format(signature))
798
762
799
def decorator(func):
763
800
func._dbus_is_property = True
764
801
func._dbus_interface = dbus_interface
769
806
func._dbus_name = func._dbus_name[:-14]
770
807
func._dbus_get_args_options = {'byte_arrays': byte_arrays }
771
808
return func
809
772
810
return decorator
773
811
774
812
775
813
def dbus_interface_annotations(dbus_interface):
776
"""Decorator for marking functions returning interface annotations.
814
"""Decorator for marking functions returning interface annotations
777
815
778
816
Usage:
779
817
783
821
"org.freedesktop.DBus.Property.EmitsChangedSignal":
784
822
"false"}
785
823
"""
824
786
825
def decorator(func):
787
826
func._dbus_is_interface = True
788
827
func._dbus_interface = dbus_interface
789
828
func._dbus_name = dbus_interface
790
829
return func
830
791
831
return decorator
792
832
793
833
795
835
"""Decorator to annotate D-Bus methods, signals or properties
796
836
Usage:
797
837
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
798
841
@dbus_service_property("org.example.Interface", signature="b",
799
842
access="r")
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
803
843
def Property_dbus_property(self):
804
844
return dbus.Boolean(False)
805
845
"""
846
806
847
def decorator(func):
807
848
func._dbus_annotations = annotations
808
849
return func
850
809
851
return decorator
810
852
811
853
812
854
class DBusPropertyException(dbus.exceptions.DBusException):
813
855
"""A base class for D-Bus property-related exceptions
814
856
"""
815
def __unicode__(self):
816
return unicode(str(self))
857
pass
817
858
818
859
819
860
class DBusPropertyAccessException(DBusPropertyException):
843
884
If called like _is_dbus_thing("method") it returns a function
844
885
suitable for use as predicate to inspect.getmembers().
845
886
"""
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
847
888
False)
848
889
849
890
def _get_all_dbus_things(self, thing):
850
891
"""Returns a generator of (name, attribute) pairs
851
892
"""
852
return ((getattr(athing.__get__(self), "_dbus_name",
853
name),
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
854
894
athing.__get__(self))
855
895
for cls in self.__class__.__mro__
856
896
for name, athing in
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
859
898
860
899
def _get_dbus_property(self, interface_name, property_name):
861
900
"""Returns a bound method if one exists which is a D-Bus
862
901
property with the specified name and interface.
863
902
"""
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
866
(cls,
867
self._is_dbus_thing("property"))):
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
868
906
if (value._dbus_name == property_name
869
907
and value._dbus_interface == interface_name):
870
908
return value.__get__(self)
871
909
872
910
# No such property
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
875
+ property_name)
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
876
913
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
915
in_signature="ss",
878
916
out_signature="v")
879
917
def Get(self, interface_name, property_name):
880
918
"""Standard D-Bus property Get() method, see D-Bus standard.
898
936
# The byte_arrays option is not supported yet on
899
937
# signatures other than "ay".
900
938
if prop._dbus_signature != "ay":
901
raise ValueError
939
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {!r}"
941
.format(prop._dbus_signature))
902
942
value = dbus.ByteArray(b''.join(chr(byte)
903
943
for byte in value))
904
944
prop(value)
905
945
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
946
@dbus.service.method(dbus.PROPERTIES_IFACE,
947
in_signature="s",
907
948
out_signature="a{sv}")
908
949
def GetAll(self, interface_name):
909
950
"""Standard D-Bus property GetAll() method, see D-Bus
924
965
if not hasattr(value, "variant_level"):
925
966
properties[name] = value
926
967
continue
927
properties[name] = type(value)(value, variant_level=
928
value.variant_level+1)
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
929
970
return dbus.Dictionary(properties, signature="sv")
930
971
972
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as")
973
def PropertiesChanged(self, interface_name, changed_properties,
974
invalidated_properties):
975
"""Standard D-Bus PropertiesChanged() signal, see D-Bus
976
standard.
977
"""
978
pass
979
931
980
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
932
981
out_signature="s",
933
982
path_keyword='object_path',
941
990
connection)
942
991
try:
943
992
document = xml.dom.minidom.parseString(xmlstring)
993
944
994
def make_tag(document, name, prop):
945
995
e = document.createElement("property")
946
996
e.setAttribute("name", name)
947
997
e.setAttribute("type", prop._dbus_signature)
948
998
e.setAttribute("access", prop._dbus_access)
949
999
return e
1000
950
1001
for if_tag in document.getElementsByTagName("interface"):
951
1002
# Add property tags
952
1003
for tag in (make_tag(document, name, prop)
964
1015
if (name == tag.getAttribute("name")
965
1016
and prop._dbus_interface
966
1017
== if_tag.getAttribute("name")):
967
annots.update(getattr
968
(prop,
969
"_dbus_annotations",
970
{}))
971
for name, value in annots.iteritems():
1018
annots.update(getattr(
1019
prop, "_dbus_annotations", {}))
1020
for name, value in annots.items():
972
1021
ann_tag = document.createElement(
973
1022
"annotation")
974
1023
ann_tag.setAttribute("name", name)
976
1025
tag.appendChild(ann_tag)
977
1026
# Add interface annotation tags
978
1027
for annotation, value in dict(
979
itertools.chain(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
984
))).iteritems():
1028
itertools.chain.from_iterable(
1029
annotations().items()
1030
for name, annotations
1031
in self._get_all_dbus_things("interface")
1032
if name == if_tag.getAttribute("name")
1033
)).items():
985
1034
ann_tag = document.createElement("annotation")
986
1035
ann_tag.setAttribute("name", annotation)
987
1036
ann_tag.setAttribute("value", value)
1010
1059
return xmlstring
1011
1060
1012
1061
1013
def datetime_to_dbus (dt, variant_level=0):
1062
def datetime_to_dbus(dt, variant_level=0):
1014
1063
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1015
1064
if dt is None:
1016
1065
return dbus.String("", variant_level = variant_level)
1017
return dbus.String(dt.isoformat(),
1018
variant_level=variant_level)
1019
1020
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
.__metaclass__):
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1066
return dbus.String(dt.isoformat(), variant_level=variant_level)
1067
1068
1069
def alternate_dbus_interfaces(alt_interface_names, deprecate=True):
1070
"""A class decorator; applied to a subclass of
1071
dbus.service.Object, it will add alternate D-Bus attributes with
1072
interface names according to the "alt_interface_names" mapping.
1073
Usage:
1074
1075
@alternate_dbus_interfaces({"org.example.Interface":
1076
"net.example.AlternateInterface"})
1077
class SampleDBusObject(dbus.service.Object):
1078
@dbus.service.method("org.example.Interface")
1079
def SampleDBusMethod():
1080
pass
1081
1082
The above "SampleDBusMethod" on "SampleDBusObject" will be
1083
reachable via two interfaces: "org.example.Interface" and
1084
"net.example.AlternateInterface", the latter of which will have
1085
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
1086
"true", unless "deprecate" is passed with a False value.
1087
1088
This works for methods and signals, and also for D-Bus properties
1089
(from DBusObjectWithProperties) and interfaces (from the
1090
dbus_interface_annotations decorator).
1025
1091
"""
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1092
1093
def wrapper(cls):
1094
for orig_interface_name, alt_interface_name in (
1095
alt_interface_names.items()):
1096
attr = {}
1097
interface_names = set()
1098
# Go though all attributes of the class
1099
for attrname, attribute in inspect.getmembers(cls):
1034
1100
# Ignore non-D-Bus attributes, and D-Bus attributes
1035
1101
# with the wrong interface name
1036
1102
if (not hasattr(attribute, "_dbus_interface")
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1039
1105
continue
1040
1106
# Create an alternate D-Bus interface name based on
1041
1107
# the current name
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1110
interface_names.add(alt_interface)
1047
1111
# Is this a D-Bus signal?
1048
1112
if getattr(attribute, "_dbus_is_signal", False):
1049
# Extract the original non-method function by
1050
# black magic
1051
nonmethod_func = (dict(
1113
if sys.version_info.major == 2:
1114
# Extract the original non-method undecorated
1115
# function by black magic
1116
nonmethod_func = (dict(
1052
1117
zip(attribute.func_code.co_freevars,
1053
attribute.__closure__))["func"]
1054
.cell_contents)
1118
attribute.__closure__))
1119
["func"].cell_contents)
1120
else:
1121
nonmethod_func = attribute
1055
1122
# Create a new, but exactly alike, function
1056
1123
# object, and decorate it to be a new D-Bus signal
1057
1124
# with the alternate D-Bus interface name
1058
new_function = (dbus.service.signal
1059
(alt_interface,
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1125
if sys.version_info.major == 2:
1126
new_function = types.FunctionType(
1127
nonmethod_func.func_code,
1128
nonmethod_func.func_globals,
1129
nonmethod_func.func_name,
1130
nonmethod_func.func_defaults,
1131
nonmethod_func.func_closure)
1132
else:
1133
new_function = types.FunctionType(
1134
nonmethod_func.__code__,
1135
nonmethod_func.__globals__,
1136
nonmethod_func.__name__,
1137
nonmethod_func.__defaults__,
1138
nonmethod_func.__closure__)
1139
new_function = (dbus.service.signal(
1140
alt_interface,
1141
attribute._dbus_signature)(new_function))
1067
1142
# Copy annotations, if any
1068
1143
try:
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1071
1146
except AttributeError:
1072
1147
pass
1073
1148
# Define a creator of a function to call both the
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1149
# original and alternate functions, so both the
1150
# original and alternate signals gets sent when
1151
# the function is called
1076
1152
def fixscope(func1, func2):
1077
1153
"""This function is a scope container to pass
1078
1154
func1 and func2 to the "call_both" function
1079
1155
outside of its arguments"""
1156
1080
1157
def call_both(*args, **kwargs):
1081
1158
"""This function will emit two D-Bus
1082
1159
signals by calling func1 and func2"""
1083
1160
func1(*args, **kwargs)
1084
1161
func2(*args, **kwargs)
1162
1085
1163
return call_both
1086
1164
# Create the "call_both" function and add it to
1087
1165
# the class
1088
attr[attrname] = fixscope(attribute,
1089
new_function)
1166
attr[attrname] = fixscope(attribute, new_function)
1090
1167
# Is this a D-Bus method?
1091
1168
elif getattr(attribute, "_dbus_is_method", False):
1092
1169
# Create a new, but exactly alike, function
1093
1170
# object. Decorate it to be a new D-Bus method
1094
1171
# with the alternate D-Bus interface name. Add it
1095
1172
# to the class.
1096
attr[attrname] = (dbus.service.method
1097
(alt_interface,
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1100
(types.FunctionType
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1173
attr[attrname] = (
1174
dbus.service.method(
1175
alt_interface,
1176
attribute._dbus_in_signature,
1177
attribute._dbus_out_signature)
1178
(types.FunctionType(attribute.func_code,
1179
attribute.func_globals,
1180
attribute.func_name,
1181
attribute.func_defaults,
1182
attribute.func_closure)))
1106
1183
# Copy annotations, if any
1107
1184
try:
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1110
1187
except AttributeError:
1111
1188
pass
1112
1189
# Is this a D-Bus property?
1115
1192
# object, and decorate it to be a new D-Bus
1116
1193
# property with the alternate D-Bus interface
1117
1194
# name. Add it to the class.
1118
attr[attrname] = (dbus_service_property
1119
(alt_interface,
1120
attribute._dbus_signature,
1121
attribute._dbus_access,
1122
attribute
1123
._dbus_get_args_options
1124
["byte_arrays"])
1125
(types.FunctionType
1126
(attribute.func_code,
1127
attribute.func_globals,
1128
attribute.func_name,
1129
attribute.func_defaults,
1130
attribute.func_closure)))
1195
attr[attrname] = (dbus_service_property(
1196
alt_interface, attribute._dbus_signature,
1197
attribute._dbus_access,
1198
attribute._dbus_get_args_options
1199
["byte_arrays"])
1200
(types.FunctionType(
1201
attribute.func_code,
1202
attribute.func_globals,
1203
attribute.func_name,
1204
attribute.func_defaults,
1205
attribute.func_closure)))
1131
1206
# Copy annotations, if any
1132
1207
try:
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1135
1210
except AttributeError:
1136
1211
pass
1137
1212
# Is this a D-Bus interface?
1140
1215
# object. Decorate it to be a new D-Bus interface
1141
1216
# with the alternate D-Bus interface name. Add it
1142
1217
# to the class.
1143
attr[attrname] = (dbus_interface_annotations
1144
(alt_interface)
1145
(types.FunctionType
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1155
def func(self):
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1159
itertools.count()):
1160
if aname not in attr:
1161
attr[aname] = func
1162
break
1163
return type.__new__(mcs, name, bases, attr)
1164
1165
1218
attr[attrname] = (
1219
dbus_interface_annotations(alt_interface)
1220
(types.FunctionType(attribute.func_code,
1221
attribute.func_globals,
1222
attribute.func_name,
1223
attribute.func_defaults,
1224
attribute.func_closure)))
1225
if deprecate:
1226
# Deprecate all alternate interfaces
1227
iname="_AlternateDBusNames_interface_annotation{}"
1228
for interface_name in interface_names:
1229
1230
@dbus_interface_annotations(interface_name)
1231
def func(self):
1232
return { "org.freedesktop.DBus.Deprecated":
1233
"true" }
1234
# Find an unused name
1235
for aname in (iname.format(i)
1236
for i in itertools.count()):
1237
if aname not in attr:
1238
attr[aname] = func
1239
break
1240
if interface_names:
1241
# Replace the class with a new subclass of it with
1242
# methods, signals, etc. as created above.
1243
cls = type(b"{}Alternate".format(cls.__name__),
1244
(cls, ), attr)
1245
return cls
1246
1247
return wrapper
1248
1249
1250
@alternate_dbus_interfaces({"se.recompile.Mandos":
1251
"se.bsnet.fukt.Mandos"})
1166
1252
class ClientDBus(Client, DBusObjectWithProperties):
1167
1253
"""A Client class using D-Bus
1168
1254
1172
1258
"""
1173
1259
1174
1260
runtime_expansions = (Client.runtime_expansions
1175
+ ("dbus_object_path",))
1261
+ ("dbus_object_path", ))
1262
1263
_interface = "se.recompile.Mandos.Client"
1176
1264
1177
1265
# dbus.service.Object doesn't use super(), so we can't either.
1178
1266
1181
1269
Client.__init__(self, *args, **kwargs)
1182
1270
# Only now, when this client is initialized, can it show up on
1183
1271
# the D-Bus
1184
client_object_name = unicode(self.name).translate(
1272
client_object_name = str(self.name).translate(
1185
1273
{ord("."): ord("_"),
1186
1274
ord("-"): ord("_")})
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1189
1277
DBusObjectWithProperties.__init__(self, self.bus,
1190
1278
self.dbus_object_path)
1191
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1194
variant_level=1):
1279
1280
def notifychangeproperty(transform_func, dbus_name,
1281
type_func=lambda x: x,
1282
variant_level=1,
1283
invalidate_only=False,
1284
_interface=_interface):
1195
1285
""" Modify a variable so that it's a property which announces
1196
1286
its changes to DBus.
1197
1287
1202
1292
to the D-Bus. Default: no transform
1203
1293
variant_level: D-Bus variant level. Default: 1
1204
1294
"""
1205
attrname = "_{0}".format(dbus_name)
1295
attrname = "_{}".format(dbus_name)
1296
1206
1297
def setter(self, value):
1207
1298
if hasattr(self, "dbus_object_path"):
1208
1299
if (not hasattr(self, attrname) or
1209
1300
type_func(getattr(self, attrname, None))
1210
1301
!= type_func(value)):
1211
dbus_value = transform_func(type_func(value),
1212
variant_level
1213
=variant_level)
1214
self.PropertyChanged(dbus.String(dbus_name),
1215
dbus_value)
1302
if invalidate_only:
1303
self.PropertiesChanged(
1304
_interface, dbus.Dictionary(),
1305
dbus.Array((dbus_name, )))
1306
else:
1307
dbus_value = transform_func(
1308
type_func(value),
1309
variant_level = variant_level)
1310
self.PropertyChanged(dbus.String(dbus_name),
1311
dbus_value)
1312
self.PropertiesChanged(
1313
_interface,
1314
dbus.Dictionary({ dbus.String(dbus_name):
1315
dbus_value }),
1316
dbus.Array())
1216
1317
setattr(self, attrname, value)
1217
1318
1218
1319
return property(lambda self: getattr(self, attrname), setter)
1219
1320
1220
1221
1321
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1222
1322
approvals_pending = notifychangeproperty(dbus.Boolean,
1223
1323
"ApprovalPending",
1225
1325
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1226
1326
last_enabled = notifychangeproperty(datetime_to_dbus,
1227
1327
"LastEnabled")
1228
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1229
type_func = lambda checker:
1230
checker is not None)
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1231
1331
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1232
1332
"LastCheckedOK")
1233
1333
last_checker_status = notifychangeproperty(dbus.Int16,
1236
1336
datetime_to_dbus, "LastApprovalRequest")
1237
1337
approved_by_default = notifychangeproperty(dbus.Boolean,
1238
1338
"ApprovedByDefault")
1239
approval_delay = notifychangeproperty(dbus.UInt64,
1240
"ApprovalDelay",
1241
type_func =
1242
timedelta_to_milliseconds)
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1243
1342
approval_duration = notifychangeproperty(
1244
1343
dbus.UInt64, "ApprovalDuration",
1245
type_func = timedelta_to_milliseconds)
1344
type_func = lambda td: td.total_seconds() * 1000)
1246
1345
host = notifychangeproperty(dbus.String, "Host")
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
type_func =
1249
timedelta_to_milliseconds)
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1250
1349
extended_timeout = notifychangeproperty(
1251
1350
dbus.UInt64, "ExtendedTimeout",
1252
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
1254
"Interval",
1255
type_func =
1256
timedelta_to_milliseconds)
1351
type_func = lambda td: td.total_seconds() * 1000)
1352
interval = notifychangeproperty(
1353
dbus.UInt64, "Interval",
1354
type_func = lambda td: td.total_seconds() * 1000)
1257
1355
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1258
1358
1259
1359
del notifychangeproperty
1260
1360
1267
1367
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1268
1368
Client.__del__(self, *args, **kwargs)
1269
1369
1270
def checker_callback(self, pid, condition, command,
1271
*args, **kwargs):
1272
self.checker_callback_tag = None
1273
self.checker = None
1274
if os.WIFEXITED(condition):
1275
exitstatus = os.WEXITSTATUS(condition)
1370
def checker_callback(self, source, condition,
1371
connection, command, *args, **kwargs):
1372
ret = Client.checker_callback(self, source, condition,
1373
connection, command, *args,
1374
**kwargs)
1375
exitstatus = self.last_checker_status
1376
if exitstatus >= 0:
1276
1377
# Emit D-Bus signal
1277
1378
self.CheckerCompleted(dbus.Int16(exitstatus),
1278
dbus.Int64(condition),
1379
dbus.Int64(0),
1279
1380
dbus.String(command))
1280
1381
else:
1281
1382
# Emit D-Bus signal
1282
1383
self.CheckerCompleted(dbus.Int16(-1),
1283
dbus.Int64(condition),
1384
dbus.Int64(
1385
self.last_checker_signal),
1284
1386
dbus.String(command))
1285
1286
return Client.checker_callback(self, pid, condition, command,
1287
*args, **kwargs)
1387
return ret
1288
1388
1289
1389
def start_checker(self, *args, **kwargs):
1290
old_checker = self.checker
1291
if self.checker is not None:
1292
old_checker_pid = self.checker.pid
1293
else:
1294
old_checker_pid = None
1390
old_checker_pid = getattr(self.checker, "pid", None)
1295
1391
r = Client.start_checker(self, *args, **kwargs)
1296
1392
# Only if new checker process was started
1297
1393
if (self.checker is not None
1305
1401
return False
1306
1402
1307
1403
def approve(self, value=True):
1308
self.send_changedstate()
1309
1404
self.approved = value
1310
gobject.timeout_add(timedelta_to_milliseconds
1311
(self.approval_duration),
1312
self._reset_approved)
1313
1405
gobject.timeout_add(int(self.approval_duration.total_seconds()
1406
* 1000), self._reset_approved)
1407
self.send_changedstate()
1314
1408
1315
1409
## D-Bus methods, signals & properties
1316
_interface = "se.recompile.Mandos.Client"
1317
1410
1318
1411
## Interfaces
1319
1412
1320
@dbus_interface_annotations(_interface)
1321
def _foo(self):
1322
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
"false"}
1324
1325
1413
## Signals
1326
1414
1327
1415
# CheckerCompleted - signal
1337
1425
pass
1338
1426
1339
1427
# PropertyChanged - signal
1428
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1340
1429
@dbus.service.signal(_interface, signature="sv")
1341
1430
def PropertyChanged(self, property, value):
1342
1431
"D-Bus signal"
1406
1495
return dbus.Boolean(bool(self.approvals_pending))
1407
1496
1408
1497
# ApprovedByDefault - property
1409
@dbus_service_property(_interface, signature="b",
1498
@dbus_service_property(_interface,
1499
signature="b",
1410
1500
access="readwrite")
1411
1501
def ApprovedByDefault_dbus_property(self, value=None):
1412
1502
if value is None: # get
1414
1504
self.approved_by_default = bool(value)
1415
1505
1416
1506
# ApprovalDelay - property
1417
@dbus_service_property(_interface, signature="t",
1507
@dbus_service_property(_interface,
1508
signature="t",
1418
1509
access="readwrite")
1419
1510
def ApprovalDelay_dbus_property(self, value=None):
1420
1511
if value is None: # get
1421
return dbus.UInt64(self.approval_delay_milliseconds())
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1513
* 1000)
1422
1514
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1423
1515
1424
1516
# ApprovalDuration - property
1425
@dbus_service_property(_interface, signature="t",
1517
@dbus_service_property(_interface,
1518
signature="t",
1426
1519
access="readwrite")
1427
1520
def ApprovalDuration_dbus_property(self, value=None):
1428
1521
if value is None: # get
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1523
* 1000)
1431
1524
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1432
1525
1433
1526
# Name - property
1441
1534
return dbus.String(self.fingerprint)
1442
1535
1443
1536
# Host - property
1444
@dbus_service_property(_interface, signature="s",
1537
@dbus_service_property(_interface,
1538
signature="s",
1445
1539
access="readwrite")
1446
1540
def Host_dbus_property(self, value=None):
1447
1541
if value is None: # get
1448
1542
return dbus.String(self.host)
1449
self.host = unicode(value)
1543
self.host = str(value)
1450
1544
1451
1545
# Created - property
1452
1546
@dbus_service_property(_interface, signature="s", access="read")
1459
1553
return datetime_to_dbus(self.last_enabled)
1460
1554
1461
1555
# Enabled - property
1462
@dbus_service_property(_interface, signature="b",
1556
@dbus_service_property(_interface,
1557
signature="b",
1463
1558
access="readwrite")
1464
1559
def Enabled_dbus_property(self, value=None):
1465
1560
if value is None: # get
1470
1565
self.disable()
1471
1566
1472
1567
# LastCheckedOK - property
1473
@dbus_service_property(_interface, signature="s",
1568
@dbus_service_property(_interface,
1569
signature="s",
1474
1570
access="readwrite")
1475
1571
def LastCheckedOK_dbus_property(self, value=None):
1476
1572
if value is not None:
1479
1575
return datetime_to_dbus(self.last_checked_ok)
1480
1576
1481
1577
# LastCheckerStatus - property
1482
@dbus_service_property(_interface, signature="n",
1483
access="read")
1578
@dbus_service_property(_interface, signature="n", access="read")
1484
1579
def LastCheckerStatus_dbus_property(self):
1485
1580
return dbus.Int16(self.last_checker_status)
1486
1581
1495
1590
return datetime_to_dbus(self.last_approval_request)
1496
1591
1497
1592
# Timeout - property
1498
@dbus_service_property(_interface, signature="t",
1593
@dbus_service_property(_interface,
1594
signature="t",
1499
1595
access="readwrite")
1500
1596
def Timeout_dbus_property(self, value=None):
1501
1597
if value is None: # get
1502
return dbus.UInt64(self.timeout_milliseconds())
1598
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1599
old_timeout = self.timeout
1503
1600
self.timeout = datetime.timedelta(0, 0, 0, value)
1504
# Reschedule timeout
1601
# Reschedule disabling
1505
1602
if self.enabled:
1506
1603
now = datetime.datetime.utcnow()
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1604
self.expires += self.timeout - old_timeout
1605
if self.expires <= now:
1510
1606
# The timeout has passed
1511
1607
self.disable()
1512
1608
else:
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1515
time_to_die))
1516
1609
if (getattr(self, "disable_initiator_tag", None)
1517
1610
is None):
1518
1611
return
1519
1612
gobject.source_remove(self.disable_initiator_tag)
1520
self.disable_initiator_tag = (gobject.timeout_add
1521
(time_to_die,
1522
self.disable))
1613
self.disable_initiator_tag = gobject.timeout_add(
1614
int((self.expires - now).total_seconds() * 1000),
1615
self.disable)
1523
1616
1524
1617
# ExtendedTimeout - property
1525
@dbus_service_property(_interface, signature="t",
1618
@dbus_service_property(_interface,
1619
signature="t",
1526
1620
access="readwrite")
1527
1621
def ExtendedTimeout_dbus_property(self, value=None):
1528
1622
if value is None: # get
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
1623
return dbus.UInt64(self.extended_timeout.total_seconds()
1624
* 1000)
1530
1625
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1531
1626
1532
1627
# Interval - property
1533
@dbus_service_property(_interface, signature="t",
1628
@dbus_service_property(_interface,
1629
signature="t",
1534
1630
access="readwrite")
1535
1631
def Interval_dbus_property(self, value=None):
1536
1632
if value is None: # get
1537
return dbus.UInt64(self.interval_milliseconds())
1633
return dbus.UInt64(self.interval.total_seconds() * 1000)
1538
1634
self.interval = datetime.timedelta(0, 0, 0, value)
1539
1635
if getattr(self, "checker_initiator_tag", None) is None:
1540
1636
return
1541
1637
if self.enabled:
1542
1638
# Reschedule checker run
1543
1639
gobject.source_remove(self.checker_initiator_tag)
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
1640
self.checker_initiator_tag = gobject.timeout_add(
1641
value, self.start_checker)
1642
self.start_checker() # Start one now, too
1547
1643
1548
1644
# Checker - property
1549
@dbus_service_property(_interface, signature="s",
1645
@dbus_service_property(_interface,
1646
signature="s",
1550
1647
access="readwrite")
1551
1648
def Checker_dbus_property(self, value=None):
1552
1649
if value is None: # get
1553
1650
return dbus.String(self.checker_command)
1554
self.checker_command = unicode(value)
1651
self.checker_command = str(value)
1555
1652
1556
1653
# CheckerRunning - property
1557
@dbus_service_property(_interface, signature="b",
1654
@dbus_service_property(_interface,
1655
signature="b",
1558
1656
access="readwrite")
1559
1657
def CheckerRunning_dbus_property(self, value=None):
1560
1658
if value is None: # get
1570
1668
return self.dbus_object_path # is already a dbus.ObjectPath
1571
1669
1572
1670
# Secret = property
1573
@dbus_service_property(_interface, signature="ay",
1574
access="write", byte_arrays=True)
1671
@dbus_service_property(_interface,
1672
signature="ay",
1673
access="write",
1674
byte_arrays=True)
1575
1675
def Secret_dbus_property(self, value):
1576
self.secret = str(value)
1676
self.secret = bytes(value)
1577
1677
1578
1678
del _interface
1579
1679
1583
1683
self._pipe = child_pipe
1584
1684
self._pipe.send(('init', fpr, address))
1585
1685
if not self._pipe.recv():
1586
raise KeyError()
1686
raise KeyError(fpr)
1587
1687
1588
1688
def __getattribute__(self, name):
1589
1689
if name == '_pipe':
1593
1693
if data[0] == 'data':
1594
1694
return data[1]
1595
1695
if data[0] == 'function':
1696
1596
1697
def func(*args, **kwargs):
1597
1698
self._pipe.send(('funcall', name, args, kwargs))
1598
1699
return self._pipe.recv()[1]
1700
1599
1701
return func
1600
1702
1601
1703
def __setattr__(self, name, value):
1604
1706
self._pipe.send(('setattr', name, value))
1605
1707
1606
1708
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1609
1610
1611
1709
class ClientHandler(socketserver.BaseRequestHandler, object):
1612
1710
"""A class to handle client connections.
1613
1711
1617
1715
def handle(self):
1618
1716
with contextlib.closing(self.server.child_pipe) as child_pipe:
1619
1717
logger.info("TCP connection from: %s",
1620
unicode(self.client_address))
1718
str(self.client_address))
1621
1719
logger.debug("Pipe FD: %d",
1622
1720
self.server.child_pipe.fileno())
1623
1721
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1626
gnutls.connection
1627
.X509Credentials()))
1722
session = gnutls.connection.ClientSession(
1723
self.request, gnutls.connection .X509Credentials())
1628
1724
1629
1725
# Note: gnutls.connection.X509Credentials is really a
1630
1726
# generic GnuTLS certificate credentials object so long as
1639
1735
priority = self.server.gnutls_priority
1640
1736
if priority is None:
1641
1737
priority = "NORMAL"
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
1644
priority, None))
1738
gnutls.library.functions.gnutls_priority_set_direct(
1739
session._c_object, priority, None)
1645
1740
1646
1741
# Start communication using the Mandos protocol
1647
1742
# Get protocol number
1649
1744
logger.debug("Protocol version: %r", line)
1650
1745
try:
1651
1746
if int(line.strip().split()[0]) > 1:
1652
raise RuntimeError
1747
raise RuntimeError(line)
1653
1748
except (ValueError, IndexError, RuntimeError) as error:
1654
1749
logger.error("Unknown protocol version: %s", error)
1655
1750
return
1667
1762
approval_required = False
1668
1763
try:
1669
1764
try:
1670
fpr = self.fingerprint(self.peer_certificate
1671
(session))
1765
fpr = self.fingerprint(
1766
self.peer_certificate(session))
1672
1767
except (TypeError,
1673
1768
gnutls.errors.GNUTLSError) as error:
1674
1769
logger.warning("Bad certificate: %s", error)
1689
1784
while True:
1690
1785
if not client.enabled:
1691
1786
logger.info("Client %s is disabled",
1692
client.name)
1787
client.name)
1693
1788
if self.server.use_dbus:
1694
1789
# Emit D-Bus signal
1695
1790
client.Rejected("Disabled")
1704
1799
if self.server.use_dbus:
1705
1800
# Emit D-Bus signal
1706
1801
client.NeedApproval(
1707
client.approval_delay_milliseconds(),
1708
client.approved_by_default)
1802
client.approval_delay.total_seconds()
1803
* 1000, client.approved_by_default)
1709
1804
else:
1710
1805
logger.warning("Client %s was not approved",
1711
1806
client.name)
1717
1812
#wait until timeout or approved
1718
1813
time = datetime.datetime.now()
1719
1814
client.changedstate.acquire()
1720
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1722
/ 1000)))
1815
client.changedstate.wait(delay.total_seconds())
1723
1816
client.changedstate.release()
1724
1817
time2 = datetime.datetime.now()
1725
1818
if (time2 - time) >= delay:
1741
1834
try:
1742
1835
sent = session.send(client.secret[sent_size:])
1743
1836
except gnutls.errors.GNUTLSError as error:
1744
logger.warning("gnutls send failed")
1837
logger.warning("gnutls send failed",
1838
exc_info=error)
1745
1839
return
1746
logger.debug("Sent: %d, remaining: %d",
1747
sent, len(client.secret)
1748
- (sent_size + sent))
1840
logger.debug("Sent: %d, remaining: %d", sent,
1841
len(client.secret) - (sent_size
1842
+ sent))
1749
1843
sent_size += sent
1750
1844
1751
1845
logger.info("Sending secret to %s", client.name)
1761
1855
try:
1762
1856
session.bye()
1763
1857
except gnutls.errors.GNUTLSError as error:
1764
logger.warning("GnuTLS bye failed")
1858
logger.warning("GnuTLS bye failed",
1859
exc_info=error)
1765
1860
1766
1861
@staticmethod
1767
1862
def peer_certificate(session):
1768
1863
"Return the peer's OpenPGP certificate as a bytestring"
1769
1864
# If not an OpenPGP certificate...
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1865
if (gnutls.library.functions.gnutls_certificate_type_get(
1866
session._c_object)
1772
1867
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1773
1868
# ...do the normal thing
1774
1869
return session.peer_certificate
1788
1883
def fingerprint(openpgp):
1789
1884
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1790
1885
# New GnuTLS "datum" with the OpenPGP public key
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1793
ctypes.POINTER
1794
(ctypes.c_ubyte)),
1795
ctypes.c_uint(len(openpgp))))
1886
datum = gnutls.library.types.gnutls_datum_t(
1887
ctypes.cast(ctypes.c_char_p(openpgp),
1888
ctypes.POINTER(ctypes.c_ubyte)),
1889
ctypes.c_uint(len(openpgp)))
1796
1890
# New empty GnuTLS certificate
1797
1891
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1893
ctypes.byref(crt))
1800
1894
# Import the OpenPGP public key into the certificate
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
1895
gnutls.library.functions.gnutls_openpgp_crt_import(
1896
crt, ctypes.byref(datum),
1897
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
1805
1898
# Verify the self signature in the key
1806
1899
crtverify = ctypes.c_uint()
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1810
1902
if crtverify.value != 0:
1811
1903
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1812
raise (gnutls.errors.CertificateSecurityError
1813
("Verify failed"))
1904
raise gnutls.errors.CertificateSecurityError(
1905
"Verify failed")
1814
1906
# New buffer for the fingerprint
1815
1907
buf = ctypes.create_string_buffer(20)
1816
1908
buf_len = ctypes.c_size_t()
1817
1909
# Get the fingerprint from the certificate into the buffer
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
1910
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1911
crt, ctypes.byref(buf), ctypes.byref(buf_len))
1821
1912
# Deinit the certificate
1822
1913
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1823
1914
# Convert the buffer to a Python bytestring
1829
1920
1830
1921
class MultiprocessingMixIn(object):
1831
1922
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1923
1832
1924
def sub_process_main(self, request, address):
1833
1925
try:
1834
1926
self.finish_request(request, address)
1839
1931
def process_request(self, request, address):
1840
1932
"""Start a new process to process the request."""
1841
1933
proc = multiprocessing.Process(target = self.sub_process_main,
1842
args = (request,
1843
address))
1934
args = (request, address))
1844
1935
proc.start()
1845
1936
return proc
1846
1937
1847
1938
1848
1939
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1849
1940
""" adds a pipe to the MixIn """
1941
1850
1942
def process_request(self, request, client_address):
1851
1943
"""Overrides and wraps the original process_request().
1852
1944
1861
1953
1862
1954
def add_pipe(self, parent_pipe, proc):
1863
1955
"""Dummy function; override as necessary"""
1864
raise NotImplementedError
1956
raise NotImplementedError()
1865
1957
1866
1958
1867
1959
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1873
1965
interface: None or a network interface name (string)
1874
1966
use_ipv6: Boolean; to use IPv6 or not
1875
1967
"""
1968
1876
1969
def __init__(self, server_address, RequestHandlerClass,
1877
interface=None, use_ipv6=True):
1970
interface=None,
1971
use_ipv6=True,
1972
socketfd=None):
1973
"""If socketfd is set, use that file descriptor instead of
1974
creating a new one with socket.socket().
1975
"""
1878
1976
self.interface = interface
1879
1977
if use_ipv6:
1880
1978
self.address_family = socket.AF_INET6
1979
if socketfd is not None:
1980
# Save the file descriptor
1981
self.socketfd = socketfd
1982
# Save the original socket.socket() function
1983
self.socket_socket = socket.socket
1984
# To implement --socket, we monkey patch socket.socket.
1985
#
1986
# (When socketserver.TCPServer is a new-style class, we
1987
# could make self.socket into a property instead of monkey
1988
# patching socket.socket.)
1989
#
1990
# Create a one-time-only replacement for socket.socket()
1991
@functools.wraps(socket.socket)
1992
def socket_wrapper(*args, **kwargs):
1993
# Restore original function so subsequent calls are
1994
# not affected.
1995
socket.socket = self.socket_socket
1996
del self.socket_socket
1997
# This time only, return a new socket object from the
1998
# saved file descriptor.
1999
return socket.fromfd(self.socketfd, *args, **kwargs)
2000
# Replace socket.socket() function with wrapper
2001
socket.socket = socket_wrapper
2002
# The socketserver.TCPServer.__init__ will call
2003
# socket.socket(), which might be our replacement,
2004
# socket_wrapper(), if socketfd was set.
1881
2005
socketserver.TCPServer.__init__(self, server_address,
1882
2006
RequestHandlerClass)
2007
1883
2008
def server_bind(self):
1884
2009
"""This overrides the normal server_bind() function
1885
2010
to bind to an interface if one was specified, and also NOT to
1891
2016
self.interface)
1892
2017
else:
1893
2018
try:
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1895
SO_BINDTODEVICE,
1896
str(self.interface
1897
+ '\0'))
2019
self.socket.setsockopt(
2020
socket.SOL_SOCKET, SO_BINDTODEVICE,
2021
(self.interface + "\0").encode("utf-8"))
1898
2022
except socket.error as error:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1902
self.interface)
1903
elif error[0] == errno.ENOPROTOOPT:
2023
if error.errno == errno.EPERM:
2024
logger.error("No permission to bind to"
2025
" interface %s", self.interface)
2026
elif error.errno == errno.ENOPROTOOPT:
1904
2027
logger.error("SO_BINDTODEVICE not available;"
1905
2028
" cannot bind to interface %s",
1906
2029
self.interface)
2030
elif error.errno == errno.ENODEV:
2031
logger.error("Interface %s does not exist,"
2032
" cannot bind", self.interface)
1907
2033
else:
1908
2034
raise
1909
2035
# Only bind(2) the socket if we really need to.
1912
2038
if self.address_family == socket.AF_INET6:
1913
2039
any_address = "::" # in6addr_any
1914
2040
else:
1915
any_address = socket.INADDR_ANY
2041
any_address = "0.0.0.0" # INADDR_ANY
1916
2042
self.server_address = (any_address,
1917
2043
self.server_address[1])
1918
2044
elif not self.server_address[1]:
1919
self.server_address = (self.server_address[0],
1920
0)
2045
self.server_address = (self.server_address[0], 0)
1921
2046
# if self.interface:
1922
2047
# self.server_address = (self.server_address[0],
1923
2048
# 0, # port
1937
2062
1938
2063
Assumes a gobject.MainLoop event loop.
1939
2064
"""
2065
1940
2066
def __init__(self, server_address, RequestHandlerClass,
1941
interface=None, use_ipv6=True, clients=None,
1942
gnutls_priority=None, use_dbus=True):
2067
interface=None,
2068
use_ipv6=True,
2069
clients=None,
2070
gnutls_priority=None,
2071
use_dbus=True,
2072
socketfd=None):
1943
2073
self.enabled = False
1944
2074
self.clients = clients
1945
2075
if self.clients is None:
1949
2079
IPv6_TCPServer.__init__(self, server_address,
1950
2080
RequestHandlerClass,
1951
2081
interface = interface,
1952
use_ipv6 = use_ipv6)
2082
use_ipv6 = use_ipv6,
2083
socketfd = socketfd)
2084
1953
2085
def server_activate(self):
1954
2086
if self.enabled:
1955
2087
return socketserver.TCPServer.server_activate(self)
1959
2091
1960
2092
def add_pipe(self, parent_pipe, proc):
1961
2093
# Call "handle_ipc" for both data and EOF events
1962
gobject.io_add_watch(parent_pipe.fileno(),
1963
gobject.IO_IN | gobject.IO_HUP,
1964
functools.partial(self.handle_ipc,
1965
parent_pipe =
1966
parent_pipe,
1967
proc = proc))
2094
gobject.io_add_watch(
2095
parent_pipe.fileno(),
2096
gobject.IO_IN | gobject.IO_HUP,
2097
functools.partial(self.handle_ipc,
2098
parent_pipe = parent_pipe,
2099
proc = proc))
1968
2100
1969
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1971
condition_names = {
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1974
# blocking).
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1978
# broken, usually for pipes and
1979
# sockets).
1980
}
1981
conditions_string = ' | '.join(name
1982
for cond, name in
1983
condition_names.iteritems()
1984
if cond & condition)
2101
def handle_ipc(self, source, condition,
2102
parent_pipe=None,
2103
proc = None,
2104
client_object=None):
1985
2105
# error, or the other end of multiprocessing.Pipe has closed
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2106
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1987
2107
# Wait for other process to exit
1988
2108
proc.join()
1989
2109
return False
2010
2130
parent_pipe.send(False)
2011
2131
return False
2012
2132
2013
gobject.io_add_watch(parent_pipe.fileno(),
2014
gobject.IO_IN | gobject.IO_HUP,
2015
functools.partial(self.handle_ipc,
2016
parent_pipe =
2017
parent_pipe,
2018
proc = proc,
2019
client_object =
2020
client))
2133
gobject.io_add_watch(
2134
parent_pipe.fileno(),
2135
gobject.IO_IN | gobject.IO_HUP,
2136
functools.partial(self.handle_ipc,
2137
parent_pipe = parent_pipe,
2138
proc = proc,
2139
client_object = client))
2021
2140
parent_pipe.send(True)
2022
2141
# remove the old hook in favor of the new above hook on
2023
2142
# same fileno
2029
2148
2030
2149
parent_pipe.send(('data', getattr(client_object,
2031
2150
funcname)(*args,
2032
**kwargs)))
2151
**kwargs)))
2033
2152
2034
2153
if command == 'getattr':
2035
2154
attrname = request[1]
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2155
if isinstance(client_object.__getattribute__(attrname),
2156
collections.Callable):
2157
parent_pipe.send(('function', ))
2038
2158
else:
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2159
parent_pipe.send((
2160
'data', client_object.__getattribute__(attrname)))
2041
2161
2042
2162
if command == 'setattr':
2043
2163
attrname = request[1]
2047
2167
return True
2048
2168
2049
2169
2170
def rfc3339_duration_to_delta(duration):
2171
"""Parse an RFC 3339 "duration" and return a datetime.timedelta
2172
2173
>>> rfc3339_duration_to_delta("P7D")
2174
datetime.timedelta(7)
2175
>>> rfc3339_duration_to_delta("PT60S")
2176
datetime.timedelta(0, 60)
2177
>>> rfc3339_duration_to_delta("PT60M")
2178
datetime.timedelta(0, 3600)
2179
>>> rfc3339_duration_to_delta("PT24H")
2180
datetime.timedelta(1)
2181
>>> rfc3339_duration_to_delta("P1W")
2182
datetime.timedelta(7)
2183
>>> rfc3339_duration_to_delta("PT5M30S")
2184
datetime.timedelta(0, 330)
2185
>>> rfc3339_duration_to_delta("P1DT3M20S")
2186
datetime.timedelta(1, 200)
2187
"""
2188
2189
# Parsing an RFC 3339 duration with regular expressions is not
2190
# possible - there would have to be multiple places for the same
2191
# values, like seconds. The current code, while more esoteric, is
2192
# cleaner without depending on a parsing library. If Python had a
2193
# built-in library for parsing we would use it, but we'd like to
2194
# avoid excessive use of external libraries.
2195
2196
# New type for defining tokens, syntax, and semantics all-in-one
2197
Token = collections.namedtuple("Token", (
2198
"regexp", # To match token; if "value" is not None, must have
2199
# a "group" containing digits
2200
"value", # datetime.timedelta or None
2201
"followers")) # Tokens valid after this token
2202
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
2203
# the "duration" ABNF definition in RFC 3339, Appendix A.
2204
token_end = Token(re.compile(r"$"), None, frozenset())
2205
token_second = Token(re.compile(r"(\d+)S"),
2206
datetime.timedelta(seconds=1),
2207
frozenset((token_end, )))
2208
token_minute = Token(re.compile(r"(\d+)M"),
2209
datetime.timedelta(minutes=1),
2210
frozenset((token_second, token_end)))
2211
token_hour = Token(re.compile(r"(\d+)H"),
2212
datetime.timedelta(hours=1),
2213
frozenset((token_minute, token_end)))
2214
token_time = Token(re.compile(r"T"),
2215
None,
2216
frozenset((token_hour, token_minute,
2217
token_second)))
2218
token_day = Token(re.compile(r"(\d+)D"),
2219
datetime.timedelta(days=1),
2220
frozenset((token_time, token_end)))
2221
token_month = Token(re.compile(r"(\d+)M"),
2222
datetime.timedelta(weeks=4),
2223
frozenset((token_day, token_end)))
2224
token_year = Token(re.compile(r"(\d+)Y"),
2225
datetime.timedelta(weeks=52),
2226
frozenset((token_month, token_end)))
2227
token_week = Token(re.compile(r"(\d+)W"),
2228
datetime.timedelta(weeks=1),
2229
frozenset((token_end, )))
2230
token_duration = Token(re.compile(r"P"), None,
2231
frozenset((token_year, token_month,
2232
token_day, token_time,
2233
token_week)))
2234
# Define starting values
2235
value = datetime.timedelta() # Value so far
2236
found_token = None
2237
followers = frozenset((token_duration, )) # Following valid tokens
2238
s = duration # String left to parse
2239
# Loop until end token is found
2240
while found_token is not token_end:
2241
# Search for any currently valid tokens
2242
for token in followers:
2243
match = token.regexp.match(s)
2244
if match is not None:
2245
# Token found
2246
if token.value is not None:
2247
# Value found, parse digits
2248
factor = int(match.group(1), 10)
2249
# Add to value so far
2250
value += factor * token.value
2251
# Strip token from string
2252
s = token.regexp.sub("", s, 1)
2253
# Go to found token
2254
found_token = token
2255
# Set valid next tokens
2256
followers = found_token.followers
2257
break
2258
else:
2259
# No currently valid tokens were found
2260
raise ValueError("Invalid RFC 3339 duration: {!r}"
2261
.format(duration))
2262
# End token found
2263
return value
2264
2265
2050
2266
def string_to_delta(interval):
2051
2267
"""Parse a string and return a datetime.timedelta
2052
2268
2063
2279
>>> string_to_delta('5m 30s')
2064
2280
datetime.timedelta(0, 330)
2065
2281
"""
2282
2283
try:
2284
return rfc3339_duration_to_delta(interval)
2285
except ValueError:
2286
pass
2287
2066
2288
timevalue = datetime.timedelta(0)
2067
2289
for s in interval.split():
2068
2290
try:
2069
suffix = unicode(s[-1])
2291
suffix = s[-1]
2070
2292
value = int(s[:-1])
2071
2293
if suffix == "d":
2072
2294
delta = datetime.timedelta(value)
2079
2301
elif suffix == "w":
2080
2302
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2081
2303
else:
2082
raise ValueError("Unknown suffix {0!r}"
2083
.format(suffix))
2084
except (ValueError, IndexError) as e:
2304
raise ValueError("Unknown suffix {!r}".format(suffix))
2305
except IndexError as e:
2085
2306
raise ValueError(*(e.args))
2086
2307
timevalue += delta
2087
2308
return timevalue
2103
2324
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2104
2325
if not stat.S_ISCHR(os.fstat(null).st_mode):
2105
2326
raise OSError(errno.ENODEV,
2106
"{0} not a character device"
2327
"{} not a character device"
2107
2328
.format(os.devnull))
2108
2329
os.dup2(null, sys.stdin.fileno())
2109
2330
os.dup2(null, sys.stdout.fileno())
2119
2340
2120
2341
parser = argparse.ArgumentParser()
2121
2342
parser.add_argument("-v", "--version", action="version",
2122
version = "%(prog)s {0}".format(version),
2343
version = "%(prog)s {}".format(version),
2123
2344
help="show version number and exit")
2124
2345
parser.add_argument("-i", "--interface", metavar="IF",
2125
2346
help="Bind to interface IF")
2131
2352
help="Run self-test")
2132
2353
parser.add_argument("--debug", action="store_true",
2133
2354
help="Debug mode; run in foreground and log"
2134
" to terminal")
2355
" to terminal", default=None)
2135
2356
parser.add_argument("--debuglevel", metavar="LEVEL",
2136
2357
help="Debug level for stdout output")
2137
2358
parser.add_argument("--priority", help="GnuTLS"
2144
2365
" files")
2145
2366
parser.add_argument("--no-dbus", action="store_false",
2146
2367
dest="use_dbus", help="Do not provide D-Bus"
2147
" system bus interface")
2368
" system bus interface", default=None)
2148
2369
parser.add_argument("--no-ipv6", action="store_false",
2149
dest="use_ipv6", help="Do not use IPv6")
2370
dest="use_ipv6", help="Do not use IPv6",
2371
default=None)
2150
2372
parser.add_argument("--no-restore", action="store_false",
2151
2373
dest="restore", help="Do not restore stored"
2152
" state")
2374
" state", default=None)
2375
parser.add_argument("--socket", type=int,
2376
help="Specify a file descriptor to a network"
2377
" socket to use instead of creating one")
2153
2378
parser.add_argument("--statedir", metavar="DIR",
2154
2379
help="Directory to save/restore state in")
2380
parser.add_argument("--foreground", action="store_true",
2381
help="Run in foreground", default=None)
2382
parser.add_argument("--no-zeroconf", action="store_false",
2383
dest="zeroconf", help="Do not use Zeroconf",
2384
default=None)
2155
2385
2156
2386
options = parser.parse_args()
2157
2387
2158
2388
if options.check:
2159
2389
import doctest
2160
doctest.testmod()
2161
sys.exit()
2390
fail_count, test_count = doctest.testmod()
2391
sys.exit(os.EX_OK if fail_count == 0 else 1)
2162
2392
2163
2393
# Default values for config file for server-global settings
2164
2394
server_defaults = { "interface": "",
2166
2396
"port": "",
2167
2397
"debug": "False",
2168
2398
"priority":
2169
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2399
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2400
":+SIGN-DSA-SHA256",
2170
2401
"servicename": "Mandos",
2171
2402
"use_dbus": "True",
2172
2403
"use_ipv6": "True",
2173
2404
"debuglevel": "",
2174
2405
"restore": "True",
2175
"statedir": "/var/lib/mandos"
2176
}
2406
"socket": "",
2407
"statedir": "/var/lib/mandos",
2408
"foreground": "False",
2409
"zeroconf": "True",
2410
}
2177
2411
2178
2412
# Parse config file for server-global settings
2179
2413
server_config = configparser.SafeConfigParser(server_defaults)
2180
2414
del server_defaults
2181
server_config.read(os.path.join(options.configdir,
2182
"mandos.conf"))
2415
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2183
2416
# Convert the SafeConfigParser object to a dict
2184
2417
server_settings = server_config.defaults()
2185
2418
# Use the appropriate methods on the non-string config options
2186
for option in ("debug", "use_dbus", "use_ipv6"):
2419
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2187
2420
server_settings[option] = server_config.getboolean("DEFAULT",
2188
2421
option)
2189
2422
if server_settings["port"]:
2190
2423
server_settings["port"] = server_config.getint("DEFAULT",
2191
2424
"port")
2425
if server_settings["socket"]:
2426
server_settings["socket"] = server_config.getint("DEFAULT",
2427
"socket")
2428
# Later, stdin will, and stdout and stderr might, be dup'ed
2429
# over with an opened os.devnull. But we don't want this to
2430
# happen with a supplied network socket.
2431
if 0 <= server_settings["socket"] <= 2:
2432
server_settings["socket"] = os.dup(server_settings
2433
["socket"])
2192
2434
del server_config
2193
2435
2194
2436
# Override the settings from the config file with command line
2195
2437
# options, if set.
2196
2438
for option in ("interface", "address", "port", "debug",
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
2199
"statedir"):
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2200
2442
value = getattr(options, option)
2201
2443
if value is not None:
2202
2444
server_settings[option] = value
2203
2445
del options
2204
2446
# Force all strings to be unicode
2205
2447
for option in server_settings.keys():
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
2448
if isinstance(server_settings[option], bytes):
2449
server_settings[option] = (server_settings[option]
2450
.decode("utf-8"))
2451
# Force all boolean options to be boolean
2452
for option in ("debug", "use_dbus", "use_ipv6", "restore",
2453
"foreground", "zeroconf"):
2454
server_settings[option] = bool(server_settings[option])
2455
# Debug implies foreground
2456
if server_settings["debug"]:
2457
server_settings["foreground"] = True
2208
2458
# Now we have our good server settings in "server_settings"
2209
2459
2210
2460
##################################################################
2211
2461
2462
if (not server_settings["zeroconf"]
2463
and not (server_settings["port"]
2464
or server_settings["socket"] != "")):
2465
parser.error("Needs port or socket to work without Zeroconf")
2466
2212
2467
# For convenience
2213
2468
debug = server_settings["debug"]
2214
2469
debuglevel = server_settings["debuglevel"]
2216
2471
use_ipv6 = server_settings["use_ipv6"]
2217
2472
stored_state_path = os.path.join(server_settings["statedir"],
2218
2473
stored_state_file)
2474
foreground = server_settings["foreground"]
2475
zeroconf = server_settings["zeroconf"]
2219
2476
2220
2477
if debug:
2221
2478
initlogger(debug, logging.DEBUG)
2227
2484
initlogger(debug, level)
2228
2485
2229
2486
if server_settings["servicename"] != "Mandos":
2230
syslogger.setFormatter(logging.Formatter
2231
('Mandos ({0}) [%(process)d]:'
2232
' %(levelname)s: %(message)s'
2233
.format(server_settings
2234
["servicename"])))
2487
syslogger.setFormatter(
2488
logging.Formatter('Mandos ({}) [%(process)d]:'
2489
' %(levelname)s: %(message)s'.format(
2490
server_settings["servicename"])))
2235
2491
2236
2492
# Parse config file with clients
2237
2493
client_config = configparser.SafeConfigParser(Client
2242
2498
global mandos_dbus_service
2243
2499
mandos_dbus_service = None
2244
2500
2245
tcp_server = MandosServer((server_settings["address"],
2246
server_settings["port"]),
2247
ClientHandler,
2248
interface=(server_settings["interface"]
2249
or None),
2250
use_ipv6=use_ipv6,
2251
gnutls_priority=
2252
server_settings["priority"],
2253
use_dbus=use_dbus)
2254
if not debug:
2255
pidfilename = "/var/run/mandos.pid"
2501
socketfd = None
2502
if server_settings["socket"] != "":
2503
socketfd = server_settings["socket"]
2504
tcp_server = MandosServer(
2505
(server_settings["address"], server_settings["port"]),
2506
ClientHandler,
2507
interface=(server_settings["interface"] or None),
2508
use_ipv6=use_ipv6,
2509
gnutls_priority=server_settings["priority"],
2510
use_dbus=use_dbus,
2511
socketfd=socketfd)
2512
if not foreground:
2513
pidfilename = "/run/mandos.pid"
2514
if not os.path.isdir("/run/."):
2515
pidfilename = "/var/run/mandos.pid"
2516
pidfile = None
2256
2517
try:
2257
pidfile = open(pidfilename, "w")
2258
except IOError:
2259
logger.error("Could not open file %r", pidfilename)
2518
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2519
except IOError as e:
2520
logger.error("Could not open file %r", pidfilename,
2521
exc_info=e)
2260
2522
2261
2523
for name in ("_mandos", "mandos", "nobody"):
2262
2524
try:
2272
2534
os.setgid(gid)
2273
2535
os.setuid(uid)
2274
2536
except OSError as error:
2275
if error[0] != errno.EPERM:
2276
raise error
2537
if error.errno != errno.EPERM:
2538
raise
2277
2539
2278
2540
if debug:
2279
2541
# Enable all possible GnuTLS debugging
2286
2548
def debug_gnutls(level, string):
2287
2549
logger.debug("GnuTLS: %s", string[:-1])
2288
2550
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
2551
gnutls.library.functions.gnutls_global_set_log_function(
2552
debug_gnutls)
2291
2553
2292
2554
# Redirect stdin so all checkers get /dev/null
2293
2555
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2296
2558
os.close(null)
2297
2559
2298
2560
# Need to fork before connecting to D-Bus
2299
if not debug:
2561
if not foreground:
2300
2562
# Close all input and output, do double fork, etc.
2301
2563
daemon()
2302
2564
2565
# multiprocessing will use threads, so before we use gobject we
2566
# need to inform gobject that threads will be used.
2303
2567
gobject.threads_init()
2304
2568
2305
2569
global main_loop
2311
2575
if use_dbus:
2312
2576
try:
2313
2577
bus_name = dbus.service.BusName("se.recompile.Mandos",
2314
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2317
do_not_queue=True))
2318
except dbus.exceptions.NameExistsException as e:
2319
logger.error(unicode(e) + ", disabling D-Bus")
2578
bus,
2579
do_not_queue=True)
2580
old_bus_name = dbus.service.BusName(
2581
"se.bsnet.fukt.Mandos", bus,
2582
do_not_queue=True)
2583
except dbus.exceptions.DBusException as e:
2584
logger.error("Disabling D-Bus:", exc_info=e)
2320
2585
use_dbus = False
2321
2586
server_settings["use_dbus"] = False
2322
2587
tcp_server.use_dbus = False
2323
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
2328
if server_settings["interface"]:
2329
service.interface = (if_nametoindex
2330
(str(server_settings["interface"])))
2588
if zeroconf:
2589
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2590
service = AvahiServiceToSyslog(
2591
name = server_settings["servicename"],
2592
servicetype = "_mandos._tcp",
2593
protocol = protocol,
2594
bus = bus)
2595
if server_settings["interface"]:
2596
service.interface = if_nametoindex(
2597
server_settings["interface"].encode("utf-8"))
2331
2598
2332
2599
global multiprocessing_manager
2333
2600
multiprocessing_manager = multiprocessing.Manager()
2334
2601
2335
2602
client_class = Client
2336
2603
if use_dbus:
2337
client_class = functools.partial(ClientDBusTransitional,
2338
bus = bus)
2604
client_class = functools.partial(ClientDBus, bus = bus)
2339
2605
2340
2606
client_settings = Client.config_parser(client_config)
2341
2607
old_client_settings = {}
2342
2608
clients_data = {}
2343
2609
2610
# This is used to redirect stdout and stderr for checker processes
2611
global wnull
2612
wnull = open(os.devnull, "w") # A writable /dev/null
2613
# Only used if server is running in foreground but not in debug
2614
# mode
2615
if debug or not foreground:
2616
wnull.close()
2617
2344
2618
# Get client data and settings from last running state.
2345
2619
if server_settings["restore"]:
2346
2620
try:
2347
2621
with open(stored_state_path, "rb") as stored_state:
2348
clients_data, old_client_settings = (pickle.load
2349
(stored_state))
2622
clients_data, old_client_settings = pickle.load(
2623
stored_state)
2350
2624
os.remove(stored_state_path)
2351
2625
except IOError as e:
2352
logger.warning("Could not load persistent state: {0}"
2353
.format(e))
2354
if e.errno != errno.ENOENT:
2626
if e.errno == errno.ENOENT:
2627
logger.warning("Could not load persistent state:"
2628
" {}".format(os.strerror(e.errno)))
2629
else:
2630
logger.critical("Could not load persistent state:",
2631
exc_info=e)
2355
2632
raise
2356
2633
except EOFError as e:
2357
2634
logger.warning("Could not load persistent state: "
2358
"EOFError: {0}".format(e))
2635
"EOFError:",
2636
exc_info=e)
2359
2637
2360
2638
with PGPEngine() as pgp:
2361
for client_name, client in clients_data.iteritems():
2639
for client_name, client in clients_data.items():
2640
# Skip removed clients
2641
if client_name not in client_settings:
2642
continue
2643
2362
2644
# Decide which value to use after restoring saved state.
2363
2645
# We have three different values: Old config file,
2364
2646
# new config file, and saved state.
2369
2651
# For each value in new config, check if it
2370
2652
# differs from the old config value (Except for
2371
2653
# the "secret" attribute)
2372
if (name != "secret" and
2373
value != old_client_settings[client_name]
2374
[name]):
2654
if (name != "secret"
2655
and (value !=
2656
old_client_settings[client_name][name])):
2375
2657
client[name] = value
2376
2658
except KeyError:
2377
2659
pass
2378
2660
2379
2661
# Clients who has passed its expire date can still be
2380
# enabled if its last checker was successful. Clients
2662
# enabled if its last checker was successful. A Client
2381
2663
# whose checker succeeded before we stored its state is
2382
2664
# assumed to have successfully run all checkers during
2383
2665
# downtime.
2385
2667
if datetime.datetime.utcnow() >= client["expires"]:
2386
2668
if not client["last_checked_ok"]:
2387
2669
logger.warning(
2388
"disabling client {0} - Client never "
2389
"performed a successful checker"
2390
.format(client_name))
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2672
client_name))
2391
2673
client["enabled"] = False
2392
2674
elif client["last_checker_status"] != 0:
2393
2675
logger.warning(
2394
"disabling client {0} - Client "
2395
"last checker failed with error code {1}"
2396
.format(client_name,
2397
client["last_checker_status"]))
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2678
" {}".format(
2679
client_name,
2680
client["last_checker_status"]))
2398
2681
client["enabled"] = False
2399
2682
else:
2400
client["expires"] = (datetime.datetime
2401
.utcnow()
2402
+ client["timeout"])
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2403
2686
logger.debug("Last checker succeeded,"
2404
" keeping {0} enabled"
2405
.format(client_name))
2687
" keeping {} enabled".format(
2688
client_name))
2406
2689
try:
2407
client["secret"] = (
2408
pgp.decrypt(client["encrypted_secret"],
2409
client_settings[client_name]
2410
["secret"]))
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2411
2693
except PGPError:
2412
2694
# If decryption fails, we use secret from new settings
2413
logger.debug("Failed to decrypt {0} old secret"
2414
.format(client_name))
2415
client["secret"] = (
2416
client_settings[client_name]["secret"])
2417
2695
logger.debug("Failed to decrypt {} old secret".format(
2696
client_name))
2697
client["secret"] = (client_settings[client_name]
2698
["secret"])
2418
2699
2419
2700
# Add/remove clients based on new changes made to config
2420
2701
for client_name in (set(old_client_settings)
2423
2704
for client_name in (set(client_settings)
2424
2705
- set(old_client_settings)):
2425
2706
clients_data[client_name] = client_settings[client_name]
2426
2707
2427
2708
# Create all client objects
2428
for client_name, client in clients_data.iteritems():
2709
for client_name, client in clients_data.items():
2429
2710
tcp_server.clients[client_name] = client_class(
2430
name = client_name, settings = client)
2711
name = client_name,
2712
settings = client,
2713
server_settings = server_settings)
2431
2714
2432
2715
if not tcp_server.clients:
2433
2716
logger.warning("No clients defined")
2434
2435
if not debug:
2436
try:
2437
with pidfile:
2438
pid = os.getpid()
2439
pidfile.write(str(pid) + "\n".encode("utf-8"))
2440
del pidfile
2441
except IOError:
2442
logger.error("Could not write to file %r with PID %d",
2443
pidfilename, pid)
2444
except NameError:
2445
# "pidfile" was never created
2446
pass
2717
2718
if not foreground:
2719
if pidfile is not None:
2720
pid = os.getpid()
2721
try:
2722
with pidfile:
2723
print(pid, file=pidfile)
2724
except IOError:
2725
logger.error("Could not write to file %r with PID %d",
2726
pidfilename, pid)
2727
del pidfile
2447
2728
del pidfilename
2448
signal.signal(signal.SIGINT, signal.SIG_IGN)
2449
2729
2450
2730
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2451
2731
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2452
2732
2453
2733
if use_dbus:
2734
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2454
2737
class MandosDBusService(DBusObjectWithProperties):
2455
2738
"""A D-Bus proxy object"""
2739
2456
2740
def __init__(self):
2457
2741
dbus.service.Object.__init__(self, bus, "/")
2742
2458
2743
_interface = "se.recompile.Mandos"
2459
2744
2460
2745
@dbus_interface_annotations(_interface)
2461
2746
def _foo(self):
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2464
"false"}
2747
return {
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2749
"false" }
2465
2750
2466
2751
@dbus.service.signal(_interface, signature="o")
2467
2752
def ClientAdded(self, objpath):
2481
2766
@dbus.service.method(_interface, out_signature="ao")
2482
2767
def GetAllClients(self):
2483
2768
"D-Bus method"
2484
return dbus.Array(c.dbus_object_path
2485
for c in
2769
return dbus.Array(c.dbus_object_path for c in
2486
2770
tcp_server.clients.itervalues())
2487
2771
2488
2772
@dbus.service.method(_interface,
2490
2774
def GetAllClientsWithProperties(self):
2491
2775
"D-Bus method"
2492
2776
return dbus.Dictionary(
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
2777
{ c.dbus_object_path: c.GetAll("")
2778
for c in tcp_server.clients.itervalues() },
2495
2779
signature="oa{sv}")
2496
2780
2497
2781
@dbus.service.method(_interface, in_signature="o")
2510
2794
2511
2795
del _interface
2512
2796
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
2797
mandos_dbus_service = MandosDBusService()
2516
2798
2517
2799
def cleanup():
2518
2800
"Cleanup function; run on exit"
2519
service.cleanup()
2801
if zeroconf:
2802
service.cleanup()
2520
2803
2521
2804
multiprocessing.active_children()
2805
wnull.close()
2522
2806
if not (tcp_server.clients or client_settings):
2523
2807
return
2524
2808
2535
2819
2536
2820
# A list of attributes that can not be pickled
2537
2821
# + secret.
2538
exclude = set(("bus", "changedstate", "secret",
2539
"checker"))
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
2824
for name, typ in inspect.getmembers(dbus.service
2825
.Object):
2542
2826
exclude.add(name)
2543
2827
2544
2828
client_dict["encrypted_secret"] = (client
2551
2835
del client_settings[client.name]["secret"]
2552
2836
2553
2837
try:
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
prefix="clients-",
2556
dir=os.path.dirname
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2838
with tempfile.NamedTemporaryFile(
2839
mode='wb',
2840
suffix=".pickle",
2841
prefix='clients-',
2842
dir=os.path.dirname(stored_state_path),
2843
delete=False) as stored_state:
2559
2844
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2560
2846
os.rename(tempname, stored_state_path)
2561
2847
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2563
.format(e))
2564
2848
if not debug:
2565
2849
try:
2566
2850
os.remove(tempname)
2567
2851
except NameError:
2568
2852
pass
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
2570
errno.EEXIST)):
2571
raise e
2853
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST):
2854
logger.warning("Could not save persistent state: {}"
2855
.format(os.strerror(e.errno)))
2856
else:
2857
logger.warning("Could not save persistent state:",
2858
exc_info=e)
2859
raise
2572
2860
2573
2861
# Delete all clients, and settings from config
2574
2862
while tcp_server.clients:
2579
2867
client.disable(quiet=True)
2580
2868
if use_dbus:
2581
2869
# Emit D-Bus signal
2582
mandos_dbus_service.ClientRemoved(client
2583
.dbus_object_path,
2584
client.name)
2870
mandos_dbus_service.ClientRemoved(
2871
client.dbus_object_path, client.name)
2585
2872
client_settings.clear()
2586
2873
2587
2874
atexit.register(cleanup)
2598
2885
tcp_server.server_activate()
2599
2886
2600
2887
# Find out what port we got
2601
service.port = tcp_server.socket.getsockname()[1]
2888
if zeroconf:
2889
service.port = tcp_server.socket.getsockname()[1]
2602
2890
if use_ipv6:
2603
2891
logger.info("Now listening on address %r, port %d,"
2604
2892
" flowinfo %d, scope_id %d",
2610
2898
#service.interface = tcp_server.socket.getsockname()[3]
2611
2899
2612
2900
try:
2613
# From the Avahi example code
2614
try:
2615
service.activate()
2616
except dbus.exceptions.DBusException as error:
2617
logger.critical("D-Bus Exception", exc_info=error)
2618
cleanup()
2619
sys.exit(1)
2620
# End of Avahi example code
2901
if zeroconf:
2902
# From the Avahi example code
2903
try:
2904
service.activate()
2905
except dbus.exceptions.DBusException as error:
2906
logger.critical("D-Bus Exception", exc_info=error)
2907
cleanup()
2908
sys.exit(1)
2909
# End of Avahi example code
2621
2910
2622
2911
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2623
2912
lambda *args, **kwargs:
2638
2927
# Must run before the D-Bus bus name gets deregistered
2639
2928
cleanup()
2640
2929
2930
2641
2931
if __name__ == '__main__':
2642
2932
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0