[JIRA GEOS-8867] Extra login forms show up in the UI only if the filt…

…er chain name matches the LoginFormInfo name
geoserver · Aug 14, 2018 · e1dcef8 · e1dcef8
1 parent 5cecfeb
commit e1dcef8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java b/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java
@@ -211,7 +211,6 @@ protected void onComponentTag(
                             if (securityProvider.getFilterClass() != null
                                     && securityProvider
                                             .getFilterClass()
-                                            .getName()
                                             .equals(info.getFilterClass())) {
                                 filterInChain = true;
                                 break;

diff --git a/src/web/core/src/main/java/org/geoserver/web/LoginFormInfo.java b/src/web/core/src/main/java/org/geoserver/web/LoginFormInfo.java
@@ -4,6 +4,8 @@
  */
 package org.geoserver.web;
 
+import org.geoserver.security.GeoServerSecurityProvider;
+
 /**
  * Information about a login form that should be shown from the main page in the GeoServer UI. The
  * "order" field is based on the "name".
@@ -15,7 +17,7 @@ public class LoginFormInfo extends ComponentInfo<GeoServerBasePage>
         implements Comparable<LoginFormInfo> {
     String name;
     String icon = "";
-    private String filterClass;
+    private Class<GeoServerSecurityProvider> filterClass;
     private String include;
     private String loginPath;
 
@@ -53,7 +55,7 @@ public void setIcon(String icon) {
      *
      * @return the filterClass
      */
-    public String getFilterClass() {
+    public Class<GeoServerSecurityProvider> getFilterClass() {
         return filterClass;
     }
 
@@ -62,7 +64,7 @@ public String getFilterClass() {
      *
      * @param filterClass the filterClass to set
      */
-    public void setFilterClass(String filterClass) {
+    public void setFilterClass(Class<GeoServerSecurityProvider> filterClass) {
         this.filterClass = filterClass;
     }