Tweaks IP authentication

[mkjsf-moved-to-github.git] / src / main / java / com / indexdata / mkjsf / pazpar2 / sp / auth / ServiceProxyUser.java

diff --git a/src/main/java/com/indexdata/mkjsf/pazpar2/sp/auth/ServiceProxyUser.java b/src/main/java/com/indexdata/mkjsf/pazpar2/sp/auth/ServiceProxyUser.java
index ea0be27..43971df 100644 (file)
--- a/src/main/java/com/indexdata/mkjsf/pazpar2/sp/auth/ServiceProxyUser.java
+++ b/src/main/java/com/indexdata/mkjsf/pazpar2/sp/auth/ServiceProxyUser.java
@@ -8,19 +8,24 @@ import java.util.Map;
 import javax.enterprise.context.SessionScoped;\r
 import javax.inject.Named;\r
 \r
+import org.apache.log4j.Logger;\r
+\r
+import com.indexdata.mkjsf.utils.Utils;\r
+\r
 @Named("user") @SessionScoped\r
 public class ServiceProxyUser implements AuthenticationEntity {\r
 \r
   private static final long serialVersionUID = 2351542518778803071L;\r
   private List<String> possibleProperties = Arrays.asList("name","password","realm");\r
   private Map<String,String> actualProperties = new HashMap<String,String>();\r
+  private static Logger logger = Logger.getLogger(ServiceProxyUser.class);\r
+  private boolean authenticated = false;\r
+  private boolean ipAuthenticated = false;\r
 \r
-  public ServiceProxyUser()  {}\r
-  \r
-  public void setAuthenticationMethod() {\r
-    \r
+  public ServiceProxyUser()  {\r
+    logger.debug("ServiceProxyUser instantiated: " + Utils.objectId(this));\r
   }\r
-\r
+  \r
   public String getName() { \r
     return actualProperties.get("name"); \r
   }\r
@@ -44,6 +49,22 @@ public class ServiceProxyUser implements AuthenticationEntity {
   public String getRealm() {\r
     return actualProperties.get("realm");\r
   }\r
+   \r
+  public void isAuthenticated(boolean authenticated) {\r
+    this.authenticated = authenticated;\r
+  }\r
+  \r
+  public void isIpAuthenticated (boolean authenticated) {\r
+    this.ipAuthenticated = authenticated;\r
+  }\r
+  \r
+  public boolean isAuthenticated() {\r
+    return authenticated;\r
+  }\r
+  \r
+  public boolean isIpAuthenticated () {\r
+    return ipAuthenticated;\r
+  }\r
   \r
 \r
   @Override\r
@@ -61,5 +82,11 @@ public class ServiceProxyUser implements AuthenticationEntity {
     return possibleProperties;\r
   } \r
   \r
+  public void clear() {\r
+    actualProperties = new HashMap<String,String>();\r
+    authenticated = false;\r
+    ipAuthenticated = false;\r
+  }\r
+  \r
 \r
 }\r