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

Issue #9631 - update jaspi jar and permissions for Jetty-10 

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
This commit is contained in:
Lachlan Roberts 2023-05-05 14:42:45 +10:00
parent 12581c0ea0
commit 33f1320a71
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jetty-jaspi/pom.xml
View File

@ -51,8 +51,9 @@
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jetty.orbit</groupId> <groupId>jakarta.security.auth.message</groupId>
<artifactId>javax.security.auth.message</artifactId> <artifactId>jakarta.security.auth.message-api</artifactId>
<version>1.1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>

2
jetty-jaspi/src/main/java/module-info.java
View File

@ -16,7 +16,7 @@ module org.eclipse.jetty.security.jaspi
requires jetty.servlet.api; requires jetty.servlet.api;
requires org.slf4j; requires org.slf4j;
requires transitive javax.security.auth.message; requires transitive java.security.auth.message;
requires transitive org.eclipse.jetty.security; requires transitive org.eclipse.jetty.security;
exports org.eclipse.jetty.security.jaspi; exports org.eclipse.jetty.security.jaspi;

15
jetty-jaspi/src/main/java/org/eclipse/jetty/security/jaspi/DefaultAuthConfigFactory.java
View File

@ -18,7 +18,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import javax.security.auth.AuthPermission;
import javax.security.auth.message.config.AuthConfigFactory; import javax.security.auth.message.config.AuthConfigFactory;
import javax.security.auth.message.config.AuthConfigProvider; import javax.security.auth.message.config.AuthConfigProvider;
import javax.security.auth.message.config.RegistrationListener; import javax.security.auth.message.config.RegistrationListener;
@ -61,7 +60,7 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override @Override
public String registerConfigProvider(String className, Map properties, String layer, String appContext, String description) public String registerConfigProvider(String className, Map properties, String layer, String appContext, String description)
{ {
checkPermission("registerAuthConfigProvider"); checkPermission();
String key = getKey(layer, appContext); String key = getKey(layer, appContext);
AuthConfigProvider configProvider = createConfigProvider(className, properties); AuthConfigProvider configProvider = createConfigProvider(className, properties);
@ -75,7 +74,7 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override @Override
public String registerConfigProvider(AuthConfigProvider provider, String layer, String appContext, String description) public String registerConfigProvider(AuthConfigProvider provider, String layer, String appContext, String description)
{ {
checkPermission("registerAuthConfigProvider"); checkPermission();
String key = getKey(layer, appContext); String key = getKey(layer, appContext);
DefaultRegistrationContext context = new DefaultRegistrationContext(provider, layer, appContext, description, false); DefaultRegistrationContext context = new DefaultRegistrationContext(provider, layer, appContext, description, false);
@ -88,7 +87,7 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override @Override
public boolean removeRegistration(String registrationID) public boolean removeRegistration(String registrationID)
{ {
checkPermission("removeAuthRegistration"); checkPermission();
DefaultRegistrationContext registrationContext = _registrations.remove(registrationID); DefaultRegistrationContext registrationContext = _registrations.remove(registrationID);
if (registrationContext == null) if (registrationContext == null)
@ -101,7 +100,7 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override @Override
public String[] detachListener(RegistrationListener listener, String layer, String appContext) public String[] detachListener(RegistrationListener listener, String layer, String appContext)
{ {
checkPermission("detachAuthListener"); checkPermission();
List<String> registrationIds = new ArrayList<>(); List<String> registrationIds = new ArrayList<>();
for (DefaultRegistrationContext registration : _registrations.values()) for (DefaultRegistrationContext registration : _registrations.values())
@ -138,14 +137,14 @@ public class DefaultAuthConfigFactory extends AuthConfigFactory
@Override @Override
public void refresh() public void refresh()
{ {
checkPermission("refreshAuth"); checkPermission();
// TODO: maybe we should re-construct providers created from classname. // TODO: maybe we should re-construct providers created from classname.
} }
private static void checkPermission(String permission) private static void checkPermission()
{ {
SecurityUtils.checkPermission(new AuthPermission(permission)); SecurityUtils.checkPermission(providerRegistrationSecurityPermission);
} }
private static String getKey(String layer, String appContext) private static String getKey(String layer, String appContext)