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