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