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 570
- compare with another revision
- download diff
- download tarball
- view history from revision 570
- Committer: Teddy Hogeborn
- Date: 2012-05-05 09:20:23 UTC
- mfrom: (569.1.2 ctl-using-properties)
- Revision ID: teddy@recompile.se-20120505092023-es5pn711z02193ny
* mandos-ctl (main): Use D-Bus properties instead of methods.
- 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("D-Bus Exception", exc_info=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: {0!s}"
326
.format(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 ({0}) [%(process)d]:'
379
' %(levelname)s: %(message)s'
380
.format(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 {}"
492
raise TypeError("No secret or secfile for section {0}"
545
493
.format(section))
546
494
client["timeout"] = string_to_delta(section["timeout"])
547
495
client["extended_timeout"] = string_to_delta(
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
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,
680
try:
681
# In case checker_command has exactly one % operator
682
command = self.checker_command % self.host
683
except TypeError:
684
# Escape attributes for the shell
685
escaped_attrs = dict(
686
(attr,
687
re.escape(unicode(str(getattr(self, attr, "")),
688
errors=
689
'replace')))
690
for attr in
691
self.runtime_expansions)
692
693
try:
694
command = self.checker_command % escaped_attrs
695
except TypeError as error:
696
logger.error('Could not format string "%s"',
697
self.checker_command, exc_info=error)
698
return True # Try again later
699
self.current_checker_command = command
700
try:
701
logger.info("Starting checker %r for %s",
702
command, self.name)
703
# We don't need to redirect stdout and stderr, since
704
# in normal mode, that is already done by daemon(),
705
# and in debug mode we don't want to. (Stdin is
706
# always replaced by /dev/null.)
707
self.checker = subprocess.Popen(command,
708
close_fds=True,
709
shell=True, cwd="/")
710
self.checker_callback_tag = (gobject.child_watch_add
711
(self.checker.pid,
712
self.checker_callback,
713
data=command))
714
# The checker may have completed before the gobject
715
# watch was added. Check for this.
716
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
717
if pid:
718
gobject.source_remove(self.checker_callback_tag)
719
self.checker_callback(pid, status, command)
720
except OSError as error:
721
logger.error("Failed to start subprocess",
736
722
exc_info=error)
737
return True # Try again later
738
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)
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
self.checker.terminate()
736
#time.sleep(0.5)
737
#if self.checker.poll() is None:
738
# self.checker.kill()
739
except OSError as error:
740
if error.errno != errno.ESRCH: # No such process
741
raise
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 {0!r}".format(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
791
return decorator
832
792
833
793
835
795
"""Decorator to annotate D-Bus methods, signals or properties
836
796
Usage:
837
797
838
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
839
"org.freedesktop.DBus.Property."
840
"EmitsChangedSignal": "false"})
841
798
@dbus_service_property("org.example.Interface", signature="b",
842
799
access="r")
800
@dbus_annotations({{"org.freedesktop.DBus.Deprecated": "true",
801
"org.freedesktop.DBus.Property."
802
"EmitsChangedSignal": "false"})
843
803
def Property_dbus_property(self):
844
804
return dbus.Boolean(False)
845
805
"""
846
847
806
def decorator(func):
848
807
func._dbus_annotations = annotations
849
808
return func
850
851
809
return decorator
852
810
853
811
854
812
class DBusPropertyException(dbus.exceptions.DBusException):
855
813
"""A base class for D-Bus property-related exceptions
856
814
"""
857
pass
815
def __unicode__(self):
816
return unicode(str(self))
858
817
859
818
860
819
class DBusPropertyAccessException(DBusPropertyException):
884
843
If called like _is_dbus_thing("method") it returns a function
885
844
suitable for use as predicate to inspect.getmembers().
886
845
"""
887
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing),
846
return lambda obj: getattr(obj, "_dbus_is_{0}".format(thing),
888
847
False)
889
848
890
849
def _get_all_dbus_things(self, thing):
891
850
"""Returns a generator of (name, attribute) pairs
892
851
"""
893
return ((getattr(athing.__get__(self), "_dbus_name", name),
852
return ((getattr(athing.__get__(self), "_dbus_name",
853
name),
894
854
athing.__get__(self))
895
855
for cls in self.__class__.__mro__
896
856
for name, athing in
897
inspect.getmembers(cls, self._is_dbus_thing(thing)))
857
inspect.getmembers(cls,
858
self._is_dbus_thing(thing)))
898
859
899
860
def _get_dbus_property(self, interface_name, property_name):
900
861
"""Returns a bound method if one exists which is a D-Bus
901
862
property with the specified name and interface.
902
863
"""
903
for cls in self.__class__.__mro__:
904
for name, value in inspect.getmembers(
905
cls, self._is_dbus_thing("property")):
864
for cls in self.__class__.__mro__:
865
for name, value in (inspect.getmembers
866
(cls,
867
self._is_dbus_thing("property"))):
906
868
if (value._dbus_name == property_name
907
869
and value._dbus_interface == interface_name):
908
870
return value.__get__(self)
909
871
910
872
# No such property
911
raise DBusPropertyNotFound("{}:{}.{}".format(
912
self.dbus_object_path, interface_name, property_name))
873
raise DBusPropertyNotFound(self.dbus_object_path + ":"
874
+ interface_name + "."
875
+ property_name)
913
876
914
@dbus.service.method(dbus.PROPERTIES_IFACE,
915
in_signature="ss",
877
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ss",
916
878
out_signature="v")
917
879
def Get(self, interface_name, property_name):
918
880
"""Standard D-Bus property Get() method, see D-Bus standard.
936
898
# The byte_arrays option is not supported yet on
937
899
# signatures other than "ay".
938
900
if prop._dbus_signature != "ay":
939
raise ValueError("Byte arrays not supported for non-"
940
"'ay' signature {!r}"
941
.format(prop._dbus_signature))
901
raise ValueError
942
902
value = dbus.ByteArray(b''.join(chr(byte)
943
903
for byte in value))
944
904
prop(value)
945
905
946
@dbus.service.method(dbus.PROPERTIES_IFACE,
947
in_signature="s",
906
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="s",
948
907
out_signature="a{sv}")
949
908
def GetAll(self, interface_name):
950
909
"""Standard D-Bus property GetAll() method, see D-Bus
965
924
if not hasattr(value, "variant_level"):
966
925
properties[name] = value
967
926
continue
968
properties[name] = type(value)(
969
value, variant_level = value.variant_level + 1)
927
properties[name] = type(value)(value, variant_level=
928
value.variant_level+1)
970
929
return dbus.Dictionary(properties, signature="sv")
971
930
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
931
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
981
932
out_signature="s",
982
933
path_keyword='object_path',
990
941
connection)
991
942
try:
992
943
document = xml.dom.minidom.parseString(xmlstring)
993
994
944
def make_tag(document, name, prop):
995
945
e = document.createElement("property")
996
946
e.setAttribute("name", name)
997
947
e.setAttribute("type", prop._dbus_signature)
998
948
e.setAttribute("access", prop._dbus_access)
999
949
return e
1000
1001
950
for if_tag in document.getElementsByTagName("interface"):
1002
951
# Add property tags
1003
952
for tag in (make_tag(document, name, prop)
1015
964
if (name == tag.getAttribute("name")
1016
965
and prop._dbus_interface
1017
966
== if_tag.getAttribute("name")):
1018
annots.update(getattr(
1019
prop, "_dbus_annotations", {}))
1020
for name, value in annots.items():
967
annots.update(getattr
968
(prop,
969
"_dbus_annotations",
970
{}))
971
for name, value in annots.iteritems():
1021
972
ann_tag = document.createElement(
1022
973
"annotation")
1023
974
ann_tag.setAttribute("name", name)
1025
976
tag.appendChild(ann_tag)
1026
977
# Add interface annotation tags
1027
978
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():
979
itertools.chain(
980
*(annotations().iteritems()
981
for name, annotations in
982
self._get_all_dbus_things("interface")
983
if name == if_tag.getAttribute("name")
984
))).iteritems():
1034
985
ann_tag = document.createElement("annotation")
1035
986
ann_tag.setAttribute("name", annotation)
1036
987
ann_tag.setAttribute("value", value)
1059
1010
return xmlstring
1060
1011
1061
1012
1062
def datetime_to_dbus(dt, variant_level=0):
1013
def datetime_to_dbus (dt, variant_level=0):
1063
1014
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1064
1015
if dt is None:
1065
1016
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).
1017
return dbus.String(dt.isoformat(),
1018
variant_level=variant_level)
1019
1020
1021
class AlternateDBusNamesMetaclass(DBusObjectWithProperties
1022
.__metaclass__):
1023
"""Applied to an empty subclass of a D-Bus object, this metaclass
1024
will add additional D-Bus attributes matching a certain pattern.
1091
1025
"""
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):
1026
def __new__(mcs, name, bases, attr):
1027
# Go through all the base classes which could have D-Bus
1028
# methods, signals, or properties in them
1029
old_interface_names = []
1030
for base in (b for b in bases
1031
if issubclass(b, dbus.service.Object)):
1032
# Go though all attributes of the base class
1033
for attrname, attribute in inspect.getmembers(base):
1100
1034
# Ignore non-D-Bus attributes, and D-Bus attributes
1101
1035
# with the wrong interface name
1102
1036
if (not hasattr(attribute, "_dbus_interface")
1103
or not attribute._dbus_interface.startswith(
1104
orig_interface_name)):
1037
or not attribute._dbus_interface
1038
.startswith("se.recompile.Mandos")):
1105
1039
continue
1106
1040
# Create an alternate D-Bus interface name based on
1107
1041
# the current name
1108
alt_interface = attribute._dbus_interface.replace(
1109
orig_interface_name, alt_interface_name)
1110
interface_names.add(alt_interface)
1042
alt_interface = (attribute._dbus_interface
1043
.replace("se.recompile.Mandos",
1044
"se.bsnet.fukt.Mandos"))
1045
if alt_interface != attribute._dbus_interface:
1046
old_interface_names.append(alt_interface)
1111
1047
# Is this a D-Bus signal?
1112
1048
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(
1049
# Extract the original non-method function by
1050
# black magic
1051
nonmethod_func = (dict(
1117
1052
zip(attribute.func_code.co_freevars,
1118
attribute.__closure__))
1119
["func"].cell_contents)
1120
else:
1121
nonmethod_func = attribute
1053
attribute.__closure__))["func"]
1054
.cell_contents)
1122
1055
# Create a new, but exactly alike, function
1123
1056
# object, and decorate it to be a new D-Bus signal
1124
1057
# 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))
1058
new_function = (dbus.service.signal
1059
(alt_interface,
1060
attribute._dbus_signature)
1061
(types.FunctionType(
1062
nonmethod_func.func_code,
1063
nonmethod_func.func_globals,
1064
nonmethod_func.func_name,
1065
nonmethod_func.func_defaults,
1066
nonmethod_func.func_closure)))
1142
1067
# Copy annotations, if any
1143
1068
try:
1144
new_function._dbus_annotations = dict(
1145
attribute._dbus_annotations)
1069
new_function._dbus_annotations = (
1070
dict(attribute._dbus_annotations))
1146
1071
except AttributeError:
1147
1072
pass
1148
1073
# 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
1074
# old and new functions, so both the old and new
1075
# signals gets sent when the function is called
1152
1076
def fixscope(func1, func2):
1153
1077
"""This function is a scope container to pass
1154
1078
func1 and func2 to the "call_both" function
1155
1079
outside of its arguments"""
1156
1157
1080
def call_both(*args, **kwargs):
1158
1081
"""This function will emit two D-Bus
1159
1082
signals by calling func1 and func2"""
1160
1083
func1(*args, **kwargs)
1161
1084
func2(*args, **kwargs)
1162
1163
1085
return call_both
1164
1086
# Create the "call_both" function and add it to
1165
1087
# the class
1166
attr[attrname] = fixscope(attribute, new_function)
1088
attr[attrname] = fixscope(attribute,
1089
new_function)
1167
1090
# Is this a D-Bus method?
1168
1091
elif getattr(attribute, "_dbus_is_method", False):
1169
1092
# Create a new, but exactly alike, function
1170
1093
# object. Decorate it to be a new D-Bus method
1171
1094
# with the alternate D-Bus interface name. Add it
1172
1095
# 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)))
1096
attr[attrname] = (dbus.service.method
1097
(alt_interface,
1098
attribute._dbus_in_signature,
1099
attribute._dbus_out_signature)
1100
(types.FunctionType
1101
(attribute.func_code,
1102
attribute.func_globals,
1103
attribute.func_name,
1104
attribute.func_defaults,
1105
attribute.func_closure)))
1183
1106
# Copy annotations, if any
1184
1107
try:
1185
attr[attrname]._dbus_annotations = dict(
1186
attribute._dbus_annotations)
1108
attr[attrname]._dbus_annotations = (
1109
dict(attribute._dbus_annotations))
1187
1110
except AttributeError:
1188
1111
pass
1189
1112
# Is this a D-Bus property?
1192
1115
# object, and decorate it to be a new D-Bus
1193
1116
# property with the alternate D-Bus interface
1194
1117
# 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)))
1118
attr[attrname] = (dbus_service_property
1119
(alt_interface,
1120
attribute._dbus_signature,
1121
attribute._dbus_access,
1122
attribute
1123
._dbus_get_args_options
1124
["byte_arrays"])
1125
(types.FunctionType
1126
(attribute.func_code,
1127
attribute.func_globals,
1128
attribute.func_name,
1129
attribute.func_defaults,
1130
attribute.func_closure)))
1206
1131
# Copy annotations, if any
1207
1132
try:
1208
attr[attrname]._dbus_annotations = dict(
1209
attribute._dbus_annotations)
1133
attr[attrname]._dbus_annotations = (
1134
dict(attribute._dbus_annotations))
1210
1135
except AttributeError:
1211
1136
pass
1212
1137
# Is this a D-Bus interface?
1215
1140
# object. Decorate it to be a new D-Bus interface
1216
1141
# with the alternate D-Bus interface name. Add it
1217
1142
# 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"})
1143
attr[attrname] = (dbus_interface_annotations
1144
(alt_interface)
1145
(types.FunctionType
1146
(attribute.func_code,
1147
attribute.func_globals,
1148
attribute.func_name,
1149
attribute.func_defaults,
1150
attribute.func_closure)))
1151
# Deprecate all old interfaces
1152
basename="_AlternateDBusNamesMetaclass_interface_annotation{0}"
1153
for old_interface_name in old_interface_names:
1154
@dbus_interface_annotations(old_interface_name)
1155
def func(self):
1156
return { "org.freedesktop.DBus.Deprecated": "true" }
1157
# Find an unused name
1158
for aname in (basename.format(i) for i in
1159
itertools.count()):
1160
if aname not in attr:
1161
attr[aname] = func
1162
break
1163
return type.__new__(mcs, name, bases, attr)
1164
1165
1252
1166
class ClientDBus(Client, DBusObjectWithProperties):
1253
1167
"""A Client class using D-Bus
1254
1168
1258
1172
"""
1259
1173
1260
1174
runtime_expansions = (Client.runtime_expansions
1261
+ ("dbus_object_path", ))
1262
1263
_interface = "se.recompile.Mandos.Client"
1175
+ ("dbus_object_path",))
1264
1176
1265
1177
# dbus.service.Object doesn't use super(), so we can't either.
1266
1178
1269
1181
Client.__init__(self, *args, **kwargs)
1270
1182
# Only now, when this client is initialized, can it show up on
1271
1183
# the D-Bus
1272
client_object_name = str(self.name).translate(
1184
client_object_name = unicode(self.name).translate(
1273
1185
{ord("."): ord("_"),
1274
1186
ord("-"): ord("_")})
1275
self.dbus_object_path = dbus.ObjectPath(
1276
"/clients/" + client_object_name)
1187
self.dbus_object_path = (dbus.ObjectPath
1188
("/clients/" + client_object_name))
1277
1189
DBusObjectWithProperties.__init__(self, self.bus,
1278
1190
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):
1191
1192
def notifychangeproperty(transform_func,
1193
dbus_name, type_func=lambda x: x,
1194
variant_level=1):
1285
1195
""" Modify a variable so that it's a property which announces
1286
1196
its changes to DBus.
1287
1197
1292
1202
to the D-Bus. Default: no transform
1293
1203
variant_level: D-Bus variant level. Default: 1
1294
1204
"""
1295
attrname = "_{}".format(dbus_name)
1296
1205
attrname = "_{0}".format(dbus_name)
1297
1206
def setter(self, value):
1298
1207
if hasattr(self, "dbus_object_path"):
1299
1208
if (not hasattr(self, attrname) or
1300
1209
type_func(getattr(self, attrname, None))
1301
1210
!= 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())
1211
dbus_value = transform_func(type_func(value),
1212
variant_level
1213
=variant_level)
1214
self.PropertyChanged(dbus.String(dbus_name),
1215
dbus_value)
1317
1216
setattr(self, attrname, value)
1318
1217
1319
1218
return property(lambda self: getattr(self, attrname), setter)
1320
1219
1220
1321
1221
expires = notifychangeproperty(datetime_to_dbus, "Expires")
1322
1222
approvals_pending = notifychangeproperty(dbus.Boolean,
1323
1223
"ApprovalPending",
1325
1225
enabled = notifychangeproperty(dbus.Boolean, "Enabled")
1326
1226
last_enabled = notifychangeproperty(datetime_to_dbus,
1327
1227
"LastEnabled")
1328
checker = notifychangeproperty(
1329
dbus.Boolean, "CheckerRunning",
1330
type_func = lambda checker: checker is not None)
1228
checker = notifychangeproperty(dbus.Boolean, "CheckerRunning",
1229
type_func = lambda checker:
1230
checker is not None)
1331
1231
last_checked_ok = notifychangeproperty(datetime_to_dbus,
1332
1232
"LastCheckedOK")
1333
1233
last_checker_status = notifychangeproperty(dbus.Int16,
1336
1236
datetime_to_dbus, "LastApprovalRequest")
1337
1237
approved_by_default = notifychangeproperty(dbus.Boolean,
1338
1238
"ApprovedByDefault")
1339
approval_delay = notifychangeproperty(
1340
dbus.UInt64, "ApprovalDelay",
1341
type_func = lambda td: td.total_seconds() * 1000)
1239
approval_delay = notifychangeproperty(dbus.UInt64,
1240
"ApprovalDelay",
1241
type_func =
1242
timedelta_to_milliseconds)
1342
1243
approval_duration = notifychangeproperty(
1343
1244
dbus.UInt64, "ApprovalDuration",
1344
type_func = lambda td: td.total_seconds() * 1000)
1245
type_func = timedelta_to_milliseconds)
1345
1246
host = notifychangeproperty(dbus.String, "Host")
1346
timeout = notifychangeproperty(
1347
dbus.UInt64, "Timeout",
1348
type_func = lambda td: td.total_seconds() * 1000)
1247
timeout = notifychangeproperty(dbus.UInt64, "Timeout",
1248
type_func =
1249
timedelta_to_milliseconds)
1349
1250
extended_timeout = notifychangeproperty(
1350
1251
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)
1252
type_func = timedelta_to_milliseconds)
1253
interval = notifychangeproperty(dbus.UInt64,
1254
"Interval",
1255
type_func =
1256
timedelta_to_milliseconds)
1355
1257
checker_command = notifychangeproperty(dbus.String, "Checker")
1356
secret = notifychangeproperty(dbus.ByteArray, "Secret",
1357
invalidate_only=True)
1358
1258
1359
1259
del notifychangeproperty
1360
1260
1367
1267
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1368
1268
Client.__del__(self, *args, **kwargs)
1369
1269
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:
1270
def checker_callback(self, pid, condition, command,
1271
*args, **kwargs):
1272
self.checker_callback_tag = None
1273
self.checker = None
1274
if os.WIFEXITED(condition):
1275
exitstatus = os.WEXITSTATUS(condition)
1377
1276
# Emit D-Bus signal
1378
1277
self.CheckerCompleted(dbus.Int16(exitstatus),
1379
dbus.Int64(0),
1278
dbus.Int64(condition),
1380
1279
dbus.String(command))
1381
1280
else:
1382
1281
# Emit D-Bus signal
1383
1282
self.CheckerCompleted(dbus.Int16(-1),
1384
dbus.Int64(
1385
self.last_checker_signal),
1283
dbus.Int64(condition),
1386
1284
dbus.String(command))
1387
return ret
1285
1286
return Client.checker_callback(self, pid, condition, command,
1287
*args, **kwargs)
1388
1288
1389
1289
def start_checker(self, *args, **kwargs):
1390
old_checker_pid = getattr(self.checker, "pid", None)
1290
old_checker = self.checker
1291
if self.checker is not None:
1292
old_checker_pid = self.checker.pid
1293
else:
1294
old_checker_pid = None
1391
1295
r = Client.start_checker(self, *args, **kwargs)
1392
1296
# Only if new checker process was started
1393
1297
if (self.checker is not None
1401
1305
return False
1402
1306
1403
1307
def approve(self, value=True):
1308
self.send_changedstate()
1404
1309
self.approved = value
1405
gobject.timeout_add(int(self.approval_duration.total_seconds()
1406
* 1000), self._reset_approved)
1407
self.send_changedstate()
1310
gobject.timeout_add(timedelta_to_milliseconds
1311
(self.approval_duration),
1312
self._reset_approved)
1313
1408
1314
1409
1315
## D-Bus methods, signals & properties
1316
_interface = "se.recompile.Mandos.Client"
1410
1317
1411
1318
## Interfaces
1412
1319
1320
@dbus_interface_annotations(_interface)
1321
def _foo(self):
1322
return { "org.freedesktop.DBus.Property.EmitsChangedSignal":
1323
"false"}
1324
1413
1325
## Signals
1414
1326
1415
1327
# CheckerCompleted - signal
1425
1337
pass
1426
1338
1427
1339
# PropertyChanged - signal
1428
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1429
1340
@dbus.service.signal(_interface, signature="sv")
1430
1341
def PropertyChanged(self, property, value):
1431
1342
"D-Bus signal"
1495
1406
return dbus.Boolean(bool(self.approvals_pending))
1496
1407
1497
1408
# ApprovedByDefault - property
1498
@dbus_service_property(_interface,
1499
signature="b",
1409
@dbus_service_property(_interface, signature="b",
1500
1410
access="readwrite")
1501
1411
def ApprovedByDefault_dbus_property(self, value=None):
1502
1412
if value is None: # get
1504
1414
self.approved_by_default = bool(value)
1505
1415
1506
1416
# ApprovalDelay - property
1507
@dbus_service_property(_interface,
1508
signature="t",
1417
@dbus_service_property(_interface, signature="t",
1509
1418
access="readwrite")
1510
1419
def ApprovalDelay_dbus_property(self, value=None):
1511
1420
if value is None: # get
1512
return dbus.UInt64(self.approval_delay.total_seconds()
1513
* 1000)
1421
return dbus.UInt64(self.approval_delay_milliseconds())
1514
1422
self.approval_delay = datetime.timedelta(0, 0, 0, value)
1515
1423
1516
1424
# ApprovalDuration - property
1517
@dbus_service_property(_interface,
1518
signature="t",
1425
@dbus_service_property(_interface, signature="t",
1519
1426
access="readwrite")
1520
1427
def ApprovalDuration_dbus_property(self, value=None):
1521
1428
if value is None: # get
1522
return dbus.UInt64(self.approval_duration.total_seconds()
1523
* 1000)
1429
return dbus.UInt64(timedelta_to_milliseconds(
1430
self.approval_duration))
1524
1431
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1525
1432
1526
1433
# Name - property
1534
1441
return dbus.String(self.fingerprint)
1535
1442
1536
1443
# Host - property
1537
@dbus_service_property(_interface,
1538
signature="s",
1444
@dbus_service_property(_interface, signature="s",
1539
1445
access="readwrite")
1540
1446
def Host_dbus_property(self, value=None):
1541
1447
if value is None: # get
1542
1448
return dbus.String(self.host)
1543
self.host = str(value)
1449
self.host = unicode(value)
1544
1450
1545
1451
# Created - property
1546
1452
@dbus_service_property(_interface, signature="s", access="read")
1553
1459
return datetime_to_dbus(self.last_enabled)
1554
1460
1555
1461
# Enabled - property
1556
@dbus_service_property(_interface,
1557
signature="b",
1462
@dbus_service_property(_interface, signature="b",
1558
1463
access="readwrite")
1559
1464
def Enabled_dbus_property(self, value=None):
1560
1465
if value is None: # get
1565
1470
self.disable()
1566
1471
1567
1472
# LastCheckedOK - property
1568
@dbus_service_property(_interface,
1569
signature="s",
1473
@dbus_service_property(_interface, signature="s",
1570
1474
access="readwrite")
1571
1475
def LastCheckedOK_dbus_property(self, value=None):
1572
1476
if value is not None:
1575
1479
return datetime_to_dbus(self.last_checked_ok)
1576
1480
1577
1481
# LastCheckerStatus - property
1578
@dbus_service_property(_interface, signature="n", access="read")
1482
@dbus_service_property(_interface, signature="n",
1483
access="read")
1579
1484
def LastCheckerStatus_dbus_property(self):
1580
1485
return dbus.Int16(self.last_checker_status)
1581
1486
1590
1495
return datetime_to_dbus(self.last_approval_request)
1591
1496
1592
1497
# Timeout - property
1593
@dbus_service_property(_interface,
1594
signature="t",
1498
@dbus_service_property(_interface, signature="t",
1595
1499
access="readwrite")
1596
1500
def Timeout_dbus_property(self, value=None):
1597
1501
if value is None: # get
1598
return dbus.UInt64(self.timeout.total_seconds() * 1000)
1599
old_timeout = self.timeout
1502
return dbus.UInt64(self.timeout_milliseconds())
1600
1503
self.timeout = datetime.timedelta(0, 0, 0, value)
1601
# Reschedule disabling
1504
# Reschedule timeout
1602
1505
if self.enabled:
1603
1506
now = datetime.datetime.utcnow()
1604
self.expires += self.timeout - old_timeout
1605
if self.expires <= now:
1507
time_to_die = timedelta_to_milliseconds(
1508
(self.last_checked_ok + self.timeout) - now)
1509
if time_to_die <= 0:
1606
1510
# The timeout has passed
1607
1511
self.disable()
1608
1512
else:
1513
self.expires = (now +
1514
datetime.timedelta(milliseconds =
1515
time_to_die))
1609
1516
if (getattr(self, "disable_initiator_tag", None)
1610
1517
is None):
1611
1518
return
1612
1519
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)
1520
self.disable_initiator_tag = (gobject.timeout_add
1521
(time_to_die,
1522
self.disable))
1616
1523
1617
1524
# ExtendedTimeout - property
1618
@dbus_service_property(_interface,
1619
signature="t",
1525
@dbus_service_property(_interface, signature="t",
1620
1526
access="readwrite")
1621
1527
def ExtendedTimeout_dbus_property(self, value=None):
1622
1528
if value is None: # get
1623
return dbus.UInt64(self.extended_timeout.total_seconds()
1624
* 1000)
1529
return dbus.UInt64(self.extended_timeout_milliseconds())
1625
1530
self.extended_timeout = datetime.timedelta(0, 0, 0, value)
1626
1531
1627
1532
# Interval - property
1628
@dbus_service_property(_interface,
1629
signature="t",
1533
@dbus_service_property(_interface, signature="t",
1630
1534
access="readwrite")
1631
1535
def Interval_dbus_property(self, value=None):
1632
1536
if value is None: # get
1633
return dbus.UInt64(self.interval.total_seconds() * 1000)
1537
return dbus.UInt64(self.interval_milliseconds())
1634
1538
self.interval = datetime.timedelta(0, 0, 0, value)
1635
1539
if getattr(self, "checker_initiator_tag", None) is None:
1636
1540
return
1637
1541
if self.enabled:
1638
1542
# Reschedule checker run
1639
1543
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
1544
self.checker_initiator_tag = (gobject.timeout_add
1545
(value, self.start_checker))
1546
self.start_checker() # Start one now, too
1643
1547
1644
1548
# Checker - property
1645
@dbus_service_property(_interface,
1646
signature="s",
1549
@dbus_service_property(_interface, signature="s",
1647
1550
access="readwrite")
1648
1551
def Checker_dbus_property(self, value=None):
1649
1552
if value is None: # get
1650
1553
return dbus.String(self.checker_command)
1651
self.checker_command = str(value)
1554
self.checker_command = unicode(value)
1652
1555
1653
1556
# CheckerRunning - property
1654
@dbus_service_property(_interface,
1655
signature="b",
1557
@dbus_service_property(_interface, signature="b",
1656
1558
access="readwrite")
1657
1559
def CheckerRunning_dbus_property(self, value=None):
1658
1560
if value is None: # get
1668
1570
return self.dbus_object_path # is already a dbus.ObjectPath
1669
1571
1670
1572
# Secret = property
1671
@dbus_service_property(_interface,
1672
signature="ay",
1673
access="write",
1674
byte_arrays=True)
1573
@dbus_service_property(_interface, signature="ay",
1574
access="write", byte_arrays=True)
1675
1575
def Secret_dbus_property(self, value):
1676
self.secret = bytes(value)
1576
self.secret = str(value)
1677
1577
1678
1578
del _interface
1679
1579
1683
1583
self._pipe = child_pipe
1684
1584
self._pipe.send(('init', fpr, address))
1685
1585
if not self._pipe.recv():
1686
raise KeyError(fpr)
1586
raise KeyError()
1687
1587
1688
1588
def __getattribute__(self, name):
1689
1589
if name == '_pipe':
1693
1593
if data[0] == 'data':
1694
1594
return data[1]
1695
1595
if data[0] == 'function':
1696
1697
1596
def func(*args, **kwargs):
1698
1597
self._pipe.send(('funcall', name, args, kwargs))
1699
1598
return self._pipe.recv()[1]
1700
1701
1599
return func
1702
1600
1703
1601
def __setattr__(self, name, value):
1706
1604
self._pipe.send(('setattr', name, value))
1707
1605
1708
1606
1607
class ClientDBusTransitional(ClientDBus):
1608
__metaclass__ = AlternateDBusNamesMetaclass
1609
1610
1709
1611
class ClientHandler(socketserver.BaseRequestHandler, object):
1710
1612
"""A class to handle client connections.
1711
1613
1715
1617
def handle(self):
1716
1618
with contextlib.closing(self.server.child_pipe) as child_pipe:
1717
1619
logger.info("TCP connection from: %s",
1718
str(self.client_address))
1620
unicode(self.client_address))
1719
1621
logger.debug("Pipe FD: %d",
1720
1622
self.server.child_pipe.fileno())
1721
1623
1722
session = gnutls.connection.ClientSession(
1723
self.request, gnutls.connection .X509Credentials())
1624
session = (gnutls.connection
1625
.ClientSession(self.request,
1626
gnutls.connection
1627
.X509Credentials()))
1724
1628
1725
1629
# Note: gnutls.connection.X509Credentials is really a
1726
1630
# generic GnuTLS certificate credentials object so long as
1735
1639
priority = self.server.gnutls_priority
1736
1640
if priority is None:
1737
1641
priority = "NORMAL"
1738
gnutls.library.functions.gnutls_priority_set_direct(
1739
session._c_object, priority, None)
1642
(gnutls.library.functions
1643
.gnutls_priority_set_direct(session._c_object,
1644
priority, None))
1740
1645
1741
1646
# Start communication using the Mandos protocol
1742
1647
# Get protocol number
1744
1649
logger.debug("Protocol version: %r", line)
1745
1650
try:
1746
1651
if int(line.strip().split()[0]) > 1:
1747
raise RuntimeError(line)
1652
raise RuntimeError
1748
1653
except (ValueError, IndexError, RuntimeError) as error:
1749
1654
logger.error("Unknown protocol version: %s", error)
1750
1655
return
1762
1667
approval_required = False
1763
1668
try:
1764
1669
try:
1765
fpr = self.fingerprint(
1766
self.peer_certificate(session))
1670
fpr = self.fingerprint(self.peer_certificate
1671
(session))
1767
1672
except (TypeError,
1768
1673
gnutls.errors.GNUTLSError) as error:
1769
1674
logger.warning("Bad certificate: %s", error)
1784
1689
while True:
1785
1690
if not client.enabled:
1786
1691
logger.info("Client %s is disabled",
1787
client.name)
1692
client.name)
1788
1693
if self.server.use_dbus:
1789
1694
# Emit D-Bus signal
1790
1695
client.Rejected("Disabled")
1799
1704
if self.server.use_dbus:
1800
1705
# Emit D-Bus signal
1801
1706
client.NeedApproval(
1802
client.approval_delay.total_seconds()
1803
* 1000, client.approved_by_default)
1707
client.approval_delay_milliseconds(),
1708
client.approved_by_default)
1804
1709
else:
1805
1710
logger.warning("Client %s was not approved",
1806
1711
client.name)
1812
1717
#wait until timeout or approved
1813
1718
time = datetime.datetime.now()
1814
1719
client.changedstate.acquire()
1815
client.changedstate.wait(delay.total_seconds())
1720
(client.changedstate.wait
1721
(float(client.timedelta_to_milliseconds(delay)
1722
/ 1000)))
1816
1723
client.changedstate.release()
1817
1724
time2 = datetime.datetime.now()
1818
1725
if (time2 - time) >= delay:
1834
1741
try:
1835
1742
sent = session.send(client.secret[sent_size:])
1836
1743
except gnutls.errors.GNUTLSError as error:
1837
logger.warning("gnutls send failed",
1838
exc_info=error)
1744
logger.warning("gnutls send failed")
1839
1745
return
1840
logger.debug("Sent: %d, remaining: %d", sent,
1841
len(client.secret) - (sent_size
1842
+ sent))
1746
logger.debug("Sent: %d, remaining: %d",
1747
sent, len(client.secret)
1748
- (sent_size + sent))
1843
1749
sent_size += sent
1844
1750
1845
1751
logger.info("Sending secret to %s", client.name)
1855
1761
try:
1856
1762
session.bye()
1857
1763
except gnutls.errors.GNUTLSError as error:
1858
logger.warning("GnuTLS bye failed",
1859
exc_info=error)
1764
logger.warning("GnuTLS bye failed")
1860
1765
1861
1766
@staticmethod
1862
1767
def peer_certificate(session):
1863
1768
"Return the peer's OpenPGP certificate as a bytestring"
1864
1769
# If not an OpenPGP certificate...
1865
if (gnutls.library.functions.gnutls_certificate_type_get(
1866
session._c_object)
1770
if (gnutls.library.functions
1771
.gnutls_certificate_type_get(session._c_object)
1867
1772
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1868
1773
# ...do the normal thing
1869
1774
return session.peer_certificate
1883
1788
def fingerprint(openpgp):
1884
1789
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
1885
1790
# 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)))
1791
datum = (gnutls.library.types
1792
.gnutls_datum_t(ctypes.cast(ctypes.c_char_p(openpgp),
1793
ctypes.POINTER
1794
(ctypes.c_ubyte)),
1795
ctypes.c_uint(len(openpgp))))
1890
1796
# New empty GnuTLS certificate
1891
1797
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1892
gnutls.library.functions.gnutls_openpgp_crt_init(
1893
ctypes.byref(crt))
1798
(gnutls.library.functions
1799
.gnutls_openpgp_crt_init(ctypes.byref(crt)))
1894
1800
# 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)
1801
(gnutls.library.functions
1802
.gnutls_openpgp_crt_import(crt, ctypes.byref(datum),
1803
gnutls.library.constants
1804
.GNUTLS_OPENPGP_FMT_RAW))
1898
1805
# Verify the self signature in the key
1899
1806
crtverify = ctypes.c_uint()
1900
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1901
crt, 0, ctypes.byref(crtverify))
1807
(gnutls.library.functions
1808
.gnutls_openpgp_crt_verify_self(crt, 0,
1809
ctypes.byref(crtverify)))
1902
1810
if crtverify.value != 0:
1903
1811
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1904
raise gnutls.errors.CertificateSecurityError(
1905
"Verify failed")
1812
raise (gnutls.errors.CertificateSecurityError
1813
("Verify failed"))
1906
1814
# New buffer for the fingerprint
1907
1815
buf = ctypes.create_string_buffer(20)
1908
1816
buf_len = ctypes.c_size_t()
1909
1817
# 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))
1818
(gnutls.library.functions
1819
.gnutls_openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
1820
ctypes.byref(buf_len)))
1912
1821
# Deinit the certificate
1913
1822
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1914
1823
# Convert the buffer to a Python bytestring
1920
1829
1921
1830
class MultiprocessingMixIn(object):
1922
1831
"""Like socketserver.ThreadingMixIn, but with multiprocessing"""
1923
1924
1832
def sub_process_main(self, request, address):
1925
1833
try:
1926
1834
self.finish_request(request, address)
1931
1839
def process_request(self, request, address):
1932
1840
"""Start a new process to process the request."""
1933
1841
proc = multiprocessing.Process(target = self.sub_process_main,
1934
args = (request, address))
1842
args = (request,
1843
address))
1935
1844
proc.start()
1936
1845
return proc
1937
1846
1938
1847
1939
1848
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object):
1940
1849
""" adds a pipe to the MixIn """
1941
1942
1850
def process_request(self, request, client_address):
1943
1851
"""Overrides and wraps the original process_request().
1944
1852
1953
1861
1954
1862
def add_pipe(self, parent_pipe, proc):
1955
1863
"""Dummy function; override as necessary"""
1956
raise NotImplementedError()
1864
raise NotImplementedError
1957
1865
1958
1866
1959
1867
class IPv6_TCPServer(MultiprocessingMixInWithPipe,
1965
1873
interface: None or a network interface name (string)
1966
1874
use_ipv6: Boolean; to use IPv6 or not
1967
1875
"""
1968
1969
1876
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
"""
1877
interface=None, use_ipv6=True):
1976
1878
self.interface = interface
1977
1879
if use_ipv6:
1978
1880
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
1881
socketserver.TCPServer.__init__(self, server_address,
2006
1882
RequestHandlerClass)
2007
2008
1883
def server_bind(self):
2009
1884
"""This overrides the normal server_bind() function
2010
1885
to bind to an interface if one was specified, and also NOT to
2016
1891
self.interface)
2017
1892
else:
2018
1893
try:
2019
self.socket.setsockopt(
2020
socket.SOL_SOCKET, SO_BINDTODEVICE,
2021
(self.interface + "\0").encode("utf-8"))
1894
self.socket.setsockopt(socket.SOL_SOCKET,
1895
SO_BINDTODEVICE,
1896
str(self.interface
1897
+ '\0'))
2022
1898
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:
1899
if error[0] == errno.EPERM:
1900
logger.error("No permission to"
1901
" bind to interface %s",
1902
self.interface)
1903
elif error[0] == errno.ENOPROTOOPT:
2027
1904
logger.error("SO_BINDTODEVICE not available;"
2028
1905
" cannot bind to interface %s",
2029
1906
self.interface)
2030
elif error.errno == errno.ENODEV:
2031
logger.error("Interface %s does not exist,"
2032
" cannot bind", self.interface)
2033
1907
else:
2034
1908
raise
2035
1909
# Only bind(2) the socket if we really need to.
2038
1912
if self.address_family == socket.AF_INET6:
2039
1913
any_address = "::" # in6addr_any
2040
1914
else:
2041
any_address = "0.0.0.0" # INADDR_ANY
1915
any_address = socket.INADDR_ANY
2042
1916
self.server_address = (any_address,
2043
1917
self.server_address[1])
2044
1918
elif not self.server_address[1]:
2045
self.server_address = (self.server_address[0], 0)
1919
self.server_address = (self.server_address[0],
1920
0)
2046
1921
# if self.interface:
2047
1922
# self.server_address = (self.server_address[0],
2048
1923
# 0, # port
2062
1937
2063
1938
Assumes a gobject.MainLoop event loop.
2064
1939
"""
2065
2066
1940
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):
1941
interface=None, use_ipv6=True, clients=None,
1942
gnutls_priority=None, use_dbus=True):
2073
1943
self.enabled = False
2074
1944
self.clients = clients
2075
1945
if self.clients is None:
2079
1949
IPv6_TCPServer.__init__(self, server_address,
2080
1950
RequestHandlerClass,
2081
1951
interface = interface,
2082
use_ipv6 = use_ipv6,
2083
socketfd = socketfd)
2084
1952
use_ipv6 = use_ipv6)
2085
1953
def server_activate(self):
2086
1954
if self.enabled:
2087
1955
return socketserver.TCPServer.server_activate(self)
2091
1959
2092
1960
def add_pipe(self, parent_pipe, proc):
2093
1961
# 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))
1962
gobject.io_add_watch(parent_pipe.fileno(),
1963
gobject.IO_IN | gobject.IO_HUP,
1964
functools.partial(self.handle_ipc,
1965
parent_pipe =
1966
parent_pipe,
1967
proc = proc))
2100
1968
2101
def handle_ipc(self, source, condition,
2102
parent_pipe=None,
2103
proc = None,
2104
client_object=None):
1969
def handle_ipc(self, source, condition, parent_pipe=None,
1970
proc = None, client_object=None):
1971
condition_names = {
1972
gobject.IO_IN: "IN", # There is data to read.
1973
gobject.IO_OUT: "OUT", # Data can be written (without
1974
# blocking).
1975
gobject.IO_PRI: "PRI", # There is urgent data to read.
1976
gobject.IO_ERR: "ERR", # Error condition.
1977
gobject.IO_HUP: "HUP" # Hung up (the connection has been
1978
# broken, usually for pipes and
1979
# sockets).
1980
}
1981
conditions_string = ' | '.join(name
1982
for cond, name in
1983
condition_names.iteritems()
1984
if cond & condition)
2105
1985
# error, or the other end of multiprocessing.Pipe has closed
2106
if condition & (gobject.IO_ERR | gobject.IO_HUP):
1986
if condition & (gobject.IO_ERR | condition & gobject.IO_HUP):
2107
1987
# Wait for other process to exit
2108
1988
proc.join()
2109
1989
return False
2130
2010
parent_pipe.send(False)
2131
2011
return False
2132
2012
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))
2013
gobject.io_add_watch(parent_pipe.fileno(),
2014
gobject.IO_IN | gobject.IO_HUP,
2015
functools.partial(self.handle_ipc,
2016
parent_pipe =
2017
parent_pipe,
2018
proc = proc,
2019
client_object =
2020
client))
2140
2021
parent_pipe.send(True)
2141
2022
# remove the old hook in favor of the new above hook on
2142
2023
# same fileno
2148
2029
2149
2030
parent_pipe.send(('data', getattr(client_object,
2150
2031
funcname)(*args,
2151
**kwargs)))
2032
**kwargs)))
2152
2033
2153
2034
if command == 'getattr':
2154
2035
attrname = request[1]
2155
if isinstance(client_object.__getattribute__(attrname),
2156
collections.Callable):
2157
parent_pipe.send(('function', ))
2036
if callable(client_object.__getattribute__(attrname)):
2037
parent_pipe.send(('function',))
2158
2038
else:
2159
parent_pipe.send((
2160
'data', client_object.__getattribute__(attrname)))
2039
parent_pipe.send(('data', client_object
2040
.__getattribute__(attrname)))
2161
2041
2162
2042
if command == 'setattr':
2163
2043
attrname = request[1]
2167
2047
return True
2168
2048
2169
2049
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
2050
def string_to_delta(interval):
2267
2051
"""Parse a string and return a datetime.timedelta
2268
2052
2279
2063
>>> string_to_delta('5m 30s')
2280
2064
datetime.timedelta(0, 330)
2281
2065
"""
2282
2283
try:
2284
return rfc3339_duration_to_delta(interval)
2285
except ValueError:
2286
pass
2287
2288
2066
timevalue = datetime.timedelta(0)
2289
2067
for s in interval.split():
2290
2068
try:
2291
suffix = s[-1]
2069
suffix = unicode(s[-1])
2292
2070
value = int(s[:-1])
2293
2071
if suffix == "d":
2294
2072
delta = datetime.timedelta(value)
2301
2079
elif suffix == "w":
2302
2080
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value)
2303
2081
else:
2304
raise ValueError("Unknown suffix {!r}".format(suffix))
2305
except IndexError as e:
2082
raise ValueError("Unknown suffix {0!r}"
2083
.format(suffix))
2084
except (ValueError, IndexError) as e:
2306
2085
raise ValueError(*(e.args))
2307
2086
timevalue += delta
2308
2087
return timevalue
2324
2103
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2325
2104
if not stat.S_ISCHR(os.fstat(null).st_mode):
2326
2105
raise OSError(errno.ENODEV,
2327
"{} not a character device"
2106
"{0} not a character device"
2328
2107
.format(os.devnull))
2329
2108
os.dup2(null, sys.stdin.fileno())
2330
2109
os.dup2(null, sys.stdout.fileno())
2340
2119
2341
2120
parser = argparse.ArgumentParser()
2342
2121
parser.add_argument("-v", "--version", action="version",
2343
version = "%(prog)s {}".format(version),
2122
version = "%(prog)s {0}".format(version),
2344
2123
help="show version number and exit")
2345
2124
parser.add_argument("-i", "--interface", metavar="IF",
2346
2125
help="Bind to interface IF")
2352
2131
help="Run self-test")
2353
2132
parser.add_argument("--debug", action="store_true",
2354
2133
help="Debug mode; run in foreground and log"
2355
" to terminal", default=None)
2134
" to terminal")
2356
2135
parser.add_argument("--debuglevel", metavar="LEVEL",
2357
2136
help="Debug level for stdout output")
2358
2137
parser.add_argument("--priority", help="GnuTLS"
2365
2144
" files")
2366
2145
parser.add_argument("--no-dbus", action="store_false",
2367
2146
dest="use_dbus", help="Do not provide D-Bus"
2368
" system bus interface", default=None)
2147
" system bus interface")
2369
2148
parser.add_argument("--no-ipv6", action="store_false",
2370
dest="use_ipv6", help="Do not use IPv6",
2371
default=None)
2149
dest="use_ipv6", help="Do not use IPv6")
2372
2150
parser.add_argument("--no-restore", action="store_false",
2373
2151
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")
2152
" state")
2378
2153
parser.add_argument("--statedir", metavar="DIR",
2379
2154
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
2155
2386
2156
options = parser.parse_args()
2387
2157
2388
2158
if options.check:
2389
2159
import doctest
2390
fail_count, test_count = doctest.testmod()
2391
sys.exit(os.EX_OK if fail_count == 0 else 1)
2160
doctest.testmod()
2161
sys.exit()
2392
2162
2393
2163
# Default values for config file for server-global settings
2394
2164
server_defaults = { "interface": "",
2396
2166
"port": "",
2397
2167
"debug": "False",
2398
2168
"priority":
2399
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2400
":+SIGN-DSA-SHA256",
2169
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP",
2401
2170
"servicename": "Mandos",
2402
2171
"use_dbus": "True",
2403
2172
"use_ipv6": "True",
2404
2173
"debuglevel": "",
2405
2174
"restore": "True",
2406
"socket": "",
2407
"statedir": "/var/lib/mandos",
2408
"foreground": "False",
2409
"zeroconf": "True",
2410
}
2175
"statedir": "/var/lib/mandos"
2176
}
2411
2177
2412
2178
# Parse config file for server-global settings
2413
2179
server_config = configparser.SafeConfigParser(server_defaults)
2414
2180
del server_defaults
2415
server_config.read(os.path.join(options.configdir, "mandos.conf"))
2181
server_config.read(os.path.join(options.configdir,
2182
"mandos.conf"))
2416
2183
# Convert the SafeConfigParser object to a dict
2417
2184
server_settings = server_config.defaults()
2418
2185
# Use the appropriate methods on the non-string config options
2419
for option in ("debug", "use_dbus", "use_ipv6", "foreground"):
2186
for option in ("debug", "use_dbus", "use_ipv6"):
2420
2187
server_settings[option] = server_config.getboolean("DEFAULT",
2421
2188
option)
2422
2189
if server_settings["port"]:
2423
2190
server_settings["port"] = server_config.getint("DEFAULT",
2424
2191
"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
2192
del server_config
2435
2193
2436
2194
# Override the settings from the config file with command line
2437
2195
# options, if set.
2438
2196
for option in ("interface", "address", "port", "debug",
2439
"priority", "servicename", "configdir", "use_dbus",
2440
"use_ipv6", "debuglevel", "restore", "statedir",
2441
"socket", "foreground", "zeroconf"):
2197
"priority", "servicename", "configdir",
2198
"use_dbus", "use_ipv6", "debuglevel", "restore",
2199
"statedir"):
2442
2200
value = getattr(options, option)
2443
2201
if value is not None:
2444
2202
server_settings[option] = value
2445
2203
del options
2446
2204
# Force all strings to be unicode
2447
2205
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
2206
if type(server_settings[option]) is str:
2207
server_settings[option] = unicode(server_settings[option])
2458
2208
# Now we have our good server settings in "server_settings"
2459
2209
2460
2210
##################################################################
2461
2211
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
2212
# For convenience
2468
2213
debug = server_settings["debug"]
2469
2214
debuglevel = server_settings["debuglevel"]
2471
2216
use_ipv6 = server_settings["use_ipv6"]
2472
2217
stored_state_path = os.path.join(server_settings["statedir"],
2473
2218
stored_state_file)
2474
foreground = server_settings["foreground"]
2475
zeroconf = server_settings["zeroconf"]
2476
2219
2477
2220
if debug:
2478
2221
initlogger(debug, logging.DEBUG)
2484
2227
initlogger(debug, level)
2485
2228
2486
2229
if server_settings["servicename"] != "Mandos":
2487
syslogger.setFormatter(
2488
logging.Formatter('Mandos ({}) [%(process)d]:'
2489
' %(levelname)s: %(message)s'.format(
2490
server_settings["servicename"])))
2230
syslogger.setFormatter(logging.Formatter
2231
('Mandos ({0}) [%(process)d]:'
2232
' %(levelname)s: %(message)s'
2233
.format(server_settings
2234
["servicename"])))
2491
2235
2492
2236
# Parse config file with clients
2493
2237
client_config = configparser.SafeConfigParser(Client
2498
2242
global mandos_dbus_service
2499
2243
mandos_dbus_service = None
2500
2244
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
2245
tcp_server = MandosServer((server_settings["address"],
2246
server_settings["port"]),
2247
ClientHandler,
2248
interface=(server_settings["interface"]
2249
or None),
2250
use_ipv6=use_ipv6,
2251
gnutls_priority=
2252
server_settings["priority"],
2253
use_dbus=use_dbus)
2254
if not debug:
2255
pidfilename = "/var/run/mandos.pid"
2517
2256
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)
2257
pidfile = open(pidfilename, "w")
2258
except IOError:
2259
logger.error("Could not open file %r", pidfilename)
2522
2260
2523
2261
for name in ("_mandos", "mandos", "nobody"):
2524
2262
try:
2534
2272
os.setgid(gid)
2535
2273
os.setuid(uid)
2536
2274
except OSError as error:
2537
if error.errno != errno.EPERM:
2538
raise
2275
if error[0] != errno.EPERM:
2276
raise error
2539
2277
2540
2278
if debug:
2541
2279
# Enable all possible GnuTLS debugging
2548
2286
def debug_gnutls(level, string):
2549
2287
logger.debug("GnuTLS: %s", string[:-1])
2550
2288
2551
gnutls.library.functions.gnutls_global_set_log_function(
2552
debug_gnutls)
2289
(gnutls.library.functions
2290
.gnutls_global_set_log_function(debug_gnutls))
2553
2291
2554
2292
# Redirect stdin so all checkers get /dev/null
2555
2293
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2558
2296
os.close(null)
2559
2297
2560
2298
# Need to fork before connecting to D-Bus
2561
if not foreground:
2299
if not debug:
2562
2300
# Close all input and output, do double fork, etc.
2563
2301
daemon()
2564
2302
2565
# multiprocessing will use threads, so before we use gobject we
2566
# need to inform gobject that threads will be used.
2567
2303
gobject.threads_init()
2568
2304
2569
2305
global main_loop
2575
2311
if use_dbus:
2576
2312
try:
2577
2313
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)
2314
bus, do_not_queue=True)
2315
old_bus_name = (dbus.service.BusName
2316
("se.bsnet.fukt.Mandos", bus,
2317
do_not_queue=True))
2318
except dbus.exceptions.NameExistsException as e:
2319
logger.error(unicode(e) + ", disabling D-Bus")
2585
2320
use_dbus = False
2586
2321
server_settings["use_dbus"] = False
2587
2322
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"))
2323
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET
2324
service = AvahiServiceToSyslog(name =
2325
server_settings["servicename"],
2326
servicetype = "_mandos._tcp",
2327
protocol = protocol, bus = bus)
2328
if server_settings["interface"]:
2329
service.interface = (if_nametoindex
2330
(str(server_settings["interface"])))
2598
2331
2599
2332
global multiprocessing_manager
2600
2333
multiprocessing_manager = multiprocessing.Manager()
2601
2334
2602
2335
client_class = Client
2603
2336
if use_dbus:
2604
client_class = functools.partial(ClientDBus, bus = bus)
2337
client_class = functools.partial(ClientDBusTransitional,
2338
bus = bus)
2605
2339
2606
2340
client_settings = Client.config_parser(client_config)
2607
2341
old_client_settings = {}
2608
2342
clients_data = {}
2609
2343
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
2344
# Get client data and settings from last running state.
2619
2345
if server_settings["restore"]:
2620
2346
try:
2621
2347
with open(stored_state_path, "rb") as stored_state:
2622
clients_data, old_client_settings = pickle.load(
2623
stored_state)
2348
clients_data, old_client_settings = (pickle.load
2349
(stored_state))
2624
2350
os.remove(stored_state_path)
2625
2351
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)
2352
logger.warning("Could not load persistent state: {0}"
2353
.format(e))
2354
if e.errno != errno.ENOENT:
2632
2355
raise
2633
2356
except EOFError as e:
2634
2357
logger.warning("Could not load persistent state: "
2635
"EOFError:",
2636
exc_info=e)
2358
"EOFError: {0}".format(e))
2637
2359
2638
2360
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
2361
for client_name, client in clients_data.iteritems():
2644
2362
# Decide which value to use after restoring saved state.
2645
2363
# We have three different values: Old config file,
2646
2364
# new config file, and saved state.
2651
2369
# For each value in new config, check if it
2652
2370
# differs from the old config value (Except for
2653
2371
# the "secret" attribute)
2654
if (name != "secret"
2655
and (value !=
2656
old_client_settings[client_name][name])):
2372
if (name != "secret" and
2373
value != old_client_settings[client_name]
2374
[name]):
2657
2375
client[name] = value
2658
2376
except KeyError:
2659
2377
pass
2660
2378
2661
2379
# Clients who has passed its expire date can still be
2662
# enabled if its last checker was successful. A Client
2380
# enabled if its last checker was successful. Clients
2663
2381
# whose checker succeeded before we stored its state is
2664
2382
# assumed to have successfully run all checkers during
2665
2383
# downtime.
2667
2385
if datetime.datetime.utcnow() >= client["expires"]:
2668
2386
if not client["last_checked_ok"]:
2669
2387
logger.warning(
2670
"disabling client {} - Client never "
2671
"performed a successful checker".format(
2672
client_name))
2388
"disabling client {0} - Client never "
2389
"performed a successful checker"
2390
.format(client_name))
2673
2391
client["enabled"] = False
2674
2392
elif client["last_checker_status"] != 0:
2675
2393
logger.warning(
2676
"disabling client {} - Client last"
2677
" checker failed with error code"
2678
" {}".format(
2679
client_name,
2680
client["last_checker_status"]))
2394
"disabling client {0} - Client "
2395
"last checker failed with error code {1}"
2396
.format(client_name,
2397
client["last_checker_status"]))
2681
2398
client["enabled"] = False
2682
2399
else:
2683
client["expires"] = (
2684
datetime.datetime.utcnow()
2685
+ client["timeout"])
2400
client["expires"] = (datetime.datetime
2401
.utcnow()
2402
+ client["timeout"])
2686
2403
logger.debug("Last checker succeeded,"
2687
" keeping {} enabled".format(
2688
client_name))
2404
" keeping {0} enabled"
2405
.format(client_name))
2689
2406
try:
2690
client["secret"] = pgp.decrypt(
2691
client["encrypted_secret"],
2692
client_settings[client_name]["secret"])
2407
client["secret"] = (
2408
pgp.decrypt(client["encrypted_secret"],
2409
client_settings[client_name]
2410
["secret"]))
2693
2411
except PGPError:
2694
2412
# 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"])
2413
logger.debug("Failed to decrypt {0} old secret"
2414
.format(client_name))
2415
client["secret"] = (
2416
client_settings[client_name]["secret"])
2417
2699
2418
2700
2419
# Add/remove clients based on new changes made to config
2701
2420
for client_name in (set(old_client_settings)
2704
2423
for client_name in (set(client_settings)
2705
2424
- set(old_client_settings)):
2706
2425
clients_data[client_name] = client_settings[client_name]
2707
2426
2708
2427
# Create all client objects
2709
for client_name, client in clients_data.items():
2428
for client_name, client in clients_data.iteritems():
2710
2429
tcp_server.clients[client_name] = client_class(
2711
name = client_name,
2712
settings = client,
2713
server_settings = server_settings)
2430
name = client_name, settings = client)
2714
2431
2715
2432
if not tcp_server.clients:
2716
2433
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
2434
2435
if not debug:
2436
try:
2437
with pidfile:
2438
pid = os.getpid()
2439
pidfile.write(str(pid) + "\n".encode("utf-8"))
2440
del pidfile
2441
except IOError:
2442
logger.error("Could not write to file %r with PID %d",
2443
pidfilename, pid)
2444
except NameError:
2445
# "pidfile" was never created
2446
pass
2728
2447
del pidfilename
2448
signal.signal(signal.SIGINT, signal.SIG_IGN)
2729
2449
2730
2450
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit())
2731
2451
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit())
2732
2452
2733
2453
if use_dbus:
2734
2735
@alternate_dbus_interfaces(
2736
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
2737
2454
class MandosDBusService(DBusObjectWithProperties):
2738
2455
"""A D-Bus proxy object"""
2739
2740
2456
def __init__(self):
2741
2457
dbus.service.Object.__init__(self, bus, "/")
2742
2743
2458
_interface = "se.recompile.Mandos"
2744
2459
2745
2460
@dbus_interface_annotations(_interface)
2746
2461
def _foo(self):
2747
return {
2748
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2749
"false" }
2462
return { "org.freedesktop.DBus.Property"
2463
".EmitsChangedSignal":
2464
"false"}
2750
2465
2751
2466
@dbus.service.signal(_interface, signature="o")
2752
2467
def ClientAdded(self, objpath):
2766
2481
@dbus.service.method(_interface, out_signature="ao")
2767
2482
def GetAllClients(self):
2768
2483
"D-Bus method"
2769
return dbus.Array(c.dbus_object_path for c in
2484
return dbus.Array(c.dbus_object_path
2485
for c in
2770
2486
tcp_server.clients.itervalues())
2771
2487
2772
2488
@dbus.service.method(_interface,
2774
2490
def GetAllClientsWithProperties(self):
2775
2491
"D-Bus method"
2776
2492
return dbus.Dictionary(
2777
{ c.dbus_object_path: c.GetAll("")
2778
for c in tcp_server.clients.itervalues() },
2493
((c.dbus_object_path, c.GetAll(""))
2494
for c in tcp_server.clients.itervalues()),
2779
2495
signature="oa{sv}")
2780
2496
2781
2497
@dbus.service.method(_interface, in_signature="o")
2794
2510
2795
2511
del _interface
2796
2512
2797
mandos_dbus_service = MandosDBusService()
2513
class MandosDBusServiceTransitional(MandosDBusService):
2514
__metaclass__ = AlternateDBusNamesMetaclass
2515
mandos_dbus_service = MandosDBusServiceTransitional()
2798
2516
2799
2517
def cleanup():
2800
2518
"Cleanup function; run on exit"
2801
if zeroconf:
2802
service.cleanup()
2519
service.cleanup()
2803
2520
2804
2521
multiprocessing.active_children()
2805
wnull.close()
2806
2522
if not (tcp_server.clients or client_settings):
2807
2523
return
2808
2524
2819
2535
2820
2536
# A list of attributes that can not be pickled
2821
2537
# + secret.
2822
exclude = { "bus", "changedstate", "secret",
2823
"checker", "server_settings" }
2824
for name, typ in inspect.getmembers(dbus.service
2825
.Object):
2538
exclude = set(("bus", "changedstate", "secret",
2539
"checker"))
2540
for name, typ in (inspect.getmembers
2541
(dbus.service.Object)):
2826
2542
exclude.add(name)
2827
2543
2828
2544
client_dict["encrypted_secret"] = (client
2835
2551
del client_settings[client.name]["secret"]
2836
2552
2837
2553
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:
2554
tempfd, tempname = tempfile.mkstemp(suffix=".pickle",
2555
prefix="clients-",
2556
dir=os.path.dirname
2557
(stored_state_path))
2558
with os.fdopen(tempfd, "wb") as stored_state:
2844
2559
pickle.dump((clients, client_settings), stored_state)
2845
tempname = stored_state.name
2846
2560
os.rename(tempname, stored_state_path)
2847
2561
except (IOError, OSError) as e:
2562
logger.warning("Could not save persistent state: {0}"
2563
.format(e))
2848
2564
if not debug:
2849
2565
try:
2850
2566
os.remove(tempname)
2851
2567
except NameError:
2852
2568
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
2569
if e.errno not in set((errno.ENOENT, errno.EACCES,
2570
errno.EEXIST)):
2571
raise e
2860
2572
2861
2573
# Delete all clients, and settings from config
2862
2574
while tcp_server.clients:
2867
2579
client.disable(quiet=True)
2868
2580
if use_dbus:
2869
2581
# Emit D-Bus signal
2870
mandos_dbus_service.ClientRemoved(
2871
client.dbus_object_path, client.name)
2582
mandos_dbus_service.ClientRemoved(client
2583
.dbus_object_path,
2584
client.name)
2872
2585
client_settings.clear()
2873
2586
2874
2587
atexit.register(cleanup)
2885
2598
tcp_server.server_activate()
2886
2599
2887
2600
# Find out what port we got
2888
if zeroconf:
2889
service.port = tcp_server.socket.getsockname()[1]
2601
service.port = tcp_server.socket.getsockname()[1]
2890
2602
if use_ipv6:
2891
2603
logger.info("Now listening on address %r, port %d,"
2892
2604
" flowinfo %d, scope_id %d",
2898
2610
#service.interface = tcp_server.socket.getsockname()[3]
2899
2611
2900
2612
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
2613
# From the Avahi example code
2614
try:
2615
service.activate()
2616
except dbus.exceptions.DBusException as error:
2617
logger.critical("D-Bus Exception", exc_info=error)
2618
cleanup()
2619
sys.exit(1)
2620
# End of Avahi example code
2910
2621
2911
2622
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
2912
2623
lambda *args, **kwargs:
2927
2638
# Must run before the D-Bus bus name gets deregistered
2928
2639
cleanup()
2929
2640
2930
2931
2641
if __name__ == '__main__':
2932
2642
main()
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0