On 01/07/15 16:31, David Kupka wrote:
Updated patch attached.
--
David Kupka
From 65eb52bff00135f4feb84dfde1e56a69bc8ea438 Mon Sep 17 00:00:00 2001
From: David Kupka <dku...@redhat.com>
Date: Wed, 1 Jul 2015 16:26:15 +0200
Subject: [PATCH] cermonger: Use private unix socket when DBus SystemBus is not
available.
---
ipaplatform/base/paths.py | 1 +
ipapython/certmonger.py | 124 ++++++++++++++++++++++++++++++++--------------
2 files changed, 87 insertions(+), 38 deletions(-)
diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py
index e94cb9d02a8d429a5c19a935766486d5e60c97ad..52ab156c907158d6f52ca4ffc876c01cd5ffa01e 100644
--- a/ipaplatform/base/paths.py
+++ b/ipaplatform/base/paths.py
@@ -346,6 +346,7 @@ class BasePathNamespace(object):
BAK2DB = '/usr/sbin/bak2db'
DB2BAK = '/usr/sbin/db2bak'
KDCPROXY_CONFIG = '/etc/ipa/kdcproxy/kdcproxy.conf'
+ CERTMONGER = '/usr/sbin/certmonger'
path_namespace = BasePathNamespace
diff --git a/ipapython/certmonger.py b/ipapython/certmonger.py
index 4baaaa85da08bb943d6b9f0091a1d2acc36b18d6..275b6181aa575175180ba68feaf61a4d5c9dffb8 100644
--- a/ipapython/certmonger.py
+++ b/ipapython/certmonger.py
@@ -27,6 +27,8 @@ import sys
import time
import dbus
import shlex
+import subprocess
+import tempfile
from ipapython import ipautil
from ipapython import dogtag
from ipapython.ipa_log_manager import *
@@ -35,6 +37,7 @@ from ipaplatform import services
DBUS_CM_PATH = '/org/fedorahosted/certmonger'
DBUS_CM_IF = 'org.fedorahosted.certmonger'
+DBUS_CM_NAME = 'org.fedorahosted.certmonger'
DBUS_CM_REQUEST_IF = 'org.fedorahosted.certmonger.request'
DBUS_CM_CA_IF = 'org.fedorahosted.certmonger.ca'
DBUS_PROPERTY_IF = 'org.freedesktop.DBus.Properties'
@@ -44,7 +47,7 @@ class _cm_dbus_object(object):
"""
Auxiliary class for convenient DBus object handling.
"""
- def __init__(self, bus, object_path, object_dbus_interface,
+ def __init__(self, bus, parent, object_path, object_dbus_interface,
parent_dbus_interface=None, property_interface=False):
"""
bus - DBus bus object, result of dbus.SystemBus() or dbus.SessionBus()
@@ -60,6 +63,7 @@ class _cm_dbus_object(object):
if parent_dbus_interface is None:
parent_dbus_interface = object_dbus_interface
self.bus = bus
+ self.parent = parent
self.path = object_path
self.obj_dbus_if = object_dbus_interface
self.parent_dbus_if = parent_dbus_interface
@@ -69,36 +73,79 @@ class _cm_dbus_object(object):
self.prop_if = dbus.Interface(self.obj, DBUS_PROPERTY_IF)
-def _start_certmonger():
+class _certmonger(_cm_dbus_object):
"""
- Start certmonger daemon. If it's already running systemctl just ignores
- the command.
+ Create a connection to certmonger.
+ By default use SystemBus. When not available use private connection
+ over Unix socket.
+ This solution is really ugly and should be removed as soon as DBus
+ SystemBus is available at system install time.
"""
- if not services.knownservices.certmonger.is_running():
+ _bus = None
+ _proc = None
+ timeout = 30
+
+ def _start_private_conn(self):
+ sock_filename = os.path.join(tempfile.mkdtemp(), 'certmonger')
+ self._proc = subprocess.Popen([paths.CERTMONGER, '-n', '-L', '-P',
+ sock_filename])
+ for t in range(0, self.timeout, 5):
+ if os.path.exists(sock_filename):
+ return "unix:path=%s" % sock_filename
+ time.sleep(5)
+ raise RuntimeError("Failed to start certmonger: Timeouted")
+
+ def __del__(self):
+ if self._proc:
+ retcode = self._proc.poll()
+ if retcode is not None:
+ return
+ self._proc.terminate()
+ for t in range(0, self.timeout, 5):
+ retcode = self._proc.poll()
+ if retcode is not None:
+ return
+ time.sleep(5)
+ root_logger.error("Failed to stop certmonger.")
+
+ def __init__(self):
try:
- services.knownservices.certmonger.start()
- except Exception, e:
- root_logger.error('Failed to start certmonger: %s' % e)
- raise
+ self._bus = dbus.SystemBus()
+ except dbus.DBusException as e:
+ err_name = e.get_dbus_name()
+ if err_name not in ['org.freedesktop.DBus.Error.NoServer',
+ 'org.freedesktop.DBus.Error.FileNotFound']:
+ root_logger.error("Failed to connect to certmonger over "
+ "SystemBus: %s" % e)
+ raise
+ try:
+ self._private_sock = self._start_private_conn()
+ self._bus = dbus.connection.Connection(self._private_sock)
+ except dbus.DBusException as e:
+ root_logger.error("Failed to connect to certmonger over "
+ "private socket: %s" % e)
+ raise
+ else:
+ try:
+ self._bus.get_name_owner(DBUS_CM_NAME)
+ except dbus.DBusException:
+ try:
+ services.knownservices.certmonger.start()
+ except Exception as e:
+ root_logger.error("Failed to start certmonger: %s" % e)
+ raise
+ for t in range(0, self.timeout, 5):
+ try:
+ self._bus.get_name_owner(DBUS_CM_NAME)
+ break
+ except dbus.DBusException:
+ pass
+ time.sleep(5)
+ raise RuntimeError('Failed to start certmonger')
-def _connect_to_certmonger():
- """
- Start certmonger daemon and connect to it via DBus.
- """
- try:
- _start_certmonger()
- except (KeyboardInterrupt, OSError), e:
- root_logger.error('Failed to start certmonger: %s' % e)
- raise
-
- try:
- bus = dbus.SystemBus()
- cm = _cm_dbus_object(bus, DBUS_CM_PATH, DBUS_CM_IF)
- except dbus.DBusException, e:
- root_logger.error("Failed to access certmonger over DBus: %s", e)
- raise
- return cm
+ super(_certmonger, self).__init__(self._bus, None, DBUS_CM_PATH,
+ DBUS_CM_IF)
def _get_requests(criteria=dict()):
@@ -108,7 +155,7 @@ def _get_requests(criteria=dict()):
if not isinstance(criteria, dict):
raise TypeError('"criteria" must be dict.')
- cm = _connect_to_certmonger()
+ cm = _certmonger()
requests = []
requests_paths = []
if 'nickname' in criteria:
@@ -119,12 +166,12 @@ def _get_requests(criteria=dict()):
requests_paths = cm.obj_if.get_requests()
for request_path in requests_paths:
- request = _cm_dbus_object(cm.bus, request_path, DBUS_CM_REQUEST_IF,
+ request = _cm_dbus_object(cm.bus, cm, request_path, DBUS_CM_REQUEST_IF,
DBUS_CM_IF, True)
for criterion in criteria:
if criterion == 'ca-name':
ca_path = request.obj_if.get_ca()
- ca = _cm_dbus_object(cm.bus, ca_path, DBUS_CM_CA_IF,
+ ca = _cm_dbus_object(cm.bus, cm, ca_path, DBUS_CM_CA_IF,
DBUS_CM_IF)
value = ca.obj_if.get_nickname()
else:
@@ -133,6 +180,7 @@ def _get_requests(criteria=dict()):
break
else:
requests.append(request)
+
return requests
@@ -166,7 +214,7 @@ def get_request_value(request_id, directive):
if request:
if directive == 'ca-name':
ca_path = request.obj_if.get_ca()
- ca = _cm_dbus_object(request.bus, ca_path, DBUS_CM_CA_IF,
+ ca = _cm_dbus_object(request.bus, request, ca_path, DBUS_CM_CA_IF,
DBUS_CM_IF)
return ca.obj_if.get_nickname()
else:
@@ -250,7 +298,7 @@ def request_cert(nssdb, nickname, subject, principal, passwd_fname=None):
"""
Execute certmonger to request a server certificate.
"""
- cm = _connect_to_certmonger()
+ cm = _certmonger()
ca_path = cm.obj_if.find_ca_by_nickname('IPA')
if not ca_path:
raise RuntimeError('IPA CA not found')
@@ -264,7 +312,7 @@ def request_cert(nssdb, nickname, subject, principal, passwd_fname=None):
result = cm.obj_if.add_request(request_parameters)
try:
if result[0]:
- request = _cm_dbus_object(cm.bus, result[1], DBUS_CM_REQUEST_IF,
+ request = _cm_dbus_object(cm.bus, cm, result[1], DBUS_CM_REQUEST_IF,
DBUS_CM_IF, True)
except TypeError:
root_logger.error('Failed to get create new request.')
@@ -283,7 +331,7 @@ def start_tracking(nickname, secdir, password_file=None, command=None):
Returns certificate nickname.
"""
- cm = _connect_to_certmonger()
+ cm = _certmonger()
params = {'TRACK': True}
params['cert-nickname'] = nickname
params['cert-database'] = os.path.abspath(secdir)
@@ -302,7 +350,7 @@ def start_tracking(nickname, secdir, password_file=None, command=None):
result = cm.obj_if.add_request(params)
try:
if result[0]:
- request = _cm_dbus_object(cm.bus, result[1], DBUS_CM_REQUEST_IF,
+ request = _cm_dbus_object(cm.bus, cm, result[1], DBUS_CM_REQUEST_IF,
DBUS_CM_IF, True)
except TypeError, e:
root_logger.error('Failed to add new request.')
@@ -330,7 +378,7 @@ def stop_tracking(secdir, request_id=None, nickname=None):
root_logger.error('Failed to get request: %s' % e)
raise
if request:
- cm = _connect_to_certmonger()
+ cm = _certmonger()
cm.obj_if.remove_request(request.path)
@@ -357,9 +405,9 @@ def _find_IPA_ca():
We can use find_request_value because the ca files have the
same file format.
"""
- cm = _connect_to_certmonger()
+ cm = _certmonger()
ca_path = cm.obj_if.find_ca_by_nickname('IPA')
- return _cm_dbus_object(cm.bus, ca_path, DBUS_CM_CA_IF, DBUS_CM_IF, True)
+ return _cm_dbus_object(cm.bus, cm, ca_path, DBUS_CM_CA_IF, DBUS_CM_IF, True)
def add_principal_to_cas(principal):
@@ -423,7 +471,7 @@ def dogtag_start_tracking(ca, nickname, pin, pinfile, secdir, pre_command,
Both commands can be None.
"""
- cm = _connect_to_certmonger()
+ cm = _certmonger()
certmonger_cmd_template = paths.CERTMONGER_COMMAND_TEMPLATE
params = {'TRACK': True}
--
2.4.3
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
