Bearer tokens

Model/lib/conifer/roles/conifer/templates/WDK/model-config.xml.j2

@@ -145,49 +145,6 @@ site_vars file: {{ site_vars }}
             {% endif -%}
     />
 
-    <accountDb login="{{ modelconfig_accountDb_login }}"
-            password="{{ modelconfig_accountDb_password }}"
-            connectionUrl="{{ modelconfig_accountDb_connectionUrl }}"
-            platform="{{ modelconfig_accountDb_platform }}"
-            accountSchema="{{ modelconfig_accountDb_accountSchema }}"
-            {% if modelconfig_accountDb_maxActive is defined -%}
-            maxActive="{{ modelconfig_accountDb_maxActive }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_maxIdle is defined -%}
-            maxIdle="{{ modelconfig_accountDb_maxIdle }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_minIdle is defined -%}
-            minIdle="{{ modelconfig_accountDb_minIdle }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_maxWait is defined -%}
-            maxWait="{{ modelconfig_accountDb_maxWait }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_defaultFetchSize is defined -%}
-            defaultFetchSize="{{ modelconfig_accountDb_defaultFetchSize }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_showConnections is defined -%}
-            showConnections="{{ modelconfig_accountDb_showConnections }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_showConnectionsInterval is defined -%}
-            showConnectionsInterval="{{ modelconfig_accountDb_showConnectionsInterval }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_showConnectionsDuration is defined -%}
-            showConnectionsDuration="{{ modelconfig_accountDb_showConnectionsDuration }}"
-            {% endif -%}
-            {% if modelconfig_accountDb_driverInitClass is defined -%}
-            driverInitClass="{{ modelconfig_accountDb_driverInitClass }}"
-            {% endif %}
-      >
-
-      <userProperty name="username" displayName="Username" dbKey="username"/>
-      <userProperty name="firstName" displayName="First Name" dbKey="first_name" required="true"/>
-      <userProperty name="middleName" displayName="Middle Name" dbKey="middle_name"/>
-      <userProperty name="lastName" displayName="Last Name" dbKey="last_name" required="true"/>
-      <userProperty name="organization" displayName="Organization" dbKey="organization" required="true"/>
-      <userProperty name="interests" displayName="Interests" dbKey="interests" multiLine="true"/>
-
-    </accountDb>
-
     {% if modelconfig_userDatasetStoreConfig is defined -%}
     {{ modelconfig_userDatasetStoreConfig|indent }}
     {% endif -%}

Model/lib/rng/wdkModel-config.rng

@@ -94,39 +94,6 @@
                     <attribute name="userSchema" />
                 </element>
 
-                <element name="accountDb">
-                    <ref name="DBBaseContent" />
-                    <attribute name="accountSchema" />
-                    <zeroOrMore>
-                        <element name="userProperty">
-                          <attribute name="name">
-                              <data type="string"/>
-                          </attribute>
-                          <attribute name="displayName">
-                              <data type="string"/>
-                          </attribute>
-                          <attribute name="dbKey">
-                              <data type="string"/>
-                          </attribute>
-                          <optional>
-                            <attribute name="required">
-                              <data type="boolean"/>
-                            </attribute>
-                          </optional>
-                          <optional>
-                            <attribute name="public">
-                              <data type="boolean"/>
-                            </attribute>
-                          </optional>
-                          <optional>
-                            <attribute name="multiLine">
-                              <data type="boolean"/>
-                            </attribute>
-                          </optional>
-                        </element>
-                    </zeroOrMore>
-                </element>
-
                 <optional>
                     <element name="userDatasetStore">
                         <attribute name="implementation"/>

Model/pom.xml

@@ -77,17 +77,22 @@
 
     <dependency>
       <groupId>org.gusdb</groupId>
-      <artifactId>fgputil-accountdb</artifactId>
+      <artifactId>fgputil-server</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.gusdb</groupId>
-      <artifactId>fgputil-server</artifactId>
+      <artifactId>fgputil-db</artifactId>
     </dependency>
 
     <dependency>
       <groupId>org.gusdb</groupId>
