Renamed UserSource/Service to identity store

Author: arjantijms

identity-store-jndi-with-rolemapper/README.adoc

@@ -0,0 +1,27 @@
+# user-and-role-service
+
+https://java.net/jira/browse/JAVAEE_SECURITY_SPEC-10
+
+From: Alex Kosowski (edited by Arjan Tijms)
+
+START Evaluation by Arjan Tijms
+
+This proposal models primarily a mutable identity store with many operations. Most of those operations go far beyond the minimal {credentials in/identity out} that containers themselves call.
+
+The identity store is represented by the IdentityStore interface. There are definition (factory) annotations for various standardized implementations. Usage of these annotations by
+applications will cause an IdentityStore implementation to be made available via JNDI.
+
+The {identity out} part of the {credentials in/identity out} function comes from the UserInfo class that is returned by IdentityStore#loadUserByUsername.
+
+The {credentials in} part of the {credentials in/identity out} function is not shown in this proposal.
+
+This proposal also models a role mapper, which largely follows the same pattern as the identity store.
+
+Finally, the proposal seems to model an authentication mechanism (orginally called authenticator). TODO: I'm not 100% if this indeed models an authentication mechanism such as a JASPIC SAM
+does.
+
+
+END Evaluation by Arjan Tijms
+
+
+The IdentityStore annotations would be an adapter between the repository and the IdentityStore interface. We would standardize IdentityStore implementations for various repository types (LDAP, DataSource,

user-and-role-service/pom.xml …ntity-store-jndi-with-rolemapper/pom.xmluser-and-role-service/pom.xml renamed to identity-store-jndi-with-rolemapper/pom.xml user-and-role-service/pom.xml renamed to identity-store-jndi-with-rolemapper/pom.xml

@@ -25,6 +25,6 @@
     <version>1.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>user-and-role-service</artifactId>
+  <artifactId>identity-store-jndi-with-rolemapper</artifactId>
 
 </project>

…a/javax/security/auth/Authenticator.java …curity/auth/AuthenticationMechanism.javauser-and-role-service/src/main/java/javax/security/auth/Authenticator.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/AuthenticationMechanism.java user-and-role-service/src/main/java/javax/security/auth/Authenticator.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/AuthenticationMechanism.java

@@ -1,6 +1,6 @@
 package javax.security.auth;
 
-public @interface Authenticator {
+public @interface AuthenticationMechanism {
     String userSourceName();
 
     String roleMapperName();

…uth/user/CustomUserSourceDefinition.java …store/CustomIdentityStoreDefinition.javauser-and-role-service/src/main/java/javax/security/auth/user/CustomUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/CustomIdentityStoreDefinition.java user-and-role-service/src/main/java/javax/security/auth/user/CustomUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/CustomIdentityStoreDefinition.java

@@ -19,13 +19,19 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-package javax.security.auth.user;
+package javax.security.auth.identitystore;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 /**
  * Application definable
  */
-@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface CustomUserSourceDefinition {
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface CustomIdentityStoreDefinition {
     String name();
 }

…user/DataSourceUserSourceDefinition.java …e/DataSourceIdentityStoreDefinition.javauser-and-role-service/src/main/java/javax/security/auth/user/DataSourceUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/DataSourceIdentityStoreDefinition.java user-and-role-service/src/main/java/javax/security/auth/user/DataSourceUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/DataSourceIdentityStoreDefinition.java

@@ -19,13 +19,19 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-package javax.security.auth.user;
+package javax.security.auth.identitystore;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 /**
  * Points to an application supplied DataSource
  */
-@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface DataSourceUserSourceDefinition {
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface DataSourceIdentityStoreDefinition {
     String name();
 }

…avax/security/auth/user/UserService.java …ty/auth/identitystore/IdentityStore.javauser-and-role-service/src/main/java/javax/security/auth/user/UserService.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/IdentityStore.java user-and-role-service/src/main/java/javax/security/auth/user/UserService.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/IdentityStore.java

@@ -19,11 +19,11 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-package javax.security.auth.user;
+package javax.security.auth.identitystore;
 
 import java.util.List;
 
-public interface UserService {
+public interface IdentityStore {
 
     UserInfo loadUserByUsername(String username);
 

…uth/user/Jsr351UserSourceDefinition.java …store/Jsr351IdentityStoreDefinition.javauser-and-role-service/src/main/java/javax/security/auth/user/Jsr351UserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/Jsr351IdentityStoreDefinition.java user-and-role-service/src/main/java/javax/security/auth/user/Jsr351UserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/Jsr351IdentityStoreDefinition.java

@@ -19,13 +19,19 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-package javax.security.auth.user;
+package javax.security.auth.identitystore;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 /**
  * Bridges to the JSR 351 Identity API
  */
-@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface Jsr351UserSourceDefinition {
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface Jsr351IdentityStoreDefinition {
     String name();
 }

…/auth/user/LdapUserSourceDefinition.java …tystore/LdapIdentityStoreDefinition.javauser-and-role-service/src/main/java/javax/security/auth/user/LdapUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/LdapIdentityStoreDefinition.java user-and-role-service/src/main/java/javax/security/auth/user/LdapUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/LdapIdentityStoreDefinition.java

@@ -19,11 +19,17 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-package javax.security.auth.user;
+package javax.security.auth.identitystore;
 
-@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface LdapUserSourceDefinition {
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface LdapIdentityStoreDefinition {
     String name();
 
     String ldapUrl();

…uth/user/MemoryUserSourceDefinition.java …store/MemoryIdentityStoreDefinition.javauser-and-role-service/src/main/java/javax/security/auth/user/MemoryUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/MemoryIdentityStoreDefinition.java user-and-role-service/src/main/java/javax/security/auth/user/MemoryUserSourceDefinition.java renamed to identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/MemoryIdentityStoreDefinition.java

@@ -19,13 +19,19 @@
 // Community Process. In order to remain compliant with the specification
 // DO NOT add / change / or delete method signatures!
 //
-package javax.security.auth.user;
+package javax.security.auth.identitystore;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
 
 /**
  * Code-embedded users, or read from file (JSON, XML, or Properties)
  */
-@java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE})
-@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
-public @interface MemoryUserSourceDefinition {
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface MemoryIdentityStoreDefinition {
     String name();
 }

identity-store-jndi-with-rolemapper/src/main/java/javax/security/auth/identitystore/ServerIdentityStoreDefinition.java

@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+//
+// This source code implements specifications defined by the Java
+// Community Process. In order to remain compliant with the specification
+// DO NOT add / change / or delete method signatures!
+//
+package javax.security.auth.identitystore;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface ServerIdentityStoreDefinition {
+    String name();
+}