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