https://fedorahosted.org/freeipa/ticket/5144
Patch attached.
From 9101589ee9236586e68db764c63255397c4b20dd Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Tue, 27 Oct 2015 15:36:55 +0100 Subject: [PATCH] Drop configure.jar Configure.jar used to be used with firefox version < 10 which is not supported anymore, thus this can be removed. https://fedorahosted.org/freeipa/ticket/5144 --- freeipa.spec.in | 2 -- install/html/ssbrowser.html | 12 ------------ ipaplatform/base/paths.py | 1 - ipaserver/install/httpinstance.py | 20 -------------------- ipaserver/install/ipa_replica_prepare.py | 3 --- ipaserver/install/server/replicainstall.py | 3 --- 6 files changed, 41 deletions(-) diff --git a/freeipa.spec.in b/freeipa.spec.in index 6a993088b16d6af9cb967775e145b712e9414b75..e7da5e9c943d4d83836e39a61cc9e3a19b8d4994 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -467,7 +467,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/ /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf mkdir -p %{buildroot}%{_usr}/share/ipa/html/ /bin/touch %{buildroot}%{_usr}/share/ipa/html/ca.crt -/bin/touch %{buildroot}%{_usr}/share/ipa/html/configure.jar /bin/touch %{buildroot}%{_usr}/share/ipa/html/kerberosauth.xpi /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js @@ -834,7 +833,6 @@ fi %{_usr}/share/ipa/ipa-pki-proxy.conf %{_usr}/share/ipa/kdcproxy.conf %ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt -%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/configure.jar %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/kerberosauth.xpi %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.js diff --git a/install/html/ssbrowser.html b/install/html/ssbrowser.html index b88deac900fb1d5a1a5960741512593f9b7f3b15..bfd398e68a6268e4b1d66d338566547bfce6502d 100644 --- a/install/html/ssbrowser.html +++ b/install/html/ssbrowser.html @@ -10,18 +10,6 @@ $(document).ready(function() { var domain = '.' + (IPA_DOMAIN || 'example.com'); $('.example-domain').text(domain); - - var browser = IPA.browser_config.get_browser(); - if (browser.mozilla) { - var ff_config = $("#configurefirefox"); - var obj = $('<object/>', { - type: 'text/html', - 'class': 'browser-config' - }); - obj.prop('data', 'jar:/ipa/errors/configure.jar!/preferences.html'); - obj.appendTo(ff_config); - ff_config.show(); - } }); } diff --git a/ipaplatform/base/paths.py b/ipaplatform/base/paths.py index 74d7a7d9726b4b43ea896c29a602938f73bdc2e4..6d591e64c465aed7dc8152bbefe7ae4cea407863 100644 --- a/ipaplatform/base/paths.py +++ b/ipaplatform/base/paths.py @@ -241,7 +241,6 @@ class BasePathNamespace(object): FFEXTENSION = "/usr/share/ipa/ffextension" IPA_HTML_DIR = "/usr/share/ipa/html" CA_CRT = "/usr/share/ipa/html/ca.crt" - CONFIGURE_JAR = "/usr/share/ipa/html/configure.jar" KERBEROSAUTH_XPI = "/usr/share/ipa/html/kerberosauth.xpi" KRB_CON = "/usr/share/ipa/html/krb.con" KRB_JS = "/usr/share/ipa/html/krb.js" diff --git a/ipaserver/install/httpinstance.py b/ipaserver/install/httpinstance.py index 0d1074dbda486f6102dd1628d720080e6dfb7ff7..1c5d2a1ec35f9555cbc47213b6ef7225501dfbd1 100644 --- a/ipaserver/install/httpinstance.py +++ b/ipaserver/install/httpinstance.py @@ -349,26 +349,6 @@ class HTTPInstance(service.Service): target_fname, self.sub_dict) os.chmod(target_fname, 0o644) - # The signing cert is generated in __setup_ssl - db = certs.CertDB(self.realm, subject_base=self.subject_base) - with open(db.passwd_fname) as pwdfile: - pwd = pwdfile.read() - - # Setup configure.jar - if db.has_nickname('Signing-Cert'): - tmpdir = tempfile.mkdtemp(prefix="tmp-") - target_fname = paths.CONFIGURE_JAR - shutil.copy(paths.PREFERENCES_HTML, tmpdir) - db.run_signtool(["-k", "Signing-Cert", - "-Z", target_fname, - "-e", ".html", "-p", pwd, - tmpdir]) - shutil.rmtree(tmpdir) - os.chmod(target_fname, 0o644) - else: - root_logger.warning('Object-signing certificate was not found; ' - 'therefore, configure.jar was not created.') - self.setup_firefox_extension(self.realm, self.domain) def setup_firefox_extension(self, realm, domain): diff --git a/ipaserver/install/ipa_replica_prepare.py b/ipaserver/install/ipa_replica_prepare.py index 8998bc094e22ba9a95d528b09f73b2884d78462f..06c58ed3ab4051e40bb6861a33c670408433e9d2 100644 --- a/ipaserver/install/ipa_replica_prepare.py +++ b/ipaserver/install/ipa_replica_prepare.py @@ -459,9 +459,6 @@ class ReplicaPrepare(admintool.AdminTool): preferences_filename = paths.PREFERENCES_HTML if ipautil.file_exists(preferences_filename): self.copy_info_file(preferences_filename, "preferences.html") - jar_filename = paths.CONFIGURE_JAR - if ipautil.file_exists(jar_filename): - self.copy_info_file(jar_filename, "configure.jar") cacert_filename = paths.CACERT_PEM if ipautil.file_exists(cacert_filename): self.copy_info_file(cacert_filename, "cacert.pem") diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index b01df9526bb3a7dce7abca67f85fc54cd95f6218..18387db60ae8e8e1bbec567081d9985204822969 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -168,9 +168,6 @@ def install_http(config, auto_redirect, promote=False): if ipautil.file_exists(config.dir + "/preferences.html"): shutil.copy(config.dir + "/preferences.html", paths.PREFERENCES_HTML) - if ipautil.file_exists(config.dir + "/configure.jar"): - shutil.copy(config.dir + "/configure.jar", - paths.CONFIGURE_JAR) except Exception as e: print("error copying files: " + str(e)) sys.exit(1) -- 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
