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