Skip to content

O
Openfire
Commit 49628cb9 authored by Dave Cridland's avatar Dave Cridland Committed by GitHub
Browse files
Options

Merge pull request #848 from GregDThomas/hybrid-ldap-admin 

Ensure that LDAP configuration options are appropriately displayed
parents 99033b18 5d9f2052
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 4 deletions
src/java/org/jivesoftware/openfire/auth/AuthFactory.java
View file @ 49628cb9
...@@ -131,6 +131,17 @@ public class AuthFactory { ...@@ -131,6 +131,17 @@ public class AuthFactory {
return c.isInstance(authProvider); return c.isInstance(authProvider);
} }
/**
* Indicates if the currently-installed AuthProvider is the HybridAuthProvider supporting a specific class.
*
* @param clazz the class to check
* @return {@code true} if the currently-installed AuthProvider is a HybridAuthProvider that supports an instance of clazz, otherwise {@code false}.
*/
public static boolean isProviderHybridInstanceOf(Class<? extends AuthProvider> clazz) {
return authProvider instanceof HybridAuthProvider &&
((HybridAuthProvider) authProvider).isProvider(clazz);
}
/** /**
* Returns true if the currently installed {@link AuthProvider} supports password * Returns true if the currently installed {@link AuthProvider} supports password
* retrieval. Certain implementation utilize password hashes and other authentication * retrieval. Certain implementation utilize password hashes and other authentication
...@@ -301,4 +312,4 @@ public class AuthFactory { ...@@ -301,4 +312,4 @@ public class AuthFactory {
public static String getStoredKey(String username) throws UnsupportedOperationException, UserNotFoundException { public static String getStoredKey(String username) throws UnsupportedOperationException, UserNotFoundException {
return authProvider.getStoredKey(username); return authProvider.getStoredKey(username);
} }
} }
\ No newline at end of file
src/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java
View file @ 49628cb9
...@@ -249,4 +249,10 @@ public class HybridAuthProvider implements AuthProvider { ...@@ -249,4 +249,10 @@ public class HybridAuthProvider implements AuthProvider {
public String getStoredKey(String username) throws UnsupportedOperationException, UserNotFoundException { public String getStoredKey(String username) throws UnsupportedOperationException, UserNotFoundException {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
}
\ No newline at end of file boolean isProvider(final Class<? extends AuthProvider> clazz) {
return (primaryProvider != null && clazz.isAssignableFrom(primaryProvider.getClass()))
|| (secondaryProvider != null && clazz.isAssignableFrom(secondaryProvider.getClass()))
||(tertiaryProvider != null && clazz.isAssignableFrom(tertiaryProvider.getClass()));
}
}
src/web/profile-settings.jsp
View file @ 49628cb9
<%@ page import="org.jivesoftware.util.JiveGlobals" %> <%@ page import="org.jivesoftware.util.JiveGlobals" %>
<%@ page import="org.jivesoftware.openfire.ldap.LdapManager" %> <%@ page import="org.jivesoftware.openfire.ldap.LdapManager" %>
<%@ page import="org.jivesoftware.openfire.auth.AuthFactory" %>
<%@ page import="org.jivesoftware.openfire.ldap.LdapAuthProvider" %>
<%-- <%--
- -
- Copyright (C) 2005-2008 Jive Software. All rights reserved. - Copyright (C) 2005-2008 Jive Software. All rights reserved.
...@@ -36,8 +38,8 @@ ...@@ -36,8 +38,8 @@
</head> </head>
<body> <body>
<% <%
boolean isLDAP = "org.jivesoftware.openfire.ldap.LdapAuthProvider".equals( boolean isLDAP = "org.jivesoftware.openfire.ldap.LdapAuthProvider".equals(JiveGlobals.getProperty("provider.auth.className"))
JiveGlobals.getProperty("provider.auth.className")); || AuthFactory.isProviderHybridInstanceOf(LdapAuthProvider.class);
%> %>
<p> <p>
<fmt:message key="profile-settings.info"/> <fmt:message key="profile-settings.info"/>
......
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

Technounit-GROUP 2023