IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Drop configure.jar

Browse Source 
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

Reviewed-By: Petr Vobornik <pvoborni@redhat.com>
This commit is contained in:
Martin Basti
2015-10-27 15:36:55 +01:00
parent b0faf30eac
commit 19044e87ac
8 changed files with 3 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
freeipa.spec.in
View File

@@ -473,13 +473,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d/
/bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf /bin/touch %{buildroot}%{_sysconfdir}/httpd/conf.d/ipa-rewrite.conf
mkdir -p %{buildroot}%{_usr}/share/ipa/html/ mkdir -p %{buildroot}%{_usr}/share/ipa/html/
/bin/touch %{buildroot}%{_usr}/share/ipa/html/ca.crt /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/kerberosauth.xpi
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.con
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb.js
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini /bin/touch %{buildroot}%{_usr}/share/ipa/html/krb5.ini
/bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con /bin/touch %{buildroot}%{_usr}/share/ipa/html/krbrealm.con
/bin/touch %{buildroot}%{_usr}/share/ipa/html/preferences.html
mkdir -p %{buildroot}%{_initrddir} mkdir -p %{buildroot}%{_initrddir}
mkdir %{buildroot}%{_sysconfdir}/sysconfig/ mkdir %{buildroot}%{_sysconfdir}/sysconfig/
install -m 644 init/ipa_memcached.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa_memcached install -m 644 init/ipa_memcached.conf %{buildroot}%{_sysconfdir}/sysconfig/ipa_memcached
@@ -840,13 +838,11 @@ fi
%{_usr}/share/ipa/ipa-pki-proxy.conf %{_usr}/share/ipa/ipa-pki-proxy.conf
%{_usr}/share/ipa/kdcproxy.conf %{_usr}/share/ipa/kdcproxy.conf
%ghost %attr(0644,root,apache) %config(noreplace) %{_usr}/share/ipa/html/ca.crt %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/kerberosauth.xpi
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.con
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.js %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb.js
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb5.ini %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krb5.ini
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krbrealm.con %ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/krbrealm.con
%ghost %attr(0644,root,apache) %{_usr}/share/ipa/html/preferences.html
%dir %{_usr}/share/ipa/updates/ %dir %{_usr}/share/ipa/updates/
%{_usr}/share/ipa/updates/* %{_usr}/share/ipa/updates/*
%attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so %attr(755,root,root) %{plugin_dir}/libipa_pwd_extop.so

25
install/html/ssbrowser.html
View File

@@ -10,18 +10,6 @@
$(document).ready(function() { $(document).ready(function() {
var domain = '.' + (IPA_DOMAIN || 'example.com'); var domain = '.' + (IPA_DOMAIN || 'example.com');
$('.example-domain').text(domain); $('.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();
}
}); });
} }
@@ -62,6 +50,9 @@
</p> </p>
<ol> <ol>
<li>
Import <a href="ca.crt">CA certificate</a>. Make sure you checked all three checkboxes.
</li>
<li> <li>
In the address bar of Firefox, type <code>about:config</code> to display the list of current configuration options. In the address bar of Firefox, type <code>about:config</code> to display the list of current configuration options.
</li> </li>
@@ -77,16 +68,6 @@
<li><strong> You are all set. </strong></li> <li><strong> You are all set. </strong></li>
</ol> </ol>
<h3>Automatic Configuration of older versions</h3>
<p>You can configure older versions of Firefox (up to version 14) using signed code. Use <a href="browserconfig.html">Firefox configuration page</a> for newer versions.</p>
<ol>
<li>Import <a href="ca.crt">CA certificate</a>. Make sure you checked all three checkboxes.</li>
<li>
Click on "Configure Browser" button below.
<div id="configurefirefox" style="display:none"></div>
</li>
</ol>
<h2>Chrome</h2> <h2>Chrome</h2>
<p> <p>

1
install/share/Makefile.am
View File

@@ -54,7 +54,6 @@ app_DATA = \
krb.con.template \ krb.con.template \
krb.js.template \ krb.js.template \
krbrealm.con.template \ krbrealm.con.template \
preferences.html.template \
smb.conf.template \ smb.conf.template \
smb.conf.empty \ smb.conf.empty \
referint-conf.ldif \ referint-conf.ldif \

90
install/share/preferences.html.template
View File

@@ -1,90 +0,0 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title>Automatically set browser preferences</title>
<style type="text/css">
body {
font-family:"Liberation Sans",Arial,Sans;
font-size:11px;
}
.textblock {
text-align: left;
margin-top: 1.0em;
font-size: 1.1em;
}
a {
color: #1D85D5;
font-weight: normal;
text-decoration: none;
text-transform: none;
}
</style>
</head>
<body>
<form action="undefined" method="get">
<input id="button" type=button onclick="setPreferences()" name="prefs" value="Configure Firefox">
<div id="success" class="textblock" style="display: none;">
<p>Browser configured.</p>
<p>
<a href="/ipa/ui" id="redirect_link" target="_top">Click here to return to the Web UI.</a>
</p>
</div>
</form>
<script type="text/javascript">
function setPreferences() {
var privilege, setIntPref, setCharPref, setBoolPref;
if (typeof navigator.preference == 'undefined') {
// From Firefox 4 and SeaMonkey 2.1, navigator.preference intefrace is dropped
// Use new Gecko2 Services.jsm JavaScript code module instead.
privilege = 'UniversalXPConnect';
netscape.security.PrivilegeManager.enablePrivilege(privilege);
Components.utils.import("resource://gre/modules/Services.jsm");
setIntPref = function(par, val) {Services.prefs.setIntPref(par, val)};
setCharPref = function(par, val) {Services.prefs.setCharPref(par, val)};
setBoolPref = function(par, val) {Services.prefs.setBoolPref(par, val)};
} else {
privilege = 'UniversalPreferencesWrite';
netscape.security.PrivilegeManager.enablePrivilege(privilege);
setCharPref = function(par, val) {navigator.preference(par, val)};
setBoolPref = setCharPref; // same function for bool and char and int
setIntPref = setCharPref;
}
try {
try {
setIntPref('network.http.sendRefererHeader', 2);
setBoolPref('network.negotiate-auth.using-native-gsslib', true);
setCharPref('network.negotiate-auth.trusted-uris', '.$DOMAIN');
setBoolPref('network.negotiate-auth.allow-proxies', true);
} catch (e) {
alert("Unable to store preferences: " + e);
return;
}
netscape.security.PrivilegeManager.disablePrivilege(privilege);
alert("Successfully configured Firefox for single sign-on.");
var redirect_link = document.getElementById('redirect_link');
redirect_link.href = "https://" + location.hostname + location.port + "/ipa/ui";
var button = document.getElementById('button');
button.style['display'] = "none";
var successDiv = document.getElementById('success');
successDiv.style['display'] = "block";
} catch (e) {
alert("Unable to apply recommended settings.\n\n" +
"Click on the Certificate Authority link and select trust for all, " +
"then reload this page and try again.\n\nThe error returned was: " + e);
return;
}
}
</script>
</body>
</html>

2
ipaplatform/base/paths.py
View File

@@ -241,13 +241,11 @@ class BasePathNamespace(object):
FFEXTENSION = "/usr/share/ipa/ffextension" FFEXTENSION = "/usr/share/ipa/ffextension"
IPA_HTML_DIR = "/usr/share/ipa/html" IPA_HTML_DIR = "/usr/share/ipa/html"
CA_CRT = "/usr/share/ipa/html/ca.crt" CA_CRT = "/usr/share/ipa/html/ca.crt"
CONFIGURE_JAR = "/usr/share/ipa/html/configure.jar"
KERBEROSAUTH_XPI = "/usr/share/ipa/html/kerberosauth.xpi" KERBEROSAUTH_XPI = "/usr/share/ipa/html/kerberosauth.xpi"
KRB_CON = "/usr/share/ipa/html/krb.con" KRB_CON = "/usr/share/ipa/html/krb.con"
KRB_JS = "/usr/share/ipa/html/krb.js" KRB_JS = "/usr/share/ipa/html/krb.js"
HTML_KRB5_INI = "/usr/share/ipa/html/krb5.ini" HTML_KRB5_INI = "/usr/share/ipa/html/krb5.ini"
HTML_KRBREALM_CON = "/usr/share/ipa/html/krbrealm.con" HTML_KRBREALM_CON = "/usr/share/ipa/html/krbrealm.con"
PREFERENCES_HTML = "/usr/share/ipa/html/preferences.html"
NIS_ULDIF = "/usr/share/ipa/nis.uldif" NIS_ULDIF = "/usr/share/ipa/nis.uldif"
IPA_PLUGINS = "/usr/share/ipa/plugins" IPA_PLUGINS = "/usr/share/ipa/plugins"
SCHEMA_COMPAT_ULDIF = "/usr/share/ipa/schema_compat.uldif" SCHEMA_COMPAT_ULDIF = "/usr/share/ipa/schema_compat.uldif"

26
ipaserver/install/httpinstance.py
View File

@@ -346,32 +346,6 @@ class HTTPInstance(service.Service):
self.import_ca_certs(db, self.ca_is_configured) self.import_ca_certs(db, self.ca_is_configured)
def __setup_autoconfig(self): def __setup_autoconfig(self):
target_fname = paths.PREFERENCES_HTML
ipautil.copy_template_file(
ipautil.SHARE_DIR + "preferences.html.template",
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) self.setup_firefox_extension(self.realm, self.domain)
def setup_firefox_extension(self, realm, domain): def setup_firefox_extension(self, realm, domain):

6
ipaserver/install/ipa_replica_prepare.py
View File

@@ -456,12 +456,6 @@ class ReplicaPrepare(admintool.AdminTool):
self.log.info("Copying additional files") self.log.info("Copying additional files")
self.copy_info_file(CACERT, "ca.crt") self.copy_info_file(CACERT, "ca.crt")
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 cacert_filename = paths.CACERT_PEM
if ipautil.file_exists(cacert_filename): if ipautil.file_exists(cacert_filename):
self.copy_info_file(cacert_filename, "cacert.pem") self.copy_info_file(cacert_filename, "cacert.pem")

12
ipaserver/install/server/replicainstall.py
View File

@@ -163,18 +163,6 @@ def install_http(config, auto_redirect, promote=False):
ca_is_configured=ipautil.file_exists(config.dir + "/cacert.p12"), ca_is_configured=ipautil.file_exists(config.dir + "/cacert.p12"),
promote=promote) promote=promote)
# Now copy the autoconfiguration files
try:
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)
http.setup_firefox_extension(config.realm_name, config.domain_name) http.setup_firefox_extension(config.realm_name, config.domain_name)
return http return http