-      <artifactId>fgputil-db</artifactId>
+      <artifactId>oauth2-client</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>com.github.ben-manes.caffeine</groupId>
+      <artifactId>caffeine</artifactId>
     </dependency>
 
     <dependency>
@@ -115,17 +120,6 @@
       <artifactId>jersey-container-grizzly2-http</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>io.jsonwebtoken</groupId>
-      <artifactId>jjwt</artifactId>
-      <exclusions>
-        <exclusion>
-          <groupId>com.fasterxml.jackson.core</groupId>
-          <artifactId>jackson-databind</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>

Model/src/main/java/org/gusdb/wdk/cache/TemporaryUserDataStore.java

@@ -0,0 +1,86 @@
+package org.gusdb.wdk.cache;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.log4j.Logger;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.RemovalListener;
+import com.github.benmanes.caffeine.cache.stats.CacheStats;
+
+/**
+ * Manages a map of user-scoped short-term information.  Traditionally,
+ * this data was stored in the user's session object; instead, we store
+ * it now in a userId-keyed map, whose values time out some duration
+ * after last access (currently 60 minutes).  If instance() is called
+ * within the application, shutDown() should also be called to clean
+ * up the expiration thread threadpool.
+ */
+public class TemporaryUserDataStore {
+
+  private static final Logger LOG = Logger.getLogger(TemporaryUserDataStore.class);
+
+  public static class TemporaryUserData extends ConcurrentHashMap<String,Object> {
+
+    private final TemporaryUserDataStore _parent;
+    private final Long _owner;
+
+    private TemporaryUserData(TemporaryUserDataStore parent, Long owner) {
+      _parent = parent;
+      _owner = owner;
+    }
+
+    public void invalidate() {
+      clear();
+      _parent.remove(_owner);
+    }
+
+  }
+
+  // singleton pattern
+  private static TemporaryUserDataStore _instance;
+
+  public static synchronized TemporaryUserDataStore instance() {
+    return _instance == null ? (_instance = new TemporaryUserDataStore()) : _instance;
+  }
+
+  public static void shutDown() {
+    if (_instance != null)
+      _instance._threadPool.shutdown();
+    _instance = null;
+  }
+
+  private static final RemovalListener<Long,Map<String,Object>> LISTENER =
+      (k,v,cause) -> LOG.info("User " + k + "'s temporary user data store has expired with " + v.size() + " entries; Reason: " + cause);
+
+  private final ExecutorService _threadPool;
+  private final Cache<Long,TemporaryUserData> _data;
+
+  private TemporaryUserDataStore() {
+    _threadPool = Executors.newCachedThreadPool();
+    _data = Caffeine.newBuilder()
+        .executor(_threadPool)
+        .recordStats()
+        .removalListener(LISTENER)
+        .expireAfterAccess(60, TimeUnit.MINUTES)
+        .build();
+  }
+
+  public TemporaryUserData get(Long userId) {
+    return _data.get(userId, id -> new TemporaryUserData(this, id));
+  }
+
+  public void remove(Long userId) {
+    _data.invalidate(userId);
+  }
+
+  public CacheStats getStats() {
+    return _data.stats();
+  }
+
+}

Model/src/main/java/org/gusdb/wdk/controller/WdkInitializer.java

@@ -6,6 +6,7 @@
 import org.gusdb.fgputil.logging.ThreadLocalLoggingVars;
 import org.gusdb.fgputil.runtime.GusHome;
 import org.gusdb.fgputil.web.ApplicationContext;
+import org.gusdb.wdk.cache.TemporaryUserDataStore;
 import org.gusdb.wdk.model.ThreadMonitor;
 import org.gusdb.wdk.model.Utilities;
 import org.gusdb.wdk.model.WdkModel;
@@ -77,6 +78,9 @@ public static void terminateWdk(ApplicationContext applicationScope) {
       // shut down thread monitor
       ThreadMonitor.shutDown();
 
+      // shut down TemporaryUserData threadpool
+      TemporaryUserDataStore.shutDown();
+
       WdkModel wdkModel = getWdkModel(applicationScope);
       if (wdkModel != null) {
         // insulate in case model never properly loaded