bzr branch
http://bzr.recompile.se/loggerhead/mandos/release
237.23.1
by Teddy Hogeborn
Require Python 2.7. |
1 |
#!/usr/bin/python2.7
|
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
2 |
# -*- mode: python; coding: utf-8 -*-
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
3 |
#
|
4 |
# Mandos server - give out binary blobs to connecting clients.
|
|
5 |
#
|
|
6 |
# This program is partly derived from an example program for an Avahi
|
|
7 |
# service publisher, downloaded from
|
|
8 |
# <http://avahi.org/wiki/PythonPublishExample>. This includes the
|
|
237.2.99
by Teddy Hogeborn
Code cleanup. |
9 |
# methods "add", "remove", "server_state_changed",
|
10 |
# "entry_group_state_changed", "cleanup", and "activate" in the
|
|
11 |
# "AvahiService" class, and some lines in "main".
|
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
12 |
#
|
28
by Teddy Hogeborn
* server.conf: New file. |
13 |
# Everything else is
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
14 |
# Copyright © 2008-2015 Teddy Hogeborn
|
15 |
# Copyright © 2008-2015 Björn Påhlsson
|
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
16 |
#
|
17 |
# This program is free software: you can redistribute it and/or modify
|
|
18 |
# it under the terms of the GNU General Public License as published by
|
|
19 |
# the Free Software Foundation, either version 3 of the License, or
|
|
20 |
# (at your option) any later version.
|
|
21 |
#
|
|
22 |
# This program is distributed in the hope that it will be useful,
|
|
23 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
24 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
25 |
# GNU General Public License for more details.
|
|
26 |
#
|
|
27 |
# You should have received a copy of the GNU General Public License
|
|
109
by Teddy Hogeborn
* .bzrignore: New. |
28 |
# along with this program. If not, see
|
29 |
# <http://www.gnu.org/licenses/>.
|
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
30 |
#
|
237.11.2
by Teddy Hogeborn
Change "fukt.bsnet.se" to "recompile.se" throughout. |
31 |
# Contact the authors at <mandos@recompile.se>.
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
32 |
#
|
3
by Björn Påhlsson
Python based server |
33 |
|
237.8.5
by teddy at bsnet
* mandos: Use unicode string literals. |
34 |
from __future__ import (division, absolute_import, print_function, |
35 |
unicode_literals) |
|
10
by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division". |
36 |
|
237.7.127
by Teddy Hogeborn
* mandos: Use all new builtins. |
37 |
from future_builtins import * |
38 |
||
237.7.297
by Teddy Hogeborn
mandos: Some more minor changes to prepare for Python 3. |
39 |
try: |
40 |
import SocketServer as socketserver |
|
41 |
except ImportError: |
|
42 |
import socketserver |
|
3
by Björn Påhlsson
Python based server |
43 |
import socket |
237.7.22
by teddy at bsnet
* mandos: Use the new argparse library instead of optparse. |
44 |
import argparse |
3
by Björn Påhlsson
Python based server |
45 |
import datetime |
46 |
import errno |
|
47 |
import gnutls.crypto |
|
48 |
import gnutls.connection |
|
49 |
import gnutls.errors |
|
12
by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn, |
50 |
import gnutls.library.functions |
51 |
import gnutls.library.constants |
|
52 |
import gnutls.library.types |
|
237.7.297
by Teddy Hogeborn
mandos: Some more minor changes to prepare for Python 3. |
53 |
try: |
54 |
import ConfigParser as configparser |
|
55 |
except ImportError: |
|
56 |
import configparser |
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
57 |
import sys |
9
by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits. |
58 |
import re |
59 |
import os |
|
60 |
import signal |
|
10
by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division". |
61 |
import subprocess |
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
62 |
import atexit |
63 |
import stat |
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
64 |
import logging |
65 |
import logging.handlers |
|
163
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed. |
66 |
import pwd |
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
67 |
import contextlib |
237.2.96
by Teddy Hogeborn
Minor code cleanup; one minor bug fix. |
68 |
import struct |
69 |
import fcntl |
|
237.2.100
by Teddy Hogeborn
Code cleanup. Move some global stuff into main. |
70 |
import functools |
237.7.297
by Teddy Hogeborn
mandos: Some more minor changes to prepare for Python 3. |
71 |
try: |
72 |
import cPickle as pickle |
|
73 |
except ImportError: |
|
74 |
import pickle |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
75 |
import multiprocessing |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
76 |
import types |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
77 |
import binascii |
78 |
import tempfile |
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
79 |
import itertools |
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
80 |
import collections |
237.7.299
by Teddy Hogeborn
mandos: Use codecs.open() and print() for PID file. |
81 |
import codecs |
5
by Teddy Hogeborn
* server.py (server_metaclass): New. |
82 |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
83 |
import dbus |
237.1.1
by Teddy Hogeborn
First steps of a D-Bus interface to the server. |
84 |
import dbus.service |
237.7.297
by Teddy Hogeborn
mandos: Some more minor changes to prepare for Python 3. |
85 |
try: |
86 |
import gobject |
|
87 |
except ImportError: |
|
88 |
from gi.repository import GObject as gobject |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
89 |
import avahi |
90 |
from dbus.mainloop.glib import DBusGMainLoop |
|
12
by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn, |
91 |
import ctypes |
215
by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util". |
92 |
import ctypes.util |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
93 |
import xml.dom.minidom |
94 |
import inspect |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
95 |
|
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
96 |
try: |
97 |
SO_BINDTODEVICE = socket.SO_BINDTODEVICE |
|
98 |
except AttributeError: |
|
99 |
try: |
|
100 |
from IN import SO_BINDTODEVICE |
|
101 |
except ImportError: |
|
237.2.101
by Teddy Hogeborn
* mandos: Minor doc string fixes. |
102 |
SO_BINDTODEVICE = None |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
103 |
|
237.7.278
by Teddy Hogeborn
mandos: Replace unicode() with str(). |
104 |
if sys.version_info.major == 2: |
105 |
str = unicode |
|
106 |
||
326
by Teddy Hogeborn
* Makefile (version): Changed to "1.7.0". |
107 |
version = "1.7.0" |
237.14.2
by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir" |
108 |
stored_state_file = "clients.pickle" |
13
by Björn Påhlsson
Added following support: |
109 |
|
237.11.20
by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning. |
110 |
logger = logging.getLogger() |
237.7.203
by Teddy Hogeborn
Allow self-tests to run without needing /dev/log. |
111 |
syslogger = None |
13
by Björn Påhlsson
Added following support: |
112 |
|
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
113 |
try: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
114 |
if_nametoindex = ctypes.cdll.LoadLibrary( |
115 |
ctypes.util.find_library("c")).if_nametoindex |
|
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
116 |
except (OSError, AttributeError): |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
117 |
|
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
118 |
def if_nametoindex(interface): |
119 |
"Get an interface index the hard way, i.e. using fcntl()"
|
|
120 |
SIOCGIFINDEX = 0x8933 # From /usr/include/linux/sockios.h |
|
121 |
with contextlib.closing(socket.socket()) as s: |
|
122 |
ifreq = fcntl.ioctl(s, SIOCGIFINDEX, |
|
237.7.277
by Teddy Hogeborn
mandos: Stop using str() and remove unnecessary unicode() calls. |
123 |
struct.pack(b"16s16x", interface)) |
124 |
interface_index = struct.unpack("I", ifreq[16:20])[0] |
|
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
125 |
return interface_index |
126 |
||
127 |
||
237.7.78
by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed. |
128 |
def initlogger(debug, level=logging.WARNING): |
237.12.4
by Björn Påhlsson
restructured logger |
129 |
"""init logger and add loglevel""" |
130 |
||
237.7.246
by Teddy Hogeborn
Fix mandos server "--servicename" option, broken since 1.6.4. |
131 |
global syslogger |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
132 |
syslogger = (logging.handlers.SysLogHandler( |
133 |
facility = logging.handlers.SysLogHandler.LOG_DAEMON, |
|
134 |
address = "/dev/log")) |
|
237.12.4
by Björn Påhlsson
restructured logger |
135 |
syslogger.setFormatter(logging.Formatter |
136 |
('Mandos [%(process)d]: %(levelname)s:' |
|
137 |
' %(message)s')) |
|
138 |
logger.addHandler(syslogger) |
|
139 |
||
237.7.78
by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed. |
140 |
if debug: |
141 |
console = logging.StreamHandler() |
|
142 |
console.setFormatter(logging.Formatter('%(asctime)s %(name)s' |
|
143 |
' [%(process)d]:' |
|
144 |
' %(levelname)s:' |
|
145 |
' %(message)s')) |
|
146 |
logger.addHandler(console) |
|
237.12.4
by Björn Påhlsson
restructured logger |
147 |
logger.setLevel(level) |
28
by Teddy Hogeborn
* server.conf: New file. |
148 |
|
237.11.20
by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning. |
149 |
|
237.12.9
by Björn Påhlsson
renamed variables |
150 |
class PGPError(Exception): |
151 |
"""Exception if encryption/decryption fails""" |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
152 |
pass
|
153 |
||
154 |
||
237.12.9
by Björn Påhlsson
renamed variables |
155 |
class PGPEngine(object): |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
156 |
"""A simple class for OpenPGP symmetric encryption & decryption""" |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
157 |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
158 |
def __init__(self): |
159 |
self.tempdir = tempfile.mkdtemp(prefix="mandos-") |
|
237.7.163
by Teddy Hogeborn
* mandos: Don't use the GnuPGInterface module. |
160 |
self.gnupgargs = ['--batch', |
161 |
'--home', self.tempdir, |
|
162 |
'--force-mdc', |
|
163 |
'--quiet', |
|
164 |
'--no-use-agent'] |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
165 |
|
166 |
def __enter__(self): |
|
167 |
return self |
|
168 |
||
237.7.135
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Only run man --warnings if both "man" and |
169 |
def __exit__(self, exc_type, exc_value, traceback): |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
170 |
self._cleanup() |
171 |
return False |
|
172 |
||
173 |
def __del__(self): |
|
174 |
self._cleanup() |
|
175 |
||
176 |
def _cleanup(self): |
|
177 |
if self.tempdir is not None: |
|
178 |
# Delete contents of tempdir
|
|
179 |
for root, dirs, files in os.walk(self.tempdir, |
|
180 |
topdown = False): |
|
181 |
for filename in files: |
|
182 |
os.remove(os.path.join(root, filename)) |
|
183 |
for dirname in dirs: |
|
184 |
os.rmdir(os.path.join(root, dirname)) |
|
185 |
# Remove tempdir
|
|
186 |
os.rmdir(self.tempdir) |
|
187 |
self.tempdir = None |
|
188 |
||
189 |
def password_encode(self, password): |
|
190 |
# Passphrase can not be empty and can not contain newlines or
|
|
191 |
# NUL bytes. So we prefix it and hex encode it.
|
|
237.7.178
by Teddy Hogeborn
* mandos (PGPEngine.password_encode): Bug fix: GnuPG can't handle |
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 |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
199 |
|
200 |
def encrypt(self, data, password): |
|
237.7.163
by Teddy Hogeborn
* mandos: Don't use the GnuPGInterface module. |
201 |
passphrase = self.password_encode(password) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
202 |
with tempfile.NamedTemporaryFile( |
203 |
dir=self.tempdir) as passfile: |
|
237.7.163
by Teddy Hogeborn
* mandos: Don't use the GnuPGInterface module. |
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) |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
216 |
return ciphertext |
217 |
||
218 |
def decrypt(self, data, password): |
|
237.7.163
by Teddy Hogeborn
* mandos: Don't use the GnuPGInterface module. |
219 |
passphrase = self.password_encode(password) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
220 |
with tempfile.NamedTemporaryFile( |
221 |
dir = self.tempdir) as passfile: |
|
237.7.163
by Teddy Hogeborn
* mandos: Don't use the GnuPGInterface module. |
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) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
231 |
decrypted_plaintext, err = proc.communicate(input = data) |
237.7.163
by Teddy Hogeborn
* mandos: Don't use the GnuPGInterface module. |
232 |
if proc.returncode != 0: |
233 |
raise PGPError(err) |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
234 |
return decrypted_plaintext |
235 |
||
236 |
||
28
by Teddy Hogeborn
* server.conf: New file. |
237 |
class AvahiError(Exception): |
237.2.5
by Teddy Hogeborn
* mandos (AvahiError): Converted to use unicode. All users changed. |
238 |
def __init__(self, value, *args, **kwargs): |
28
by Teddy Hogeborn
* server.conf: New file. |
239 |
self.value = value |
237.7.277
by Teddy Hogeborn
mandos: Stop using str() and remove unnecessary unicode() calls. |
240 |
return super(AvahiError, self).__init__(value, *args, |
241 |
**kwargs) |
|
28
by Teddy Hogeborn
* server.conf: New file. |
242 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
243 |
|
28
by Teddy Hogeborn
* server.conf: New file. |
244 |
class AvahiServiceError(AvahiError): |
245 |
pass
|
|
246 |
||
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
247 |
|
28
by Teddy Hogeborn
* server.conf: New file. |
248 |
class AvahiGroupError(AvahiError): |
249 |
pass
|
|
250 |
||
251 |
||
252 |
class AvahiService(object): |
|
45
by Teddy Hogeborn
* server.py: Cosmetic changes. |
253 |
"""An Avahi (Zeroconf) service. |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
254 |
|
45
by Teddy Hogeborn
* server.py: Cosmetic changes. |
255 |
Attributes:
|
28
by Teddy Hogeborn
* server.conf: New file. |
256 |
interface: integer; avahi.IF_UNSPEC or an interface index.
|
257 |
Used to optionally bind to the specified interface.
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
258 |
name: string; Example: 'Mandos'
|
259 |
type: string; Example: '_mandos._tcp'.
|
|
237.7.162
by Teddy Hogeborn
* mandos: Comment changes. |
260 |
See <https://www.iana.org/assignments/service-names-port-numbers>
|
45
by Teddy Hogeborn
* server.py: Cosmetic changes. |
261 |
port: integer; what port to announce
|
262 |
TXT: list of strings; TXT record for the service
|
|
263 |
domain: string; Domain to publish on, default to .local if empty.
|
|
264 |
host: string; Host to publish records for, default is localhost
|
|
265 |
max_renames: integer; maximum number of renames
|
|
266 |
rename_count: integer; counter so we only rename after collisions
|
|
267 |
a sensible number of times
|
|
237.2.99
by Teddy Hogeborn
Code cleanup. |
268 |
group: D-Bus Entry Group
|
269 |
server: D-Bus Server
|
|
237.2.101
by Teddy Hogeborn
* mandos: Minor doc string fixes. |
270 |
bus: dbus.SystemBus()
|
28
by Teddy Hogeborn
* server.conf: New file. |
271 |
"""
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
272 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
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): |
|
28
by Teddy Hogeborn
* server.conf: New file. |
284 |
self.interface = interface |
285 |
self.name = name |
|
215
by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util". |
286 |
self.type = servicetype |
28
by Teddy Hogeborn
* server.conf: New file. |
287 |
self.port = port |
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
288 |
self.TXT = TXT if TXT is not None else [] |
28
by Teddy Hogeborn
* server.conf: New file. |
289 |
self.domain = domain |
290 |
self.host = host |
|
291 |
self.rename_count = 0 |
|
76
by Teddy Hogeborn
* plugins.d/password-request.c (init_gnutls_global): Renamed |
292 |
self.max_renames = max_renames |
237.2.77
by Teddy Hogeborn
Support not using IPv6 in server: |
293 |
self.protocol = protocol |
237.2.99
by Teddy Hogeborn
Code cleanup. |
294 |
self.group = None # our entry group |
295 |
self.server = None |
|
237.2.100
by Teddy Hogeborn
Code cleanup. Move some global stuff into main. |
296 |
self.bus = bus |
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
297 |
self.entry_group_state_changed_match = None |
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
298 |
|
237.7.286
by Teddy Hogeborn
Handle local Zeroconf service name collisions. |
299 |
def rename(self, remove=True): |
28
by Teddy Hogeborn
* server.conf: New file. |
300 |
"""Derived from the Avahi example code""" |
301 |
if self.rename_count >= self.max_renames: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
302 |
logger.critical("No suitable Zeroconf service name found" |
303 |
" after %i retries, exiting.", |
|
215
by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util". |
304 |
self.rename_count) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
305 |
raise AvahiServiceError("Too many renames") |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
306 |
self.name = str( |
307 |
self.server.GetAlternativeServiceName(self.name)) |
|
237.7.286
by Teddy Hogeborn
Handle local Zeroconf service name collisions. |
308 |
self.rename_count += 1 |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
309 |
logger.info("Changing Zeroconf service name to %r ...", |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
310 |
self.name) |
237.7.286
by Teddy Hogeborn
Handle local Zeroconf service name collisions. |
311 |
if remove: |
312 |
self.remove() |
|
24.1.160
by Björn Påhlsson
fixed bug with local name collisions after a non-local name collision |
313 |
try: |
314 |
self.add() |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
315 |
except dbus.exceptions.DBusException as error: |
237.7.286
by Teddy Hogeborn
Handle local Zeroconf service name collisions. |
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) |
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
324 |
|
28
by Teddy Hogeborn
* server.conf: New file. |
325 |
def remove(self): |
326 |
"""Derived from the Avahi example code""" |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
327 |
if self.entry_group_state_changed_match is not None: |
328 |
self.entry_group_state_changed_match.remove() |
|
329 |
self.entry_group_state_changed_match = None |
|
237.7.31
by Teddy Hogeborn
* mandos: Never call .Reset() on a defunct Avahi entry group. |
330 |
if self.group is not None: |
331 |
self.group.Reset() |
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
332 |
|
28
by Teddy Hogeborn
* server.conf: New file. |
333 |
def add(self): |
334 |
"""Derived from the Avahi example code""" |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
335 |
self.remove() |
237.7.31
by Teddy Hogeborn
* mandos: Never call .Reset() on a defunct Avahi entry group. |
336 |
if self.group is None: |
337 |
self.group = dbus.Interface( |
|
338 |
self.bus.get_object(avahi.DBUS_NAME, |
|
339 |
self.server.EntryGroupNew()), |
|
340 |
avahi.DBUS_INTERFACE_ENTRY_GROUP) |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
341 |
self.entry_group_state_changed_match = ( |
342 |
self.group.connect_to_signal( |
|
237.11.20
by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning. |
343 |
'StateChanged', self.entry_group_state_changed)) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
344 |
logger.debug("Adding Zeroconf service '%s' of type '%s' ...", |
237.2.99
by Teddy Hogeborn
Code cleanup. |
345 |
self.name, self.type) |
346 |
self.group.AddService( |
|
347 |
self.interface, |
|
348 |
self.protocol, |
|
349 |
dbus.UInt32(0), # flags |
|
350 |
self.name, self.type, |
|
351 |
self.domain, self.host, |
|
352 |
dbus.UInt16(self.port), |
|
353 |
avahi.string_array_to_txt_array(self.TXT)) |
|
354 |
self.group.Commit() |
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
355 |
|
237.2.99
by Teddy Hogeborn
Code cleanup. |
356 |
def entry_group_state_changed(self, state, error): |
357 |
"""Derived from the Avahi example code""" |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
358 |
logger.debug("Avahi entry group state change: %i", state) |
237.2.99
by Teddy Hogeborn
Code cleanup. |
359 |
|
360 |
if state == avahi.ENTRY_GROUP_ESTABLISHED: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
361 |
logger.debug("Zeroconf service established.") |
237.2.99
by Teddy Hogeborn
Code cleanup. |
362 |
elif state == avahi.ENTRY_GROUP_COLLISION: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
363 |
logger.info("Zeroconf service name collision.") |
237.2.99
by Teddy Hogeborn
Code cleanup. |
364 |
self.rename() |
365 |
elif state == avahi.ENTRY_GROUP_FAILURE: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
366 |
logger.critical("Avahi: Error in group state changed %s", |
237.7.278
by Teddy Hogeborn
mandos: Replace unicode() with str(). |
367 |
str(error)) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
368 |
raise AvahiGroupError("State changed: {!s}".format(error)) |
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
369 |
|
237.2.99
by Teddy Hogeborn
Code cleanup. |
370 |
def cleanup(self): |
371 |
"""Derived from the Avahi example code""" |
|
237.7.31
by Teddy Hogeborn
* mandos: Never call .Reset() on a defunct Avahi entry group. |
372 |
if self.group is not None: |
373 |
try: |
|
374 |
self.group.Free() |
|
375 |
except (dbus.exceptions.UnknownMethodException, |
|
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
376 |
dbus.exceptions.DBusException): |
237.7.31
by Teddy Hogeborn
* mandos: Never call .Reset() on a defunct Avahi entry group. |
377 |
pass
|
378 |
self.group = None |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
379 |
self.remove() |
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
380 |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
381 |
def server_state_changed(self, state, error=None): |
237.2.99
by Teddy Hogeborn
Code cleanup. |
382 |
"""Derived from the Avahi example code""" |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
383 |
logger.debug("Avahi server state change: %i", state) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
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 |
}
|
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
390 |
if state in bad_states: |
237.7.31
by Teddy Hogeborn
* mandos: Never call .Reset() on a defunct Avahi entry group. |
391 |
if bad_states[state] is not None: |
392 |
if error is None: |
|
393 |
logger.error(bad_states[state]) |
|
394 |
else: |
|
395 |
logger.error(bad_states[state] + ": %r", error) |
|
396 |
self.cleanup() |
|
237.2.99
by Teddy Hogeborn
Code cleanup. |
397 |
elif state == avahi.SERVER_RUNNING: |
237.7.317
by Teddy Hogeborn
Handle local Zeroconf service name collisions on startup, too. |
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) |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
410 |
else: |
237.7.31
by Teddy Hogeborn
* mandos: Never call .Reset() on a defunct Avahi entry group. |
411 |
if error is None: |
412 |
logger.debug("Unknown state: %r", state) |
|
413 |
else: |
|
414 |
logger.debug("Unknown state: %r: %r", state, error) |
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
415 |
|
237.2.99
by Teddy Hogeborn
Code cleanup. |
416 |
def activate(self): |
417 |
"""Derived from the Avahi example code""" |
|
418 |
if self.server is None: |
|
419 |
self.server = dbus.Interface( |
|
237.2.100
by Teddy Hogeborn
Code cleanup. Move some global stuff into main. |
420 |
self.bus.get_object(avahi.DBUS_NAME, |
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
421 |
avahi.DBUS_PATH_SERVER, |
422 |
follow_name_owner_changes=True), |
|
237.2.99
by Teddy Hogeborn
Code cleanup. |
423 |
avahi.DBUS_INTERFACE_SERVER) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
424 |
self.server.connect_to_signal("StateChanged", |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
425 |
self.server_state_changed) |
237.2.99
by Teddy Hogeborn
Code cleanup. |
426 |
self.server_state_changed(self.server.GetState()) |
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
427 |
|
237.7.130
by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: handle non-existing |
428 |
|
237.11.20
by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning. |
429 |
class AvahiServiceToSyslog(AvahiService): |
237.7.286
by Teddy Hogeborn
Handle local Zeroconf service name collisions. |
430 |
def rename(self, *args, **kwargs): |
237.11.20
by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning. |
431 |
"""Add the new name to the syslog messages""" |
237.7.286
by Teddy Hogeborn
Handle local Zeroconf service name collisions. |
432 |
ret = AvahiService.rename(self, *args, **kwargs) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
433 |
syslogger.setFormatter(logging.Formatter( |
434 |
'Mandos ({}) [%(process)d]: %(levelname)s: %(message)s' |
|
435 |
.format(self.name))) |
|
237.11.20
by Teddy Hogeborn
* Makefile (run-server): Remove obsolete warning. |
436 |
return ret |
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
437 |
|
237.24.2
by Teddy Hogeborn
mandos (subprocess_call_pipe): Rename to "call_pipe" and take "func". |
438 |
def call_pipe(connection, # : multiprocessing.Connection |
439 |
func, *args, **kwargs): |
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
440 |
"""This function is meant to be called by multiprocessing.Process |
441 |
|
|
237.24.2
by Teddy Hogeborn
mandos (subprocess_call_pipe): Rename to "call_pipe" and take "func". |
442 |
This function runs func(*args, **kwargs), and writes the resulting
|
443 |
return value on the provided multiprocessing.Connection.
|
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
444 |
"""
|
237.24.2
by Teddy Hogeborn
mandos (subprocess_call_pipe): Rename to "call_pipe" and take "func". |
445 |
connection.send(func(*args, **kwargs)) |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
446 |
connection.close() |
237.7.130
by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: handle non-existing |
447 |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
448 |
class Client(object): |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
449 |
"""A representation of a client host served by this server. |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
450 |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
451 |
Attributes:
|
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
452 |
approved: bool(); 'None' if not yet approved/disapproved
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
453 |
approval_delay: datetime.timedelta(); Time to wait for approval
|
454 |
approval_duration: datetime.timedelta(); Duration of one approval
|
|
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
455 |
checker: subprocess.Popen(); a running checker process used
|
456 |
to see if the client lives.
|
|
457 |
'None' if no process is running.
|
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
458 |
checker_callback_tag: a gobject event source tag, or None
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
459 |
checker_command: string; External command which is run to check
|
460 |
if client lives. %() expansions are done at
|
|
12
by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn, |
461 |
runtime with vars(self) as dict, so that for
|
462 |
instance %(name)s can be used in the command.
|
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
463 |
checker_initiator_tag: a gobject event source tag, or None
|
464 |
created: datetime.datetime(); (UTC) object creation
|
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
465 |
client_structure: Object describing what attributes a client has
|
466 |
and is used for storing the client at exit
|
|
237.2.78
by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute. |
467 |
current_checker_command: string; current running checker_command
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
468 |
disable_initiator_tag: a gobject event source tag, or None
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
469 |
enabled: bool()
|
470 |
fingerprint: string (40 or 32 hexadecimal digits); used to
|
|
471 |
uniquely identify the client
|
|
472 |
host: string; available for use by the checker command
|
|
473 |
interval: datetime.timedelta(); How often to start a new checker
|
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
474 |
last_approval_request: datetime.datetime(); (UTC) or None
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
475 |
last_checked_ok: datetime.datetime(); (UTC) or None
|
237.7.69
by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto". |
476 |
last_checker_status: integer between 0 and 255 reflecting exit
|
237.12.7
by Teddy Hogeborn
* mandos: Break long lines and fix some more white space. |
477 |
status of last checker. -1 reflects crashed
|
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
478 |
checker, -2 means no checker completed yet.
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
479 |
last_checker_signal: The signal which killed the last checker, if
|
480 |
last_checker_status is -1
|
|
237.14.3
by Teddy Hogeborn
Make "enabled" a client config option. |
481 |
last_enabled: datetime.datetime(); (UTC) or None
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
482 |
name: string; from the config file, used in log messages and
|
483 |
D-Bus identifiers
|
|
484 |
secret: bytestring; sent verbatim (over TLS) to client
|
|
485 |
timeout: datetime.timedelta(); How long from last_checked_ok
|
|
486 |
until this client is disabled
|
|
237.7.100
by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the |
487 |
extended_timeout: extra long timeout when secret has been sent
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
488 |
runtime_expansions: Allowed attributes for runtime expansion.
|
237.7.45
by Teddy Hogeborn
* DBUS-API: Document new "Expires" and "ExtendedTimeout" properties. |
489 |
expires: datetime.datetime(); time (UTC) when a client will be
|
24.1.179
by Björn Påhlsson
New feature: |
490 |
disabled, or None
|
237.7.165
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
491 |
server_settings: The server_settings dict from main()
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
492 |
"""
|
237.2.96
by Teddy Hogeborn
Minor code cleanup; one minor bug fix. |
493 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
494 |
runtime_expansions = ("approval_delay", "approval_duration", |
237.7.132
by Teddy Hogeborn
* mandos (Client.runtime_expansions): Add "expires" and (bug fix) |
495 |
"created", "enabled", "expires", |
496 |
"fingerprint", "host", "interval", |
|
497 |
"last_approval_request", "last_checked_ok", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
498 |
"last_enabled", "name", "timeout") |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
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 |
}
|
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
510 |
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
511 |
@staticmethod
|
512 |
def config_parser(config): |
|
237.7.90
by Björn Påhlsson
fixed bug with bad stored config state for expires and last_checked_ok. |
513 |
"""Construct a new dict of client settings of this form: |
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
514 |
{ client_name: {setting_name: value, ...}, ...}
|
237.7.90
by Björn Påhlsson
fixed bug with bad stored config state for expires and last_checked_ok. |
515 |
with exceptions for any special settings as defined above.
|
516 |
NOTE: Must be a pure function. Must return the same result
|
|
517 |
value given the same arguments.
|
|
518 |
"""
|
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
519 |
settings = {} |
520 |
for client_name in config.sections(): |
|
521 |
section = dict(config.items(client_name)) |
|
522 |
client = settings[client_name] = {} |
|
523 |
||
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
524 |
client["host"] = section["host"] |
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
525 |
# Reformat values from string types to Python types
|
526 |
client["approved_by_default"] = config.getboolean( |
|
527 |
client_name, "approved_by_default") |
|
237.7.91
by Teddy Hogeborn
* mandos: Break some long lines. |
528 |
client["enabled"] = config.getboolean(client_name, |
529 |
"enabled") |
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
530 |
|
237.7.287
by Teddy Hogeborn
mandos (Client.config_parser): Move comment to correct place. |
531 |
# Uppercase and remove spaces from fingerprint for later
|
532 |
# comparison purposes with return value from the
|
|
533 |
# fingerprint() function
|
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
534 |
client["fingerprint"] = (section["fingerprint"].upper() |
535 |
.replace(" ", "")) |
|
536 |
if "secret" in section: |
|
537 |
client["secret"] = section["secret"].decode("base64") |
|
538 |
elif "secfile" in section: |
|
539 |
with open(os.path.expanduser(os.path.expandvars |
|
540 |
(section["secfile"])), |
|
541 |
"rb") as secfile: |
|
542 |
client["secret"] = secfile.read() |
|
543 |
else: |
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
544 |
raise TypeError("No secret or secfile for section {}" |
237.7.116
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
545 |
.format(section)) |
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
546 |
client["timeout"] = string_to_delta(section["timeout"]) |
547 |
client["extended_timeout"] = string_to_delta( |
|
548 |
section["extended_timeout"]) |
|
549 |
client["interval"] = string_to_delta(section["interval"]) |
|
550 |
client["approval_delay"] = string_to_delta( |
|
551 |
section["approval_delay"]) |
|
552 |
client["approval_duration"] = string_to_delta( |
|
553 |
section["approval_duration"]) |
|
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
554 |
client["checker_command"] = section["checker"] |
555 |
client["last_approval_request"] = None |
|
556 |
client["last_checked_ok"] = None |
|
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
557 |
client["last_checker_status"] = -2 |
237.7.90
by Björn Påhlsson
fixed bug with bad stored config state for expires and last_checked_ok. |
558 |
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
559 |
return settings |
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
560 |
|
237.7.165
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
561 |
def __init__(self, settings, name = None, server_settings=None): |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
562 |
self.name = name |
237.7.165
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
563 |
if server_settings is None: |
564 |
server_settings = {} |
|
565 |
self.server_settings = server_settings |
|
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
566 |
# adding all client settings
|
237.23.4
by Teddy Hogeborn
Use the .items() method instead of .iteritems(). |
567 |
for setting, value in settings.items(): |
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
568 |
setattr(self, setting, value) |
569 |
||
237.7.90
by Björn Påhlsson
fixed bug with bad stored config state for expires and last_checked_ok. |
570 |
if self.enabled: |
571 |
if not hasattr(self, "last_enabled"): |
|
572 |
self.last_enabled = datetime.datetime.utcnow() |
|
573 |
if not hasattr(self, "expires"): |
|
574 |
self.expires = (datetime.datetime.utcnow() |
|
575 |
+ self.timeout) |
|
576 |
else: |
|
577 |
self.last_enabled = None |
|
578 |
self.expires = None |
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
579 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
580 |
logger.debug("Creating client %r", self.name) |
581 |
logger.debug(" Fingerprint: %s", self.fingerprint) |
|
237.7.91
by Teddy Hogeborn
* mandos: Break some long lines. |
582 |
self.created = settings.get("created", |
583 |
datetime.datetime.utcnow()) |
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
584 |
|
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
585 |
# attributes specific for this server instance
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
586 |
self.checker = None |
587 |
self.checker_initiator_tag = None |
|
237.2.2
by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus"; |
588 |
self.disable_initiator_tag = None |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
589 |
self.checker_callback_tag = None |
237.2.78
by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute. |
590 |
self.current_checker_command = None |
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
591 |
self.approved = None |
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
592 |
self.approvals_pending = 0 |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
593 |
self.changedstate = multiprocessing_manager.Condition( |
594 |
multiprocessing_manager.Lock()) |
|
595 |
self.client_structure = [attr |
|
596 |
for attr in self.__dict__.iterkeys() |
|
237.7.69
by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto". |
597 |
if not attr.startswith("_")] |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
598 |
self.client_structure.append("client_structure") |
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
599 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
600 |
for name, t in inspect.getmembers( |
601 |
type(self), lambda obj: isinstance(obj, property)): |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
602 |
if not name.startswith("_"): |
603 |
self.client_structure.append(name) |
|
604 |
||
237.7.68
by Björn Påhlsson
merge persistent state |
605 |
# Send notice to process children that client state has changed
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
606 |
def send_changedstate(self): |
237.7.68
by Björn Påhlsson
merge persistent state |
607 |
with self.changedstate: |
608 |
self.changedstate.notify_all() |
|
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
609 |
|
237.2.2
by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus"; |
610 |
def enable(self): |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
611 |
"""Start this client's checker and timeout hooks""" |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
612 |
if getattr(self, "enabled", False): |
237.2.104
by Teddy Hogeborn
Code cleanup and one bug fix. |
613 |
# Already enabled
|
614 |
return
|
|
24.1.179
by Björn Påhlsson
New feature: |
615 |
self.expires = datetime.datetime.utcnow() + self.timeout |
237.2.2
by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus"; |
616 |
self.enabled = True |
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
617 |
self.last_enabled = datetime.datetime.utcnow() |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
618 |
self.init_checker() |
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
619 |
self.send_changedstate() |
237.1.1
by Teddy Hogeborn
First steps of a D-Bus interface to the server. |
620 |
|
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
621 |
def disable(self, quiet=True): |
237.2.2
by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus"; |
622 |
"""Disable this client.""" |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
623 |
if not getattr(self, "enabled", False): |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
624 |
return False |
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
625 |
if not quiet: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
626 |
logger.info("Disabling client %s", self.name) |
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
627 |
if getattr(self, "disable_initiator_tag", None) is not None: |
237.2.2
by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus"; |
628 |
gobject.source_remove(self.disable_initiator_tag) |
629 |
self.disable_initiator_tag = None |
|
24.1.179
by Björn Påhlsson
New feature: |
630 |
self.expires = None |
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
631 |
if getattr(self, "checker_initiator_tag", None) is not None: |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
632 |
gobject.source_remove(self.checker_initiator_tag) |
633 |
self.checker_initiator_tag = None |
|
634 |
self.stop_checker() |
|
237.2.2
by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus"; |
635 |
self.enabled = False |
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
636 |
if not quiet: |
637 |
self.send_changedstate() |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
638 |
# Do not run this again if called by a gobject.timeout_add
|
639 |
return False |
|
237.1.1
by Teddy Hogeborn
First steps of a D-Bus interface to the server. |
640 |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
641 |
def __del__(self): |
237.2.2
by Teddy Hogeborn
* mandos (_datetime_to_dbus_struct): Renamed to "_datetime_to_dbus"; |
642 |
self.disable() |
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
643 |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
644 |
def init_checker(self): |
645 |
# Schedule a new checker to be started an 'interval' from now,
|
|
646 |
# and every interval from then on.
|
|
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
647 |
if self.checker_initiator_tag is not None: |
648 |
gobject.source_remove(self.checker_initiator_tag) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
649 |
self.checker_initiator_tag = gobject.timeout_add( |
650 |
int(self.interval.total_seconds() * 1000), |
|
651 |
self.start_checker) |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
652 |
# Schedule a disable() when 'timeout' has passed
|
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
653 |
if self.disable_initiator_tag is not None: |
654 |
gobject.source_remove(self.disable_initiator_tag) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
655 |
self.disable_initiator_tag = gobject.timeout_add( |
656 |
int(self.timeout.total_seconds() * 1000), self.disable) |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
657 |
# Also start a new checker *right now*.
|
658 |
self.start_checker() |
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
659 |
|
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
660 |
def checker_callback(self, source, condition, connection, |
661 |
command): |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
662 |
"""The checker has completed, so take appropriate actions.""" |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
663 |
self.checker_callback_tag = None |
664 |
self.checker = None |
|
237.24.2
by Teddy Hogeborn
mandos (subprocess_call_pipe): Rename to "call_pipe" and take "func". |
665 |
# Read return code from connection (see call_pipe)
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
666 |
returncode = connection.recv() |
667 |
connection.close() |
|
668 |
||
669 |
if returncode >= 0: |
|
670 |
self.last_checker_status = returncode |
|
671 |
self.last_checker_signal = None |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
672 |
if self.last_checker_status == 0: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
673 |
logger.info("Checker for %(name)s succeeded", |
237.2.43
by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return |
674 |
vars(self)) |
237.2.44
by Teddy Hogeborn
* mandos (Client.bump_timeout): Renamed to "checked_ok". All callers |
675 |
self.checked_ok() |
237.2.43
by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return |
676 |
else: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
677 |
logger.info("Checker for %(name)s failed", vars(self)) |
237.2.43
by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return |
678 |
else: |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
679 |
self.last_checker_status = -1 |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
680 |
self.last_checker_signal = -returncode |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
681 |
logger.warning("Checker for %(name)s crashed?", |
13
by Björn Påhlsson
Added following support: |
682 |
vars(self)) |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
683 |
return False |
237.1.1
by Teddy Hogeborn
First steps of a D-Bus interface to the server. |
684 |
|
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
685 |
def checked_ok(self): |
686 |
"""Assert that the client has been seen, alive and well.""" |
|
687 |
self.last_checked_ok = datetime.datetime.utcnow() |
|
688 |
self.last_checker_status = 0 |
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
689 |
self.last_checker_signal = None |
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
690 |
self.bump_timeout() |
691 |
||
692 |
def bump_timeout(self, timeout=None): |
|
693 |
"""Bump up the timeout for this client.""" |
|
24.1.179
by Björn Påhlsson
New feature: |
694 |
if timeout is None: |
695 |
timeout = self.timeout |
|
237.11.17
by Teddy Hogeborn
* mandos (Client.checked_ok): Bug fix: Handle disabled client. |
696 |
if self.disable_initiator_tag is not None: |
697 |
gobject.source_remove(self.disable_initiator_tag) |
|
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
698 |
self.disable_initiator_tag = None |
237.11.17
by Teddy Hogeborn
* mandos (Client.checked_ok): Bug fix: Handle disabled client. |
699 |
if getattr(self, "enabled", False): |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
700 |
self.disable_initiator_tag = gobject.timeout_add( |
701 |
int(timeout.total_seconds() * 1000), self.disable) |
|
237.11.17
by Teddy Hogeborn
* mandos (Client.checked_ok): Bug fix: Handle disabled client. |
702 |
self.expires = datetime.datetime.utcnow() + timeout |
237.1.1
by Teddy Hogeborn
First steps of a D-Bus interface to the server. |
703 |
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
704 |
def need_approval(self): |
705 |
self.last_approval_request = datetime.datetime.utcnow() |
|
706 |
||
9
by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits. |
707 |
def start_checker(self): |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
708 |
"""Start a new checker subprocess if one is not running. |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
709 |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
710 |
If a checker already exists, leave it running and do
|
711 |
nothing."""
|
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
712 |
# The reason for not killing a running checker is that if we
|
237.7.125
by Teddy Hogeborn
* mandos (Client.start_checker): Reworded comment. |
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
|
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
717 |
# checkers alone, the checker would have to take more time
|
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
718 |
# than 'timeout' for the client to be disabled, which is as it
|
719 |
# should be.
|
|
237.2.78
by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute. |
720 |
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
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 |
|
237.2.78
by Teddy Hogeborn
* mandos (Client.current_checker_command): New attribute. |
725 |
# Start a new checker if needed
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
726 |
if self.checker is None: |
237.7.131
by Teddy Hogeborn
* mandos (Client.start_checker): Remove undocumented support for "%%s" |
727 |
# Escape attributes for the shell
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
728 |
escaped_attrs = { |
729 |
attr: re.escape(str(getattr(self, attr))) |
|
730 |
for attr in self.runtime_expansions } |
|
12
by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn, |
731 |
try: |
237.7.131
by Teddy Hogeborn
* mandos (Client.start_checker): Remove undocumented support for "%%s" |
732 |
command = self.checker_command % escaped_attrs |
733 |
except TypeError as error: |
|
734 |
logger.error('Could not format string "%s"', |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
735 |
self.checker_command, |
736 |
exc_info=error) |
|
737 |
return True # Try again later |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
738 |
self.current_checker_command = command |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
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 }) |
|
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
755 |
pipe = multiprocessing.Pipe(duplex = False) |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
756 |
self.checker = multiprocessing.Process( |
237.24.2
by Teddy Hogeborn
mandos (subprocess_call_pipe): Rename to "call_pipe" and take "func". |
757 |
target = call_pipe, |
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
758 |
args = (pipe[1], subprocess.call, command), |
237.24.2
by Teddy Hogeborn
mandos (subprocess_call_pipe): Rename to "call_pipe" and take "func". |
759 |
kwargs = popen_args) |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
760 |
self.checker.start() |
761 |
self.checker_callback_tag = gobject.io_add_watch( |
|
762 |
pipe[0].fileno(), gobject.IO_IN, |
|
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
763 |
self.checker_callback, pipe[0], command) |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
764 |
# Re-run this periodically if run by gobject.timeout_add
|
765 |
return True |
|
237.1.1
by Teddy Hogeborn
First steps of a D-Bus interface to the server. |
766 |
|
9
by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits. |
767 |
def stop_checker(self): |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
768 |
"""Force the checker process, if any, to stop.""" |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
769 |
if self.checker_callback_tag: |
770 |
gobject.source_remove(self.checker_callback_tag) |
|
771 |
self.checker_callback_tag = None |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
772 |
if getattr(self, "checker", None) is None: |
9
by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits. |
773 |
return
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
774 |
logger.debug("Stopping checker for %(name)s", vars(self)) |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
775 |
self.checker.terminate() |
9
by Teddy Hogeborn
* client.cpp (main): Get t_old early since it is used on error exits. |
776 |
self.checker = None |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
777 |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
778 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
779 |
def dbus_service_property(dbus_interface, |
780 |
signature="v", |
|
781 |
access="readwrite", |
|
782 |
byte_arrays=False): |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
783 |
"""Decorators for marking methods of a DBusObjectWithProperties to |
784 |
become properties on the D-Bus.
|
|
785 |
|
|
786 |
The decorated method will be called with no arguments by "Get"
|
|
787 |
and with one argument by "Set".
|
|
788 |
|
|
789 |
The parameters, where they are supported, are the same as
|
|
790 |
dbus.service.method, except there is only "signature", since the
|
|
791 |
type from Get() and the type sent to Set() is the same.
|
|
792 |
"""
|
|
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
793 |
# Encoding deeply encoded byte arrays is not supported yet by the
|
794 |
# "Set" method, so we fail early here:
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
795 |
if byte_arrays and signature != "ay": |
796 |
raise ValueError("Byte arrays not supported for non-'ay'" |
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
797 |
" signature {!r}".format(signature)) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
798 |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
799 |
def decorator(func): |
800 |
func._dbus_is_property = True |
|
801 |
func._dbus_interface = dbus_interface |
|
802 |
func._dbus_signature = signature |
|
803 |
func._dbus_access = access |
|
804 |
func._dbus_name = func.__name__ |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
805 |
if func._dbus_name.endswith("_dbus_property"): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
806 |
func._dbus_name = func._dbus_name[:-14] |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
807 |
func._dbus_get_args_options = {'byte_arrays': byte_arrays } |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
808 |
return func |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
809 |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
810 |
return decorator |
811 |
||
812 |
||
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
813 |
def dbus_interface_annotations(dbus_interface): |
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
814 |
"""Decorator for marking functions returning interface annotations |
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
815 |
|
816 |
Usage:
|
|
817 |
|
|
818 |
@dbus_interface_annotations("org.example.Interface")
|
|
819 |
def _foo(self): # Function name does not matter
|
|
820 |
return {"org.freedesktop.DBus.Deprecated": "true",
|
|
821 |
"org.freedesktop.DBus.Property.EmitsChangedSignal":
|
|
822 |
"false"}
|
|
823 |
"""
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
824 |
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
825 |
def decorator(func): |
826 |
func._dbus_is_interface = True |
|
827 |
func._dbus_interface = dbus_interface |
|
828 |
func._dbus_name = dbus_interface |
|
829 |
return func |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
830 |
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
831 |
return decorator |
832 |
||
833 |
||
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
834 |
def dbus_annotations(annotations): |
835 |
"""Decorator to annotate D-Bus methods, signals or properties |
|
836 |
Usage:
|
|
837 |
|
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
838 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true",
|
839 |
"org.freedesktop.DBus.Property."
|
|
840 |
"EmitsChangedSignal": "false"})
|
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
841 |
@dbus_service_property("org.example.Interface", signature="b",
|
842 |
access="r")
|
|
843 |
def Property_dbus_property(self):
|
|
844 |
return dbus.Boolean(False)
|
|
237.7.332
by Teddy Hogeborn
Refactor D-Bus annotation class out from D-Bus properties class. |
845 |
|
846 |
See also the DBusObjectWithAnnotations class.
|
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
847 |
"""
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
848 |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
849 |
def decorator(func): |
850 |
func._dbus_annotations = annotations |
|
851 |
return func |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
852 |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
853 |
return decorator |
854 |
||
855 |
||
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
856 |
class DBusPropertyException(dbus.exceptions.DBusException): |
857 |
"""A base class for D-Bus property-related exceptions |
|
858 |
"""
|
|
237.7.277
by Teddy Hogeborn
mandos: Stop using str() and remove unnecessary unicode() calls. |
859 |
pass
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
860 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
861 |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
862 |
class DBusPropertyAccessException(DBusPropertyException): |
863 |
"""A property's access permissions disallows an operation. |
|
864 |
"""
|
|
865 |
pass
|
|
866 |
||
867 |
||
868 |
class DBusPropertyNotFound(DBusPropertyException): |
|
869 |
"""An attempt was made to access a non-existing property. |
|
870 |
"""
|
|
871 |
pass
|
|
872 |
||
873 |
||
237.7.332
by Teddy Hogeborn
Refactor D-Bus annotation class out from D-Bus properties class. |
874 |
class DBusObjectWithAnnotations(dbus.service.Object): |
875 |
"""A D-Bus object with annotations. |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
876 |
|
237.7.332
by Teddy Hogeborn
Refactor D-Bus annotation class out from D-Bus properties class. |
877 |
Classes inheriting from this can use the dbus_annotations
|
878 |
decorator to add annotations to methods or signals.
|
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
879 |
"""
|
880 |
||
881 |
@staticmethod
|
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
882 |
def _is_dbus_thing(thing): |
883 |
"""Returns a function testing if an attribute is a D-Bus thing |
|
884 |
|
|
885 |
If called like _is_dbus_thing("method") it returns a function
|
|
886 |
suitable for use as predicate to inspect.getmembers().
|
|
887 |
"""
|
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
888 |
return lambda obj: getattr(obj, "_dbus_is_{}".format(thing), |
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
889 |
False) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
890 |
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
891 |
def _get_all_dbus_things(self, thing): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
892 |
"""Returns a generator of (name, attribute) pairs |
893 |
"""
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
894 |
return ((getattr(athing.__get__(self), "_dbus_name", name), |
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
895 |
athing.__get__(self)) |
24.1.186
by Björn Påhlsson
transitional stuff actually working |
896 |
for cls in self.__class__.__mro__ |
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
897 |
for name, athing in |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
898 |
inspect.getmembers(cls, self._is_dbus_thing(thing))) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
899 |
|
237.7.332
by Teddy Hogeborn
Refactor D-Bus annotation class out from D-Bus properties class. |
900 |
@dbus.service.method(dbus.INTROSPECTABLE_IFACE, |
901 |
out_signature = "s", |
|
902 |
path_keyword = 'object_path', |
|
903 |
connection_keyword = 'connection') |
|
904 |
def Introspect(self, object_path, connection): |
|
905 |
"""Overloading of standard D-Bus method. |
|
906 |
|
|
907 |
Inserts annotation tags on methods and signals.
|
|
908 |
"""
|
|
909 |
xmlstring = dbus.service.Object.Introspect(self, object_path, |
|
910 |
connection) |
|
911 |
try: |
|
912 |
document = xml.dom.minidom.parseString(xmlstring) |
|
913 |
||
914 |
for if_tag in document.getElementsByTagName("interface"): |
|
915 |
# Add annotation tags
|
|
916 |
for typ in ("method", "signal"): |
|
917 |
for tag in if_tag.getElementsByTagName(typ): |
|
918 |
annots = dict() |
|
919 |
for name, prop in (self. |
|
920 |
_get_all_dbus_things(typ)): |
|
921 |
if (name == tag.getAttribute("name") |
|
922 |
and prop._dbus_interface |
|
923 |
== if_tag.getAttribute("name")): |
|
924 |
annots.update(getattr( |
|
925 |
prop, "_dbus_annotations", {})) |
|
926 |
for name, value in annots.items(): |
|
927 |
ann_tag = document.createElement( |
|
928 |
"annotation") |
|
929 |
ann_tag.setAttribute("name", name) |
|
930 |
ann_tag.setAttribute("value", value) |
|
931 |
tag.appendChild(ann_tag) |
|
932 |
# Add interface annotation tags
|
|
933 |
for annotation, value in dict( |
|
934 |
itertools.chain.from_iterable( |
|
935 |
annotations().items() |
|
936 |
for name, annotations |
|
937 |
in self._get_all_dbus_things("interface") |
|
938 |
if name == if_tag.getAttribute("name") |
|
939 |
)).items(): |
|
940 |
ann_tag = document.createElement("annotation") |
|
941 |
ann_tag.setAttribute("name", annotation) |
|
942 |
ann_tag.setAttribute("value", value) |
|
943 |
if_tag.appendChild(ann_tag) |
|
944 |
# Fix argument name for the Introspect method itself
|
|
945 |
if (if_tag.getAttribute("name") |
|
946 |
== dbus.INTROSPECTABLE_IFACE): |
|
947 |
for cn in if_tag.getElementsByTagName("method"): |
|
948 |
if cn.getAttribute("name") == "Introspect": |
|
949 |
for arg in cn.getElementsByTagName("arg"): |
|
950 |
if (arg.getAttribute("direction") |
|
951 |
== "out"): |
|
952 |
arg.setAttribute("name", |
|
953 |
"xml_data") |
|
954 |
xmlstring = document.toxml("utf-8") |
|
955 |
document.unlink() |
|
956 |
except (AttributeError, xml.dom.DOMException, |
|
957 |
xml.parsers.expat.ExpatError) as error: |
|
958 |
logger.error("Failed to override Introspection method", |
|
959 |
exc_info=error) |
|
960 |
return xmlstring |
|
961 |
||
962 |
||
963 |
class DBusObjectWithProperties(DBusObjectWithAnnotations): |
|
964 |
"""A D-Bus object with properties. |
|
965 |
|
|
966 |
Classes inheriting from this can use the dbus_service_property
|
|
967 |
decorator to expose methods as D-Bus properties. It exposes the
|
|
968 |
standard Get(), Set(), and GetAll() methods on the D-Bus.
|
|
969 |
"""
|
|
970 |
||
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
971 |
def _get_dbus_property(self, interface_name, property_name): |
972 |
"""Returns a bound method if one exists which is a D-Bus |
|
973 |
property with the specified name and interface.
|
|
974 |
"""
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
975 |
for cls in self.__class__.__mro__: |
976 |
for name, value in inspect.getmembers( |
|
977 |
cls, self._is_dbus_thing("property")): |
|
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
978 |
if (value._dbus_name == property_name |
979 |
and value._dbus_interface == interface_name): |
|
24.1.186
by Björn Påhlsson
transitional stuff actually working |
980 |
return value.__get__(self) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
981 |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
982 |
# No such property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
983 |
raise DBusPropertyNotFound("{}:{}.{}".format( |
984 |
self.dbus_object_path, interface_name, property_name)) |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
985 |
|
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
986 |
@classmethod
|
987 |
def _get_all_interface_names(cls): |
|
988 |
"""Get a sequence of all interfaces supported by an object""" |
|
989 |
return (name for name in set(getattr(getattr(x, attr), |
|
990 |
"_dbus_interface", None) |
|
991 |
for x in (inspect.getmro(cls)) |
|
992 |
for attr in dir(x)) |
|
993 |
if name is not None) |
|
994 |
||
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
995 |
@dbus.service.method(dbus.PROPERTIES_IFACE, |
996 |
in_signature="ss", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
997 |
out_signature="v") |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
998 |
def Get(self, interface_name, property_name): |
999 |
"""Standard D-Bus property Get() method, see D-Bus standard. |
|
1000 |
"""
|
|
1001 |
prop = self._get_dbus_property(interface_name, property_name) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1002 |
if prop._dbus_access == "write": |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1003 |
raise DBusPropertyAccessException(property_name) |
1004 |
value = prop() |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1005 |
if not hasattr(value, "variant_level"): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1006 |
return value |
1007 |
return type(value)(value, variant_level=value.variant_level+1) |
|
1008 |
||
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1009 |
@dbus.service.method(dbus.PROPERTIES_IFACE, in_signature="ssv") |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1010 |
def Set(self, interface_name, property_name, value): |
1011 |
"""Standard D-Bus property Set() method, see D-Bus standard. |
|
1012 |
"""
|
|
1013 |
prop = self._get_dbus_property(interface_name, property_name) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1014 |
if prop._dbus_access == "read": |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1015 |
raise DBusPropertyAccessException(property_name) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1016 |
if prop._dbus_get_args_options["byte_arrays"]: |
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
1017 |
# The byte_arrays option is not supported yet on
|
1018 |
# signatures other than "ay".
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1019 |
if prop._dbus_signature != "ay": |
237.7.197
by Teddy Hogeborn
Minor code fix; raise only exception instances, not classes. |
1020 |
raise ValueError("Byte arrays not supported for non-" |
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
1021 |
"'ay' signature {!r}"
|
237.7.197
by Teddy Hogeborn
Minor code fix; raise only exception instances, not classes. |
1022 |
.format(prop._dbus_signature)) |
237.7.94
by Teddy Hogeborn
* debian/rules (binary-common): Exclude network-hooks.d from |
1023 |
value = dbus.ByteArray(b''.join(chr(byte) |
1024 |
for byte in value)) |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1025 |
prop(value) |
1026 |
||
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1027 |
@dbus.service.method(dbus.PROPERTIES_IFACE, |
1028 |
in_signature="s", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1029 |
out_signature="a{sv}") |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1030 |
def GetAll(self, interface_name): |
1031 |
"""Standard D-Bus property GetAll() method, see D-Bus |
|
1032 |
standard.
|
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1033 |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1034 |
Note: Will not include properties with access="write".
|
1035 |
"""
|
|
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
1036 |
properties = {} |
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
1037 |
for name, prop in self._get_all_dbus_things("property"): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1038 |
if (interface_name |
1039 |
and interface_name != prop._dbus_interface): |
|
1040 |
# Interface non-empty but did not match
|
|
1041 |
continue
|
|
1042 |
# Ignore write-only properties
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1043 |
if prop._dbus_access == "write": |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1044 |
continue
|
1045 |
value = prop() |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1046 |
if not hasattr(value, "variant_level"): |
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
1047 |
properties[name] = value |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1048 |
continue
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1049 |
properties[name] = type(value)( |
1050 |
value, variant_level = value.variant_level + 1) |
|
237.12.5
by Björn Påhlsson
First run of python-lint. Fixed some *obviously* bad code and turned |
1051 |
return dbus.Dictionary(properties, signature="sv") |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1052 |
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1053 |
@dbus.service.signal(dbus.PROPERTIES_IFACE, signature="sa{sv}as") |
1054 |
def PropertiesChanged(self, interface_name, changed_properties, |
|
1055 |
invalidated_properties): |
|
1056 |
"""Standard D-Bus PropertiesChanged() signal, see D-Bus |
|
1057 |
standard.
|
|
1058 |
"""
|
|
1059 |
pass
|
|
1060 |
||
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1061 |
@dbus.service.method(dbus.INTROSPECTABLE_IFACE, |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1062 |
out_signature="s", |
1063 |
path_keyword='object_path', |
|
1064 |
connection_keyword='connection') |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1065 |
def Introspect(self, object_path, connection): |
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
1066 |
"""Overloading of standard D-Bus method. |
1067 |
|
|
1068 |
Inserts property tags and interface annotation tags.
|
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1069 |
"""
|
237.7.332
by Teddy Hogeborn
Refactor D-Bus annotation class out from D-Bus properties class. |
1070 |
xmlstring = DBusObjectWithAnnotations.Introspect(self, |
1071 |
object_path, |
|
1072 |
connection) |
|
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1073 |
try: |
1074 |
document = xml.dom.minidom.parseString(xmlstring) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1075 |
|
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1076 |
def make_tag(document, name, prop): |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1077 |
e = document.createElement("property") |
1078 |
e.setAttribute("name", name) |
|
1079 |
e.setAttribute("type", prop._dbus_signature) |
|
1080 |
e.setAttribute("access", prop._dbus_access) |
|
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1081 |
return e |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1082 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1083 |
for if_tag in document.getElementsByTagName("interface"): |
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
1084 |
# Add property tags
|
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1085 |
for tag in (make_tag(document, name, prop) |
1086 |
for name, prop |
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
1087 |
in self._get_all_dbus_things("property") |
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1088 |
if prop._dbus_interface |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1089 |
== if_tag.getAttribute("name")): |
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1090 |
if_tag.appendChild(tag) |
237.7.332
by Teddy Hogeborn
Refactor D-Bus annotation class out from D-Bus properties class. |
1091 |
# Add annotation tags for properties
|
1092 |
for tag in if_tag.getElementsByTagName("property"): |
|
1093 |
annots = dict() |
|
1094 |
for name, prop in self._get_all_dbus_things( |
|
1095 |
"property"): |
|
1096 |
if (name == tag.getAttribute("name") |
|
1097 |
and prop._dbus_interface |
|
1098 |
== if_tag.getAttribute("name")): |
|
1099 |
annots.update(getattr( |
|
1100 |
prop, "_dbus_annotations", {})) |
|
1101 |
for name, value in annots.items(): |
|
1102 |
ann_tag = document.createElement( |
|
1103 |
"annotation") |
|
1104 |
ann_tag.setAttribute("name", name) |
|
1105 |
ann_tag.setAttribute("value", value) |
|
1106 |
tag.appendChild(ann_tag) |
|
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1107 |
# Add the names to the return values for the
|
1108 |
# "org.freedesktop.DBus.Properties" methods
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1109 |
if (if_tag.getAttribute("name") |
1110 |
== "org.freedesktop.DBus.Properties"): |
|
1111 |
for cn in if_tag.getElementsByTagName("method"): |
|
1112 |
if cn.getAttribute("name") == "Get": |
|
1113 |
for arg in cn.getElementsByTagName("arg"): |
|
1114 |
if (arg.getAttribute("direction") |
|
1115 |
== "out"): |
|
1116 |
arg.setAttribute("name", "value") |
|
1117 |
elif cn.getAttribute("name") == "GetAll": |
|
1118 |
for arg in cn.getElementsByTagName("arg"): |
|
1119 |
if (arg.getAttribute("direction") |
|
1120 |
== "out"): |
|
1121 |
arg.setAttribute("name", "props") |
|
1122 |
xmlstring = document.toxml("utf-8") |
|
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1123 |
document.unlink() |
1124 |
except (AttributeError, xml.dom.DOMException, |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
1125 |
xml.parsers.expat.ExpatError) as error: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1126 |
logger.error("Failed to override Introspection method", |
237.7.113
by Teddy Hogeborn
* mandos (AvahiService.rename, Client.start_checker, |
1127 |
exc_info=error) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1128 |
return xmlstring |
1129 |
||
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
1130 |
try: |
1131 |
dbus.OBJECT_MANAGER_IFACE |
|
1132 |
except AttributeError: |
|
1133 |
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager" |
|
1134 |
||
1135 |
class DBusObjectWithObjectManager(DBusObjectWithAnnotations): |
|
1136 |
"""A D-Bus object with an ObjectManager. |
|
1137 |
|
|
1138 |
Classes inheriting from this exposes the standard
|
|
1139 |
GetManagedObjects call and the InterfacesAdded and
|
|
1140 |
InterfacesRemoved signals on the standard
|
|
1141 |
"org.freedesktop.DBus.ObjectManager" interface.
|
|
1142 |
|
|
1143 |
Note: No signals are sent automatically; they must be sent
|
|
1144 |
manually.
|
|
1145 |
"""
|
|
1146 |
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE, |
|
1147 |
out_signature = "a{oa{sa{sv}}}") |
|
1148 |
def GetManagedObjects(self): |
|
1149 |
"""This function must be overridden""" |
|
1150 |
raise NotImplementedError() |
|
1151 |
||
1152 |
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, |
|
1153 |
signature = "oa{sa{sv}}") |
|
1154 |
def InterfacesAdded(self, object_path, interfaces_and_properties): |
|
1155 |
pass
|
|
1156 |
||
237.7.334
by Teddy Hogeborn
Server Bug fix: Make D-Bus introspection work again. |
1157 |
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas") |
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
1158 |
def InterfacesRemoved(self, object_path, interfaces): |
1159 |
pass
|
|
1160 |
||
1161 |
@dbus.service.method(dbus.INTROSPECTABLE_IFACE, |
|
1162 |
out_signature = "s", |
|
1163 |
path_keyword = 'object_path', |
|
1164 |
connection_keyword = 'connection') |
|
1165 |
def Introspect(self, object_path, connection): |
|
1166 |
"""Overloading of standard D-Bus method. |
|
1167 |
|
|
1168 |
Override return argument name of GetManagedObjects to be
|
|
1169 |
"objpath_interfaces_and_properties"
|
|
1170 |
"""
|
|
237.7.334
by Teddy Hogeborn
Server Bug fix: Make D-Bus introspection work again. |
1171 |
xmlstring = DBusObjectWithAnnotations.Introspect(self, |
1172 |
object_path, |
|
1173 |
connection) |
|
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
1174 |
try: |
1175 |
document = xml.dom.minidom.parseString(xmlstring) |
|
1176 |
||
1177 |
for if_tag in document.getElementsByTagName("interface"): |
|
1178 |
# Fix argument name for the GetManagedObjects method
|
|
1179 |
if (if_tag.getAttribute("name") |
|
1180 |
== dbus.OBJECT_MANAGER_IFACE): |
|
1181 |
for cn in if_tag.getElementsByTagName("method"): |
|
1182 |
if (cn.getAttribute("name") |
|
1183 |
== "GetManagedObjects"): |
|
1184 |
for arg in cn.getElementsByTagName("arg"): |
|
1185 |
if (arg.getAttribute("direction") |
|
1186 |
== "out"): |
|
1187 |
arg.setAttribute( |
|
1188 |
"name", |
|
1189 |
"objpath_interfaces"
|
|
1190 |
"_and_properties") |
|
1191 |
xmlstring = document.toxml("utf-8") |
|
1192 |
document.unlink() |
|
1193 |
except (AttributeError, xml.dom.DOMException, |
|
1194 |
xml.parsers.expat.ExpatError) as error: |
|
1195 |
logger.error("Failed to override Introspection method", |
|
1196 |
exc_info = error) |
|
1197 |
return xmlstring |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1198 |
|
237.7.135
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Only run man --warnings if both "man" and |
1199 |
def datetime_to_dbus(dt, variant_level=0): |
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1200 |
"""Convert a UTC datetime.datetime() to a D-Bus type.""" |
1201 |
if dt is None: |
|
1202 |
return dbus.String("", variant_level = variant_level) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1203 |
return dbus.String(dt.isoformat(), variant_level=variant_level) |
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1204 |
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
1205 |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1206 |
def alternate_dbus_interfaces(alt_interface_names, deprecate=True): |
1207 |
"""A class decorator; applied to a subclass of |
|
1208 |
dbus.service.Object, it will add alternate D-Bus attributes with
|
|
1209 |
interface names according to the "alt_interface_names" mapping.
|
|
1210 |
Usage:
|
|
1211 |
|
|
237.7.135
by Teddy Hogeborn
* Makefile (DOCBOOKTOMAN): Only run man --warnings if both "man" and |
1212 |
@alternate_dbus_interfaces({"org.example.Interface":
|
1213 |
"net.example.AlternateInterface"})
|
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1214 |
class SampleDBusObject(dbus.service.Object):
|
1215 |
@dbus.service.method("org.example.Interface")
|
|
1216 |
def SampleDBusMethod():
|
|
1217 |
pass
|
|
1218 |
|
|
1219 |
The above "SampleDBusMethod" on "SampleDBusObject" will be
|
|
1220 |
reachable via two interfaces: "org.example.Interface" and
|
|
1221 |
"net.example.AlternateInterface", the latter of which will have
|
|
1222 |
its D-Bus annotation "org.freedesktop.DBus.Deprecated" set to
|
|
1223 |
"true", unless "deprecate" is passed with a False value.
|
|
1224 |
|
|
1225 |
This works for methods and signals, and also for D-Bus properties
|
|
1226 |
(from DBusObjectWithProperties) and interfaces (from the
|
|
1227 |
dbus_interface_annotations decorator).
|
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1228 |
"""
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1229 |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1230 |
def wrapper(cls): |
1231 |
for orig_interface_name, alt_interface_name in ( |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1232 |
alt_interface_names.items()): |
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1233 |
attr = {} |
1234 |
interface_names = set() |
|
1235 |
# Go though all attributes of the class
|
|
1236 |
for attrname, attribute in inspect.getmembers(cls): |
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1237 |
# Ignore non-D-Bus attributes, and D-Bus attributes
|
1238 |
# with the wrong interface name
|
|
1239 |
if (not hasattr(attribute, "_dbus_interface") |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1240 |
or not attribute._dbus_interface.startswith( |
1241 |
orig_interface_name)): |
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1242 |
continue
|
1243 |
# Create an alternate D-Bus interface name based on
|
|
1244 |
# the current name
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1245 |
alt_interface = attribute._dbus_interface.replace( |
1246 |
orig_interface_name, alt_interface_name) |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1247 |
interface_names.add(alt_interface) |
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1248 |
# Is this a D-Bus signal?
|
1249 |
if getattr(attribute, "_dbus_is_signal", False): |
|
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
1250 |
if sys.version_info.major == 2: |
237.7.302
by Teddy Hogeborn
mandos: More Python 3 fixes. |
1251 |
# Extract the original non-method undecorated
|
1252 |
# function by black magic
|
|
1253 |
nonmethod_func = (dict( |
|
1254 |
zip(attribute.func_code.co_freevars, |
|
1255 |
attribute.__closure__)) |
|
1256 |
["func"].cell_contents) |
|
1257 |
else: |
|
1258 |
nonmethod_func = attribute |
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1259 |
# Create a new, but exactly alike, function
|
1260 |
# object, and decorate it to be a new D-Bus signal
|
|
1261 |
# with the alternate D-Bus interface name
|
|
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
1262 |
if sys.version_info.major == 2: |
237.7.302
by Teddy Hogeborn
mandos: More Python 3 fixes. |
1263 |
new_function = types.FunctionType( |
1264 |
nonmethod_func.func_code, |
|
1265 |
nonmethod_func.func_globals, |
|
1266 |
nonmethod_func.func_name, |
|
1267 |
nonmethod_func.func_defaults, |
|
1268 |
nonmethod_func.func_closure) |
|
1269 |
else: |
|
1270 |
new_function = types.FunctionType( |
|
1271 |
nonmethod_func.__code__, |
|
1272 |
nonmethod_func.__globals__, |
|
1273 |
nonmethod_func.__name__, |
|
1274 |
nonmethod_func.__defaults__, |
|
1275 |
nonmethod_func.__closure__) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1276 |
new_function = (dbus.service.signal( |
237.7.302
by Teddy Hogeborn
mandos: More Python 3 fixes. |
1277 |
alt_interface, |
1278 |
attribute._dbus_signature)(new_function)) |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
1279 |
# Copy annotations, if any
|
1280 |
try: |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1281 |
new_function._dbus_annotations = dict( |
1282 |
attribute._dbus_annotations) |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
1283 |
except AttributeError: |
1284 |
pass
|
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1285 |
# Define a creator of a function to call both the
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1286 |
# original and alternate functions, so both the
|
1287 |
# original and alternate signals gets sent when
|
|
1288 |
# the function is called
|
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1289 |
def fixscope(func1, func2): |
1290 |
"""This function is a scope container to pass |
|
1291 |
func1 and func2 to the "call_both" function
|
|
1292 |
outside of its arguments"""
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1293 |
|
237.7.334
by Teddy Hogeborn
Server Bug fix: Make D-Bus introspection work again. |
1294 |
@functools.wraps(func2) |
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1295 |
def call_both(*args, **kwargs): |
1296 |
"""This function will emit two D-Bus |
|
1297 |
signals by calling func1 and func2"""
|
|
1298 |
func1(*args, **kwargs) |
|
1299 |
func2(*args, **kwargs) |
|
237.7.334
by Teddy Hogeborn
Server Bug fix: Make D-Bus introspection work again. |
1300 |
# Make wrapper function look like a D-Bus signal
|
1301 |
for name, attr in inspect.getmembers(func2): |
|
1302 |
if name.startswith("_dbus_"): |
|
1303 |
setattr(call_both, name, attr) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1304 |
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1305 |
return call_both |
1306 |
# Create the "call_both" function and add it to
|
|
1307 |
# the class
|
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1308 |
attr[attrname] = fixscope(attribute, new_function) |
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1309 |
# Is this a D-Bus method?
|
1310 |
elif getattr(attribute, "_dbus_is_method", False): |
|
1311 |
# Create a new, but exactly alike, function
|
|
1312 |
# object. Decorate it to be a new D-Bus method
|
|
1313 |
# with the alternate D-Bus interface name. Add it
|
|
1314 |
# to the class.
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1315 |
attr[attrname] = ( |
1316 |
dbus.service.method( |
|
1317 |
alt_interface, |
|
1318 |
attribute._dbus_in_signature, |
|
1319 |
attribute._dbus_out_signature) |
|
1320 |
(types.FunctionType(attribute.func_code, |
|
1321 |
attribute.func_globals, |
|
1322 |
attribute.func_name, |
|
1323 |
attribute.func_defaults, |
|
1324 |
attribute.func_closure))) |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
1325 |
# Copy annotations, if any
|
1326 |
try: |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1327 |
attr[attrname]._dbus_annotations = dict( |
1328 |
attribute._dbus_annotations) |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
1329 |
except AttributeError: |
1330 |
pass
|
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1331 |
# Is this a D-Bus property?
|
1332 |
elif getattr(attribute, "_dbus_is_property", False): |
|
1333 |
# Create a new, but exactly alike, function
|
|
1334 |
# object, and decorate it to be a new D-Bus
|
|
1335 |
# property with the alternate D-Bus interface
|
|
1336 |
# name. Add it to the class.
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1337 |
attr[attrname] = (dbus_service_property( |
1338 |
alt_interface, attribute._dbus_signature, |
|
1339 |
attribute._dbus_access, |
|
1340 |
attribute._dbus_get_args_options |
|
1341 |
["byte_arrays"]) |
|
1342 |
(types.FunctionType( |
|
1343 |
attribute.func_code, |
|
1344 |
attribute.func_globals, |
|
1345 |
attribute.func_name, |
|
1346 |
attribute.func_defaults, |
|
1347 |
attribute.func_closure))) |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
1348 |
# Copy annotations, if any
|
1349 |
try: |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1350 |
attr[attrname]._dbus_annotations = dict( |
1351 |
attribute._dbus_annotations) |
|
237.19.1
by Teddy Hogeborn
Add D-Bus annotations support to methods, signals and properties. |
1352 |
except AttributeError: |
1353 |
pass
|
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
1354 |
# Is this a D-Bus interface?
|
1355 |
elif getattr(attribute, "_dbus_is_interface", False): |
|
1356 |
# Create a new, but exactly alike, function
|
|
1357 |
# object. Decorate it to be a new D-Bus interface
|
|
1358 |
# with the alternate D-Bus interface name. Add it
|
|
1359 |
# to the class.
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1360 |
attr[attrname] = ( |
1361 |
dbus_interface_annotations(alt_interface) |
|
1362 |
(types.FunctionType(attribute.func_code, |
|
1363 |
attribute.func_globals, |
|
1364 |
attribute.func_name, |
|
1365 |
attribute.func_defaults, |
|
1366 |
attribute.func_closure))) |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1367 |
if deprecate: |
1368 |
# Deprecate all alternate interfaces
|
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
1369 |
iname="_AlternateDBusNames_interface_annotation{}" |
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1370 |
for interface_name in interface_names: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1371 |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1372 |
@dbus_interface_annotations(interface_name) |
1373 |
def func(self): |
|
1374 |
return { "org.freedesktop.DBus.Deprecated": |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1375 |
"true" } |
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1376 |
# Find an unused name
|
1377 |
for aname in (iname.format(i) |
|
1378 |
for i in itertools.count()): |
|
1379 |
if aname not in attr: |
|
1380 |
attr[aname] = func |
|
1381 |
break
|
|
1382 |
if interface_names: |
|
1383 |
# Replace the class with a new subclass of it with
|
|
1384 |
# methods, signals, etc. as created above.
|
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
1385 |
cls = type(b"{}Alternate".format(cls.__name__), |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1386 |
(cls, ), attr) |
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1387 |
return cls |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1388 |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
1389 |
return wrapper |
1390 |
||
1391 |
||
1392 |
@alternate_dbus_interfaces({"se.recompile.Mandos": |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1393 |
"se.bsnet.fukt.Mandos"}) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1394 |
class ClientDBus(Client, DBusObjectWithProperties): |
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1395 |
"""A Client class using D-Bus |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
1396 |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1397 |
Attributes:
|
237.2.101
by Teddy Hogeborn
* mandos: Minor doc string fixes. |
1398 |
dbus_object_path: dbus.ObjectPath
|
1399 |
bus: dbus.SystemBus()
|
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1400 |
"""
|
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
1401 |
|
1402 |
runtime_expansions = (Client.runtime_expansions |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1403 |
+ ("dbus_object_path", )) |
237.2.201
by Teddy Hogeborn
* mandos (Client.runtime_expansions): New attribute containing the |
1404 |
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1405 |
_interface = "se.recompile.Mandos.Client" |
1406 |
||
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1407 |
# dbus.service.Object doesn't use super(), so we can't either.
|
1408 |
||
237.2.100
by Teddy Hogeborn
Code cleanup. Move some global stuff into main. |
1409 |
def __init__(self, bus = None, *args, **kwargs): |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
1410 |
self.bus = bus |
1411 |
Client.__init__(self, *args, **kwargs) |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1412 |
# Only now, when this client is initialized, can it show up on
|
1413 |
# the D-Bus
|
|
237.7.278
by Teddy Hogeborn
mandos: Replace unicode() with str(). |
1414 |
client_object_name = str(self.name).translate( |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1415 |
{ord("."): ord("_"), |
1416 |
ord("-"): ord("_")}) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1417 |
self.dbus_object_path = dbus.ObjectPath( |
1418 |
"/clients/" + client_object_name) |
|
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1419 |
DBusObjectWithProperties.__init__(self, self.bus, |
1420 |
self.dbus_object_path) |
|
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
1421 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1422 |
def notifychangeproperty(transform_func, dbus_name, |
1423 |
type_func=lambda x: x, |
|
1424 |
variant_level=1, |
|
1425 |
invalidate_only=False, |
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1426 |
_interface=_interface): |
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1427 |
""" Modify a variable so that it's a property which announces |
1428 |
its changes to DBus.
|
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
1429 |
|
237.11.15
by Teddy Hogeborn
Bug fix: Make D-Bus properties settable again. |
1430 |
transform_fun: Function that takes a value and a variant_level
|
1431 |
and transforms it to a D-Bus type.
|
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1432 |
dbus_name: D-Bus name of the variable
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1433 |
type_func: Function that transform the value before sending it
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
1434 |
to the D-Bus. Default: no transform
|
1435 |
variant_level: D-Bus variant level. Default: 1
|
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1436 |
"""
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
1437 |
attrname = "_{}".format(dbus_name) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1438 |
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1439 |
def setter(self, value): |
1440 |
if hasattr(self, "dbus_object_path"): |
|
237.11.6
by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance |
1441 |
if (not hasattr(self, attrname) or |
1442 |
type_func(getattr(self, attrname, None)) |
|
1443 |
!= type_func(value)): |
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1444 |
if invalidate_only: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1445 |
self.PropertiesChanged( |
1446 |
_interface, dbus.Dictionary(), |
|
1447 |
dbus.Array((dbus_name, ))) |
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1448 |
else: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1449 |
dbus_value = transform_func( |
1450 |
type_func(value), |
|
1451 |
variant_level = variant_level) |
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1452 |
self.PropertyChanged(dbus.String(dbus_name), |
1453 |
dbus_value) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1454 |
self.PropertiesChanged( |
1455 |
_interface, |
|
1456 |
dbus.Dictionary({ dbus.String(dbus_name): |
|
1457 |
dbus_value }), |
|
1458 |
dbus.Array()) |
|
237.11.6
by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance |
1459 |
setattr(self, attrname, value) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1460 |
|
237.11.6
by Teddy Hogeborn
* mandos (ClientDBus.notifychangeproperty): Bug fix: Use instance |
1461 |
return property(lambda self: getattr(self, attrname), setter) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1462 |
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1463 |
expires = notifychangeproperty(datetime_to_dbus, "Expires") |
1464 |
approvals_pending = notifychangeproperty(dbus.Boolean, |
|
1465 |
"ApprovalPending", |
|
1466 |
type_func = bool) |
|
1467 |
enabled = notifychangeproperty(dbus.Boolean, "Enabled") |
|
1468 |
last_enabled = notifychangeproperty(datetime_to_dbus, |
|
1469 |
"LastEnabled") |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1470 |
checker = notifychangeproperty( |
1471 |
dbus.Boolean, "CheckerRunning", |
|
1472 |
type_func = lambda checker: checker is not None) |
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1473 |
last_checked_ok = notifychangeproperty(datetime_to_dbus, |
1474 |
"LastCheckedOK") |
|
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
1475 |
last_checker_status = notifychangeproperty(dbus.Int16, |
1476 |
"LastCheckerStatus") |
|
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
1477 |
last_approval_request = notifychangeproperty( |
1478 |
datetime_to_dbus, "LastApprovalRequest") |
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1479 |
approved_by_default = notifychangeproperty(dbus.Boolean, |
1480 |
"ApprovedByDefault") |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1481 |
approval_delay = notifychangeproperty( |
1482 |
dbus.UInt64, "ApprovalDelay", |
|
1483 |
type_func = lambda td: td.total_seconds() * 1000) |
|
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
1484 |
approval_duration = notifychangeproperty( |
237.14.9
by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration, |
1485 |
dbus.UInt64, "ApprovalDuration", |
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1486 |
type_func = lambda td: td.total_seconds() * 1000) |
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1487 |
host = notifychangeproperty(dbus.String, "Host") |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1488 |
timeout = notifychangeproperty( |
1489 |
dbus.UInt64, "Timeout", |
|
1490 |
type_func = lambda td: td.total_seconds() * 1000) |
|
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
1491 |
extended_timeout = notifychangeproperty( |
237.14.9
by Teddy Hogeborn
* mandos (ClientDBus.approval_delay, ClientDBus.approval_duration, |
1492 |
dbus.UInt64, "ExtendedTimeout", |
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1493 |
type_func = lambda td: td.total_seconds() * 1000) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1494 |
interval = notifychangeproperty( |
1495 |
dbus.UInt64, "Interval", |
|
1496 |
type_func = lambda td: td.total_seconds() * 1000) |
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1497 |
checker_command = notifychangeproperty(dbus.String, "Checker") |
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1498 |
secret = notifychangeproperty(dbus.ByteArray, "Secret", |
1499 |
invalidate_only=True) |
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1500 |
|
1501 |
del notifychangeproperty |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1502 |
|
1503 |
def __del__(self, *args, **kwargs): |
|
1504 |
try: |
|
1505 |
self.remove_from_connection() |
|
237.2.92
by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do |
1506 |
except LookupError: |
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1507 |
pass
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1508 |
if hasattr(DBusObjectWithProperties, "__del__"): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1509 |
DBusObjectWithProperties.__del__(self, *args, **kwargs) |
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1510 |
Client.__del__(self, *args, **kwargs) |
1511 |
||
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
1512 |
def checker_callback(self, source, condition, |
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
1513 |
connection, command, *args, **kwargs): |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
1514 |
ret = Client.checker_callback(self, source, condition, |
237.7.304
by Teddy Hogeborn
Merge change to use multiprocessing module to run checkers. |
1515 |
connection, command, *args, |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
1516 |
**kwargs) |
1517 |
exitstatus = self.last_checker_status |
|
1518 |
if exitstatus >= 0: |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1519 |
# Emit D-Bus signal
|
1520 |
self.CheckerCompleted(dbus.Int16(exitstatus), |
|
237.7.331
by Teddy Hogeborn
Revert change to D-Bus API. |
1521 |
# This is specific to GNU libC
|
1522 |
dbus.Int64(exitstatus << 8), |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1523 |
dbus.String(command)) |
1524 |
else: |
|
1525 |
# Emit D-Bus signal
|
|
1526 |
self.CheckerCompleted(dbus.Int16(-1), |
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
1527 |
dbus.Int64( |
237.7.331
by Teddy Hogeborn
Revert change to D-Bus API. |
1528 |
# This is specific to GNU libC
|
1529 |
(exitstatus << 8) |
|
1530 |
| self.last_checker_signal), |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1531 |
dbus.String(command)) |
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
1532 |
return ret |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1533 |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1534 |
def start_checker(self, *args, **kwargs): |
237.7.206
by Teddy Hogeborn
* mandos (ClientDBus.start_checker): Removed unused variable |
1535 |
old_checker_pid = getattr(self.checker, "pid", None) |
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1536 |
r = Client.start_checker(self, *args, **kwargs) |
237.2.92
by Teddy Hogeborn
* mandos (ClientDBus.__del__): Bug fix: Correct mispasted code, and do |
1537 |
# Only if new checker process was started
|
1538 |
if (self.checker is not None |
|
1539 |
and old_checker_pid != self.checker.pid): |
|
1540 |
# Emit D-Bus signal
|
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
1541 |
self.CheckerStarted(self.current_checker_command) |
1542 |
return r |
|
1543 |
||
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1544 |
def _reset_approved(self): |
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
1545 |
self.approved = None |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1546 |
return False |
1547 |
||
1548 |
def approve(self, value=True): |
|
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
1549 |
self.approved = value |
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1550 |
gobject.timeout_add(int(self.approval_duration.total_seconds() |
1551 |
* 1000), self._reset_approved) |
|
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
1552 |
self.send_changedstate() |
24.2.1
by teddy at bsnet
* debian/control (mandos/Depends): Added "python-urwid". |
1553 |
|
24.1.147
by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors: |
1554 |
## D-Bus methods, signals & properties
|
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
1555 |
|
237.18.2
by teddy at recompile
Add facilities for D-Bus interface annotations and use them to mark |
1556 |
## Interfaces
|
1557 |
||
24.1.147
by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors: |
1558 |
## Signals
|
237.2.144
by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable |
1559 |
|
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
1560 |
# CheckerCompleted - signal
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1561 |
@dbus.service.signal(_interface, signature="nxs") |
237.2.43
by Teddy Hogeborn
* mandos (Client.CheckerCompleted): Changed signature to "nxs"; return |
1562 |
def CheckerCompleted(self, exitcode, waitstatus, command): |
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
1563 |
"D-Bus signal"
|
1564 |
pass
|
|
1565 |
||
1566 |
# CheckerStarted - signal
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1567 |
@dbus.service.signal(_interface, signature="s") |
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
1568 |
def CheckerStarted(self, command): |
1569 |
"D-Bus signal"
|
|
1570 |
pass
|
|
1571 |
||
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
1572 |
# PropertyChanged - signal
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
1573 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"}) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1574 |
@dbus.service.signal(_interface, signature="sv") |
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
1575 |
def PropertyChanged(self, property, value): |
1576 |
"D-Bus signal"
|
|
1577 |
pass
|
|
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
1578 |
|
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1579 |
# GotSecret - signal
|
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
1580 |
@dbus.service.signal(_interface) |
237.2.150
by Teddy Hogeborn
* mandos (ClientDBus.ReceivedSecret): Renamed to "GotSecret". All |
1581 |
def GotSecret(self): |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1582 |
"""D-Bus signal |
1583 |
Is sent after a successful transfer of secret from the Mandos
|
|
1584 |
server to mandos-client
|
|
1585 |
"""
|
|
24.2.4
by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property |
1586 |
pass
|
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
1587 |
|
1588 |
# Rejected - signal
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1589 |
@dbus.service.signal(_interface, signature="s") |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1590 |
def Rejected(self, reason): |
1591 |
"D-Bus signal"
|
|
24.2.4
by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property |
1592 |
pass
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1593 |
|
1594 |
# NeedApproval - signal
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1595 |
@dbus.service.signal(_interface, signature="tb") |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1596 |
def NeedApproval(self, timeout, default): |
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
1597 |
"D-Bus signal"
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
1598 |
return self.need_approval() |
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
1599 |
|
24.1.147
by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors: |
1600 |
## Methods
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
1601 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1602 |
# Approve - method
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1603 |
@dbus.service.method(_interface, in_signature="b") |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1604 |
def Approve(self, value): |
1605 |
self.approve(value) |
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
1606 |
|
24.1.147
by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors: |
1607 |
# CheckedOK - method
|
1608 |
@dbus.service.method(_interface) |
|
1609 |
def CheckedOK(self): |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
1610 |
self.checked_ok() |
24.1.147
by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors: |
1611 |
|
237.2.144
by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable |
1612 |
# Enable - method
|
237.7.329
by Teddy Hogeborn
Deprecate some D-Bus methods in favor of D-Bus properties. |
1613 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"}) |
237.2.144
by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable |
1614 |
@dbus.service.method(_interface) |
1615 |
def Enable(self): |
|
1616 |
"D-Bus method"
|
|
1617 |
self.enable() |
|
1618 |
||
1619 |
# StartChecker - method
|
|
237.7.329
by Teddy Hogeborn
Deprecate some D-Bus methods in favor of D-Bus properties. |
1620 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"}) |
237.2.144
by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable |
1621 |
@dbus.service.method(_interface) |
1622 |
def StartChecker(self): |
|
1623 |
"D-Bus method"
|
|
1624 |
self.start_checker() |
|
1625 |
||
1626 |
# Disable - method
|
|
237.7.329
by Teddy Hogeborn
Deprecate some D-Bus methods in favor of D-Bus properties. |
1627 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"}) |
237.2.144
by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable |
1628 |
@dbus.service.method(_interface) |
1629 |
def Disable(self): |
|
1630 |
"D-Bus method"
|
|
1631 |
self.disable() |
|
1632 |
||
1633 |
# StopChecker - method
|
|
237.7.329
by Teddy Hogeborn
Deprecate some D-Bus methods in favor of D-Bus properties. |
1634 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"}) |
237.2.144
by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable |
1635 |
@dbus.service.method(_interface) |
1636 |
def StopChecker(self): |
|
1637 |
self.stop_checker() |
|
1638 |
||
24.1.147
by Björn Påhlsson
The IPC pipes are now file objects, not file descriptors: |
1639 |
## Properties
|
1640 |
||
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1641 |
# ApprovalPending - property
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1642 |
@dbus_service_property(_interface, signature="b", access="read") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1643 |
def ApprovalPending_dbus_property(self): |
24.2.4
by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property |
1644 |
return dbus.Boolean(bool(self.approvals_pending)) |
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
1645 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1646 |
# ApprovedByDefault - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1647 |
@dbus_service_property(_interface, |
1648 |
signature="b", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1649 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1650 |
def ApprovedByDefault_dbus_property(self, value=None): |
1651 |
if value is None: # get |
|
1652 |
return dbus.Boolean(self.approved_by_default) |
|
1653 |
self.approved_by_default = bool(value) |
|
1654 |
||
1655 |
# ApprovalDelay - property
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1656 |
@dbus_service_property(_interface, |
1657 |
signature="t", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1658 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1659 |
def ApprovalDelay_dbus_property(self, value=None): |
1660 |
if value is None: # get |
|
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1661 |
return dbus.UInt64(self.approval_delay.total_seconds() |
1662 |
* 1000) |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1663 |
self.approval_delay = datetime.timedelta(0, 0, 0, value) |
1664 |
||
1665 |
# ApprovalDuration - property
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1666 |
@dbus_service_property(_interface, |
1667 |
signature="t", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1668 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1669 |
def ApprovalDuration_dbus_property(self, value=None): |
1670 |
if value is None: # get |
|
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1671 |
return dbus.UInt64(self.approval_duration.total_seconds() |
1672 |
* 1000) |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1673 |
self.approval_duration = datetime.timedelta(0, 0, 0, value) |
1674 |
||
1675 |
# Name - property
|
|
237.7.328
by Teddy Hogeborn
Add D-Bus annotations on a few properties on the Client object. |
1676 |
@dbus_annotations( |
1677 |
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"}) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1678 |
@dbus_service_property(_interface, signature="s", access="read") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1679 |
def Name_dbus_property(self): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1680 |
return dbus.String(self.name) |
1681 |
||
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1682 |
# Fingerprint - property
|
237.7.328
by Teddy Hogeborn
Add D-Bus annotations on a few properties on the Client object. |
1683 |
@dbus_annotations( |
1684 |
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"}) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1685 |
@dbus_service_property(_interface, signature="s", access="read") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1686 |
def Fingerprint_dbus_property(self): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1687 |
return dbus.String(self.fingerprint) |
1688 |
||
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1689 |
# Host - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1690 |
@dbus_service_property(_interface, |
1691 |
signature="s", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1692 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1693 |
def Host_dbus_property(self, value=None): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1694 |
if value is None: # get |
1695 |
return dbus.String(self.host) |
|
237.7.278
by Teddy Hogeborn
mandos: Replace unicode() with str(). |
1696 |
self.host = str(value) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1697 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1698 |
# Created - property
|
237.7.328
by Teddy Hogeborn
Add D-Bus annotations on a few properties on the Client object. |
1699 |
@dbus_annotations( |
1700 |
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"}) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1701 |
@dbus_service_property(_interface, signature="s", access="read") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1702 |
def Created_dbus_property(self): |
237.14.3
by Teddy Hogeborn
Make "enabled" a client config option. |
1703 |
return datetime_to_dbus(self.created) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1704 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1705 |
# LastEnabled - property
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1706 |
@dbus_service_property(_interface, signature="s", access="read") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1707 |
def LastEnabled_dbus_property(self): |
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1708 |
return datetime_to_dbus(self.last_enabled) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1709 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1710 |
# Enabled - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1711 |
@dbus_service_property(_interface, |
1712 |
signature="b", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1713 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1714 |
def Enabled_dbus_property(self, value=None): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1715 |
if value is None: # get |
1716 |
return dbus.Boolean(self.enabled) |
|
1717 |
if value: |
|
1718 |
self.enable() |
|
1719 |
else: |
|
1720 |
self.disable() |
|
1721 |
||
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1722 |
# LastCheckedOK - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1723 |
@dbus_service_property(_interface, |
1724 |
signature="s", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1725 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1726 |
def LastCheckedOK_dbus_property(self, value=None): |
237.2.144
by Teddy Hogeborn
Restore some poor D-Bus methods who got a bit hastily deleted. Enable |
1727 |
if value is not None: |
1728 |
self.checked_ok() |
|
1729 |
return
|
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1730 |
return datetime_to_dbus(self.last_checked_ok) |
24.1.179
by Björn Påhlsson
New feature: |
1731 |
|
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
1732 |
# LastCheckerStatus - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1733 |
@dbus_service_property(_interface, signature="n", access="read") |
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
1734 |
def LastCheckerStatus_dbus_property(self): |
1735 |
return dbus.Int16(self.last_checker_status) |
|
1736 |
||
24.1.179
by Björn Påhlsson
New feature: |
1737 |
# Expires - property
|
1738 |
@dbus_service_property(_interface, signature="s", access="read") |
|
1739 |
def Expires_dbus_property(self): |
|
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1740 |
return datetime_to_dbus(self.expires) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1741 |
|
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
1742 |
# LastApprovalRequest - property
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1743 |
@dbus_service_property(_interface, signature="s", access="read") |
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
1744 |
def LastApprovalRequest_dbus_property(self): |
24.1.182
by Björn Påhlsson
Refactoring code related to PropertyChanged dbus signal. Made sending |
1745 |
return datetime_to_dbus(self.last_approval_request) |
237.2.205
by Teddy Hogeborn
* DBUS-API: Document new "LastApprovalRequest" client property. |
1746 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1747 |
# Timeout - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1748 |
@dbus_service_property(_interface, |
1749 |
signature="t", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1750 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1751 |
def Timeout_dbus_property(self, value=None): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1752 |
if value is None: # get |
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1753 |
return dbus.UInt64(self.timeout.total_seconds() * 1000) |
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
1754 |
old_timeout = self.timeout |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1755 |
self.timeout = datetime.timedelta(0, 0, 0, value) |
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
1756 |
# Reschedule disabling
|
237.7.91
by Teddy Hogeborn
* mandos: Break some long lines. |
1757 |
if self.enabled: |
1758 |
now = datetime.datetime.utcnow() |
|
237.7.129
by Teddy Hogeborn
* mandos (Client.enable, Client.disable, ClientDBus.approve): Call |
1759 |
self.expires += self.timeout - old_timeout |
1760 |
if self.expires <= now: |
|
237.7.91
by Teddy Hogeborn
* mandos: Break some long lines. |
1761 |
# The timeout has passed
|
1762 |
self.disable() |
|
1763 |
else: |
|
1764 |
if (getattr(self, "disable_initiator_tag", None) |
|
1765 |
is None): |
|
1766 |
return
|
|
1767 |
gobject.source_remove(self.disable_initiator_tag) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1768 |
self.disable_initiator_tag = gobject.timeout_add( |
1769 |
int((self.expires - now).total_seconds() * 1000), |
|
1770 |
self.disable) |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1771 |
|
24.1.179
by Björn Påhlsson
New feature: |
1772 |
# ExtendedTimeout - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1773 |
@dbus_service_property(_interface, |
1774 |
signature="t", |
|
24.1.179
by Björn Påhlsson
New feature: |
1775 |
access="readwrite") |
1776 |
def ExtendedTimeout_dbus_property(self, value=None): |
|
1777 |
if value is None: # get |
|
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1778 |
return dbus.UInt64(self.extended_timeout.total_seconds() |
1779 |
* 1000) |
|
24.1.179
by Björn Påhlsson
New feature: |
1780 |
self.extended_timeout = datetime.timedelta(0, 0, 0, value) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1781 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1782 |
# Interval - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1783 |
@dbus_service_property(_interface, |
1784 |
signature="t", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1785 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1786 |
def Interval_dbus_property(self, value=None): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1787 |
if value is None: # get |
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1788 |
return dbus.UInt64(self.interval.total_seconds() * 1000) |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1789 |
self.interval = datetime.timedelta(0, 0, 0, value) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1790 |
if getattr(self, "checker_initiator_tag", None) is None: |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1791 |
return
|
237.14.3
by Teddy Hogeborn
Make "enabled" a client config option. |
1792 |
if self.enabled: |
1793 |
# Reschedule checker run
|
|
1794 |
gobject.source_remove(self.checker_initiator_tag) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1795 |
self.checker_initiator_tag = gobject.timeout_add( |
1796 |
value, self.start_checker) |
|
1797 |
self.start_checker() # Start one now, too |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1798 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1799 |
# Checker - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1800 |
@dbus_service_property(_interface, |
1801 |
signature="s", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1802 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1803 |
def Checker_dbus_property(self, value=None): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1804 |
if value is None: # get |
1805 |
return dbus.String(self.checker_command) |
|
237.7.278
by Teddy Hogeborn
mandos: Replace unicode() with str(). |
1806 |
self.checker_command = str(value) |
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
1807 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1808 |
# CheckerRunning - property
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1809 |
@dbus_service_property(_interface, |
1810 |
signature="b", |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1811 |
access="readwrite") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1812 |
def CheckerRunning_dbus_property(self, value=None): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1813 |
if value is None: # get |
1814 |
return dbus.Boolean(self.checker is not None) |
|
1815 |
if value: |
|
1816 |
self.start_checker() |
|
1817 |
else: |
|
1818 |
self.stop_checker() |
|
1819 |
||
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1820 |
# ObjectPath - property
|
237.7.328
by Teddy Hogeborn
Add D-Bus annotations on a few properties on the Client object. |
1821 |
@dbus_annotations( |
237.7.330
by Teddy Hogeborn
Deprecate the D-Bus property "se.recompile.Mandos.Client.ObjectPath". |
1822 |
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const", |
1823 |
"org.freedesktop.DBus.Deprecated": "true"}) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1824 |
@dbus_service_property(_interface, signature="o", access="read") |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1825 |
def ObjectPath_dbus_property(self): |
237.2.143
by Teddy Hogeborn
Use D-Bus properties instead of our own methods. |
1826 |
return self.dbus_object_path # is already a dbus.ObjectPath |
1827 |
||
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1828 |
# Secret = property
|
237.7.328
by Teddy Hogeborn
Add D-Bus annotations on a few properties on the Client object. |
1829 |
@dbus_annotations( |
1830 |
{"org.freedesktop.DBus.Property.EmitsChangedSignal": |
|
1831 |
"invalidates"}) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1832 |
@dbus_service_property(_interface, |
1833 |
signature="ay", |
|
1834 |
access="write", |
|
1835 |
byte_arrays=True) |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1836 |
def Secret_dbus_property(self, value): |
237.7.277
by Teddy Hogeborn
mandos: Stop using str() and remove unnecessary unicode() calls. |
1837 |
self.secret = bytes(value) |
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
1838 |
|
1839 |
del _interface |
|
3
by Björn Påhlsson
Python based server |
1840 |
|
1841 |
||
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1842 |
class ProxyClient(object): |
1843 |
def __init__(self, child_pipe, fpr, address): |
|
1844 |
self._pipe = child_pipe |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1845 |
self._pipe.send(('init', fpr, address)) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1846 |
if not self._pipe.recv(): |
237.7.300
by Teddy Hogeborn
mandos: Generate better messages in exceptions. |
1847 |
raise KeyError(fpr) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1848 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1849 |
def __getattribute__(self, name): |
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
1850 |
if name == '_pipe': |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1851 |
return super(ProxyClient, self).__getattribute__(name) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1852 |
self._pipe.send(('getattr', name)) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1853 |
data = self._pipe.recv() |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1854 |
if data[0] == 'data': |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1855 |
return data[1] |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1856 |
if data[0] == 'function': |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1857 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1858 |
def func(*args, **kwargs): |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1859 |
self._pipe.send(('funcall', name, args, kwargs)) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1860 |
return self._pipe.recv()[1] |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1861 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1862 |
return func |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1863 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1864 |
def __setattr__(self, name, value): |
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
1865 |
if name == '_pipe': |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1866 |
return super(ProxyClient, self).__setattr__(name, value) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1867 |
self._pipe.send(('setattr', name, value)) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1868 |
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
1869 |
|
237.2.98
by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser" |
1870 |
class ClientHandler(socketserver.BaseRequestHandler, object): |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
1871 |
"""A class to handle client connections. |
1872 |
|
|
1873 |
Instantiated once for each connection to handle it.
|
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
1874 |
Note: This will run in its own forked process."""
|
12
by Teddy Hogeborn
* mandos-clients.conf ([foo]/dn, [foo]/password, [braxen_client]/dn, |
1875 |
|
3
by Björn Påhlsson
Python based server |
1876 |
def handle(self): |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1877 |
with contextlib.closing(self.server.child_pipe) as child_pipe: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1878 |
logger.info("TCP connection from: %s", |
237.7.278
by Teddy Hogeborn
mandos: Replace unicode() with str(). |
1879 |
str(self.client_address)) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1880 |
logger.debug("Pipe FD: %d", |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1881 |
self.server.child_pipe.fileno()) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1882 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1883 |
session = gnutls.connection.ClientSession( |
1884 |
self.request, gnutls.connection .X509Credentials()) |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1885 |
|
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
1886 |
# Note: gnutls.connection.X509Credentials is really a
|
1887 |
# generic GnuTLS certificate credentials object so long as
|
|
1888 |
# no X.509 keys are added to it. Therefore, we can use it
|
|
1889 |
# here despite using OpenPGP certificates.
|
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1890 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1891 |
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
|
1892 |
# "+AES-256-CBC", "+SHA1",
|
|
1893 |
# "+COMP-NULL", "+CTYPE-OPENPGP",
|
|
1894 |
# "+DHE-DSS"))
|
|
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
1895 |
# Use a fallback default, since this MUST be set.
|
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
1896 |
priority = self.server.gnutls_priority |
1897 |
if priority is None: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1898 |
priority = "NORMAL" |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1899 |
gnutls.library.functions.gnutls_priority_set_direct( |
1900 |
session._c_object, priority, None) |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1901 |
|
237.5.2
by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object |
1902 |
# Start communication using the Mandos protocol
|
1903 |
# Get protocol number
|
|
1904 |
line = self.request.makefile().readline() |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1905 |
logger.debug("Protocol version: %r", line) |
237.5.2
by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object |
1906 |
try: |
1907 |
if int(line.strip().split()[0]) > 1: |
|
237.7.190
by Teddy Hogeborn
Syntax fix; use "raise" better in Mandos server. |
1908 |
raise RuntimeError(line) |
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
1909 |
except (ValueError, IndexError, RuntimeError) as error: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1910 |
logger.error("Unknown protocol version: %s", error) |
237.5.2
by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object |
1911 |
return
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1912 |
|
237.5.2
by Teddy Hogeborn
* mandos (ClientHandler.handle): Set up the GnuTLS session object |
1913 |
# Start GnuTLS connection
|
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
1914 |
try: |
1915 |
session.handshake() |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
1916 |
except gnutls.errors.GNUTLSError as error: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1917 |
logger.warning("Handshake failed: %s", error) |
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
1918 |
# Do not run session.bye() here: the session is not
|
1919 |
# established. Just abandon the request.
|
|
1920 |
return
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1921 |
logger.debug("Handshake succeeded") |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1922 |
|
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
1923 |
approval_required = False |
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
1924 |
try: |
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
1925 |
try: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1926 |
fpr = self.fingerprint( |
1927 |
self.peer_certificate(session)) |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
1928 |
except (TypeError, |
1929 |
gnutls.errors.GNUTLSError) as error: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1930 |
logger.warning("Bad certificate: %s", error) |
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
1931 |
return
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1932 |
logger.debug("Fingerprint: %s", fpr) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
1933 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1934 |
try: |
1935 |
client = ProxyClient(child_pipe, fpr, |
|
1936 |
self.client_address) |
|
1937 |
except KeyError: |
|
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
1938 |
return
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1939 |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
1940 |
if client.approval_delay: |
1941 |
delay = client.approval_delay |
|
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
1942 |
client.approvals_pending += 1 |
1943 |
approval_required = True |
|
1944 |
||
24.1.148
by Björn Påhlsson
half working on-demand password and approved code |
1945 |
while True: |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1946 |
if not client.enabled: |
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
1947 |
logger.info("Client %s is disabled", |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
1948 |
client.name) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1949 |
if self.server.use_dbus: |
1950 |
# Emit D-Bus signal
|
|
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
1951 |
client.Rejected("Disabled") |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1952 |
return
|
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
1953 |
|
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
1954 |
if client.approved or not client.approval_delay: |
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
1955 |
#We are approved or approval is disabled
|
1956 |
break
|
|
237.14.4
by Teddy Hogeborn
* mandos (_timedelta_to_milliseconds): Renamed to |
1957 |
elif client.approved is None: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1958 |
logger.info("Client %s needs approval", |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1959 |
client.name) |
1960 |
if self.server.use_dbus: |
|
1961 |
# Emit D-Bus signal
|
|
1962 |
client.NeedApproval( |
|
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1963 |
client.approval_delay.total_seconds() |
1964 |
* 1000, client.approved_by_default) |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1965 |
else: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1966 |
logger.warning("Client %s was not approved", |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1967 |
client.name) |
1968 |
if self.server.use_dbus: |
|
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
1969 |
# Emit D-Bus signal
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1970 |
client.Rejected("Denied") |
24.1.148
by Björn Påhlsson
half working on-demand password and approved code |
1971 |
return
|
1972 |
||
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1973 |
#wait until timeout or approved
|
1974 |
time = datetime.datetime.now() |
|
1975 |
client.changedstate.acquire() |
|
237.23.6
by Teddy Hogeborn
Use the new .total_seconds() method on datetime.timedelta objects. |
1976 |
client.changedstate.wait(delay.total_seconds()) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1977 |
client.changedstate.release() |
1978 |
time2 = datetime.datetime.now() |
|
1979 |
if (time2 - time) >= delay: |
|
1980 |
if not client.approved_by_default: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1981 |
logger.warning("Client %s timed out while" |
1982 |
" waiting for approval", |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1983 |
client.name) |
1984 |
if self.server.use_dbus: |
|
1985 |
# Emit D-Bus signal
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
1986 |
client.Rejected("Approval timed out") |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
1987 |
return
|
1988 |
else: |
|
1989 |
break
|
|
1990 |
else: |
|
1991 |
delay -= time2 - time |
|
1992 |
||
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
1993 |
sent_size = 0 |
1994 |
while sent_size < len(client.secret): |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
1995 |
try: |
1996 |
sent = session.send(client.secret[sent_size:]) |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
1997 |
except gnutls.errors.GNUTLSError as error: |
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
1998 |
logger.warning("gnutls send failed", |
1999 |
exc_info=error) |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
2000 |
return
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2001 |
logger.debug("Sent: %d, remaining: %d", sent, |
2002 |
len(client.secret) - (sent_size |
|
2003 |
+ sent)) |
|
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
2004 |
sent_size += sent |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2005 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2006 |
logger.info("Sending secret to %s", client.name) |
237.11.13
by Teddy Hogeborn
Miscellaneous fixes prompted by lintian: |
2007 |
# bump the timeout using extended_timeout
|
237.7.104
by Teddy Hogeborn
* DBUS-API (se.recompile.Mandos.Client.LastCheckerStatus): New |
2008 |
client.bump_timeout(client.extended_timeout) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2009 |
if self.server.use_dbus: |
2010 |
# Emit D-Bus signal
|
|
2011 |
client.GotSecret() |
|
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
2012 |
|
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
2013 |
finally: |
24.1.150
by Björn Påhlsson
* mandos: Added ClientDBus.approve_pending property. Exposed |
2014 |
if approval_required: |
2015 |
client.approvals_pending -= 1 |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
2016 |
try: |
2017 |
session.bye() |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
2018 |
except gnutls.errors.GNUTLSError as error: |
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
2019 |
logger.warning("GnuTLS bye failed", |
2020 |
exc_info=error) |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2021 |
|
2022 |
@staticmethod
|
|
2023 |
def peer_certificate(session): |
|
2024 |
"Return the peer's OpenPGP certificate as a bytestring"
|
|
2025 |
# If not an OpenPGP certificate...
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2026 |
if (gnutls.library.functions.gnutls_certificate_type_get( |
2027 |
session._c_object) |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2028 |
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP): |
2029 |
# ...do the normal thing
|
|
2030 |
return session.peer_certificate |
|
2031 |
list_size = ctypes.c_uint(1) |
|
2032 |
cert_list = (gnutls.library.functions |
|
2033 |
.gnutls_certificate_get_peers |
|
2034 |
(session._c_object, ctypes.byref(list_size))) |
|
2035 |
if not bool(cert_list) and list_size.value != 0: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2036 |
raise gnutls.errors.GNUTLSError("error getting peer" |
2037 |
" certificate") |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2038 |
if list_size.value == 0: |
2039 |
return None |
|
2040 |
cert = cert_list[0] |
|
2041 |
return ctypes.string_at(cert.data, cert.size) |
|
2042 |
||
2043 |
@staticmethod
|
|
2044 |
def fingerprint(openpgp): |
|
2045 |
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
|
|
2046 |
# New GnuTLS "datum" with the OpenPGP public key
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2047 |
datum = gnutls.library.types.gnutls_datum_t( |
2048 |
ctypes.cast(ctypes.c_char_p(openpgp), |
|
2049 |
ctypes.POINTER(ctypes.c_ubyte)), |
|
2050 |
ctypes.c_uint(len(openpgp))) |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2051 |
# New empty GnuTLS certificate
|
2052 |
crt = gnutls.library.types.gnutls_openpgp_crt_t() |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2053 |
gnutls.library.functions.gnutls_openpgp_crt_init( |
2054 |
ctypes.byref(crt)) |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2055 |
# Import the OpenPGP public key into the certificate
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2056 |
gnutls.library.functions.gnutls_openpgp_crt_import( |
2057 |
crt, ctypes.byref(datum), |
|
2058 |
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW) |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2059 |
# Verify the self signature in the key
|
2060 |
crtverify = ctypes.c_uint() |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2061 |
gnutls.library.functions.gnutls_openpgp_crt_verify_self( |
2062 |
crt, 0, ctypes.byref(crtverify)) |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2063 |
if crtverify.value != 0: |
2064 |
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2065 |
raise gnutls.errors.CertificateSecurityError( |
2066 |
"Verify failed") |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2067 |
# New buffer for the fingerprint
|
2068 |
buf = ctypes.create_string_buffer(20) |
|
2069 |
buf_len = ctypes.c_size_t() |
|
2070 |
# Get the fingerprint from the certificate into the buffer
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2071 |
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint( |
2072 |
crt, ctypes.byref(buf), ctypes.byref(buf_len)) |
|
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2073 |
# Deinit the certificate
|
2074 |
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt) |
|
2075 |
# Convert the buffer to a Python bytestring
|
|
2076 |
fpr = ctypes.string_at(buf, buf_len.value) |
|
2077 |
# Convert the bytestring to hexadecimal notation
|
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
2078 |
hex_fpr = binascii.hexlify(fpr).upper() |
237.2.93
by Teddy Hogeborn
* mandos (peer_certificate, fingerprint): Moved into "TCP_handler" |
2079 |
return hex_fpr |
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
2080 |
|
2081 |
||
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2082 |
class MultiprocessingMixIn(object): |
2083 |
"""Like socketserver.ThreadingMixIn, but with multiprocessing""" |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2084 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2085 |
def sub_process_main(self, request, address): |
2086 |
try: |
|
2087 |
self.finish_request(request, address) |
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
2088 |
except Exception: |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2089 |
self.handle_error(request, address) |
2090 |
self.close_request(request) |
|
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2091 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2092 |
def process_request(self, request, address): |
2093 |
"""Start a new process to process the request.""" |
|
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2094 |
proc = multiprocessing.Process(target = self.sub_process_main, |
237.7.127
by Teddy Hogeborn
* mandos: Use all new builtins. |
2095 |
args = (request, address)) |
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2096 |
proc.start() |
2097 |
return proc |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2098 |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2099 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2100 |
class MultiprocessingMixInWithPipe(MultiprocessingMixIn, object): |
2101 |
""" adds a pipe to the MixIn """ |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2102 |
|
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
2103 |
def process_request(self, request, client_address): |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2104 |
"""Overrides and wraps the original process_request(). |
2105 |
|
|
237.2.118
by Teddy Hogeborn
* mandos: White-space fixes only. |
2106 |
This function creates a new pipe in self.pipe
|
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
2107 |
"""
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2108 |
parent_pipe, self.child_pipe = multiprocessing.Pipe() |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2109 |
|
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2110 |
proc = MultiprocessingMixIn.process_request(self, request, |
2111 |
client_address) |
|
24.1.152
by Björn Påhlsson
bug fixes that prevent problems when runing server as root |
2112 |
self.child_pipe.close() |
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2113 |
self.add_pipe(parent_pipe, proc) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2114 |
|
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2115 |
def add_pipe(self, parent_pipe, proc): |
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
2116 |
"""Dummy function; override as necessary""" |
237.7.190
by Teddy Hogeborn
Syntax fix; use "raise" better in Mandos server. |
2117 |
raise NotImplementedError() |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2118 |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2119 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2120 |
class IPv6_TCPServer(MultiprocessingMixInWithPipe, |
237.2.98
by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser" |
2121 |
socketserver.TCPServer, object): |
250
by Teddy Hogeborn
Merge from trunk. Notable changes: |
2122 |
"""IPv6-capable TCP server. Accepts 'None' as address and/or port |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2123 |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2124 |
Attributes:
|
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2125 |
enabled: Boolean; whether this server is activated yet
|
2126 |
interface: None or a network interface name (string)
|
|
2127 |
use_ipv6: Boolean; to use IPv6 or not
|
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2128 |
"""
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2129 |
|
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2130 |
def __init__(self, server_address, RequestHandlerClass, |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2131 |
interface=None, |
2132 |
use_ipv6=True, |
|
2133 |
socketfd=None): |
|
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2134 |
"""If socketfd is set, use that file descriptor instead of |
2135 |
creating a new one with socket.socket().
|
|
2136 |
"""
|
|
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2137 |
self.interface = interface |
2138 |
if use_ipv6: |
|
2139 |
self.address_family = socket.AF_INET6 |
|
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2140 |
if socketfd is not None: |
2141 |
# Save the file descriptor
|
|
2142 |
self.socketfd = socketfd |
|
2143 |
# Save the original socket.socket() function
|
|
2144 |
self.socket_socket = socket.socket |
|
2145 |
# To implement --socket, we monkey patch socket.socket.
|
|
2146 |
#
|
|
2147 |
# (When socketserver.TCPServer is a new-style class, we
|
|
2148 |
# could make self.socket into a property instead of monkey
|
|
2149 |
# patching socket.socket.)
|
|
2150 |
#
|
|
2151 |
# Create a one-time-only replacement for socket.socket()
|
|
2152 |
@functools.wraps(socket.socket) |
|
2153 |
def socket_wrapper(*args, **kwargs): |
|
2154 |
# Restore original function so subsequent calls are
|
|
2155 |
# not affected.
|
|
2156 |
socket.socket = self.socket_socket |
|
2157 |
del self.socket_socket |
|
2158 |
# This time only, return a new socket object from the
|
|
2159 |
# saved file descriptor.
|
|
2160 |
return socket.fromfd(self.socketfd, *args, **kwargs) |
|
2161 |
# Replace socket.socket() function with wrapper
|
|
2162 |
socket.socket = socket_wrapper |
|
2163 |
# The socketserver.TCPServer.__init__ will call
|
|
2164 |
# socket.socket(), which might be our replacement,
|
|
2165 |
# socket_wrapper(), if socketfd was set.
|
|
237.2.98
by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser" |
2166 |
socketserver.TCPServer.__init__(self, server_address, |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2167 |
RequestHandlerClass) |
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2168 |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2169 |
def server_bind(self): |
2170 |
"""This overrides the normal server_bind() function |
|
2171 |
to bind to an interface if one was specified, and also NOT to
|
|
2172 |
bind to an address or port if they were not specified."""
|
|
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2173 |
if self.interface is not None: |
237.2.101
by Teddy Hogeborn
* mandos: Minor doc string fixes. |
2174 |
if SO_BINDTODEVICE is None: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2175 |
logger.error("SO_BINDTODEVICE does not exist;" |
2176 |
" cannot bind to interface %s", |
|
237.2.101
by Teddy Hogeborn
* mandos: Minor doc string fixes. |
2177 |
self.interface) |
2178 |
else: |
|
2179 |
try: |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2180 |
self.socket.setsockopt( |
2181 |
socket.SOL_SOCKET, SO_BINDTODEVICE, |
|
2182 |
(self.interface + "\0").encode("utf-8")) |
|
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
2183 |
except socket.error as error: |
237.7.130
by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: handle non-existing |
2184 |
if error.errno == errno.EPERM: |
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2185 |
logger.error("No permission to bind to" |
2186 |
" interface %s", self.interface) |
|
237.7.130
by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: handle non-existing |
2187 |
elif error.errno == errno.ENOPROTOOPT: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2188 |
logger.error("SO_BINDTODEVICE not available;" |
2189 |
" cannot bind to interface %s", |
|
237.2.101
by Teddy Hogeborn
* mandos: Minor doc string fixes. |
2190 |
self.interface) |
237.7.130
by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: handle non-existing |
2191 |
elif error.errno == errno.ENODEV: |
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2192 |
logger.error("Interface %s does not exist," |
2193 |
" cannot bind", self.interface) |
|
237.2.101
by Teddy Hogeborn
* mandos: Minor doc string fixes. |
2194 |
else: |
2195 |
raise
|
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2196 |
# Only bind(2) the socket if we really need to.
|
2197 |
if self.server_address[0] or self.server_address[1]: |
|
2198 |
if not self.server_address[0]: |
|
237.2.77
by Teddy Hogeborn
Support not using IPv6 in server: |
2199 |
if self.address_family == socket.AF_INET6: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2200 |
any_address = "::" # in6addr_any |
237.2.77
by Teddy Hogeborn
Support not using IPv6 in server: |
2201 |
else: |
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2202 |
any_address = "0.0.0.0" # INADDR_ANY |
237.2.77
by Teddy Hogeborn
Support not using IPv6 in server: |
2203 |
self.server_address = (any_address, |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2204 |
self.server_address[1]) |
49
by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty |
2205 |
elif not self.server_address[1]: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2206 |
self.server_address = (self.server_address[0], 0) |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2207 |
# if self.interface:
|
49
by Teddy Hogeborn
* mandos (IPv6_TCPServer.server_bind): Bug fix: allow port to be empty |
2208 |
# self.server_address = (self.server_address[0],
|
2209 |
# 0, # port
|
|
2210 |
# 0, # flowinfo
|
|
2211 |
# if_nametoindex
|
|
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2212 |
# (self.interface))
|
237.2.98
by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser" |
2213 |
return socketserver.TCPServer.server_bind(self) |
237.2.102
by Teddy Hogeborn
Code cleanup. |
2214 |
|
2215 |
||
2216 |
class MandosServer(IPv6_TCPServer): |
|
2217 |
"""Mandos server. |
|
2218 |
|
|
2219 |
Attributes:
|
|
2220 |
clients: set of Client objects
|
|
2221 |
gnutls_priority GnuTLS priority string
|
|
2222 |
use_dbus: Boolean; to emit D-Bus signals or not
|
|
237.2.103
by Teddy Hogeborn
Code cleanup. |
2223 |
|
2224 |
Assumes a gobject.MainLoop event loop.
|
|
237.2.102
by Teddy Hogeborn
Code cleanup. |
2225 |
"""
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2226 |
|
237.2.102
by Teddy Hogeborn
Code cleanup. |
2227 |
def __init__(self, server_address, RequestHandlerClass, |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2228 |
interface=None, |
2229 |
use_ipv6=True, |
|
2230 |
clients=None, |
|
2231 |
gnutls_priority=None, |
|
2232 |
use_dbus=True, |
|
2233 |
socketfd=None): |
|
237.2.102
by Teddy Hogeborn
Code cleanup. |
2234 |
self.enabled = False |
2235 |
self.clients = clients |
|
237.2.104
by Teddy Hogeborn
Code cleanup and one bug fix. |
2236 |
if self.clients is None: |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2237 |
self.clients = {} |
237.2.102
by Teddy Hogeborn
Code cleanup. |
2238 |
self.use_dbus = use_dbus |
2239 |
self.gnutls_priority = gnutls_priority |
|
2240 |
IPv6_TCPServer.__init__(self, server_address, |
|
2241 |
RequestHandlerClass, |
|
2242 |
interface = interface, |
|
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2243 |
use_ipv6 = use_ipv6, |
2244 |
socketfd = socketfd) |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2245 |
|
163
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed. |
2246 |
def server_activate(self): |
2247 |
if self.enabled: |
|
237.2.98
by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser" |
2248 |
return socketserver.TCPServer.server_activate(self) |
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2249 |
|
163
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed. |
2250 |
def enable(self): |
2251 |
self.enabled = True |
|
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2252 |
|
2253 |
def add_pipe(self, parent_pipe, proc): |
|
237.2.103
by Teddy Hogeborn
Code cleanup. |
2254 |
# Call "handle_ipc" for both data and EOF events
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2255 |
gobject.io_add_watch( |
2256 |
parent_pipe.fileno(), |
|
2257 |
gobject.IO_IN | gobject.IO_HUP, |
|
2258 |
functools.partial(self.handle_ipc, |
|
2259 |
parent_pipe = parent_pipe, |
|
2260 |
proc = proc)) |
|
237.11.9
by Teddy Hogeborn
Whitespace |
2261 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2262 |
def handle_ipc(self, source, condition, |
2263 |
parent_pipe=None, |
|
2264 |
proc = None, |
|
2265 |
client_object=None): |
|
237.11.13
by Teddy Hogeborn
Miscellaneous fixes prompted by lintian: |
2266 |
# error, or the other end of multiprocessing.Pipe has closed
|
237.7.125
by Teddy Hogeborn
* mandos (Client.start_checker): Reworded comment. |
2267 |
if condition & (gobject.IO_ERR | gobject.IO_HUP): |
237.11.13
by Teddy Hogeborn
Miscellaneous fixes prompted by lintian: |
2268 |
# Wait for other process to exit
|
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
2269 |
proc.join() |
24.1.152
by Björn Påhlsson
bug fixes that prevent problems when runing server as root |
2270 |
return False |
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
2271 |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2272 |
# Read a request from the child
|
2273 |
request = parent_pipe.recv() |
|
2274 |
command = request[0] |
|
2275 |
||
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2276 |
if command == 'init': |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2277 |
fpr = request[1] |
2278 |
address = request[2] |
|
2279 |
||
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2280 |
for c in self.clients.itervalues(): |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2281 |
if c.fingerprint == fpr: |
2282 |
client = c |
|
2283 |
break
|
|
2284 |
else: |
|
24.1.174
by Björn Påhlsson
* Makefile (CFLAGS): Added "-lrt" to include real time library. |
2285 |
logger.info("Client not found for fingerprint: %s, ad" |
2286 |
"dress: %s", fpr, address) |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2287 |
if self.use_dbus: |
2288 |
# Emit D-Bus signal
|
|
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
2289 |
mandos_dbus_service.ClientNotFound(fpr, |
2290 |
address[0]) |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2291 |
parent_pipe.send(False) |
2292 |
return False |
|
2293 |
||
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2294 |
gobject.io_add_watch( |
2295 |
parent_pipe.fileno(), |
|
2296 |
gobject.IO_IN | gobject.IO_HUP, |
|
2297 |
functools.partial(self.handle_ipc, |
|
2298 |
parent_pipe = parent_pipe, |
|
2299 |
proc = proc, |
|
2300 |
client_object = client)) |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2301 |
parent_pipe.send(True) |
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
2302 |
# remove the old hook in favor of the new above hook on
|
2303 |
# same fileno
|
|
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
2304 |
return False |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2305 |
if command == 'funcall': |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2306 |
funcname = request[1] |
2307 |
args = request[2] |
|
2308 |
kwargs = request[3] |
|
2309 |
||
237.11.3
by Teddy Hogeborn
* mandos: Break long lines. |
2310 |
parent_pipe.send(('data', getattr(client_object, |
2311 |
funcname)(*args, |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2312 |
**kwargs))) |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2313 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2314 |
if command == 'getattr': |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2315 |
attrname = request[1] |
237.7.303
by Teddy Hogeborn
mandos: More Python 3 fixes. |
2316 |
if isinstance(client_object.__getattribute__(attrname), |
2317 |
collections.Callable): |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2318 |
parent_pipe.send(('function', )) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2319 |
else: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2320 |
parent_pipe.send(( |
2321 |
'data', client_object.__getattribute__(attrname))) |
|
24.2.4
by teddy at bsnet
* mandos (ClientDBus.approvals_pending): Changed to be a property |
2322 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2323 |
if command == 'setattr': |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2324 |
attrname = request[1] |
2325 |
value = request[2] |
|
2326 |
setattr(client_object, attrname, value) |
|
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2327 |
|
237.4.1
by Teddy Hogeborn
Start of new pipe-based IPC mechanism. |
2328 |
return True |
10
by Teddy Hogeborn
* server.py: Bug fix: Do "from __future__ import division". |
2329 |
|
3
by Björn Påhlsson
Python based server |
2330 |
|
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2331 |
def rfc3339_duration_to_delta(duration): |
2332 |
"""Parse an RFC 3339 "duration" and return a datetime.timedelta |
|
2333 |
|
|
2334 |
>>> rfc3339_duration_to_delta("P7D")
|
|
2335 |
datetime.timedelta(7)
|
|
2336 |
>>> rfc3339_duration_to_delta("PT60S")
|
|
2337 |
datetime.timedelta(0, 60)
|
|
2338 |
>>> rfc3339_duration_to_delta("PT60M")
|
|
2339 |
datetime.timedelta(0, 3600)
|
|
2340 |
>>> rfc3339_duration_to_delta("PT24H")
|
|
2341 |
datetime.timedelta(1)
|
|
2342 |
>>> rfc3339_duration_to_delta("P1W")
|
|
2343 |
datetime.timedelta(7)
|
|
2344 |
>>> rfc3339_duration_to_delta("PT5M30S")
|
|
2345 |
datetime.timedelta(0, 330)
|
|
2346 |
>>> rfc3339_duration_to_delta("P1DT3M20S")
|
|
2347 |
datetime.timedelta(1, 200)
|
|
2348 |
"""
|
|
2349 |
||
2350 |
# Parsing an RFC 3339 duration with regular expressions is not
|
|
2351 |
# possible - there would have to be multiple places for the same
|
|
2352 |
# values, like seconds. The current code, while more esoteric, is
|
|
2353 |
# cleaner without depending on a parsing library. If Python had a
|
|
2354 |
# built-in library for parsing we would use it, but we'd like to
|
|
2355 |
# avoid excessive use of external libraries.
|
|
2356 |
||
2357 |
# New type for defining tokens, syntax, and semantics all-in-one
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2358 |
Token = collections.namedtuple("Token", ( |
2359 |
"regexp", # To match token; if "value" is not None, must have |
|
2360 |
# a "group" containing digits
|
|
2361 |
"value", # datetime.timedelta or None |
|
2362 |
"followers")) # Tokens valid after this token |
|
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2363 |
# RFC 3339 "duration" tokens, syntax, and semantics; taken from
|
2364 |
# the "duration" ABNF definition in RFC 3339, Appendix A.
|
|
2365 |
token_end = Token(re.compile(r"$"), None, frozenset()) |
|
2366 |
token_second = Token(re.compile(r"(\d+)S"), |
|
2367 |
datetime.timedelta(seconds=1), |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2368 |
frozenset((token_end, ))) |
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2369 |
token_minute = Token(re.compile(r"(\d+)M"), |
2370 |
datetime.timedelta(minutes=1), |
|
2371 |
frozenset((token_second, token_end))) |
|
2372 |
token_hour = Token(re.compile(r"(\d+)H"), |
|
2373 |
datetime.timedelta(hours=1), |
|
2374 |
frozenset((token_minute, token_end))) |
|
2375 |
token_time = Token(re.compile(r"T"), |
|
2376 |
None, |
|
2377 |
frozenset((token_hour, token_minute, |
|
2378 |
token_second))) |
|
2379 |
token_day = Token(re.compile(r"(\d+)D"), |
|
2380 |
datetime.timedelta(days=1), |
|
2381 |
frozenset((token_time, token_end))) |
|
2382 |
token_month = Token(re.compile(r"(\d+)M"), |
|
2383 |
datetime.timedelta(weeks=4), |
|
2384 |
frozenset((token_day, token_end))) |
|
2385 |
token_year = Token(re.compile(r"(\d+)Y"), |
|
2386 |
datetime.timedelta(weeks=52), |
|
2387 |
frozenset((token_month, token_end))) |
|
2388 |
token_week = Token(re.compile(r"(\d+)W"), |
|
2389 |
datetime.timedelta(weeks=1), |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2390 |
frozenset((token_end, ))) |
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2391 |
token_duration = Token(re.compile(r"P"), None, |
2392 |
frozenset((token_year, token_month, |
|
2393 |
token_day, token_time, |
|
237.7.269
by Teddy Hogeborn
Fix two mutually cancelling bugs. |
2394 |
token_week))) |
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2395 |
# Define starting values
|
2396 |
value = datetime.timedelta() # Value so far |
|
2397 |
found_token = None |
|
237.7.301
by Teddy Hogeborn
mandos-ctl: Generate better messages in exceptions. |
2398 |
followers = frozenset((token_duration, )) # Following valid tokens |
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2399 |
s = duration # String left to parse |
2400 |
# Loop until end token is found
|
|
2401 |
while found_token is not token_end: |
|
2402 |
# Search for any currently valid tokens
|
|
2403 |
for token in followers: |
|
2404 |
match = token.regexp.match(s) |
|
2405 |
if match is not None: |
|
2406 |
# Token found
|
|
2407 |
if token.value is not None: |
|
2408 |
# Value found, parse digits
|
|
2409 |
factor = int(match.group(1), 10) |
|
2410 |
# Add to value so far
|
|
2411 |
value += factor * token.value |
|
2412 |
# Strip token from string
|
|
2413 |
s = token.regexp.sub("", s, 1) |
|
2414 |
# Go to found token
|
|
2415 |
found_token = token |
|
2416 |
# Set valid next tokens
|
|
2417 |
followers = found_token.followers |
|
2418 |
break
|
|
2419 |
else: |
|
2420 |
# No currently valid tokens were found
|
|
237.7.300
by Teddy Hogeborn
mandos: Generate better messages in exceptions. |
2421 |
raise ValueError("Invalid RFC 3339 duration: {!r}" |
2422 |
.format(duration)) |
|
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2423 |
# End token found
|
2424 |
return value |
|
2425 |
||
2426 |
||
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2427 |
def string_to_delta(interval): |
2428 |
"""Parse a string and return a datetime.timedelta |
|
237.2.53
by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS |
2429 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2430 |
>>> string_to_delta('7d')
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2431 |
datetime.timedelta(7)
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2432 |
>>> string_to_delta('60s')
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2433 |
datetime.timedelta(0, 60)
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2434 |
>>> string_to_delta('60m')
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2435 |
datetime.timedelta(0, 3600)
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2436 |
>>> string_to_delta('24h')
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2437 |
datetime.timedelta(1)
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2438 |
>>> string_to_delta('1w')
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2439 |
datetime.timedelta(7)
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2440 |
>>> string_to_delta('5m 30s')
|
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2441 |
datetime.timedelta(0, 330)
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2442 |
"""
|
237.7.157
by Teddy Hogeborn
* clients.conf: Convert all time intervals to new RFC 3339 syntax. |
2443 |
|
2444 |
try: |
|
2445 |
return rfc3339_duration_to_delta(interval) |
|
2446 |
except ValueError: |
|
2447 |
pass
|
|
2448 |
||
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2449 |
timevalue = datetime.timedelta(0) |
2450 |
for s in interval.split(): |
|
2451 |
try: |
|
237.7.277
by Teddy Hogeborn
mandos: Stop using str() and remove unnecessary unicode() calls. |
2452 |
suffix = s[-1] |
215
by Teddy Hogeborn
* mandos: Remove unused "select" module. Import "ctypes.util". |
2453 |
value = int(s[:-1]) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2454 |
if suffix == "d": |
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2455 |
delta = datetime.timedelta(value) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2456 |
elif suffix == "s": |
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2457 |
delta = datetime.timedelta(0, value) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2458 |
elif suffix == "m": |
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2459 |
delta = datetime.timedelta(0, 0, 0, 0, value) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2460 |
elif suffix == "h": |
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2461 |
delta = datetime.timedelta(0, 0, 0, 0, 0, value) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2462 |
elif suffix == "w": |
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2463 |
delta = datetime.timedelta(0, 0, 0, 0, 0, 0, value) |
2464 |
else: |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2465 |
raise ValueError("Unknown suffix {!r}".format(suffix)) |
237.7.190
by Teddy Hogeborn
Syntax fix; use "raise" better in Mandos server. |
2466 |
except IndexError as e: |
237.7.12
by Teddy Hogeborn
* debian/mandos-client.postrm (purge): Bug fix: update initramfs also |
2467 |
raise ValueError(*(e.args)) |
93
by Teddy Hogeborn
* mandos (string_to_delta): Accept a whitespace-separated sequence of |
2468 |
timevalue += delta |
2469 |
return timevalue |
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2470 |
|
8
by Teddy Hogeborn
* Makefile (client_debug): Bug fix; add quotes and / to CERT_ROOT. |
2471 |
|
47
by Teddy Hogeborn
* plugbasedclient.c: Renamed to "mandos-client.c". All users changed. |
2472 |
def daemon(nochdir = False, noclose = False): |
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
2473 |
"""See daemon(3). Standard BSD Unix function. |
237.2.94
by Teddy Hogeborn
Minor code cleanup, and a bug fix. |
2474 |
|
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
2475 |
This should really exist as os.daemon, but it doesn't (yet)."""
|
2476 |
if os.fork(): |
|
2477 |
sys.exit() |
|
2478 |
os.setsid() |
|
2479 |
if not nochdir: |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2480 |
os.chdir("/") |
46
by Teddy Hogeborn
* network-protocol.txt: New. |
2481 |
if os.fork(): |
2482 |
sys.exit() |
|
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
2483 |
if not noclose: |
2484 |
# Close all standard open file descriptors
|
|
237.18.1
by teddy at recompile
* mandos: Use os.devnull instead of os.path.devnull. Fix some white |
2485 |
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR) |
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
2486 |
if not stat.S_ISCHR(os.fstat(null).st_mode): |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2487 |
raise OSError(errno.ENODEV, |
2488 |
"{} not a character device"
|
|
237.7.116
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
2489 |
.format(os.devnull)) |
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
2490 |
os.dup2(null, sys.stdin.fileno()) |
2491 |
os.dup2(null, sys.stdout.fileno()) |
|
2492 |
os.dup2(null, sys.stderr.fileno()) |
|
2493 |
if null > 2: |
|
2494 |
os.close(null) |
|
2495 |
||
2496 |
||
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
2497 |
def main(): |
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
2498 |
|
237.2.142
by Teddy Hogeborn
* mandos: Fix line lengths. |
2499 |
##################################################################
|
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
2500 |
# Parsing of options, both command line and config file
|
2501 |
||
237.7.22
by teddy at bsnet
* mandos: Use the new argparse library instead of optparse. |
2502 |
parser = argparse.ArgumentParser() |
2503 |
parser.add_argument("-v", "--version", action="version", |
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
2504 |
version = "%(prog)s {}".format(version), |
237.7.22
by teddy at bsnet
* mandos: Use the new argparse library instead of optparse. |
2505 |
help="show version number and exit") |
2506 |
parser.add_argument("-i", "--interface", metavar="IF", |
|
2507 |
help="Bind to interface IF") |
|
2508 |
parser.add_argument("-a", "--address", |
|
2509 |
help="Address to listen for requests on") |
|
2510 |
parser.add_argument("-p", "--port", type=int, |
|
2511 |
help="Port number to receive requests on") |
|
2512 |
parser.add_argument("--check", action="store_true", |
|
2513 |
help="Run self-test") |
|
2514 |
parser.add_argument("--debug", action="store_true", |
|
2515 |
help="Debug mode; run in foreground and log" |
|
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2516 |
" to terminal", default=None) |
237.7.22
by teddy at bsnet
* mandos: Use the new argparse library instead of optparse. |
2517 |
parser.add_argument("--debuglevel", metavar="LEVEL", |
2518 |
help="Debug level for stdout output") |
|
2519 |
parser.add_argument("--priority", help="GnuTLS" |
|
2520 |
" priority string (see GnuTLS documentation)") |
|
2521 |
parser.add_argument("--servicename", |
|
2522 |
metavar="NAME", help="Zeroconf service name") |
|
2523 |
parser.add_argument("--configdir", |
|
2524 |
default="/etc/mandos", metavar="DIR", |
|
2525 |
help="Directory to search for configuration" |
|
2526 |
" files") |
|
2527 |
parser.add_argument("--no-dbus", action="store_false", |
|
2528 |
dest="use_dbus", help="Do not provide D-Bus" |
|
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2529 |
" system bus interface", default=None) |
237.7.22
by teddy at bsnet
* mandos: Use the new argparse library instead of optparse. |
2530 |
parser.add_argument("--no-ipv6", action="store_false", |
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2531 |
dest="use_ipv6", help="Do not use IPv6", |
2532 |
default=None) |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2533 |
parser.add_argument("--no-restore", action="store_false", |
237.12.7
by Teddy Hogeborn
* mandos: Break long lines and fix some more white space. |
2534 |
dest="restore", help="Do not restore stored" |
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2535 |
" state", default=None) |
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2536 |
parser.add_argument("--socket", type=int, |
2537 |
help="Specify a file descriptor to a network" |
|
2538 |
" socket to use instead of creating one") |
|
237.14.2
by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir" |
2539 |
parser.add_argument("--statedir", metavar="DIR", |
2540 |
help="Directory to save/restore state in") |
|
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2541 |
parser.add_argument("--foreground", action="store_true", |
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2542 |
help="Run in foreground", default=None) |
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2543 |
parser.add_argument("--no-zeroconf", action="store_false", |
2544 |
dest="zeroconf", help="Do not use Zeroconf", |
|
2545 |
default=None) |
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
2546 |
|
237.7.22
by teddy at bsnet
* mandos: Use the new argparse library instead of optparse. |
2547 |
options = parser.parse_args() |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2548 |
|
4
by Teddy Hogeborn
* server.py (Client.created, Client.next_check): New. |
2549 |
if options.check: |
2550 |
import doctest |
|
237.7.202
by Teddy Hogeborn
Fix running of self-tests. |
2551 |
fail_count, test_count = doctest.testmod() |
2552 |
sys.exit(os.EX_OK if fail_count == 0 else 1) |
|
3
by Björn Påhlsson
Python based server |
2553 |
|
28
by Teddy Hogeborn
* server.conf: New file. |
2554 |
# Default values for config file for server-global settings
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2555 |
server_defaults = { "interface": "", |
2556 |
"address": "", |
|
2557 |
"port": "", |
|
2558 |
"debug": "False", |
|
2559 |
"priority": |
|
237.7.290
by Teddy Hogeborn
Add ":!RSA" to GnuTLS priority string, to disallow non-DHE kx. |
2560 |
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
|
237.7.325
by Teddy Hogeborn
Bug fix for GnuTLS 3: be compatible with old 2048-bit DSA keys. |
2561 |
":+SIGN-DSA-SHA256", |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2562 |
"servicename": "Mandos", |
2563 |
"use_dbus": "True", |
|
2564 |
"use_ipv6": "True", |
|
2565 |
"debuglevel": "", |
|
237.14.2
by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir" |
2566 |
"restore": "True", |
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2567 |
"socket": "", |
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2568 |
"statedir": "/var/lib/mandos", |
2569 |
"foreground": "False", |
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2570 |
"zeroconf": "True", |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2571 |
}
|
28
by Teddy Hogeborn
* server.conf: New file. |
2572 |
|
2573 |
# Parse config file for server-global settings
|
|
237.2.98
by Teddy Hogeborn
* mandos: Import "SocketServer" as "socketserver" and "ConfigParser" |
2574 |
server_config = configparser.SafeConfigParser(server_defaults) |
28
by Teddy Hogeborn
* server.conf: New file. |
2575 |
del server_defaults |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2576 |
server_config.read(os.path.join(options.configdir, "mandos.conf")) |
28
by Teddy Hogeborn
* server.conf: New file. |
2577 |
# Convert the SafeConfigParser object to a dict
|
89
by Teddy Hogeborn
* Makefile: Bug fix: fixed creation of man pages for section 5 pages. |
2578 |
server_settings = server_config.defaults() |
237.2.45
by Teddy Hogeborn
* mandos (main): Bug fix: use "getint" on the "port" config file |
2579 |
# Use the appropriate methods on the non-string config options
|
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2580 |
for option in ("debug", "use_dbus", "use_ipv6", "foreground"): |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2581 |
server_settings[option] = server_config.getboolean("DEFAULT", |
237.2.96
by Teddy Hogeborn
Minor code cleanup; one minor bug fix. |
2582 |
option) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2583 |
if server_settings["port"]: |
2584 |
server_settings["port"] = server_config.getint("DEFAULT", |
|
2585 |
"port") |
|
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2586 |
if server_settings["socket"]: |
2587 |
server_settings["socket"] = server_config.getint("DEFAULT", |
|
2588 |
"socket") |
|
237.7.139
by Teddy Hogeborn
Merge "--socket" option for server. |
2589 |
# Later, stdin will, and stdout and stderr might, be dup'ed
|
237.21.1
by Teddy Hogeborn
* mandos: Implement "--socket" option. |
2590 |
# over with an opened os.devnull. But we don't want this to
|
2591 |
# happen with a supplied network socket.
|
|
2592 |
if 0 <= server_settings["socket"] <= 2: |
|
2593 |
server_settings["socket"] = os.dup(server_settings |
|
2594 |
["socket"]) |
|
28
by Teddy Hogeborn
* server.conf: New file. |
2595 |
del server_config |
2596 |
||
2597 |
# Override the settings from the config file with command line
|
|
2598 |
# options, if set.
|
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2599 |
for option in ("interface", "address", "port", "debug", |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2600 |
"priority", "servicename", "configdir", "use_dbus", |
2601 |
"use_ipv6", "debuglevel", "restore", "statedir", |
|
2602 |
"socket", "foreground", "zeroconf"): |
|
28
by Teddy Hogeborn
* server.conf: New file. |
2603 |
value = getattr(options, option) |
2604 |
if value is not None: |
|
2605 |
server_settings[option] = value |
|
2606 |
del options |
|
237.2.96
by Teddy Hogeborn
Minor code cleanup; one minor bug fix. |
2607 |
# Force all strings to be unicode
|
2608 |
for option in server_settings.keys(): |
|
237.7.277
by Teddy Hogeborn
mandos: Stop using str() and remove unnecessary unicode() calls. |
2609 |
if isinstance(server_settings[option], bytes): |
2610 |
server_settings[option] = (server_settings[option] |
|
2611 |
.decode("utf-8")) |
|
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2612 |
# Force all boolean options to be boolean
|
2613 |
for option in ("debug", "use_dbus", "use_ipv6", "restore", |
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2614 |
"foreground", "zeroconf"): |
237.7.166
by Teddy Hogeborn
* mandos: Bug fix: Make boolean options work from the config file |
2615 |
server_settings[option] = bool(server_settings[option]) |
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2616 |
# Debug implies foreground
|
2617 |
if server_settings["debug"]: |
|
2618 |
server_settings["foreground"] = True |
|
28
by Teddy Hogeborn
* server.conf: New file. |
2619 |
# Now we have our good server settings in "server_settings"
|
2620 |
||
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
2621 |
##################################################################
|
2622 |
||
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2623 |
if (not server_settings["zeroconf"] |
2624 |
and not (server_settings["port"] |
|
2625 |
or server_settings["socket"] != "")): |
|
2626 |
parser.error("Needs port or socket to work without Zeroconf") |
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2627 |
|
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2628 |
# For convenience
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2629 |
debug = server_settings["debug"] |
2630 |
debuglevel = server_settings["debuglevel"] |
|
2631 |
use_dbus = server_settings["use_dbus"] |
|
2632 |
use_ipv6 = server_settings["use_ipv6"] |
|
237.14.2
by Teddy Hogeborn
Directory with persistent state can now be changed with the "statedir" |
2633 |
stored_state_path = os.path.join(server_settings["statedir"], |
2634 |
stored_state_file) |
|
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2635 |
foreground = server_settings["foreground"] |
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2636 |
zeroconf = server_settings["zeroconf"] |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2637 |
|
237.12.4
by Björn Påhlsson
restructured logger |
2638 |
if debug: |
237.7.78
by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed. |
2639 |
initlogger(debug, logging.DEBUG) |
237.12.4
by Björn Påhlsson
restructured logger |
2640 |
else: |
2641 |
if not debuglevel: |
|
237.7.78
by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed. |
2642 |
initlogger(debug) |
237.12.4
by Björn Påhlsson
restructured logger |
2643 |
else: |
2644 |
level = getattr(logging, debuglevel.upper()) |
|
237.7.78
by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed. |
2645 |
initlogger(debug, level) |
237.12.4
by Björn Påhlsson
restructured logger |
2646 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2647 |
if server_settings["servicename"] != "Mandos": |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2648 |
syslogger.setFormatter( |
2649 |
logging.Formatter('Mandos ({}) [%(process)d]:' |
|
2650 |
' %(levelname)s: %(message)s'.format( |
|
2651 |
server_settings["servicename"]))) |
|
52
by Teddy Hogeborn
* mandos: Make syslog use "/dev/log" instead of UDP to localhost. |
2652 |
|
28
by Teddy Hogeborn
* server.conf: New file. |
2653 |
# Parse config file with clients
|
237.7.91
by Teddy Hogeborn
* mandos: Break some long lines. |
2654 |
client_config = configparser.SafeConfigParser(Client |
2655 |
.client_defaults) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2656 |
client_config.read(os.path.join(server_settings["configdir"], |
2657 |
"clients.conf")) |
|
237.2.96
by Teddy Hogeborn
Minor code cleanup; one minor bug fix. |
2658 |
|
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
2659 |
global mandos_dbus_service |
2660 |
mandos_dbus_service = None |
|
28
by Teddy Hogeborn
* server.conf: New file. |
2661 |
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2662 |
socketfd = None |
2663 |
if server_settings["socket"] != "": |
|
2664 |
socketfd = server_settings["socket"] |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2665 |
tcp_server = MandosServer( |
2666 |
(server_settings["address"], server_settings["port"]), |
|
2667 |
ClientHandler, |
|
2668 |
interface=(server_settings["interface"] or None), |
|
2669 |
use_ipv6=use_ipv6, |
|
2670 |
gnutls_priority=server_settings["priority"], |
|
2671 |
use_dbus=use_dbus, |
|
2672 |
socketfd=socketfd) |
|
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2673 |
if not foreground: |
237.7.174
by Teddy Hogeborn
* Makefile (CFLAGS, LDFLAGS): Keep default flags from environment. |
2674 |
pidfilename = "/run/mandos.pid" |
237.7.184
by Teddy Hogeborn
Fall back to /var/run for pidfile if /run is not a directory. |
2675 |
if not os.path.isdir("/run/."): |
2676 |
pidfilename = "/var/run/mandos.pid" |
|
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2677 |
pidfile = None |
237.2.202
by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed. |
2678 |
try: |
237.7.299
by Teddy Hogeborn
mandos: Use codecs.open() and print() for PID file. |
2679 |
pidfile = codecs.open(pidfilename, "w", encoding="utf-8") |
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
2680 |
except IOError as e: |
2681 |
logger.error("Could not open file %r", pidfilename, |
|
2682 |
exc_info=e) |
|
164
by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it |
2683 |
|
237.7.114
by Teddy Hogeborn
* mandos (main): Simplify and shorten code selecting user and group ID |
2684 |
for name in ("_mandos", "mandos", "nobody"): |
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
2685 |
try: |
237.7.114
by Teddy Hogeborn
* mandos (main): Simplify and shorten code selecting user and group ID |
2686 |
uid = pwd.getpwnam(name).pw_uid |
2687 |
gid = pwd.getpwnam(name).pw_gid |
|
2688 |
break
|
|
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
2689 |
except KeyError: |
237.7.114
by Teddy Hogeborn
* mandos (main): Simplify and shorten code selecting user and group ID |
2690 |
continue
|
2691 |
else: |
|
2692 |
uid = 65534 |
|
2693 |
gid = 65534 |
|
163
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed. |
2694 |
try: |
237.2.53
by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS |
2695 |
os.setgid(gid) |
163
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed. |
2696 |
os.setuid(uid) |
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
2697 |
except OSError as error: |
237.7.131
by Teddy Hogeborn
* mandos (Client.start_checker): Remove undocumented support for "%%s" |
2698 |
if error.errno != errno.EPERM: |
237.7.190
by Teddy Hogeborn
Syntax fix; use "raise" better in Mandos server. |
2699 |
raise
|
164
by Teddy Hogeborn
* mandos: Open the PID file before daemonizing, but write to it |
2700 |
|
237.2.53
by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS |
2701 |
if debug: |
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
2702 |
# Enable all possible GnuTLS debugging
|
2703 |
||
237.2.53
by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS |
2704 |
# "Use a log level over 10 to enable all debugging options."
|
2705 |
# - GnuTLS manual
|
|
2706 |
gnutls.library.functions.gnutls_global_set_log_level(11) |
|
2707 |
||
2708 |
@gnutls.library.types.gnutls_log_func
|
|
2709 |
def debug_gnutls(level, string): |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2710 |
logger.debug("GnuTLS: %s", string[:-1]) |
237.2.53
by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS |
2711 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2712 |
gnutls.library.functions.gnutls_global_set_log_function( |
2713 |
debug_gnutls) |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
2714 |
|
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
2715 |
# Redirect stdin so all checkers get /dev/null
|
237.18.1
by teddy at recompile
* mandos: Use os.devnull instead of os.path.devnull. Fix some white |
2716 |
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR) |
24.1.155
by Björn Påhlsson
mandos server: Added debuglevel that adjust at what level information |
2717 |
os.dup2(null, sys.stdin.fileno()) |
2718 |
if null > 2: |
|
2719 |
os.close(null) |
|
237.2.185
by Teddy Hogeborn
Rename all D-Bus properties to conform to D-Bus naming conventions; |
2720 |
|
237.7.6
by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus. |
2721 |
# Need to fork before connecting to D-Bus
|
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2722 |
if not foreground: |
237.7.6
by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus. |
2723 |
# Close all input and output, do double fork, etc.
|
2724 |
daemon() |
|
237.2.53
by Teddy Hogeborn
* mandos (main): Bug fix: Do setgid before setuid. Add verbose GnuTLS |
2725 |
|
237.7.138
by Teddy Hogeborn
* mandos: Change comment. |
2726 |
# multiprocessing will use threads, so before we use gobject we
|
2727 |
# need to inform gobject that threads will be used.
|
|
237.14.11
by Teddy Hogeborn
* mandos (main): Tell gobject we're (or, rather, multiprocessing is) |
2728 |
gobject.threads_init() |
2729 |
||
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
2730 |
global main_loop |
2731 |
# From the Avahi example code
|
|
237.18.1
by teddy at recompile
* mandos: Use os.devnull instead of os.path.devnull. Fix some white |
2732 |
DBusGMainLoop(set_as_default=True) |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2733 |
main_loop = gobject.MainLoop() |
2734 |
bus = dbus.SystemBus() |
|
2735 |
# End of Avahi example code
|
|
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2736 |
if use_dbus: |
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
2737 |
try: |
237.7.53
by Björn Påhlsson
The domain name has changed, so the D-Bus bus and interface names must |
2738 |
bus_name = dbus.service.BusName("se.recompile.Mandos", |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2739 |
bus, |
2740 |
do_not_queue=True) |
|
2741 |
old_bus_name = dbus.service.BusName( |
|
2742 |
"se.bsnet.fukt.Mandos", bus, |
|
2743 |
do_not_queue=True) |
|
237.7.298
by Teddy Hogeborn
mandos: Disable D-Bus if any DBusException is raised when connecting. |
2744 |
except dbus.exceptions.DBusException as e: |
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
2745 |
logger.error("Disabling D-Bus:", exc_info=e) |
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
2746 |
use_dbus = False |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2747 |
server_settings["use_dbus"] = False |
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
2748 |
tcp_server.use_dbus = False |
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2749 |
if zeroconf: |
2750 |
protocol = avahi.PROTO_INET6 if use_ipv6 else avahi.PROTO_INET |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2751 |
service = AvahiServiceToSyslog( |
2752 |
name = server_settings["servicename"], |
|
2753 |
servicetype = "_mandos._tcp", |
|
2754 |
protocol = protocol, |
|
2755 |
bus = bus) |
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2756 |
if server_settings["interface"]: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2757 |
service.interface = if_nametoindex( |
2758 |
server_settings["interface"].encode("utf-8")) |
|
237.7.6
by teddy at bsnet
* mandos (main): Bug fix: Fork before connecting to D-Bus. |
2759 |
|
24.1.152
by Björn Påhlsson
bug fixes that prevent problems when runing server as root |
2760 |
global multiprocessing_manager |
2761 |
multiprocessing_manager = multiprocessing.Manager() |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
2762 |
|
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
2763 |
client_class = Client |
2764 |
if use_dbus: |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
2765 |
client_class = functools.partial(ClientDBus, bus = bus) |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2766 |
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
2767 |
client_settings = Client.config_parser(client_config) |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2768 |
old_client_settings = {} |
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
2769 |
clients_data = {} |
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
2770 |
|
237.7.165
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
2771 |
# This is used to redirect stdout and stderr for checker processes
|
2772 |
global wnull |
|
2773 |
wnull = open(os.devnull, "w") # A writable /dev/null |
|
2774 |
# Only used if server is running in foreground but not in debug
|
|
2775 |
# mode
|
|
2776 |
if debug or not foreground: |
|
2777 |
wnull.close() |
|
2778 |
||
237.12.7
by Teddy Hogeborn
* mandos: Break long lines and fix some more white space. |
2779 |
# Get client data and settings from last running state.
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2780 |
if server_settings["restore"]: |
2781 |
try: |
|
2782 |
with open(stored_state_path, "rb") as stored_state: |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2783 |
clients_data, old_client_settings = pickle.load( |
2784 |
stored_state) |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2785 |
os.remove(stored_state_path) |
2786 |
except IOError as e: |
|
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
2787 |
if e.errno == errno.ENOENT: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2788 |
logger.warning("Could not load persistent state:" |
2789 |
" {}".format(os.strerror(e.errno))) |
|
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
2790 |
else: |
2791 |
logger.critical("Could not load persistent state:", |
|
2792 |
exc_info=e) |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2793 |
raise
|
237.11.23
by Teddy Hogeborn
* mandos (main): Handle EOFError when reading state file. |
2794 |
except EOFError as e: |
2795 |
logger.warning("Could not load persistent state: " |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2796 |
"EOFError:", |
2797 |
exc_info=e) |
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
2798 |
|
237.12.9
by Björn Påhlsson
renamed variables |
2799 |
with PGPEngine() as pgp: |
237.23.4
by Teddy Hogeborn
Use the .items() method instead of .iteritems(). |
2800 |
for client_name, client in clients_data.items(): |
237.7.165
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
2801 |
# Skip removed clients
|
2802 |
if client_name not in client_settings: |
|
2803 |
continue
|
|
2804 |
||
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
2805 |
# Decide which value to use after restoring saved state.
|
2806 |
# We have three different values: Old config file,
|
|
2807 |
# new config file, and saved state.
|
|
2808 |
# New config value takes precedence if it differs from old
|
|
2809 |
# config value, otherwise use saved state.
|
|
2810 |
for name, value in client_settings[client_name].items(): |
|
2811 |
try: |
|
2812 |
# For each value in new config, check if it
|
|
2813 |
# differs from the old config value (Except for
|
|
2814 |
# the "secret" attribute)
|
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2815 |
if (name != "secret" |
2816 |
and (value != |
|
2817 |
old_client_settings[client_name][name])): |
|
237.14.10
by Teddy Hogeborn
* mandos (main): Bug fix: Syntax fix when restoring settings. |
2818 |
client[name] = value |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
2819 |
except KeyError: |
2820 |
pass
|
|
2821 |
||
2822 |
# Clients who has passed its expire date can still be
|
|
237.24.1
by Teddy Hogeborn
mandos: Use multiprocessing module to run checkers. |
2823 |
# enabled if its last checker was successful. A Client
|
237.7.100
by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the |
2824 |
# whose checker succeeded before we stored its state is
|
2825 |
# assumed to have successfully run all checkers during
|
|
2826 |
# downtime.
|
|
237.14.8
by Teddy Hogeborn
* mandos (ClientDBus.Host_dbus_property, |
2827 |
if client["enabled"]: |
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
2828 |
if datetime.datetime.utcnow() >= client["expires"]: |
2829 |
if not client["last_checked_ok"]: |
|
2830 |
logger.warning( |
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
2831 |
"disabling client {} - Client never "
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2832 |
"performed a successful checker".format( |
2833 |
client_name)) |
|
237.12.14
by Björn Påhlsson
Mandos: refactoring the code handling settings from config files. |
2834 |
client["enabled"] = False |
2835 |
elif client["last_checker_status"] != 0: |
|
2836 |
logger.warning( |
|
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
2837 |
"disabling client {} - Client last"
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2838 |
" checker failed with error code"
|
2839 |
" {}".format( |
|
2840 |
client_name, |
|
2841 |
client["last_checker_status"])) |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
2842 |
client["enabled"] = False |
2843 |
else: |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2844 |
client["expires"] = ( |
2845 |
datetime.datetime.utcnow() |
|
2846 |
+ client["timeout"]) |
|
237.7.90
by Björn Påhlsson
fixed bug with bad stored config state for expires and last_checked_ok. |
2847 |
logger.debug("Last checker succeeded," |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2848 |
" keeping {} enabled".format( |
2849 |
client_name)) |
|
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2850 |
try: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2851 |
client["secret"] = pgp.decrypt( |
2852 |
client["encrypted_secret"], |
|
2853 |
client_settings[client_name]["secret"]) |
|
237.12.9
by Björn Påhlsson
renamed variables |
2854 |
except PGPError: |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
2855 |
# If decryption fails, we use secret from new settings
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2856 |
logger.debug("Failed to decrypt {} old secret".format( |
2857 |
client_name)) |
|
2858 |
client["secret"] = (client_settings[client_name] |
|
2859 |
["secret"]) |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
2860 |
|
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
2861 |
# Add/remove clients based on new changes made to config
|
237.7.91
by Teddy Hogeborn
* mandos: Break some long lines. |
2862 |
for client_name in (set(old_client_settings) |
2863 |
- set(client_settings)): |
|
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
2864 |
del clients_data[client_name] |
237.7.91
by Teddy Hogeborn
* mandos: Break some long lines. |
2865 |
for client_name in (set(client_settings) |
2866 |
- set(old_client_settings)): |
|
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
2867 |
clients_data[client_name] = client_settings[client_name] |
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
2868 |
|
237.7.100
by teddy at recompile
* mandos: Consistent terminology; use the term "secret" for the |
2869 |
# Create all client objects
|
237.23.4
by Teddy Hogeborn
Use the .items() method instead of .iteritems(). |
2870 |
for client_name, client in clients_data.items(): |
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
2871 |
tcp_server.clients[client_name] = client_class( |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2872 |
name = client_name, |
2873 |
settings = client, |
|
237.7.165
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
2874 |
server_settings = server_settings) |
24.1.149
by Björn Påhlsson
Changed ForkingMixIn in favor of multiprocessing |
2875 |
|
237.2.104
by Teddy Hogeborn
Code cleanup and one bug fix. |
2876 |
if not tcp_server.clients: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2877 |
logger.warning("No clients defined") |
237.7.121
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
2878 |
|
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2879 |
if not foreground: |
2880 |
if pidfile is not None: |
|
237.7.299
by Teddy Hogeborn
mandos: Use codecs.open() and print() for PID file. |
2881 |
pid = os.getpid() |
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2882 |
try: |
2883 |
with pidfile: |
|
237.7.299
by Teddy Hogeborn
mandos: Use codecs.open() and print() for PID file. |
2884 |
print(pid, file=pidfile) |
237.7.154
by Teddy Hogeborn
* mandos: New "--foreground" option. |
2885 |
except IOError: |
2886 |
logger.error("Could not write to file %r with PID %d", |
|
2887 |
pidfilename, pid) |
|
2888 |
del pidfile |
|
237.2.202
by Teddy Hogeborn
* mandos: Do not write pid file if --debug is passed. |
2889 |
del pidfilename |
24.1.185
by Björn Påhlsson
working transition code for going between se.bsnet.fukt to se.recompile |
2890 |
|
28
by Teddy Hogeborn
* server.conf: New file. |
2891 |
signal.signal(signal.SIGHUP, lambda signum, frame: sys.exit()) |
2892 |
signal.signal(signal.SIGTERM, lambda signum, frame: sys.exit()) |
|
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
2893 |
|
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2894 |
if use_dbus: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2895 |
|
2896 |
@alternate_dbus_interfaces( |
|
2897 |
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" }) |
|
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2898 |
class MandosDBusService(DBusObjectWithObjectManager): |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2899 |
"""A D-Bus proxy object""" |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2900 |
|
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2901 |
def __init__(self): |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2902 |
dbus.service.Object.__init__(self, bus, "/") |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2903 |
|
237.11.1
by Teddy Hogeborn
* mandos (transitional_dbus_metaclass): Renamed to |
2904 |
_interface = "se.recompile.Mandos" |
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2905 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2906 |
@dbus.service.signal(_interface, signature="o") |
237.2.174
by Teddy Hogeborn
More consistent terminology: Clients are no longer "invalid" - they |
2907 |
def ClientAdded(self, objpath): |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2908 |
"D-Bus signal"
|
2909 |
pass
|
|
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2910 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2911 |
@dbus.service.signal(_interface, signature="ss") |
237.2.172
by Teddy Hogeborn
* mandos (MandosServer.handle_ipc): Better log message. |
2912 |
def ClientNotFound(self, fingerprint, address): |
237.2.90
by Teddy Hogeborn
Merge from pipe IPC branch. |
2913 |
"D-Bus signal"
|
2914 |
pass
|
|
2915 |
||
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2916 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": |
2917 |
"true"}) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2918 |
@dbus.service.signal(_interface, signature="os") |
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2919 |
def ClientRemoved(self, objpath, name): |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2920 |
"D-Bus signal"
|
2921 |
pass
|
|
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2922 |
|
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2923 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": |
2924 |
"true"}) |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2925 |
@dbus.service.method(_interface, out_signature="ao") |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2926 |
def GetAllClients(self): |
237.2.46
by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from |
2927 |
"D-Bus method"
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
2928 |
return dbus.Array(c.dbus_object_path for c in |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2929 |
tcp_server.clients.itervalues()) |
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2930 |
|
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2931 |
@dbus_annotations({"org.freedesktop.DBus.Deprecated": |
2932 |
"true"}) |
|
237.2.96
by Teddy Hogeborn
Minor code cleanup; one minor bug fix. |
2933 |
@dbus.service.method(_interface, |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2934 |
out_signature="a{oa{sv}}") |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2935 |
def GetAllClientsWithProperties(self): |
237.2.46
by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from |
2936 |
"D-Bus method"
|
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2937 |
return dbus.Dictionary( |
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2938 |
{ c.dbus_object_path: c.GetAll( |
2939 |
"se.recompile.Mandos.Client") |
|
237.7.280
by Teddy Hogeborn
Emit D-Bus "org.freedesktop.DBus.Properties.PropertiesChanged" signal. |
2940 |
for c in tcp_server.clients.itervalues() }, |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2941 |
signature="oa{sv}") |
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2942 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
2943 |
@dbus.service.method(_interface, in_signature="o") |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2944 |
def RemoveClient(self, object_path): |
237.2.46
by Teddy Hogeborn
* mandos (peer_certificate): Handle NULL pointer from |
2945 |
"D-Bus method"
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2946 |
for c in tcp_server.clients.itervalues(): |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2947 |
if c.dbus_object_path == object_path: |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
2948 |
del tcp_server.clients[c.name] |
237.2.91
by Teddy Hogeborn
* mandos (Client): Move all D-Bus code to new "ClientDBus" class. |
2949 |
c.remove_from_connection() |
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2950 |
# Don't signal the disabling
|
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
2951 |
c.disable(quiet=True) |
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2952 |
# Emit D-Bus signal for removal
|
2953 |
self.client_removed_signal(c) |
|
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2954 |
return
|
237.2.163
by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to |
2955 |
raise KeyError(object_path) |
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2956 |
|
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
2957 |
del _interface |
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
2958 |
|
2959 |
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE, |
|
2960 |
out_signature = "a{oa{sa{sv}}}") |
|
2961 |
def GetManagedObjects(self): |
|
2962 |
"""D-Bus method""" |
|
2963 |
return dbus.Dictionary( |
|
2964 |
{ client.dbus_object_path: |
|
2965 |
dbus.Dictionary( |
|
2966 |
{ interface: client.GetAll(interface) |
|
2967 |
for interface in |
|
2968 |
client._get_all_interface_names()}) |
|
2969 |
for client in tcp_server.clients.values()}) |
|
2970 |
||
2971 |
def client_added_signal(self, client): |
|
2972 |
"""Send the new standard signal and the old signal""" |
|
2973 |
if use_dbus: |
|
2974 |
# New standard signal
|
|
2975 |
self.InterfacesAdded( |
|
2976 |
client.dbus_object_path, |
|
2977 |
dbus.Dictionary( |
|
2978 |
{ interface: client.GetAll(interface) |
|
2979 |
for interface in |
|
2980 |
client._get_all_interface_names()})) |
|
2981 |
# Old signal
|
|
2982 |
self.ClientAdded(client.dbus_object_path) |
|
2983 |
||
2984 |
def client_removed_signal(self, client): |
|
2985 |
"""Send the new standard signal and the old signal""" |
|
2986 |
if use_dbus: |
|
2987 |
# New standard signal
|
|
2988 |
self.InterfacesRemoved( |
|
2989 |
client.dbus_object_path, |
|
2990 |
client._get_all_interface_names()) |
|
2991 |
# Old signal
|
|
2992 |
self.ClientRemoved(client.dbus_object_path, |
|
2993 |
client.name) |
|
237.2.41
by Teddy Hogeborn
* mandos (Client.GetAllProperties): Also send Client.dbus_object_path |
2994 |
|
237.7.123
by Teddy Hogeborn
* mandos: Use a class decorator instead of a metaclass to provide |
2995 |
mandos_dbus_service = MandosDBusService() |
237.2.1
by Teddy Hogeborn
First version of a somewhat complete D-Bus server interface. Also |
2996 |
|
237.2.163
by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to |
2997 |
def cleanup(): |
2998 |
"Cleanup function; run on exit"
|
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
2999 |
if zeroconf: |
3000 |
service.cleanup() |
|
237.2.163
by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to |
3001 |
|
237.11.11
by Teddy Hogeborn
* mandos (Client.checked_ok): Set "expires" after setting timeout. |
3002 |
multiprocessing.active_children() |
237.7.165
by Teddy Hogeborn
* mandos: Bug fix: Don't print output from checkers when running in |
3003 |
wnull.close() |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3004 |
if not (tcp_server.clients or client_settings): |
3005 |
return
|
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
3006 |
|
237.7.69
by teddy at bsnet
* debian/control (mandos/Depends): Added "python-crypto". |
3007 |
# Store client before exiting. Secrets are encrypted with key
|
3008 |
# based on what config file has. If config file is
|
|
3009 |
# removed/edited, old secret will thus be unrecovable.
|
|
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
3010 |
clients = {} |
237.12.9
by Björn Påhlsson
renamed variables |
3011 |
with PGPEngine() as pgp: |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
3012 |
for client in tcp_server.clients.itervalues(): |
3013 |
key = client_settings[client.name]["secret"] |
|
237.12.9
by Björn Påhlsson
renamed variables |
3014 |
client.encrypted_secret = pgp.encrypt(client.secret, |
3015 |
key) |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
3016 |
client_dict = {} |
3017 |
||
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
3018 |
# A list of attributes that can not be pickled
|
3019 |
# + secret.
|
|
237.23.2
by Teddy Hogeborn
Use set literals. |
3020 |
exclude = { "bus", "changedstate", "secret", |
3021 |
"checker", "server_settings" } |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
3022 |
for name, typ in inspect.getmembers(dbus.service |
3023 |
.Object): |
|
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
3024 |
exclude.add(name) |
3025 |
||
3026 |
client_dict["encrypted_secret"] = (client |
|
3027 |
.encrypted_secret) |
|
3028 |
for attr in client.client_structure: |
|
3029 |
if attr not in exclude: |
|
3030 |
client_dict[attr] = getattr(client, attr) |
|
3031 |
||
237.12.15
by Björn Påhlsson
more refactoring in regards to how clients get created |
3032 |
clients[client.name] = client_dict |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
3033 |
del client_settings[client.name]["secret"] |
3034 |
||
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3035 |
try: |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
3036 |
with tempfile.NamedTemporaryFile( |
3037 |
mode='wb', |
|
3038 |
suffix=".pickle", |
|
3039 |
prefix='clients-', |
|
3040 |
dir=os.path.dirname(stored_state_path), |
|
3041 |
delete=False) as stored_state: |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3042 |
pickle.dump((clients, client_settings), stored_state) |
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
3043 |
tempname = stored_state.name |
237.11.26
by teddy at bsnet
* mandos (main/cleanup): Write new file, then rename. Use |
3044 |
os.rename(tempname, stored_state_path) |
237.14.1
by Teddy Hogeborn
Use GPG to encrypt instead of AES. |
3045 |
except (IOError, OSError) as e: |
237.7.78
by teddy at bsnet
* mandos (initlogger): Take new "debug" argument; all callers changed. |
3046 |
if not debug: |
3047 |
try: |
|
3048 |
os.remove(tempname) |
|
3049 |
except NameError: |
|
3050 |
pass
|
|
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
3051 |
if e.errno in (errno.ENOENT, errno.EACCES, errno.EEXIST): |
237.23.5
by Teddy Hogeborn
Use the new auto-numbered "{}" syntax for the .format() string method. |
3052 |
logger.warning("Could not save persistent state: {}" |
237.7.122
by Teddy Hogeborn
* mandos: White space and other misc. format fixes only. |
3053 |
.format(os.strerror(e.errno))) |
3054 |
else: |
|
3055 |
logger.warning("Could not save persistent state:", |
|
3056 |
exc_info=e) |
|
237.7.190
by Teddy Hogeborn
Syntax fix; use "raise" better in Mandos server. |
3057 |
raise
|
237.12.6
by Teddy Hogeborn
* mandos: Fix whitespace. |
3058 |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3059 |
# Delete all clients, and settings from config
|
237.2.163
by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to |
3060 |
while tcp_server.clients: |
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3061 |
name, client = tcp_server.clients.popitem() |
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
3062 |
if use_dbus: |
3063 |
client.remove_from_connection() |
|
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
3064 |
# Don't signal the disabling
|
237.2.165
by Teddy Hogeborn
* mandos (Client.disable): Rename keyword argument "log" to "quiet", |
3065 |
client.disable(quiet=True) |
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
3066 |
# Emit D-Bus signal for removal
|
3067 |
mandos_dbus_service.client_removed_signal(client) |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3068 |
client_settings.clear() |
237.2.163
by Teddy Hogeborn
* mandos (Client.enable): Bug fix: Start new immediate checker last to |
3069 |
|
3070 |
atexit.register(cleanup) |
|
3071 |
||
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3072 |
for client in tcp_server.clients.itervalues(): |
237.2.6
by Teddy Hogeborn
* mandos (Client.timeout, Client.interval): Changed from being a |
3073 |
if use_dbus: |
237.7.333
by Teddy Hogeborn
Support the standard org.freedesktop.DBus.ObjectManager interface. |
3074 |
# Emit D-Bus signal for adding
|
3075 |
mandos_dbus_service.client_added_signal(client) |
|
237.12.1
by Björn Påhlsson
Persistent state: New feature. Client state is now stored when mandos |
3076 |
# Need to initiate checking of clients
|
3077 |
if client.enabled: |
|
3078 |
client.init_checker() |
|
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
3079 |
|
163
by Teddy Hogeborn
* Makefile (PIDDIR, USER, GROUP): Removed. |
3080 |
tcp_server.enable() |
3081 |
tcp_server.server_activate() |
|
3082 |
||
28
by Teddy Hogeborn
* server.conf: New file. |
3083 |
# Find out what port we got
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
3084 |
if zeroconf: |
3085 |
service.port = tcp_server.socket.getsockname()[1] |
|
237.2.77
by Teddy Hogeborn
Support not using IPv6 in server: |
3086 |
if use_ipv6: |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
3087 |
logger.info("Now listening on address %r, port %d," |
237.7.116
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
3088 |
" flowinfo %d, scope_id %d", |
3089 |
*tcp_server.socket.getsockname()) |
|
237.2.77
by Teddy Hogeborn
Support not using IPv6 in server: |
3090 |
else: # IPv4 |
237.7.116
by Teddy Hogeborn
* mandos-monitor: Use new string format method. |
3091 |
logger.info("Now listening on address %r, port %d", |
3092 |
*tcp_server.socket.getsockname()) |
|
28
by Teddy Hogeborn
* server.conf: New file. |
3093 |
|
29
by Teddy Hogeborn
* plugins.d/mandosclient.c (start_mandos_communication): Changed |
3094 |
#service.interface = tcp_server.socket.getsockname()[3]
|
28
by Teddy Hogeborn
* server.conf: New file. |
3095 |
|
3096 |
try: |
|
237.7.255
by Teddy Hogeborn
mandos: New "--no-zeroconf" option. Also make "--socket=0" work. |
3097 |
if zeroconf: |
3098 |
# From the Avahi example code
|
|
3099 |
try: |
|
3100 |
service.activate() |
|
3101 |
except dbus.exceptions.DBusException as error: |
|
3102 |
logger.critical("D-Bus Exception", exc_info=error) |
|
3103 |
cleanup() |
|
3104 |
sys.exit(1) |
|
3105 |
# End of Avahi example code
|
|
28
by Teddy Hogeborn
* server.conf: New file. |
3106 |
|
3107 |
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN, |
|
3108 |
lambda *args, **kwargs: |
|
237.1.2
by Teddy Hogeborn
Further steps towards a D-Bus server interface, plus minor syntax |
3109 |
(tcp_server.handle_request |
3110 |
(*args[2:], **kwargs) or True)) |
|
28
by Teddy Hogeborn
* server.conf: New file. |
3111 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
3112 |
logger.debug("Starting main loop") |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
3113 |
main_loop.run() |
237.7.30
by Teddy Hogeborn
* mandos: Tolerate restarting Avahi servers. Also Changed to new |
3114 |
except AvahiError as error: |
237.7.113
by Teddy Hogeborn
* mandos (AvahiService.rename, Client.start_checker, |
3115 |
logger.critical("Avahi Error", exc_info=error) |
237.2.164
by Teddy Hogeborn
* README (FAQ): Fix typo. |
3116 |
cleanup() |
28
by Teddy Hogeborn
* server.conf: New file. |
3117 |
sys.exit(1) |
11
by Teddy Hogeborn
* server.py: Rewritten to use Zeroconf (mDNS/DNS-SD) in place of the |
3118 |
except KeyboardInterrupt: |
15
by Teddy Hogeborn
* mandos-clients.conf ([foo]): Uncommented. |
3119 |
if debug: |
237.8.5
by teddy at bsnet
* mandos: Use unicode string literals. |
3120 |
print("", file=sys.stderr) |
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
3121 |
logger.debug("Server received KeyboardInterrupt") |
3122 |
logger.debug("Server exiting") |
|
237.2.164
by Teddy Hogeborn
* README (FAQ): Fix typo. |
3123 |
# Must run before the D-Bus bus name gets deregistered
|
3124 |
cleanup() |
|
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
3125 |
|
237.7.294
by Teddy Hogeborn
mandos: Do minor formatting and whitespace adjustments. |
3126 |
|
237.8.4
by teddy at bsnet
* mandos: Use unicode string literals. |
3127 |
if __name__ == '__main__': |
16
by Teddy Hogeborn
* Makefile: Include targets for all binaries. |
3128 |
main() |