Changeset 207 for ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/tools/RegistryToolHelper.java

Timestamp:

03/03/10 13:08:06 (14 years ago)

Author:

patdui

Message:

• addd Basic security in webapp
• Added Delete functionality in registry
• Made POST and DELETE use authorisation

File:

• ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/tools/RegistryToolHelper.java (modified) (6 diffs)

ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/tools/RegistryToolHelper.java

@@ -4 +4 @@
 import java.io.InputStream;
 
+import javax.ws.rs.core.HttpHeaders;
 import javax.ws.rs.core.MediaType;
 
@@ -13 +14 @@
 
 import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
+import com.sun.jersey.core.util.Base64;
 import com.sun.jersey.multipart.FormDataMultiPart;
 
@@ -22 +25 @@
     private int failed = 0;
 
-    public RegistryToolHelper(WebResource service) {
+    private final String userName;
+
+    private final String password;
+
+    public RegistryToolHelper(WebResource service, String userName, String password) {
         this.service = service;
+        this.userName = userName;
+        this.password = password;
     }
 
@@ -29 +38 @@
         FormDataMultiPart form = createForm(input, creatorName, description, name);
         form.field(ComponentRegistryRestService.GROUP_FORM_FIELD, group);
-        RegisterResponse response = service.path("/components").type(MediaType.MULTIPART_FORM_DATA).post(RegisterResponse.class, form);
+        RegisterResponse response = getAuthenticatedResource("/components").type(MediaType.MULTIPART_FORM_DATA).post(RegisterResponse.class, form);
         handleResult(response);
     }
@@ -35 +44 @@
     public void registerProfile(InputStream input, String creatorName, String description, String name) throws IOException {
         FormDataMultiPart form = createForm(input, creatorName, description, name);
-        RegisterResponse response = service.path("/profiles").type(MediaType.MULTIPART_FORM_DATA).post(RegisterResponse.class, form);
+        RegisterResponse response = getAuthenticatedResource("/profiles").type(MediaType.MULTIPART_FORM_DATA).post(RegisterResponse.class, form);
         handleResult(response);
     }
+    
+    private Builder getAuthenticatedResource(String path) {
+        return service.path(path).header(HttpHeaders.AUTHORIZATION, "Basic " + new String(Base64.encode(userName+":"+password)));
+    }
+
 
     private FormDataMultiPart createForm(InputStream input, String creatorName, String description, String name) throws IOException {
@@ -44 +58 @@
         form.field(ComponentRegistryRestService.NAME_FORM_FIELD, name);
         form.field(ComponentRegistryRestService.DESCRIPTION_FORM_FIELD, description);
-        form.field(ComponentRegistryRestService.CREATOR_NAME_FORM_FIELD, creatorName);
         return form;
     }