Changeset 218

Timestamp:

03/08/10 16:25:36 (14 years ago)

Author:

oschonef

Message:

• (try to) handle requests to methods which require authentication more gracefully if URIs contain dangling slashes

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionRegistryRestService.java (modified) (2 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/rest/VirtualCollectionRegistryRestService.java

@@ -57 +57 @@
                 Principal principal = security.getUserPrincipal();
                 if (principal == null) {
-                        throw new NullPointerException("princial == null");
+                        String path = uriInfo.getPath();
+                        if (path.endsWith("/")) {
+                                /*
+                                 * fix bad client request and remove tailing slash 
+                                 */
+                                path = path.substring(0, path.length() - 1);
+                                URI uri = uriInfo.getBaseUriBuilder().path(path).build();
+                                return Response.temporaryRedirect(uri).build();
+                        }
+                        /*
+                         * should never happen, because servlet container should
+                         * supply a valid principal
+                         */
+                        throw new AssertionError("prinicial == null");
                 }
                 try {
@@ -162 +175 @@
                 Principal principal = security.getUserPrincipal();
                 if (principal == null) {
-                        throw new NullPointerException("princial == null");
+                        String path = uriInfo.getPath();
+                        if (path.endsWith("/")) {
+                                /*
+                                 * fix bad client request and remove tailing slash 
+                                 */
+                                path = path.substring(0, path.length() - 1);
+                                URI uri = uriInfo.getBaseUriBuilder().path(path).build();
+                                return Response.seeOther(uri).build();
+                        }
+                        /*
+                         * should never happen, because servlet container should
+                         * supply a valid principal
+                         */
+                        throw new AssertionError("prinicial == null");
                 }
                 final VirtualCollectionList vcs =