Skip to content

Commit 9c1b0f9

Browse files
committed
restore QDR SSO AuthFilter
1 parent ddeb2c6 commit 9c1b0f9

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

src/main/java/edu/harvard/iq/dataverse/authorization/AuthFilter.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.logging.Logger;
1818
import org.apache.commons.lang3.StringUtils;
1919

20+
import jakarta.annotation.Priority;
2021
import jakarta.ejb.EJB;
2122
import jakarta.inject.Inject;
2223
import jakarta.servlet.Filter;
@@ -25,13 +26,16 @@
2526
import jakarta.servlet.ServletException;
2627
import jakarta.servlet.ServletRequest;
2728
import jakarta.servlet.ServletResponse;
29+
import jakarta.servlet.annotation.WebFilter;
2830
import jakarta.servlet.http.HttpServletRequest;
2931
import jakarta.servlet.http.HttpServletResponse;
3032
import jakarta.servlet.http.HttpSession;
3133
import jakarta.ws.rs.HttpMethod;
3234

3335
import com.nimbusds.openid.connect.sdk.Prompt;
3436

37+
@WebFilter("/*")
38+
@Priority(100) // Lower number means higher priority
3539
public class AuthFilter implements Filter {
3640

3741
private static final Logger logger = Logger.getLogger(AuthFilter.class.getCanonicalName());
@@ -74,9 +78,6 @@ public void doFilter(ServletRequest servletRequest, ServletResponse response, Fi
7478
//If the origin were configurable, this might be useful in general
7579
boolean ssoResetPath = path.equals("/ssoreset");
7680
if(!isCheck && ssoResetPath) {
77-
((HttpServletResponse) response).addHeader("Access-Control-Allow-Origin", drupalUrl);
78-
((HttpServletResponse) response).addHeader("Access-Control-Allow-Methods", "GET");
79-
((HttpServletResponse) response).addHeader("Access-Control-Allow-Credentials", "true");
8081

8182
logger.fine("passiveChecked flag check");
8283
if ((httpSession != null) && (httpSession.getAttribute("passiveChecked") != null)) {

0 commit comments

Comments
 (0)