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