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