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 748
- compare with another revision
- download diff
- download tarball
- view history from revision 748
- Committer: Teddy Hogeborn
- Date: 2015-05-23 10:41:35 UTC
- Revision ID: teddy@recompile.se-20150523104135-s08sbkurj1wf0jrz
mandos-keygen: Update copyright year.
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-2016 Teddy Hogeborn
15
# Copyright © 2008-2016 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
try:
38
from future_builtins import *
39
except ImportError:
40
pass
37
from future_builtins import *
41
38
42
try:
43
import SocketServer as socketserver
44
except ImportError:
45
import socketserver
39
import SocketServer as socketserver
46
40
import socket
47
41
import argparse
48
42
import datetime
49
43
import errno
50
try:
51
import ConfigParser as configparser
52
except ImportError:
53
import configparser
44
import gnutls.crypto
45
import gnutls.connection
46
import gnutls.errors
47
import gnutls.library.functions
48
import gnutls.library.constants
49
import gnutls.library.types
50
import ConfigParser as configparser
54
51
import sys
55
52
import re
56
53
import os
65
62
import struct
66
63
import fcntl
67
64
import functools
68
try:
69
import cPickle as pickle
70
except ImportError:
71
import pickle
65
import cPickle as pickle
72
66
import multiprocessing
73
67
import types
74
68
import binascii
75
69
import tempfile
76
70
import itertools
77
71
import collections
78
import codecs
79
72
80
73
import dbus
81
74
import dbus.service
82
try:
83
from gi.repository import GObject
84
except ImportError:
85
import gobject as GObject
75
import gobject
76
import avahi
86
77
from dbus.mainloop.glib import DBusGMainLoop
87
78
import ctypes
88
79
import ctypes.util
100
91
if sys.version_info.major == 2:
101
92
str = unicode
102
93
103
version = "1.7.5"
94
version = "1.6.9"
104
95
stored_state_file = "clients.pickle"
105
96
106
97
logger = logging.getLogger()
121
112
return interface_index
122
113
123
114
124
def copy_function(func):
125
"""Make a copy of a function"""
126
if sys.version_info.major == 2:
127
return types.FunctionType(func.func_code,
128
func.func_globals,
129
func.func_name,
130
func.func_defaults,
131
func.func_closure)
132
else:
133
return types.FunctionType(func.__code__,
134
func.__globals__,
135
func.__name__,
136
func.__defaults__,
137
func.__closure__)
138
139
140
115
def initlogger(debug, level=logging.WARNING):
141
116
"""init logger and add loglevel"""
142
117
169
144
170
145
def __init__(self):
171
146
self.tempdir = tempfile.mkdtemp(prefix="mandos-")
172
self.gpg = "gpg"
173
try:
174
output = subprocess.check_output(["gpgconf"])
175
for line in output.splitlines():
176
name, text, path = line.split(b":")
177
if name == "gpg":
178
self.gpg = path
179
break
180
except OSError as e:
181
if e.errno != errno.ENOENT:
182
raise
183
147
self.gnupgargs = ['--batch',
184
'--homedir', self.tempdir,
148
'--home', self.tempdir,
185
149
'--force-mdc',
186
150
'--quiet',
187
151
'--no-use-agent']
226
190
dir=self.tempdir) as passfile:
227
191
passfile.write(passphrase)
228
192
passfile.flush()
229
proc = subprocess.Popen([self.gpg, '--symmetric',
193
proc = subprocess.Popen(['gpg', '--symmetric',
230
194
'--passphrase-file',
231
195
passfile.name]
232
196
+ self.gnupgargs,
244
208
dir = self.tempdir) as passfile:
245
209
passfile.write(passphrase)
246
210
passfile.flush()
247
proc = subprocess.Popen([self.gpg, '--decrypt',
211
proc = subprocess.Popen(['gpg', '--decrypt',
248
212
'--passphrase-file',
249
213
passfile.name]
250
214
+ self.gnupgargs,
256
220
raise PGPError(err)
257
221
return decrypted_plaintext
258
222
259
# Pretend that we have an Avahi module
260
class Avahi(object):
261
"""This isn't so much a class as it is a module-like namespace.
262
It is instantiated once, and simulates having an Avahi module."""
263
IF_UNSPEC = -1 # avahi-common/address.h
264
PROTO_UNSPEC = -1 # avahi-common/address.h
265
PROTO_INET = 0 # avahi-common/address.h
266
PROTO_INET6 = 1 # avahi-common/address.h
267
DBUS_NAME = "org.freedesktop.Avahi"
268
DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup"
269
DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server"
270
DBUS_PATH_SERVER = "/"
271
def string_array_to_txt_array(self, t):
272
return dbus.Array((dbus.ByteArray(s.encode("utf-8"))
273
for s in t), signature="ay")
274
ENTRY_GROUP_ESTABLISHED = 2 # avahi-common/defs.h
275
ENTRY_GROUP_COLLISION = 3 # avahi-common/defs.h
276
ENTRY_GROUP_FAILURE = 4 # avahi-common/defs.h
277
SERVER_INVALID = 0 # avahi-common/defs.h
278
SERVER_REGISTERING = 1 # avahi-common/defs.h
279
SERVER_RUNNING = 2 # avahi-common/defs.h
280
SERVER_COLLISION = 3 # avahi-common/defs.h
281
SERVER_FAILURE = 4 # avahi-common/defs.h
282
avahi = Avahi()
283
223
284
224
class AvahiError(Exception):
285
225
def __init__(self, value, *args, **kwargs):
442
382
logger.error(bad_states[state] + ": %r", error)
443
383
self.cleanup()
444
384
elif state == avahi.SERVER_RUNNING:
445
try:
446
self.add()
447
except dbus.exceptions.DBusException as error:
448
if (error.get_dbus_name()
449
== "org.freedesktop.Avahi.CollisionError"):
450
logger.info("Local Zeroconf service name"
451
" collision.")
452
return self.rename(remove=False)
453
else:
454
logger.critical("D-Bus Exception", exc_info=error)
455
self.cleanup()
456
os._exit(1)
385
self.add()
457
386
else:
458
387
if error is None:
459
388
logger.debug("Unknown state: %r", state)
482
411
.format(self.name)))
483
412
return ret
484
413
485
# Pretend that we have a GnuTLS module
486
class GnuTLS(object):
487
"""This isn't so much a class as it is a module-like namespace.
488
It is instantiated once, and simulates having a GnuTLS module."""
489
490
_library = ctypes.cdll.LoadLibrary(
491
ctypes.util.find_library("gnutls"))
492
_need_version = b"3.3.0"
493
def __init__(self):
494
# Need to use class name "GnuTLS" here, since this method is
495
# called before the assignment to the "gnutls" global variable
496
# happens.
497
if GnuTLS.check_version(self._need_version) is None:
498
raise GnuTLS.Error("Needs GnuTLS {} or later"
499
.format(self._need_version))
500
501
# Unless otherwise indicated, the constants and types below are
502
# all from the gnutls/gnutls.h C header file.
503
504
# Constants
505
E_SUCCESS = 0
506
E_INTERRUPTED = -52
507
E_AGAIN = -28
508
CRT_OPENPGP = 2
509
CLIENT = 2
510
SHUT_RDWR = 0
511
CRD_CERTIFICATE = 1
512
E_NO_CERTIFICATE_FOUND = -49
513
OPENPGP_FMT_RAW = 0 # gnutls/openpgp.h
514
515
# Types
516
class session_int(ctypes.Structure):
517
_fields_ = []
518
session_t = ctypes.POINTER(session_int)
519
class certificate_credentials_st(ctypes.Structure):
520
_fields_ = []
521
certificate_credentials_t = ctypes.POINTER(
522
certificate_credentials_st)
523
certificate_type_t = ctypes.c_int
524
class datum_t(ctypes.Structure):
525
_fields_ = [('data', ctypes.POINTER(ctypes.c_ubyte)),
526
('size', ctypes.c_uint)]
527
class openpgp_crt_int(ctypes.Structure):
528
_fields_ = []
529
openpgp_crt_t = ctypes.POINTER(openpgp_crt_int)
530
openpgp_crt_fmt_t = ctypes.c_int # gnutls/openpgp.h
531
log_func = ctypes.CFUNCTYPE(None, ctypes.c_int, ctypes.c_char_p)
532
credentials_type_t = ctypes.c_int
533
transport_ptr_t = ctypes.c_void_p
534
close_request_t = ctypes.c_int
535
536
# Exceptions
537
class Error(Exception):
538
# We need to use the class name "GnuTLS" here, since this
539
# exception might be raised from within GnuTLS.__init__,
540
# which is called before the assignment to the "gnutls"
541
# global variable has happened.
542
def __init__(self, message = None, code = None, args=()):
543
# Default usage is by a message string, but if a return
544
# code is passed, convert it to a string with
545
# gnutls.strerror()
546
self.code = code
547
if message is None and code is not None:
548
message = GnuTLS.strerror(code)
549
return super(GnuTLS.Error, self).__init__(
550
message, *args)
551
552
class CertificateSecurityError(Error):
553
pass
554
555
# Classes
556
class Credentials(object):
557
def __init__(self):
558
self._c_object = gnutls.certificate_credentials_t()
559
gnutls.certificate_allocate_credentials(
560
ctypes.byref(self._c_object))
561
self.type = gnutls.CRD_CERTIFICATE
562
563
def __del__(self):
564
gnutls.certificate_free_credentials(self._c_object)
565
566
class ClientSession(object):
567
def __init__(self, socket, credentials = None):
568
self._c_object = gnutls.session_t()
569
gnutls.init(ctypes.byref(self._c_object), gnutls.CLIENT)
570
gnutls.set_default_priority(self._c_object)
571
gnutls.transport_set_ptr(self._c_object, socket.fileno())
572
gnutls.handshake_set_private_extensions(self._c_object,
573
True)
574
self.socket = socket
575
if credentials is None:
576
credentials = gnutls.Credentials()
577
gnutls.credentials_set(self._c_object, credentials.type,
578
ctypes.cast(credentials._c_object,
579
ctypes.c_void_p))
580
self.credentials = credentials
581
582
def __del__(self):
583
gnutls.deinit(self._c_object)
584
585
def handshake(self):
586
return gnutls.handshake(self._c_object)
587
588
def send(self, data):
589
data = bytes(data)
590
data_len = len(data)
591
while data_len > 0:
592
data_len -= gnutls.record_send(self._c_object,
593
data[-data_len:],
594
data_len)
595
596
def bye(self):
597
return gnutls.bye(self._c_object, gnutls.SHUT_RDWR)
598
599
# Error handling functions
600
def _error_code(result):
601
"""A function to raise exceptions on errors, suitable
602
for the 'restype' attribute on ctypes functions"""
603
if result >= 0:
604
return result
605
if result == gnutls.E_NO_CERTIFICATE_FOUND:
606
raise gnutls.CertificateSecurityError(code = result)
607
raise gnutls.Error(code = result)
608
609
def _retry_on_error(result, func, arguments):
610
"""A function to retry on some errors, suitable
611
for the 'errcheck' attribute on ctypes functions"""
612
while result < 0:
613
if result not in (gnutls.E_INTERRUPTED, gnutls.E_AGAIN):
614
return _error_code(result)
615
result = func(*arguments)
616
return result
617
618
# Unless otherwise indicated, the function declarations below are
619
# all from the gnutls/gnutls.h C header file.
620
621
# Functions
622
priority_set_direct = _library.gnutls_priority_set_direct
623
priority_set_direct.argtypes = [session_t, ctypes.c_char_p,
624
ctypes.POINTER(ctypes.c_char_p)]
625
priority_set_direct.restype = _error_code
626
627
init = _library.gnutls_init
628
init.argtypes = [ctypes.POINTER(session_t), ctypes.c_int]
629
init.restype = _error_code
630
631
set_default_priority = _library.gnutls_set_default_priority
632
set_default_priority.argtypes = [session_t]
633
set_default_priority.restype = _error_code
634
635
record_send = _library.gnutls_record_send
636
record_send.argtypes = [session_t, ctypes.c_void_p,
637
ctypes.c_size_t]
638
record_send.restype = ctypes.c_ssize_t
639
record_send.errcheck = _retry_on_error
640
641
certificate_allocate_credentials = (
642
_library.gnutls_certificate_allocate_credentials)
643
certificate_allocate_credentials.argtypes = [
644
ctypes.POINTER(certificate_credentials_t)]
645
certificate_allocate_credentials.restype = _error_code
646
647
certificate_free_credentials = (
648
_library.gnutls_certificate_free_credentials)
649
certificate_free_credentials.argtypes = [certificate_credentials_t]
650
certificate_free_credentials.restype = None
651
652
handshake_set_private_extensions = (
653
_library.gnutls_handshake_set_private_extensions)
654
handshake_set_private_extensions.argtypes = [session_t,
655
ctypes.c_int]
656
handshake_set_private_extensions.restype = None
657
658
credentials_set = _library.gnutls_credentials_set
659
credentials_set.argtypes = [session_t, credentials_type_t,
660
ctypes.c_void_p]
661
credentials_set.restype = _error_code
662
663
strerror = _library.gnutls_strerror
664
strerror.argtypes = [ctypes.c_int]
665
strerror.restype = ctypes.c_char_p
666
667
certificate_type_get = _library.gnutls_certificate_type_get
668
certificate_type_get.argtypes = [session_t]
669
certificate_type_get.restype = _error_code
670
671
certificate_get_peers = _library.gnutls_certificate_get_peers
672
certificate_get_peers.argtypes = [session_t,
673
ctypes.POINTER(ctypes.c_uint)]
674
certificate_get_peers.restype = ctypes.POINTER(datum_t)
675
676
global_set_log_level = _library.gnutls_global_set_log_level
677
global_set_log_level.argtypes = [ctypes.c_int]
678
global_set_log_level.restype = None
679
680
global_set_log_function = _library.gnutls_global_set_log_function
681
global_set_log_function.argtypes = [log_func]
682
global_set_log_function.restype = None
683
684
deinit = _library.gnutls_deinit
685
deinit.argtypes = [session_t]
686
deinit.restype = None
687
688
handshake = _library.gnutls_handshake
689
handshake.argtypes = [session_t]
690
handshake.restype = _error_code
691
handshake.errcheck = _retry_on_error
692
693
transport_set_ptr = _library.gnutls_transport_set_ptr
694
transport_set_ptr.argtypes = [session_t, transport_ptr_t]
695
transport_set_ptr.restype = None
696
697
bye = _library.gnutls_bye
698
bye.argtypes = [session_t, close_request_t]
699
bye.restype = _error_code
700
bye.errcheck = _retry_on_error
701
702
check_version = _library.gnutls_check_version
703
check_version.argtypes = [ctypes.c_char_p]
704
check_version.restype = ctypes.c_char_p
705
706
# All the function declarations below are from gnutls/openpgp.h
707
708
openpgp_crt_init = _library.gnutls_openpgp_crt_init
709
openpgp_crt_init.argtypes = [ctypes.POINTER(openpgp_crt_t)]
710
openpgp_crt_init.restype = _error_code
711
712
openpgp_crt_import = _library.gnutls_openpgp_crt_import
713
openpgp_crt_import.argtypes = [openpgp_crt_t,
714
ctypes.POINTER(datum_t),
715
openpgp_crt_fmt_t]
716
openpgp_crt_import.restype = _error_code
717
718
openpgp_crt_verify_self = _library.gnutls_openpgp_crt_verify_self
719
openpgp_crt_verify_self.argtypes = [openpgp_crt_t, ctypes.c_uint,
720
ctypes.POINTER(ctypes.c_uint)]
721
openpgp_crt_verify_self.restype = _error_code
722
723
openpgp_crt_deinit = _library.gnutls_openpgp_crt_deinit
724
openpgp_crt_deinit.argtypes = [openpgp_crt_t]
725
openpgp_crt_deinit.restype = None
726
727
openpgp_crt_get_fingerprint = (
728
_library.gnutls_openpgp_crt_get_fingerprint)
729
openpgp_crt_get_fingerprint.argtypes = [openpgp_crt_t,
730
ctypes.c_void_p,
731
ctypes.POINTER(
732
ctypes.c_size_t)]
733
openpgp_crt_get_fingerprint.restype = _error_code
734
735
# Remove non-public functions
736
del _error_code, _retry_on_error
737
# Create the global "gnutls" object, simulating a module
738
gnutls = GnuTLS()
739
740
def call_pipe(connection, # : multiprocessing.Connection
741
func, *args, **kwargs):
742
"""This function is meant to be called by multiprocessing.Process
743
744
This function runs func(*args, **kwargs), and writes the resulting
745
return value on the provided multiprocessing.Connection.
746
"""
747
connection.send(func(*args, **kwargs))
748
connection.close()
749
414
750
415
class Client(object):
751
416
"""A representation of a client host served by this server.
757
422
checker: subprocess.Popen(); a running checker process used
758
423
to see if the client lives.
759
424
'None' if no process is running.
760
checker_callback_tag: a GObject event source tag, or None
425
checker_callback_tag: a gobject event source tag, or None
761
426
checker_command: string; External command which is run to check
762
427
if client lives. %() expansions are done at
763
428
runtime with vars(self) as dict, so that for
764
429
instance %(name)s can be used in the command.
765
checker_initiator_tag: a GObject event source tag, or None
430
checker_initiator_tag: a gobject event source tag, or None
766
431
created: datetime.datetime(); (UTC) object creation
767
432
client_structure: Object describing what attributes a client has
768
433
and is used for storing the client at exit
769
434
current_checker_command: string; current running checker_command
770
disable_initiator_tag: a GObject event source tag, or None
435
disable_initiator_tag: a gobject event source tag, or None
771
436
enabled: bool()
772
437
fingerprint: string (40 or 32 hexadecimal digits); used to
773
438
uniquely identify the client
778
443
last_checker_status: integer between 0 and 255 reflecting exit
779
444
status of last checker. -1 reflects crashed
780
445
checker, -2 means no checker completed yet.
781
last_checker_signal: The signal which killed the last checker, if
782
last_checker_status is -1
783
446
last_enabled: datetime.datetime(); (UTC) or None
784
447
name: string; from the config file, used in log messages and
785
448
D-Bus identifiers
836
499
client["fingerprint"] = (section["fingerprint"].upper()
837
500
.replace(" ", ""))
838
501
if "secret" in section:
839
client["secret"] = codecs.decode(section["secret"]
840
.encode("utf-8"),
841
"base64")
502
client["secret"] = section["secret"].decode("base64")
842
503
elif "secfile" in section:
843
504
with open(os.path.expanduser(os.path.expandvars
844
505
(section["secfile"])),
897
558
self.changedstate = multiprocessing_manager.Condition(
898
559
multiprocessing_manager.Lock())
899
560
self.client_structure = [attr
900
for attr in self.__dict__.keys()
561
for attr in self.__dict__.iterkeys()
901
562
if not attr.startswith("_")]
902
563
self.client_structure.append("client_structure")
903
564
929
590
if not quiet:
930
591
logger.info("Disabling client %s", self.name)
931
592
if getattr(self, "disable_initiator_tag", None) is not None:
932
GObject.source_remove(self.disable_initiator_tag)
593
gobject.source_remove(self.disable_initiator_tag)
933
594
self.disable_initiator_tag = None
934
595
self.expires = None
935
596
if getattr(self, "checker_initiator_tag", None) is not None:
936
GObject.source_remove(self.checker_initiator_tag)
597
gobject.source_remove(self.checker_initiator_tag)
937
598
self.checker_initiator_tag = None
938
599
self.stop_checker()
939
600
self.enabled = False
940
601
if not quiet:
941
602
self.send_changedstate()
942
# Do not run this again if called by a GObject.timeout_add
603
# Do not run this again if called by a gobject.timeout_add
943
604
return False
944
605
945
606
def __del__(self):
949
610
# Schedule a new checker to be started an 'interval' from now,
950
611
# and every interval from then on.
951
612
if self.checker_initiator_tag is not None:
952
GObject.source_remove(self.checker_initiator_tag)
953
self.checker_initiator_tag = GObject.timeout_add(
613
gobject.source_remove(self.checker_initiator_tag)
614
self.checker_initiator_tag = gobject.timeout_add(
954
615
int(self.interval.total_seconds() * 1000),
955
616
self.start_checker)
956
617
# Schedule a disable() when 'timeout' has passed
957
618
if self.disable_initiator_tag is not None:
958
GObject.source_remove(self.disable_initiator_tag)
959
self.disable_initiator_tag = GObject.timeout_add(
619
gobject.source_remove(self.disable_initiator_tag)
620
self.disable_initiator_tag = gobject.timeout_add(
960
621
int(self.timeout.total_seconds() * 1000), self.disable)
961
622
# Also start a new checker *right now*.
962
623
self.start_checker()
963
624
964
def checker_callback(self, source, condition, connection,
965
command):
625
def checker_callback(self, pid, condition, command):
966
626
"""The checker has completed, so take appropriate actions."""
967
627
self.checker_callback_tag = None
968
628
self.checker = None
969
# Read return code from connection (see call_pipe)
970
returncode = connection.recv()
971
connection.close()
972
973
if returncode >= 0:
974
self.last_checker_status = returncode
975
self.last_checker_signal = None
629
if os.WIFEXITED(condition):
630
self.last_checker_status = os.WEXITSTATUS(condition)
976
631
if self.last_checker_status == 0:
977
632
logger.info("Checker for %(name)s succeeded",
978
633
vars(self))
981
636
logger.info("Checker for %(name)s failed", vars(self))
982
637
else:
983
638
self.last_checker_status = -1
984
self.last_checker_signal = -returncode
985
639
logger.warning("Checker for %(name)s crashed?",
986
640
vars(self))
987
return False
988
641
989
642
def checked_ok(self):
990
643
"""Assert that the client has been seen, alive and well."""
991
644
self.last_checked_ok = datetime.datetime.utcnow()
992
645
self.last_checker_status = 0
993
self.last_checker_signal = None
994
646
self.bump_timeout()
995
647
996
648
def bump_timeout(self, timeout=None):
998
650
if timeout is None:
999
651
timeout = self.timeout
1000
652
if self.disable_initiator_tag is not None:
1001
GObject.source_remove(self.disable_initiator_tag)
653
gobject.source_remove(self.disable_initiator_tag)
1002
654
self.disable_initiator_tag = None
1003
655
if getattr(self, "enabled", False):
1004
self.disable_initiator_tag = GObject.timeout_add(
656
self.disable_initiator_tag = gobject.timeout_add(
1005
657
int(timeout.total_seconds() * 1000), self.disable)
1006
658
self.expires = datetime.datetime.utcnow() + timeout
1007
659
1022
674
# than 'timeout' for the client to be disabled, which is as it
1023
675
# should be.
1024
676
1025
if self.checker is not None and not self.checker.is_alive():
1026
logger.warning("Checker was not alive; joining")
1027
self.checker.join()
1028
self.checker = None
677
# If a checker exists, make sure it is not a zombie
678
try:
679
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
680
except AttributeError:
681
pass
682
except OSError as error:
683
if error.errno != errno.ECHILD:
684
raise
685
else:
686
if pid:
687
logger.warning("Checker was a zombie")
688
gobject.source_remove(self.checker_callback_tag)
689
self.checker_callback(pid, status,
690
self.current_checker_command)
1029
691
# Start a new checker if needed
1030
692
if self.checker is None:
1031
693
# Escape attributes for the shell
1040
702
exc_info=error)
1041
703
return True # Try again later
1042
704
self.current_checker_command = command
1043
logger.info("Starting checker %r for %s", command,
1044
self.name)
1045
# We don't need to redirect stdout and stderr, since
1046
# in normal mode, that is already done by daemon(),
1047
# and in debug mode we don't want to. (Stdin is
1048
# always replaced by /dev/null.)
1049
# The exception is when not debugging but nevertheless
1050
# running in the foreground; use the previously
1051
# created wnull.
1052
popen_args = { "close_fds": True,
1053
"shell": True,
1054
"cwd": "/" }
1055
if (not self.server_settings["debug"]
1056
and self.server_settings["foreground"]):
1057
popen_args.update({"stdout": wnull,
1058
"stderr": wnull })
1059
pipe = multiprocessing.Pipe(duplex = False)
1060
self.checker = multiprocessing.Process(
1061
target = call_pipe,
1062
args = (pipe[1], subprocess.call, command),
1063
kwargs = popen_args)
1064
self.checker.start()
1065
self.checker_callback_tag = GObject.io_add_watch(
1066
pipe[0].fileno(), GObject.IO_IN,
1067
self.checker_callback, pipe[0], command)
1068
# Re-run this periodically if run by GObject.timeout_add
705
try:
706
logger.info("Starting checker %r for %s", command,
707
self.name)
708
# We don't need to redirect stdout and stderr, since
709
# in normal mode, that is already done by daemon(),
710
# and in debug mode we don't want to. (Stdin is
711
# always replaced by /dev/null.)
712
# The exception is when not debugging but nevertheless
713
# running in the foreground; use the previously
714
# created wnull.
715
popen_args = {}
716
if (not self.server_settings["debug"]
717
and self.server_settings["foreground"]):
718
popen_args.update({"stdout": wnull,
719
"stderr": wnull })
720
self.checker = subprocess.Popen(command,
721
close_fds=True,
722
shell=True,
723
cwd="/",
724
**popen_args)
725
except OSError as error:
726
logger.error("Failed to start subprocess",
727
exc_info=error)
728
return True
729
self.checker_callback_tag = gobject.child_watch_add(
730
self.checker.pid, self.checker_callback, data=command)
731
# The checker may have completed before the gobject
732
# watch was added. Check for this.
733
try:
734
pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
735
except OSError as error:
736
if error.errno == errno.ECHILD:
737
# This should never happen
738
logger.error("Child process vanished",
739
exc_info=error)
740
return True
741
raise
742
if pid:
743
gobject.source_remove(self.checker_callback_tag)
744
self.checker_callback(pid, status, command)
745
# Re-run this periodically if run by gobject.timeout_add
1069
746
return True
1070
747
1071
748
def stop_checker(self):
1072
749
"""Force the checker process, if any, to stop."""
1073
750
if self.checker_callback_tag:
1074
GObject.source_remove(self.checker_callback_tag)
751
gobject.source_remove(self.checker_callback_tag)
1075
752
self.checker_callback_tag = None
1076
753
if getattr(self, "checker", None) is None:
1077
754
return
1078
755
logger.debug("Stopping checker for %(name)s", vars(self))
1079
self.checker.terminate()
756
try:
757
self.checker.terminate()
758
#time.sleep(0.5)
759
#if self.checker.poll() is None:
760
# self.checker.kill()
761
except OSError as error:
762
if error.errno != errno.ESRCH: # No such process
763
raise
1080
764
self.checker = None
1081
765
1082
766
1146
830
access="r")
1147
831
def Property_dbus_property(self):
1148
832
return dbus.Boolean(False)
1149
1150
See also the DBusObjectWithAnnotations class.
1151
833
"""
1152
834
1153
835
def decorator(func):
1175
857
pass
1176
858
1177
859
1178
class DBusObjectWithAnnotations(dbus.service.Object):
1179
"""A D-Bus object with annotations.
860
class DBusObjectWithProperties(dbus.service.Object):
861
"""A D-Bus object with properties.
1180
862
1181
Classes inheriting from this can use the dbus_annotations
1182
decorator to add annotations to methods or signals.
863
Classes inheriting from this can use the dbus_service_property
864
decorator to expose methods as D-Bus properties. It exposes the
865
standard Get(), Set(), and GetAll() methods on the D-Bus.
1183
866
"""
1184
867
1185
868
@staticmethod
1201
884
for name, athing in
1202
885
inspect.getmembers(cls, self._is_dbus_thing(thing)))
1203
886
1204
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1205
out_signature = "s",
1206
path_keyword = 'object_path',
1207
connection_keyword = 'connection')
1208
def Introspect(self, object_path, connection):
1209
"""Overloading of standard D-Bus method.
1210
1211
Inserts annotation tags on methods and signals.
1212
"""
1213
xmlstring = dbus.service.Object.Introspect(self, object_path,
1214
connection)
1215
try:
1216
document = xml.dom.minidom.parseString(xmlstring)
1217
1218
for if_tag in document.getElementsByTagName("interface"):
1219
# Add annotation tags
1220
for typ in ("method", "signal"):
1221
for tag in if_tag.getElementsByTagName(typ):
1222
annots = dict()
1223
for name, prop in (self.
1224
_get_all_dbus_things(typ)):
1225
if (name == tag.getAttribute("name")
1226
and prop._dbus_interface
1227
== if_tag.getAttribute("name")):
1228
annots.update(getattr(
1229
prop, "_dbus_annotations", {}))
1230
for name, value in annots.items():
1231
ann_tag = document.createElement(
1232
"annotation")
1233
ann_tag.setAttribute("name", name)
1234
ann_tag.setAttribute("value", value)
1235
tag.appendChild(ann_tag)
1236
# Add interface annotation tags
1237
for annotation, value in dict(
1238
itertools.chain.from_iterable(
1239
annotations().items()
1240
for name, annotations
1241
in self._get_all_dbus_things("interface")
1242
if name == if_tag.getAttribute("name")
1243
)).items():
1244
ann_tag = document.createElement("annotation")
1245
ann_tag.setAttribute("name", annotation)
1246
ann_tag.setAttribute("value", value)
1247
if_tag.appendChild(ann_tag)
1248
# Fix argument name for the Introspect method itself
1249
if (if_tag.getAttribute("name")
1250
== dbus.INTROSPECTABLE_IFACE):
1251
for cn in if_tag.getElementsByTagName("method"):
1252
if cn.getAttribute("name") == "Introspect":
1253
for arg in cn.getElementsByTagName("arg"):
1254
if (arg.getAttribute("direction")
1255
== "out"):
1256
arg.setAttribute("name",
1257
"xml_data")
1258
xmlstring = document.toxml("utf-8")
1259
document.unlink()
1260
except (AttributeError, xml.dom.DOMException,
1261
xml.parsers.expat.ExpatError) as error:
1262
logger.error("Failed to override Introspection method",
1263
exc_info=error)
1264
return xmlstring
1265
1266
1267
class DBusObjectWithProperties(DBusObjectWithAnnotations):
1268
"""A D-Bus object with properties.
1269
1270
Classes inheriting from this can use the dbus_service_property
1271
decorator to expose methods as D-Bus properties. It exposes the
1272
standard Get(), Set(), and GetAll() methods on the D-Bus.
1273
"""
1274
1275
887
def _get_dbus_property(self, interface_name, property_name):
1276
888
"""Returns a bound method if one exists which is a D-Bus
1277
889
property with the specified name and interface.
1287
899
raise DBusPropertyNotFound("{}:{}.{}".format(
1288
900
self.dbus_object_path, interface_name, property_name))
1289
901
1290
@classmethod
1291
def _get_all_interface_names(cls):
1292
"""Get a sequence of all interfaces supported by an object"""
1293
return (name for name in set(getattr(getattr(x, attr),
1294
"_dbus_interface", None)
1295
for x in (inspect.getmro(cls))
1296
for attr in dir(x))
1297
if name is not None)
1298
1299
902
@dbus.service.method(dbus.PROPERTIES_IFACE,
1300
903
in_signature="ss",
1301
904
out_signature="v")
1371
974
1372
975
Inserts property tags and interface annotation tags.
1373
976
"""
1374
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1375
object_path,
1376
connection)
977
xmlstring = dbus.service.Object.Introspect(self, object_path,
978
connection)
1377
979
try:
1378
980
document = xml.dom.minidom.parseString(xmlstring)
1379
981
1392
994
if prop._dbus_interface
1393
995
== if_tag.getAttribute("name")):
1394
996
if_tag.appendChild(tag)
1395
# Add annotation tags for properties
1396
for tag in if_tag.getElementsByTagName("property"):
1397
annots = dict()
1398
for name, prop in self._get_all_dbus_things(
1399
"property"):
1400
if (name == tag.getAttribute("name")
1401
and prop._dbus_interface
1402
== if_tag.getAttribute("name")):
1403
annots.update(getattr(
1404
prop, "_dbus_annotations", {}))
1405
for name, value in annots.items():
1406
ann_tag = document.createElement(
1407
"annotation")
1408
ann_tag.setAttribute("name", name)
1409
ann_tag.setAttribute("value", value)
1410
tag.appendChild(ann_tag)
997
# Add annotation tags
998
for typ in ("method", "signal", "property"):
999
for tag in if_tag.getElementsByTagName(typ):
1000
annots = dict()
1001
for name, prop in (self.
1002
_get_all_dbus_things(typ)):
1003
if (name == tag.getAttribute("name")
1004
and prop._dbus_interface
1005
== if_tag.getAttribute("name")):
1006
annots.update(getattr(
1007
prop, "_dbus_annotations", {}))
1008
for name, value in annots.items():
1009
ann_tag = document.createElement(
1010
"annotation")
1011
ann_tag.setAttribute("name", name)
1012
ann_tag.setAttribute("value", value)
1013
tag.appendChild(ann_tag)
1014
# Add interface annotation tags
1015
for annotation, value in dict(
1016
itertools.chain.from_iterable(
1017
annotations().items()
1018
for name, annotations
1019
in self._get_all_dbus_things("interface")
1020
if name == if_tag.getAttribute("name")
1021
)).items():
1022
ann_tag = document.createElement("annotation")
1023
ann_tag.setAttribute("name", annotation)
1024
ann_tag.setAttribute("value", value)
1025
if_tag.appendChild(ann_tag)
1411
1026
# Add the names to the return values for the
1412
1027
# "org.freedesktop.DBus.Properties" methods
1413
1028
if (if_tag.getAttribute("name")
1431
1046
exc_info=error)
1432
1047
return xmlstring
1433
1048
1434
try:
1435
dbus.OBJECT_MANAGER_IFACE
1436
except AttributeError:
1437
dbus.OBJECT_MANAGER_IFACE = "org.freedesktop.DBus.ObjectManager"
1438
1439
class DBusObjectWithObjectManager(DBusObjectWithAnnotations):
1440
"""A D-Bus object with an ObjectManager.
1441
1442
Classes inheriting from this exposes the standard
1443
GetManagedObjects call and the InterfacesAdded and
1444
InterfacesRemoved signals on the standard
1445
"org.freedesktop.DBus.ObjectManager" interface.
1446
1447
Note: No signals are sent automatically; they must be sent
1448
manually.
1449
"""
1450
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
1451
out_signature = "a{oa{sa{sv}}}")
1452
def GetManagedObjects(self):
1453
"""This function must be overridden"""
1454
raise NotImplementedError()
1455
1456
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE,
1457
signature = "oa{sa{sv}}")
1458
def InterfacesAdded(self, object_path, interfaces_and_properties):
1459
pass
1460
1461
@dbus.service.signal(dbus.OBJECT_MANAGER_IFACE, signature = "oas")
1462
def InterfacesRemoved(self, object_path, interfaces):
1463
pass
1464
1465
@dbus.service.method(dbus.INTROSPECTABLE_IFACE,
1466
out_signature = "s",
1467
path_keyword = 'object_path',
1468
connection_keyword = 'connection')
1469
def Introspect(self, object_path, connection):
1470
"""Overloading of standard D-Bus method.
1471
1472
Override return argument name of GetManagedObjects to be
1473
"objpath_interfaces_and_properties"
1474
"""
1475
xmlstring = DBusObjectWithAnnotations.Introspect(self,
1476
object_path,
1477
connection)
1478
try:
1479
document = xml.dom.minidom.parseString(xmlstring)
1480
1481
for if_tag in document.getElementsByTagName("interface"):
1482
# Fix argument name for the GetManagedObjects method
1483
if (if_tag.getAttribute("name")
1484
== dbus.OBJECT_MANAGER_IFACE):
1485
for cn in if_tag.getElementsByTagName("method"):
1486
if (cn.getAttribute("name")
1487
== "GetManagedObjects"):
1488
for arg in cn.getElementsByTagName("arg"):
1489
if (arg.getAttribute("direction")
1490
== "out"):
1491
arg.setAttribute(
1492
"name",
1493
"objpath_interfaces"
1494
"_and_properties")
1495
xmlstring = document.toxml("utf-8")
1496
document.unlink()
1497
except (AttributeError, xml.dom.DOMException,
1498
xml.parsers.expat.ExpatError) as error:
1499
logger.error("Failed to override Introspection method",
1500
exc_info = error)
1501
return xmlstring
1502
1049
1503
1050
def datetime_to_dbus(dt, variant_level=0):
1504
1051
"""Convert a UTC datetime.datetime() to a D-Bus type."""
1553
1100
if getattr(attribute, "_dbus_is_signal", False):
1554
1101
# Extract the original non-method undecorated
1555
1102
# function by black magic
1556
if sys.version_info.major == 2:
1557
nonmethod_func = (dict(
1558
zip(attribute.func_code.co_freevars,
1559
attribute.__closure__))
1560
["func"].cell_contents)
1561
else:
1562
nonmethod_func = (dict(
1563
zip(attribute.__code__.co_freevars,
1564
attribute.__closure__))
1565
["func"].cell_contents)
1103
nonmethod_func = (dict(
1104
zip(attribute.func_code.co_freevars,
1105
attribute.__closure__))
1106
["func"].cell_contents)
1566
1107
# Create a new, but exactly alike, function
1567
1108
# object, and decorate it to be a new D-Bus signal
1568
1109
# with the alternate D-Bus interface name
1569
new_function = copy_function(nonmethod_func)
1570
1110
new_function = (dbus.service.signal(
1571
alt_interface,
1572
attribute._dbus_signature)(new_function))
1111
alt_interface, attribute._dbus_signature)
1112
(types.FunctionType(
1113
nonmethod_func.func_code,
1114
nonmethod_func.func_globals,
1115
nonmethod_func.func_name,
1116
nonmethod_func.func_defaults,
1117
nonmethod_func.func_closure)))
1573
1118
# Copy annotations, if any
1574
1119
try:
1575
1120
new_function._dbus_annotations = dict(
1585
1130
func1 and func2 to the "call_both" function
1586
1131
outside of its arguments"""
1587
1132
1588
@functools.wraps(func2)
1589
1133
def call_both(*args, **kwargs):
1590
1134
"""This function will emit two D-Bus
1591
1135
signals by calling func1 and func2"""
1592
1136
func1(*args, **kwargs)
1593
1137
func2(*args, **kwargs)
1594
# Make wrapper function look like a D-Bus signal
1595
for name, attr in inspect.getmembers(func2):
1596
if name.startswith("_dbus_"):
1597
setattr(call_both, name, attr)
1598
1138
1599
1139
return call_both
1600
1140
# Create the "call_both" function and add it to
1611
1151
alt_interface,
1612
1152
attribute._dbus_in_signature,
1613
1153
attribute._dbus_out_signature)
1614
(copy_function(attribute)))
1154
(types.FunctionType(attribute.func_code,
1155
attribute.func_globals,
1156
attribute.func_name,
1157
attribute.func_defaults,
1158
attribute.func_closure)))
1615
1159
# Copy annotations, if any
1616
1160
try:
1617
1161
attr[attrname]._dbus_annotations = dict(
1629
1173
attribute._dbus_access,
1630
1174
attribute._dbus_get_args_options
1631
1175
["byte_arrays"])
1632
(copy_function(attribute)))
1176
(types.FunctionType(
1177
attribute.func_code,
1178
attribute.func_globals,
1179
attribute.func_name,
1180
attribute.func_defaults,
1181
attribute.func_closure)))
1633
1182
# Copy annotations, if any
1634
1183
try:
1635
1184
attr[attrname]._dbus_annotations = dict(
1644
1193
# to the class.
1645
1194
attr[attrname] = (
1646
1195
dbus_interface_annotations(alt_interface)
1647
(copy_function(attribute)))
1196
(types.FunctionType(attribute.func_code,
1197
attribute.func_globals,
1198
attribute.func_name,
1199
attribute.func_defaults,
1200
attribute.func_closure)))
1648
1201
if deprecate:
1649
1202
# Deprecate all alternate interfaces
1650
1203
iname="_AlternateDBusNames_interface_annotation{}"
1663
1216
if interface_names:
1664
1217
# Replace the class with a new subclass of it with
1665
1218
# methods, signals, etc. as created above.
1666
if sys.version_info.major == 2:
1667
cls = type(b"{}Alternate".format(cls.__name__),
1668
(cls, ), attr)
1669
else:
1670
cls = type("{}Alternate".format(cls.__name__),
1671
(cls, ), attr)
1219
cls = type(b"{}Alternate".format(cls.__name__),
1220
(cls, ), attr)
1672
1221
return cls
1673
1222
1674
1223
return wrapper
1794
1343
DBusObjectWithProperties.__del__(self, *args, **kwargs)
1795
1344
Client.__del__(self, *args, **kwargs)
1796
1345
1797
def checker_callback(self, source, condition,
1798
connection, command, *args, **kwargs):
1799
ret = Client.checker_callback(self, source, condition,
1800
connection, command, *args,
1801
**kwargs)
1802
exitstatus = self.last_checker_status
1803
if exitstatus >= 0:
1346
def checker_callback(self, pid, condition, command,
1347
*args, **kwargs):
1348
self.checker_callback_tag = None
1349
self.checker = None
1350
if os.WIFEXITED(condition):
1351
exitstatus = os.WEXITSTATUS(condition)
1804
1352
# Emit D-Bus signal
1805
1353
self.CheckerCompleted(dbus.Int16(exitstatus),
1806
# This is specific to GNU libC
1807
dbus.Int64(exitstatus << 8),
1354
dbus.Int64(condition),
1808
1355
dbus.String(command))
1809
1356
else:
1810
1357
# Emit D-Bus signal
1811
1358
self.CheckerCompleted(dbus.Int16(-1),
1812
dbus.Int64(
1813
# This is specific to GNU libC
1814
(exitstatus << 8)
1815
| self.last_checker_signal),
1359
dbus.Int64(condition),
1816
1360
dbus.String(command))
1817
return ret
1361
1362
return Client.checker_callback(self, pid, condition, command,
1363
*args, **kwargs)
1818
1364
1819
1365
def start_checker(self, *args, **kwargs):
1820
1366
old_checker_pid = getattr(self.checker, "pid", None)
1832
1378
1833
1379
def approve(self, value=True):
1834
1380
self.approved = value
1835
GObject.timeout_add(int(self.approval_duration.total_seconds()
1381
gobject.timeout_add(int(self.approval_duration.total_seconds()
1836
1382
* 1000), self._reset_approved)
1837
1383
self.send_changedstate()
1838
1384
1895
1441
self.checked_ok()
1896
1442
1897
1443
# Enable - method
1898
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1899
1444
@dbus.service.method(_interface)
1900
1445
def Enable(self):
1901
1446
"D-Bus method"
1902
1447
self.enable()
1903
1448
1904
1449
# StartChecker - method
1905
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1906
1450
@dbus.service.method(_interface)
1907
1451
def StartChecker(self):
1908
1452
"D-Bus method"
1909
1453
self.start_checker()
1910
1454
1911
1455
# Disable - method
1912
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1913
1456
@dbus.service.method(_interface)
1914
1457
def Disable(self):
1915
1458
"D-Bus method"
1916
1459
self.disable()
1917
1460
1918
1461
# StopChecker - method
1919
@dbus_annotations({"org.freedesktop.DBus.Deprecated": "true"})
1920
1462
@dbus.service.method(_interface)
1921
1463
def StopChecker(self):
1922
1464
self.stop_checker()
1958
1500
self.approval_duration = datetime.timedelta(0, 0, 0, value)
1959
1501
1960
1502
# Name - property
1961
@dbus_annotations(
1962
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1963
1503
@dbus_service_property(_interface, signature="s", access="read")
1964
1504
def Name_dbus_property(self):
1965
1505
return dbus.String(self.name)
1966
1506
1967
1507
# Fingerprint - property
1968
@dbus_annotations(
1969
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1970
1508
@dbus_service_property(_interface, signature="s", access="read")
1971
1509
def Fingerprint_dbus_property(self):
1972
1510
return dbus.String(self.fingerprint)
1981
1519
self.host = str(value)
1982
1520
1983
1521
# Created - property
1984
@dbus_annotations(
1985
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const"})
1986
1522
@dbus_service_property(_interface, signature="s", access="read")
1987
1523
def Created_dbus_property(self):
1988
1524
return datetime_to_dbus(self.created)
2049
1585
if (getattr(self, "disable_initiator_tag", None)
2050
1586
is None):
2051
1587
return
2052
GObject.source_remove(self.disable_initiator_tag)
2053
self.disable_initiator_tag = GObject.timeout_add(
1588
gobject.source_remove(self.disable_initiator_tag)
1589
self.disable_initiator_tag = gobject.timeout_add(
2054
1590
int((self.expires - now).total_seconds() * 1000),
2055
1591
self.disable)
2056
1592
2076
1612
return
2077
1613
if self.enabled:
2078
1614
# Reschedule checker run
2079
GObject.source_remove(self.checker_initiator_tag)
2080
self.checker_initiator_tag = GObject.timeout_add(
1615
gobject.source_remove(self.checker_initiator_tag)
1616
self.checker_initiator_tag = gobject.timeout_add(
2081
1617
value, self.start_checker)
2082
1618
self.start_checker() # Start one now, too
2083
1619
2103
1639
self.stop_checker()
2104
1640
2105
1641
# ObjectPath - property
2106
@dbus_annotations(
2107
{"org.freedesktop.DBus.Property.EmitsChangedSignal": "const",
2108
"org.freedesktop.DBus.Deprecated": "true"})
2109
1642
@dbus_service_property(_interface, signature="o", access="read")
2110
1643
def ObjectPath_dbus_property(self):
2111
1644
return self.dbus_object_path # is already a dbus.ObjectPath
2112
1645
2113
1646
# Secret = property
2114
@dbus_annotations(
2115
{"org.freedesktop.DBus.Property.EmitsChangedSignal":
2116
"invalidates"})
2117
1647
@dbus_service_property(_interface,
2118
1648
signature="ay",
2119
1649
access="write",
2129
1659
self._pipe = child_pipe
2130
1660
self._pipe.send(('init', fpr, address))
2131
1661
if not self._pipe.recv():
2132
raise KeyError(fpr)
1662
raise KeyError()
2133
1663
2134
1664
def __getattribute__(self, name):
2135
1665
if name == '_pipe':
2165
1695
logger.debug("Pipe FD: %d",
2166
1696
self.server.child_pipe.fileno())
2167
1697
2168
session = gnutls.ClientSession(self.request)
1698
session = gnutls.connection.ClientSession(
1699
self.request, gnutls.connection .X509Credentials())
1700
1701
# Note: gnutls.connection.X509Credentials is really a
1702
# generic GnuTLS certificate credentials object so long as
1703
# no X.509 keys are added to it. Therefore, we can use it
1704
# here despite using OpenPGP certificates.
2169
1705
2170
1706
#priority = ':'.join(("NONE", "+VERS-TLS1.1",
2171
1707
# "+AES-256-CBC", "+SHA1",
2175
1711
priority = self.server.gnutls_priority
2176
1712
if priority is None:
2177
1713
priority = "NORMAL"
2178
gnutls.priority_set_direct(session._c_object, priority,
2179
None)
1714
gnutls.library.functions.gnutls_priority_set_direct(
1715
session._c_object, priority, None)
2180
1716
2181
1717
# Start communication using the Mandos protocol
2182
1718
# Get protocol number
2192
1728
# Start GnuTLS connection
2193
1729
try:
2194
1730
session.handshake()
2195
except gnutls.Error as error:
1731
except gnutls.errors.GNUTLSError as error:
2196
1732
logger.warning("Handshake failed: %s", error)
2197
1733
# Do not run session.bye() here: the session is not
2198
1734
# established. Just abandon the request.
2204
1740
try:
2205
1741
fpr = self.fingerprint(
2206
1742
self.peer_certificate(session))
2207
except (TypeError, gnutls.Error) as error:
1743
except (TypeError,
1744
gnutls.errors.GNUTLSError) as error:
2208
1745
logger.warning("Bad certificate: %s", error)
2209
1746
return
2210
1747
logger.debug("Fingerprint: %s", fpr)
2268
1805
else:
2269
1806
delay -= time2 - time
2270
1807
2271
try:
2272
session.send(client.secret)
2273
except gnutls.Error as error:
2274
logger.warning("gnutls send failed",
2275
exc_info = error)
2276
return
1808
sent_size = 0
1809
while sent_size < len(client.secret):
1810
try:
1811
sent = session.send(client.secret[sent_size:])
1812
except gnutls.errors.GNUTLSError as error:
1813
logger.warning("gnutls send failed",
1814
exc_info=error)
1815
return
1816
logger.debug("Sent: %d, remaining: %d", sent,
1817
len(client.secret) - (sent_size
1818
+ sent))
1819
sent_size += sent
2277
1820
2278
1821
logger.info("Sending secret to %s", client.name)
2279
1822
# bump the timeout using extended_timeout
2287
1830
client.approvals_pending -= 1
2288
1831
try:
2289
1832
session.bye()
2290
except gnutls.Error as error:
1833
except gnutls.errors.GNUTLSError as error:
2291
1834
logger.warning("GnuTLS bye failed",
2292
1835
exc_info=error)
2293
1836
2295
1838
def peer_certificate(session):
2296
1839
"Return the peer's OpenPGP certificate as a bytestring"
2297
1840
# If not an OpenPGP certificate...
2298
if (gnutls.certificate_type_get(session._c_object)
2299
!= gnutls.CRT_OPENPGP):
2300
# ...return invalid data
2301
return b""
1841
if (gnutls.library.functions.gnutls_certificate_type_get(
1842
session._c_object)
1843
!= gnutls.library.constants.GNUTLS_CRT_OPENPGP):
1844
# ...do the normal thing
1845
return session.peer_certificate
2302
1846
list_size = ctypes.c_uint(1)
2303
cert_list = (gnutls.certificate_get_peers
1847
cert_list = (gnutls.library.functions
1848
.gnutls_certificate_get_peers
2304
1849
(session._c_object, ctypes.byref(list_size)))
2305
1850
if not bool(cert_list) and list_size.value != 0:
2306
raise gnutls.Error("error getting peer certificate")
1851
raise gnutls.errors.GNUTLSError("error getting peer"
1852
" certificate")
2307
1853
if list_size.value == 0:
2308
1854
return None
2309
1855
cert = cert_list[0]
2313
1859
def fingerprint(openpgp):
2314
1860
"Convert an OpenPGP bytestring to a hexdigit fingerprint"
2315
1861
# New GnuTLS "datum" with the OpenPGP public key
2316
datum = gnutls.datum_t(
1862
datum = gnutls.library.types.gnutls_datum_t(
2317
1863
ctypes.cast(ctypes.c_char_p(openpgp),
2318
1864
ctypes.POINTER(ctypes.c_ubyte)),
2319
1865
ctypes.c_uint(len(openpgp)))
2320
1866
# New empty GnuTLS certificate
2321
crt = gnutls.openpgp_crt_t()
2322
gnutls.openpgp_crt_init(ctypes.byref(crt))
1867
crt = gnutls.library.types.gnutls_openpgp_crt_t()
1868
gnutls.library.functions.gnutls_openpgp_crt_init(
1869
ctypes.byref(crt))
2323
1870
# Import the OpenPGP public key into the certificate
2324
gnutls.openpgp_crt_import(crt, ctypes.byref(datum),
2325
gnutls.OPENPGP_FMT_RAW)
1871
gnutls.library.functions.gnutls_openpgp_crt_import(
1872
crt, ctypes.byref(datum),
1873
gnutls.library.constants.GNUTLS_OPENPGP_FMT_RAW)
2326
1874
# Verify the self signature in the key
2327
1875
crtverify = ctypes.c_uint()
2328
gnutls.openpgp_crt_verify_self(crt, 0,
2329
ctypes.byref(crtverify))
1876
gnutls.library.functions.gnutls_openpgp_crt_verify_self(
1877
crt, 0, ctypes.byref(crtverify))
2330
1878
if crtverify.value != 0:
2331
gnutls.openpgp_crt_deinit(crt)
2332
raise gnutls.CertificateSecurityError("Verify failed")
1879
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
1880
raise gnutls.errors.CertificateSecurityError(
1881
"Verify failed")
2333
1882
# New buffer for the fingerprint
2334
1883
buf = ctypes.create_string_buffer(20)
2335
1884
buf_len = ctypes.c_size_t()
2336
1885
# Get the fingerprint from the certificate into the buffer
2337
gnutls.openpgp_crt_get_fingerprint(crt, ctypes.byref(buf),
2338
ctypes.byref(buf_len))
1886
gnutls.library.functions.gnutls_openpgp_crt_get_fingerprint(
1887
crt, ctypes.byref(buf), ctypes.byref(buf_len))
2339
1888
# Deinit the certificate
2340
gnutls.openpgp_crt_deinit(crt)
1889
gnutls.library.functions.gnutls_openpgp_crt_deinit(crt)
2341
1890
# Convert the buffer to a Python bytestring
2342
1891
fpr = ctypes.string_at(buf, buf_len.value)
2343
1892
# Convert the bytestring to hexadecimal notation
2487
2036
gnutls_priority GnuTLS priority string
2488
2037
use_dbus: Boolean; to emit D-Bus signals or not
2489
2038
2490
Assumes a GObject.MainLoop event loop.
2039
Assumes a gobject.MainLoop event loop.
2491
2040
"""
2492
2041
2493
2042
def __init__(self, server_address, RequestHandlerClass,
2518
2067
2519
2068
def add_pipe(self, parent_pipe, proc):
2520
2069
# Call "handle_ipc" for both data and EOF events
2521
GObject.io_add_watch(
2070
gobject.io_add_watch(
2522
2071
parent_pipe.fileno(),
2523
GObject.IO_IN | GObject.IO_HUP,
2072
gobject.IO_IN | gobject.IO_HUP,
2524
2073
functools.partial(self.handle_ipc,
2525
2074
parent_pipe = parent_pipe,
2526
2075
proc = proc))
2530
2079
proc = None,
2531
2080
client_object=None):
2532
2081
# error, or the other end of multiprocessing.Pipe has closed
2533
if condition & (GObject.IO_ERR | GObject.IO_HUP):
2082
if condition & (gobject.IO_ERR | gobject.IO_HUP):
2534
2083
# Wait for other process to exit
2535
2084
proc.join()
2536
2085
return False
2543
2092
fpr = request[1]
2544
2093
address = request[2]
2545
2094
2546
for c in self.clients.values():
2095
for c in self.clients.itervalues():
2547
2096
if c.fingerprint == fpr:
2548
2097
client = c
2549
2098
break
2557
2106
parent_pipe.send(False)
2558
2107
return False
2559
2108
2560
GObject.io_add_watch(
2109
gobject.io_add_watch(
2561
2110
parent_pipe.fileno(),
2562
GObject.IO_IN | GObject.IO_HUP,
2111
gobject.IO_IN | gobject.IO_HUP,
2563
2112
functools.partial(self.handle_ipc,
2564
2113
parent_pipe = parent_pipe,
2565
2114
proc = proc,
2579
2128
2580
2129
if command == 'getattr':
2581
2130
attrname = request[1]
2582
if isinstance(client_object.__getattribute__(attrname),
2583
collections.Callable):
2131
if callable(client_object.__getattribute__(attrname)):
2584
2132
parent_pipe.send(('function', ))
2585
2133
else:
2586
2134
parent_pipe.send((
2621
2169
# avoid excessive use of external libraries.
2622
2170
2623
2171
# New type for defining tokens, syntax, and semantics all-in-one
2172
Token = collections.namedtuple("Token",
2173
("regexp", # To match token; if
2174
# "value" is not None,
2175
# must have a "group"
2176
# containing digits
2177
"value", # datetime.timedelta or
2178
# None
2179
"followers")) # Tokens valid after
2180
# this token
2624
2181
Token = collections.namedtuple("Token", (
2625
2182
"regexp", # To match token; if "value" is not None, must have
2626
2183
# a "group" containing digits
2661
2218
# Define starting values
2662
2219
value = datetime.timedelta() # Value so far
2663
2220
found_token = None
2664
followers = frozenset((token_duration, )) # Following valid tokens
2221
followers = frozenset((token_duration,)) # Following valid tokens
2665
2222
s = duration # String left to parse
2666
2223
# Loop until end token is found
2667
2224
while found_token is not token_end:
2684
2241
break
2685
2242
else:
2686
2243
# No currently valid tokens were found
2687
raise ValueError("Invalid RFC 3339 duration: {!r}"
2688
.format(duration))
2244
raise ValueError("Invalid RFC 3339 duration")
2689
2245
# End token found
2690
2246
return value
2691
2247
2824
2380
"debug": "False",
2825
2381
"priority":
2826
2382
"SECURE256:!CTYPE-X.509:+CTYPE-OPENPGP:!RSA"
2827
":+SIGN-DSA-SHA256",
2383
":+SIGN-RSA-SHA224:+SIGN-RSA-RMD160",
2828
2384
"servicename": "Mandos",
2829
2385
"use_dbus": "True",
2830
2386
"use_ipv6": "True",
2942
2498
pidfilename = "/var/run/mandos.pid"
2943
2499
pidfile = None
2944
2500
try:
2945
pidfile = codecs.open(pidfilename, "w", encoding="utf-8")
2501
pidfile = open(pidfilename, "w")
2946
2502
except IOError as e:
2947
2503
logger.error("Could not open file %r", pidfilename,
2948
2504
exc_info=e)
2949
2505
2950
for name, group in (("_mandos", "_mandos"),
2951
("mandos", "mandos"),
2952
("nobody", "nogroup")):
2506
for name in ("_mandos", "mandos", "nobody"):
2953
2507
try:
2954
2508
uid = pwd.getpwnam(name).pw_uid
2955
gid = pwd.getpwnam(group).pw_gid
2509
gid = pwd.getpwnam(name).pw_gid
2956
2510
break
2957
2511
except KeyError:
2958
2512
continue
2962
2516
try:
2963
2517
os.setgid(gid)
2964
2518
os.setuid(uid)
2965
if debug:
2966
logger.debug("Did setuid/setgid to {}:{}".format(uid,
2967
gid))
2968
2519
except OSError as error:
2969
logger.warning("Failed to setuid/setgid to {}:{}: {}"
2970
.format(uid, gid, os.strerror(error.errno)))
2971
2520
if error.errno != errno.EPERM:
2972
2521
raise
2973
2522
2976
2525
2977
2526
# "Use a log level over 10 to enable all debugging options."
2978
2527
# - GnuTLS manual
2979
gnutls.global_set_log_level(11)
2528
gnutls.library.functions.gnutls_global_set_log_level(11)
2980
2529
2981
@gnutls.log_func
2530
@gnutls.library.types.gnutls_log_func
2982
2531
def debug_gnutls(level, string):
2983
2532
logger.debug("GnuTLS: %s", string[:-1])
2984
2533
2985
gnutls.global_set_log_function(debug_gnutls)
2534
gnutls.library.functions.gnutls_global_set_log_function(
2535
debug_gnutls)
2986
2536
2987
2537
# Redirect stdin so all checkers get /dev/null
2988
2538
null = os.open(os.devnull, os.O_NOCTTY | os.O_RDWR)
2995
2545
# Close all input and output, do double fork, etc.
2996
2546
daemon()
2997
2547
2998
# multiprocessing will use threads, so before we use GObject we
2999
# need to inform GObject that threads will be used.
3000
GObject.threads_init()
2548
# multiprocessing will use threads, so before we use gobject we
2549
# need to inform gobject that threads will be used.
2550
gobject.threads_init()
3001
2551
3002
2552
global main_loop
3003
2553
# From the Avahi example code
3004
2554
DBusGMainLoop(set_as_default=True)
3005
main_loop = GObject.MainLoop()
2555
main_loop = gobject.MainLoop()
3006
2556
bus = dbus.SystemBus()
3007
2557
# End of Avahi example code
3008
2558
if use_dbus:
3013
2563
old_bus_name = dbus.service.BusName(
3014
2564
"se.bsnet.fukt.Mandos", bus,
3015
2565
do_not_queue=True)
3016
except dbus.exceptions.DBusException as e:
2566
except dbus.exceptions.NameExistsException as e:
3017
2567
logger.error("Disabling D-Bus:", exc_info=e)
3018
2568
use_dbus = False
3019
2569
server_settings["use_dbus"] = False
3052
2602
if server_settings["restore"]:
3053
2603
try:
3054
2604
with open(stored_state_path, "rb") as stored_state:
3055
if sys.version_info.major == 2:
3056
clients_data, old_client_settings = pickle.load(
3057
stored_state)
3058
else:
3059
bytes_clients_data, bytes_old_client_settings = (
3060
pickle.load(stored_state, encoding = "bytes"))
3061
### Fix bytes to strings
3062
## clients_data
3063
# .keys()
3064
clients_data = { (key.decode("utf-8")
3065
if isinstance(key, bytes)
3066
else key): value
3067
for key, value in
3068
bytes_clients_data.items() }
3069
del bytes_clients_data
3070
for key in clients_data:
3071
value = { (k.decode("utf-8")
3072
if isinstance(k, bytes) else k): v
3073
for k, v in
3074
clients_data[key].items() }
3075
clients_data[key] = value
3076
# .client_structure
3077
value["client_structure"] = [
3078
(s.decode("utf-8")
3079
if isinstance(s, bytes)
3080
else s) for s in
3081
value["client_structure"] ]
3082
# .name & .host
3083
for k in ("name", "host"):
3084
if isinstance(value[k], bytes):
3085
value[k] = value[k].decode("utf-8")
3086
## old_client_settings
3087
# .keys()
3088
old_client_settings = {
3089
(key.decode("utf-8")
3090
if isinstance(key, bytes)
3091
else key): value
3092
for key, value in
3093
bytes_old_client_settings.items() }
3094
del bytes_old_client_settings
3095
# .host
3096
for value in old_client_settings.values():
3097
if isinstance(value["host"], bytes):
3098
value["host"] = (value["host"]
3099
.decode("utf-8"))
2605
clients_data, old_client_settings = pickle.load(
2606
stored_state)
3100
2607
os.remove(stored_state_path)
3101
2608
except IOError as e:
3102
2609
if e.errno == errno.ENOENT:
3135
2642
pass
3136
2643
3137
2644
# Clients who has passed its expire date can still be
3138
# enabled if its last checker was successful. A Client
2645
# enabled if its last checker was successful. Clients
3139
2646
# whose checker succeeded before we stored its state is
3140
2647
# assumed to have successfully run all checkers during
3141
2648
# downtime.
3193
2700
3194
2701
if not foreground:
3195
2702
if pidfile is not None:
3196
pid = os.getpid()
3197
2703
try:
3198
2704
with pidfile:
3199
print(pid, file=pidfile)
2705
pid = os.getpid()
2706
pidfile.write("{}\n".format(pid).encode("utf-8"))
3200
2707
except IOError:
3201
2708
logger.error("Could not write to file %r with PID %d",
3202
2709
pidfilename, pid)
3210
2717
3211
2718
@alternate_dbus_interfaces(
3212
2719
{ "se.recompile.Mandos": "se.bsnet.fukt.Mandos" })
3213
class MandosDBusService(DBusObjectWithObjectManager):
2720
class MandosDBusService(DBusObjectWithProperties):
3214
2721
"""A D-Bus proxy object"""
3215
2722
3216
2723
def __init__(self):
3218
2725
3219
2726
_interface = "se.recompile.Mandos"
3220
2727
2728
@dbus_interface_annotations(_interface)
2729
def _foo(self):
2730
return {
2731
"org.freedesktop.DBus.Property.EmitsChangedSignal":
2732
"false" }
2733
3221
2734
@dbus.service.signal(_interface, signature="o")
3222
2735
def ClientAdded(self, objpath):
3223
2736
"D-Bus signal"
3228
2741
"D-Bus signal"
3229
2742
pass
3230
2743
3231
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3232
"true"})
3233
2744
@dbus.service.signal(_interface, signature="os")
3234
2745
def ClientRemoved(self, objpath, name):
3235
2746
"D-Bus signal"
3236
2747
pass
3237
2748
3238
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3239
"true"})
3240
2749
@dbus.service.method(_interface, out_signature="ao")
3241
2750
def GetAllClients(self):
3242
2751
"D-Bus method"
3243
2752
return dbus.Array(c.dbus_object_path for c in
3244
tcp_server.clients.values())
2753
tcp_server.clients.itervalues())
3245
2754
3246
@dbus_annotations({"org.freedesktop.DBus.Deprecated":
3247
"true"})
3248
2755
@dbus.service.method(_interface,
3249
2756
out_signature="a{oa{sv}}")
3250
2757
def GetAllClientsWithProperties(self):
3251
2758
"D-Bus method"
3252
2759
return dbus.Dictionary(
3253
{ c.dbus_object_path: c.GetAll(
3254
"se.recompile.Mandos.Client")
3255
for c in tcp_server.clients.values() },
2760
{ c.dbus_object_path: c.GetAll("")
2761
for c in tcp_server.clients.itervalues() },
3256
2762
signature="oa{sv}")
3257
2763
3258
2764
@dbus.service.method(_interface, in_signature="o")
3259
2765
def RemoveClient(self, object_path):
3260
2766
"D-Bus method"
3261
for c in tcp_server.clients.values():
2767
for c in tcp_server.clients.itervalues():
3262
2768
if c.dbus_object_path == object_path:
3263
2769
del tcp_server.clients[c.name]
3264
2770
c.remove_from_connection()
3265
# Don't signal the disabling
2771
# Don't signal anything except ClientRemoved
3266
2772
c.disable(quiet=True)
3267
# Emit D-Bus signal for removal
3268
self.client_removed_signal(c)
2773
# Emit D-Bus signal
2774
self.ClientRemoved(object_path, c.name)
3269
2775
return
3270
2776
raise KeyError(object_path)
3271
2777
3272
2778
del _interface
3273
3274
@dbus.service.method(dbus.OBJECT_MANAGER_IFACE,
3275
out_signature = "a{oa{sa{sv}}}")
3276
def GetManagedObjects(self):
3277
"""D-Bus method"""
3278
return dbus.Dictionary(
3279
{ client.dbus_object_path:
3280
dbus.Dictionary(
3281
{ interface: client.GetAll(interface)
3282
for interface in
3283
client._get_all_interface_names()})
3284
for client in tcp_server.clients.values()})
3285
3286
def client_added_signal(self, client):
3287
"""Send the new standard signal and the old signal"""
3288
if use_dbus:
3289
# New standard signal
3290
self.InterfacesAdded(
3291
client.dbus_object_path,
3292
dbus.Dictionary(
3293
{ interface: client.GetAll(interface)
3294
for interface in
3295
client._get_all_interface_names()}))
3296
# Old signal
3297
self.ClientAdded(client.dbus_object_path)
3298
3299
def client_removed_signal(self, client):
3300
"""Send the new standard signal and the old signal"""
3301
if use_dbus:
3302
# New standard signal
3303
self.InterfacesRemoved(
3304
client.dbus_object_path,
3305
client._get_all_interface_names())
3306
# Old signal
3307
self.ClientRemoved(client.dbus_object_path,
3308
client.name)
3309
2779
3310
2780
mandos_dbus_service = MandosDBusService()
3311
2781
3324
2794
# removed/edited, old secret will thus be unrecovable.
3325
2795
clients = {}
3326
2796
with PGPEngine() as pgp:
3327
for client in tcp_server.clients.values():
2797
for client in tcp_server.clients.itervalues():
3328
2798
key = client_settings[client.name]["secret"]
3329
2799
client.encrypted_secret = pgp.encrypt(client.secret,
3330
2800
key)
3354
2824
prefix='clients-',
3355
2825
dir=os.path.dirname(stored_state_path),
3356
2826
delete=False) as stored_state:
3357
pickle.dump((clients, client_settings), stored_state,
3358
protocol = 2)
2827
pickle.dump((clients, client_settings), stored_state)
3359
2828
tempname = stored_state.name
3360
2829
os.rename(tempname, stored_state_path)
3361
2830
except (IOError, OSError) as e:
3377
2846
name, client = tcp_server.clients.popitem()
3378
2847
if use_dbus:
3379
2848
client.remove_from_connection()
3380
# Don't signal the disabling
2849
# Don't signal anything except ClientRemoved
3381
2850
client.disable(quiet=True)
3382
# Emit D-Bus signal for removal
3383
2851
if use_dbus:
3384
mandos_dbus_service.client_removed_signal(client)
2852
# Emit D-Bus signal
2853
mandos_dbus_service.ClientRemoved(
2854
client.dbus_object_path, client.name)
3385
2855
client_settings.clear()
3386
2856
3387
2857
atexit.register(cleanup)
3388
2858
3389
for client in tcp_server.clients.values():
2859
for client in tcp_server.clients.itervalues():
3390
2860
if use_dbus:
3391
# Emit D-Bus signal for adding
3392
mandos_dbus_service.client_added_signal(client)
2861
# Emit D-Bus signal
2862
mandos_dbus_service.ClientAdded(client.dbus_object_path)
3393
2863
# Need to initiate checking of clients
3394
2864
if client.enabled:
3395
2865
client.init_checker()
3421
2891
sys.exit(1)
3422
2892
# End of Avahi example code
3423
2893
3424
GObject.io_add_watch(tcp_server.fileno(), GObject.IO_IN,
2894
gobject.io_add_watch(tcp_server.fileno(), gobject.IO_IN,
3425
2895
lambda *args, **kwargs:
3426
2896
(tcp_server.handle_request
3427
2897
(*args[2:], **kwargs) or True))
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0