Changeset 57:4efb21cf0ce0 in AnnotationManagerN4J for src

Timestamp:

Nov 20, 2012, 4:56:35 PM (11 years ago)

Author:

casties

Branch:

default

Message:

new non-authorized mode without tokens. enabled by default. configured with annotationmanager.authorization=false property.

Location:

src/main

Files:

• java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java (modified) (2 diffs)
• java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java (modified) (1 diff)
• java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java (modified) (5 diffs)
• webapp/WEB-INF/serverconfig.property.template (modified) (1 diff)

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -133 +133 @@
 
     /**
-     * checks Annotator Auth plugin authentication information from headers.
-     * returns userId if successful.
+     * Checks Annotator Auth plugin authentication information from headers.
+     * Returns userId if successful. Returns "anonymous" in non-authorization mode.
      * 
      * @param entity
@@ -142 +142 @@
         Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
         String authToken = requestHeaders.getFirstValue("x-annotator-auth-token", true);
-        if (authToken == null) return null;
+        if (authToken == null) {
+            if (!((BaseRestlet) getApplication()).isAuthorizationMode()) {
+                return "anonymous";
+            }
+            return null;
+        }
         // decode token first to get consumer key
         JsonToken token = new JsonTokenParser(null, null).deserialize(authToken);

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java

@@ -15 +15 @@
 public class AnnotatorRestlet extends BaseRestlet {
 
-    public final String version = "AnnotationManagerN4J/Annotator 0.2.2";
+    public final String version = "AnnotationManagerN4J/Annotator 0.2.3";
 
     public static Logger logger = Logger.getLogger(AnnotatorRestlet.class);

src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java

@@ -34 +34 @@
 
     /**
-     * Properties holding consumer keys and secrets
+     * Properties holding consumer keys and secrets.
      */
     protected Properties consumerKeys;
@@ -40 +40 @@
     public static final String CONSUMERKEYS_KEY = "annotationmanager.consumerkeys";
 
+    /**
+     * Properties holding server config.
+     */
     protected Properties serverConfig;
     public String CONFIG_PROPS_PATH = "WEB-INF/serverconfig.property";
     public static final String SERVERCONFIG_KEY = "annotationmanager.serverconfig";
 
+    /** 
+     * database instance;
+     */
     protected GraphDatabaseService graphDb;
     public static final String GRAPHDB_KEY = "annotationmanager.graphdb";
@@ -49 +55 @@
     public String graphdbPath = "WEB-INF/neo4j-annotation-db";
 
+    /**
+     * database interface server instance.
+     */
     protected WrappingNeoServerBootstrapper srv;
     public static final String GRAPHDBSRV_KEY = "annotationmanager.graphdb.srv";
 
+    /**
+     * annotation store instance.
+     */
     protected AnnotationStore store;
     public static final String ANNSTORE_KEY = "annotationmanager.store";
 
+    /**
+     * LDAP server URI (for looking up full user names).
+     */
     protected String ldapServerUrl;
     public static final String LDAP_SERVER_KEY = "annotationmanager.ldapserver.url";
@@ -61 +76 @@
     public static final String ADMIN_PASSWORD_KEY = "annotationmanager.admin.password";
 
+    /**
+     * run in authorization mode i.e. with tokens.
+     */
+    protected boolean authorizationMode = false; 
+    public static final String AUTHORIZATION_MODE_KEY = "annotationmanager.authorization";
+    
     /**
      * constructor
@@ -172 +193 @@
 
     /**
+     * @return the authorizationMode
+     */
+    public boolean isAuthorizationMode() {
+        return authorizationMode;
+    }
+
+    /**
      * @return the store
      */

src/main/webapp/WEB-INF/serverconfig.property.template

@@ -2 +2 @@
 # format: key = value
 annotationmanager.graphdb.path = /usr/local/neo4j/dbs/AnnotationManager
+annotationmanager.authorization = true
 annotationmanager.ldapserver.url = ldap://ldap.mpiwg-berlin.mpg.de/dc=mpiwg-berlin,dc=mpg,dc=de
 annotationmanager.admin.user = adminuser