Security soteria 1.1.payara maintenance

impl/pom.xml

@@ -46,7 +46,7 @@
     <parent>
        <groupId>org.glassfish.soteria</groupId>
        <artifactId>parent</artifactId>
-       <version>1.1-b01-SNAPSHOT</version>
+       <version>1.1-b01.payara-p6</version>
     </parent>
 
     <artifactId>javax.security.enterprise</artifactId>
@@ -63,8 +63,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.security.enterprise</groupId>
-            <artifactId>javax.security.enterprise-api</artifactId>
+            <groupId>jakarta.security.enterprise</groupId>
+            <artifactId>jakarta.security.enterprise-api</artifactId>
             <version>${api_dependency_version}</version>
         </dependency>
         <dependency>

impl/src/main/java/org/glassfish/soteria/cdi/AnyAnnotationLiteral.java

@@ -48,6 +48,6 @@
  * 
  */
 @SuppressWarnings("all")
-class AnyAnnotationLiteral extends AnnotationLiteral<Any> implements Any {
+public class AnyAnnotationLiteral extends AnnotationLiteral<Any> implements Any {
     private static final long serialVersionUID = 1L;
 }

impl/src/main/java/org/glassfish/soteria/cdi/AutoApplySessionInterceptor.java

@@ -50,7 +50,6 @@
 import java.security.Principal;
 
 import javax.annotation.Priority;
-import javax.el.ELProcessor;
 import javax.interceptor.AroundInvoke;
 import javax.interceptor.Interceptor;
 import javax.interceptor.InvocationContext;

impl/src/main/java/org/glassfish/soteria/cdi/CdiProducer.java

@@ -128,54 +128,54 @@ public boolean isNullable() {
         return false;
     }
 
-    protected CdiProducer<T> active(boolean active) {
+    public CdiProducer<T> active(boolean active) {
         return this;
     }
 
-    protected CdiProducer<T> name(String name) {
+    public CdiProducer<T> name(String name) {
         this.name = name;
         return this;
     }
 
-    protected CdiProducer<T> create(Function<CreationalContext<T>, T> create) {
+    public CdiProducer<T> create(Function<CreationalContext<T>, T> create) {
         this.create = create;
         return this;
     }
 
-    protected CdiProducer<T> beanClass(Class<?> beanClass) {
+    public CdiProducer<T> beanClass(Class<?> beanClass) {
         this.beanClass = beanClass;
         return this;
     }
 
-    protected CdiProducer<T> types(Type... types) {
+    public CdiProducer<T> types(Type... types) {
         this.types = asSet(types);
         return this;
     }
 
-    protected CdiProducer<T> beanClassAndType(Class<?> beanClass) {
+    public CdiProducer<T> beanClassAndType(Class<?> beanClass) {
         beanClass(beanClass);
         types(beanClass);
         return this;
     }
 
-    protected CdiProducer<T> qualifiers(Annotation... qualifiers) {
+    public CdiProducer<T> qualifiers(Annotation... qualifiers) {
         this.qualifiers = asSet(qualifiers);
         return this;
     }
 
 
-    protected CdiProducer<T> scope(Class<? extends Annotation> scope) {
+    public CdiProducer<T> scope(Class<? extends Annotation> scope) {
         this.scope = scope;
         return this;
     }
 
-    protected CdiProducer<T> addToId(Object object) {
+    public CdiProducer<T> addToId(Object object) {
         id = id + " " + object.toString();
         return this;
     }
 
     @SafeVarargs
-    protected static <T> Set<T> asSet(T... a) {
+    public static <T> Set<T> asSet(T... a) {
         return new HashSet<>(asList(a));
     }
 

impl/src/main/java/org/glassfish/soteria/cdi/DefaultAnnotationLiteral.java

@@ -48,6 +48,6 @@
  * 
  */
 @SuppressWarnings("all")
-class DefaultAnnotationLiteral extends AnnotationLiteral<Default> implements Default {
+public class DefaultAnnotationLiteral extends AnnotationLiteral<Default> implements Default {
     private static final long serialVersionUID = 1L;
 }

impl/src/main/java/org/glassfish/soteria/cdi/DefaultIdentityStoreHandler.java

@@ -40,18 +40,12 @@
 
 package org.glassfish.soteria.cdi;
 
-import javax.security.enterprise.CallerPrincipal;
-import javax.security.enterprise.credential.Credential;
-import javax.security.enterprise.identitystore.CredentialValidationResult;
-import javax.security.enterprise.identitystore.IdentityStore;
-import javax.security.enterprise.identitystore.IdentityStoreHandler;
-
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.toList;
 import static javax.security.enterprise.identitystore.CredentialValidationResult.INVALID_RESULT;
 import static javax.security.enterprise.identitystore.CredentialValidationResult.NOT_VALIDATED_RESULT;
-import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.INVALID;
+import static javax.security.enterprise.identitystore.CredentialValidationResult.Status.VALID;
 import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.PROVIDE_GROUPS;
 import static javax.security.enterprise.identitystore.IdentityStore.ValidationType.VALIDATE;
 import static org.glassfish.soteria.cdi.CdiUtils.getBeanReferencesByType;
@@ -62,6 +56,11 @@
 import java.util.List;
 import java.util.Set;
 
+import javax.security.enterprise.credential.Credential;
+import javax.security.enterprise.identitystore.CredentialValidationResult;
+import javax.security.enterprise.identitystore.IdentityStore;
+import javax.security.enterprise.identitystore.IdentityStoreHandler;
+
 
 /**
  *

impl/src/main/java/org/glassfish/soteria/cdi/LdapIdentityStoreDefinitionAnnotationLiteral.java

@@ -311,7 +311,7 @@ public String readTimeoutExpression() {
 
     @Override
     public String url() {
-        return url;
+        return hasDeferredExpressions? evalELExpression(url) : url;
     }
 
     @Override

impl/src/main/java/org/glassfish/soteria/cdi/LoginToContinueInterceptor.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-
+// Portions Copyright [2018] Payara Foundation and/or affiliates
 package org.glassfish.soteria.cdi;
 
 import static java.lang.Boolean.TRUE;
@@ -85,12 +85,14 @@ public class LoginToContinueInterceptor implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Inject
-    private BeanManager beanManager;
+    private final BeanManager beanManager;
+    private final Bean<?> interceptedBean;
 
     @Inject
-    @Intercepted
-    private Bean<?> interceptedBean;
+    public LoginToContinueInterceptor(BeanManager beanManager, @Intercepted Bean<?> interceptedBean) {
+        this.beanManager = beanManager;
+        this.interceptedBean = interceptedBean;
+    }
 
     @AroundInvoke
     public Object intercept(InvocationContext invocationContext) throws Exception {

impl/src/main/java/org/glassfish/soteria/cdi/RememberMeInterceptor.java

@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-
+// Portions Copyright [2018] Payara Foundation and/or affiliates
 package org.glassfish.soteria.cdi;
 
 import static javax.interceptor.Interceptor.Priority.PLATFORM_BEFORE;
@@ -84,12 +84,14 @@ public class RememberMeInterceptor implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Inject
-    private BeanManager beanManager;
+    private final BeanManager beanManager;
+    private final Bean<?> interceptedBean;
 
     @Inject
-    @Intercepted
-    private Bean<?> interceptedBean;
+    public RememberMeInterceptor(BeanManager beanManager, @Intercepted Bean<?> interceptedBean) {
+        this.beanManager = beanManager;
+        this.interceptedBean = interceptedBean;
+    }
 
     @AroundInvoke
     public Object intercept(InvocationContext invocationContext) throws Exception {

impl/src/main/java/org/glassfish/soteria/identitystores/IdentityStoreConfigurationException.java

@@ -42,15 +42,17 @@
 
 public class IdentityStoreConfigurationException extends IdentityStoreException {
 
-  public IdentityStoreConfigurationException(String message, Throwable cause) {
-    super(message,cause);
-  }
+    private static final long serialVersionUID = 1L;
 
-  public IdentityStoreConfigurationException(Throwable cause) {
-    super(cause);
-  }
+    public IdentityStoreConfigurationException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public IdentityStoreConfigurationException(String message) {
-    super(message);
-  }
+    public IdentityStoreConfigurationException(Throwable cause) {
+        super(cause);
+    }
+
+    public IdentityStoreConfigurationException(String message) {
+        super(message);
+    }
 }

impl/src/main/java/org/glassfish/soteria/identitystores/IdentityStoreException.java

@@ -42,15 +42,17 @@
 
 public class IdentityStoreException extends RuntimeException {
 
-  public IdentityStoreException(String message, Throwable cause) {
-    super(message,cause);
-  }
+    private static final long serialVersionUID = 1L;
 
-  public IdentityStoreException(Throwable cause) {
-    super(cause);
-  }
+    public IdentityStoreException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public IdentityStoreException(String message) {
-    super(message);
-  }
+    public IdentityStoreException(Throwable cause) {
+        super(cause);
+    }
+
+    public IdentityStoreException(String message) {
+        super(message);
+    }
 }

impl/src/main/java/org/glassfish/soteria/identitystores/IdentityStoreRuntimeException.java

@@ -42,15 +42,17 @@
 
 public class IdentityStoreRuntimeException extends IdentityStoreException {
 
-  public IdentityStoreRuntimeException(String message, Throwable cause) {
-    super(message,cause);
-  }
+    private static final long serialVersionUID = 1L;
 
-  public IdentityStoreRuntimeException(Throwable cause) {
-    super(cause);
-  }
+    public IdentityStoreRuntimeException(String message, Throwable cause) {
+        super(message, cause);
+    }
 
-  public IdentityStoreRuntimeException(String message) {
-    super(message);
-  }
+    public IdentityStoreRuntimeException(Throwable cause) {
+        super(cause);
+    }
+
+    public IdentityStoreRuntimeException(String message) {
+        super(message);
+    }
 }