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