You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lp...@apache.org on 2023/01/27 05:21:30 UTC

[shiro] branch main updated: Revert "feat(Jakarta EE): added alwaysEnabled config variable to SSL filter so as to ignore JSF if true"

This is an automated email from the ASF dual-hosted git repository.

lprimak pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/main by this push:
     new 655619ea Revert "feat(Jakarta EE): added alwaysEnabled config variable to SSL filter so as to ignore JSF if true"
655619ea is described below

commit 655619ea2b4a83c0a36c0fee4cc93d915c2123dd
Author: lprimak <le...@flowlogix.com>
AuthorDate: Thu Jan 26 21:21:09 2023 -0800

    Revert "feat(Jakarta EE): added alwaysEnabled config variable to SSL filter so as to ignore JSF if true"
    
    This reverts commit 6a6d6f1faaef6ab39020fc6d0503864cd2c95695.
---
 .../src/main/java/org/apache/shiro/ee/filters/SslFilter.java          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/SslFilter.java b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/SslFilter.java
index 21e2728f..171b09cd 100644
--- a/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/SslFilter.java
+++ b/support/jakarta-ee/src/main/java/org/apache/shiro/ee/filters/SslFilter.java
@@ -29,13 +29,11 @@ import org.omnifaces.util.Faces;
 public class SslFilter extends org.apache.shiro.web.filter.authz.SslFilter {
     @Getter @Setter
     private boolean enablePortFilter = true;
-    @Getter @Setter
-    private boolean alwaysEnabled = false;
     private final boolean enabled = computeEnabled();
 
     @Override
     protected boolean isEnabled(ServletRequest request, ServletResponse response) throws ServletException, IOException {
-        return alwaysEnabled || enabled && super.isEnabled(request, response);
+        return enabled && super.isEnabled(request, response);
     }
 
     @Override