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