From 35675ca2bbe9c044f115764a2daac45f7468be00 Mon Sep 17 00:00:00 2001 From: Stanislav Laznicka Date: May 26 2017 15:04:11 +0000 Subject: Change ConfigParser to RawConfigParser In case ipa_generate_password() generates a sequence containing '%', ConfigParser.set() will fail because it would think it is a string that should be interpolated. https://pagure.io/freeipa/issue/4985 Reviewed-By: Martin Basti --- diff --git a/ipaserver/install/cainstance.py b/ipaserver/install/cainstance.py index b0e9e87..0b31369 100644 --- a/ipaserver/install/cainstance.py +++ b/ipaserver/install/cainstance.py @@ -36,7 +36,7 @@ import tempfile import six # pylint: disable=import-error -from six.moves.configparser import ConfigParser, RawConfigParser +from six.moves.configparser import RawConfigParser # pylint: enable=import-error from cryptography.hazmat.primitives import serialization @@ -465,7 +465,7 @@ class CAInstance(DogtagInstance): self.tmp_agent_pwd = ipautil.ipa_generate_password() # Create CA configuration - config = ConfigParser() + config = RawConfigParser() config.optionxform = str config.add_section("CA") diff --git a/ipaserver/install/krainstance.py b/ipaserver/install/krainstance.py index cdd25b9..52d6273 100644 --- a/ipaserver/install/krainstance.py +++ b/ipaserver/install/krainstance.py @@ -24,7 +24,7 @@ import tempfile import six # pylint: disable=import-error -from six.moves.configparser import ConfigParser +from six.moves.configparser import RawConfigParser # pylint: enable=import-error from cryptography.hazmat.primitives import serialization @@ -153,7 +153,7 @@ class KRAInstance(DogtagInstance): tmp_agent_pwd = ipautil.ipa_generate_password() # Create KRA configuration - config = ConfigParser() + config = RawConfigParser() config.optionxform = str config.add_section("KRA")