Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bug in SecurityHandler and remove EE10 FormAuthenticator 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2023-08-17 15:44:20 +10:00
parent 9208629e95
commit 1b6b8331fa
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-core/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
View File

@ -600,7 +600,7 @@ public abstract class SecurityHandler extends Handler.Wrapper implements Configu
return switch (constraint.getAuthorization())
{
case FORBIDDEN, ALLOWED, INHERIT -> true;
case ANY_USER -> userIdentity == null || userIdentity.getUserPrincipal() == null;
case ANY_USER -> userIdentity != null && userIdentity.getUserPrincipal() != null;
case KNOWN_ROLE ->
{
if (userIdentity != null && userIdentity.getUserPrincipal() != null)

26
jetty-ee10/jetty-ee10-servlet/src/main/java/org/eclipse/jetty/ee10/servlet/security/FormAuthenticator.java
View File

@ -1,26 +0,0 @@
//
// ========================================================================
// Copyright (c) 1995 Mort Bay Consulting Pty Ltd and others.
//
// This program and the accompanying materials are made available under the
// terms of the Eclipse Public License v. 2.0 which is available at
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
//
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
// ========================================================================
//
package org.eclipse.jetty.ee10.servlet.security;
public class FormAuthenticator extends org.eclipse.jetty.security.authentication.FormAuthenticator
{
public FormAuthenticator()
{
}
public FormAuthenticator(String login, String error, boolean dispatch)
{
super(login, error, dispatch);
}
}

1
jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/security/FormAuthenticatorTest.java
View File

@ -24,6 +24,7 @@ import org.eclipse.jetty.ee10.servlet.ServletContextHandler;
import org.eclipse.jetty.security.Constraint;
import org.eclipse.jetty.security.EmptyLoginService;
import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.security.authentication.FormAuthenticator;
import org.eclipse.jetty.server.LocalConnector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.URIUtil;