Commit 30d69258 authored by Tom Evans's avatar Tom Evans

OF-783: Encrypt sensitive properties during setup

Apply encryption status to sensitive properties during setup where
applicable.
parent e427fa23
...@@ -165,6 +165,10 @@ ...@@ -165,6 +165,10 @@
xmppSettings.put("clearspace.certificate.accept-selfsigned", Boolean.toString(selfSigned)); xmppSettings.put("clearspace.certificate.accept-selfsigned", Boolean.toString(selfSigned));
xmppSettings.put("clearspace.certificate.verify.identity", Boolean.toString(verifyIdentity)); xmppSettings.put("clearspace.certificate.verify.identity", Boolean.toString(verifyIdentity));
xmppSettings.put("clearspace.certificate.verify.validity", Boolean.toString(verifyValidity)); xmppSettings.put("clearspace.certificate.verify.validity", Boolean.toString(verifyValidity));
JiveGlobals.setPropertyEncrypted("clearspace.uri", true);
JiveGlobals.setPropertyEncrypted("clearspace.sharedSecret", true);
session.setAttribute("xmppSettings", xmppSettings); session.setAttribute("xmppSettings", xmppSettings);
} }
if (initialSetup) { if (initialSetup) {
......
<%@ page import="org.jivesoftware.util.LocaleUtils"%> <%@ page import="org.jivesoftware.util.LocaleUtils"%>
<%@ page import="org.jivesoftware.util.ParamUtils"%> <%@ page import="org.jivesoftware.util.ParamUtils"%>
<%@ page import="org.jivesoftware.openfire.ldap.LdapManager"%> <%@ page import="org.jivesoftware.openfire.ldap.LdapManager"%>
<%@ page import="org.jivesoftware.util.JiveGlobals"%>
<%@ page import="java.util.*" %> <%@ page import="java.util.*" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
...@@ -109,6 +110,9 @@ ...@@ -109,6 +110,9 @@
xmppSettings.put("ldap.autoFollowAliasReferrals", Boolean.toString(aliasReferralsEnabled)); xmppSettings.put("ldap.autoFollowAliasReferrals", Boolean.toString(aliasReferralsEnabled));
xmppSettings.put("ldap.encloseDNs", Boolean.toString(encloseDNs)); xmppSettings.put("ldap.encloseDNs", Boolean.toString(encloseDNs));
JiveGlobals.setPropertyEncrypted("ldap.adminDN", true);
JiveGlobals.setPropertyEncrypted("ldap.adminPassword", true);
session.setAttribute("xmppSettings", xmppSettings); session.setAttribute("xmppSettings", xmppSettings);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment