Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
Openfire
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Openfire
Commits
a5ae728b
Commit
a5ae728b
authored
Aug 10, 2017
by
Greg Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure that LDAP configuration options are appropriately displayed
parent
23fa6f11
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
326 additions
and
307 deletions
+326
-307
AuthFactory.java
src/java/org/jivesoftware/openfire/auth/AuthFactory.java
+315
-304
HybridAuthProvider.java
...va/org/jivesoftware/openfire/auth/HybridAuthProvider.java
+7
-1
profile-settings.jsp
src/web/profile-settings.jsp
+4
-2
No files found.
src/java/org/jivesoftware/openfire/auth/AuthFactory.java
View file @
a5ae728b
...
@@ -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
...
...
src/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java
View file @
a5ae728b
...
@@ -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
();
}
}
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 @
a5ae728b
<%@ 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"
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment