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