Additional testing on PostURIValidator for upload URI regex support

Author: tomdesair

README.md

@@ -40,7 +40,7 @@ The first step is to create a `TusFileUploadService` object using its constructo
 
 * `withUploadURI(String)`: Set the relative URL under which the main tus upload endpoint will be made available, for example `/files/upload`. Optionally, this URI may contain regex parameters in order to support endpoints that contain URL parameters, for example `/users/[0-9]+/files/upload`.
 * `withMaxUploadSize(Long)`: Specify the maximum number of bytes that can be uploaded per upload. If you don't call this method, the maximum number of bytes is `Long.MAX_VALUE`.
-* `withStoragePath(String)`: If you're using the default filesystem-based storage service, you can use this method to specify the path where to store the uploaded bytes and upload information.
+* `withStoragePath(String)`: If you're using the default file system-based storage service, you can use this method to specify the path where to store the uploaded bytes and upload information.
 * `withChunkedTransferDecoding`: You can enable or disable the decoding of chunked HTTP requests by this library. Enable this feature in case the web container in which this service is running does not decode chunked transfers itself. By default, chunked decoding via this library is disabled (as modern frameworks tend to already do this for you).
 * `withThreadLocalCache(Boolean)`: Optionally you can enable (or disable) an in-memory (thread local) cache of upload request data to reduce load on the storage backend and potentially increase performance when processing upload requests.
 * `withUploadExpirationPeriod(Long)`: You can set the number of milliseconds after which an upload is considered as expired and available for cleanup.
@@ -49,7 +49,7 @@ The first step is to create a `TusFileUploadService` object using its constructo
 * `disableTusExtension(String)`: Disable the `TusExtension` for which the `getName()` method matches the provided string. The default extensions have names "creation", "checksum", "expiration", "concatenation", "termination" and "download". You cannot disable the "core" feature.
 
 
-For now this library only provides filesystem-based storage and locking options. You can however provide your own implementation of a `UploadStorageService` and `UploadLockingService` using the methods `withUploadStorageService(UploadStorageService)` and `withUploadLockingService(UploadLockingService)` in order to support different types of upload storage.
+For now this library only provides file system-based storage and locking options. You can however provide your own implementation of a `UploadStorageService` and `UploadLockingService` using the methods `withUploadStorageService(UploadStorageService)` and `withUploadLockingService(UploadLockingService)` in order to support different types of upload storage.
 
 ### 2. Processing an upload
 To process an upload request you have to pass the current `javax.servlet.http.HttpServletRequest` and `javax.servlet.http.HttpServletResponse` objects to the `me.desair.tus.server.TusFileUploadService.process()` method. Typical places were you can do this are inside Servlets, Filters or REST API Controllers (see [examples](#quick-start-and-examples)).

src/main/java/me/desair/tus/server/TusFileUploadService.java

@@ -130,7 +130,7 @@ public TusFileUploadService withUploadLockingService(UploadLockingService upload
     }
 
     /**
-     * If you're using the default filesystem-based storage service, you can use this method to
+     * If you're using the default file system-based storage service, you can use this method to
      * specify the path where to store the uploaded bytes and upload information.
      *
      * @param storagePath The file system path where uploads can be stored (temporarily)
@@ -192,9 +192,9 @@ public TusFileUploadService withDownloadFeature() {
     }
 
     /**
-     * Add a custom (application-specific) extension that implements the `me.desair.tus.server.TusExtension` interface.
-     * For example you can add your own extension that checks authentication and authorization policies within your
-     * application for the user doing the upload.
+     * Add a custom (application-specific) extension that implements the {@link me.desair.tus.server.TusExtension}
+     * interface. For example you can add your own extension that checks authentication and authorization policies
+     * within your application for the user doing the upload.
      *
      * @param feature The custom extension implementation
      * @return The current service

src/test/java/me/desair/tus/server/creation/validation/PostURIValidatorTest.java

@@ -66,4 +66,38 @@ public void validateInvalidUrl() throws Exception {
 
         //Expect PostOnInvalidRequestURIException
     }
+
+    @Test
+    public void validateMatchingRegexUrl() throws Exception {
+        servletRequest.setRequestURI("/users/1234/files/upload");
+        when(uploadStorageService.getUploadURI()).thenReturn("/users/[0-9]+/files/upload");
+
+        try {
+            validator.validate(HttpMethod.POST, servletRequest, uploadStorageService, null);
+        } catch (Exception ex) {
+            fail();
+        }
+
+        //No Exception is thrown
+    }
+
+    @Test(expected = PostOnInvalidRequestURIException.class)
+    public void validateInvalidRegexUrl() throws Exception {
+        servletRequest.setRequestURI("/users/abc123/files/upload");
+        when(uploadStorageService.getUploadURI()).thenReturn("/users/[0-9]+/files/upload");
+
+        validator.validate(HttpMethod.POST, servletRequest, uploadStorageService, null);
+
+        //Expect PostOnInvalidRequestURIException
+    }
+
+    @Test(expected = PostOnInvalidRequestURIException.class)
+    public void validateInvalidRegexUrlPatchUrl() throws Exception {
+        servletRequest.setRequestURI("/users/1234/files/upload/7669c72a-3f2a-451f-a3b9-9210e7a4c02f");
+        when(uploadStorageService.getUploadURI()).thenReturn("/users/[0-9]+/files/upload");
+
+        validator.validate(HttpMethod.POST, servletRequest, uploadStorageService, null);
+
+        //Expect PostOnInvalidRequestURIException
+    }
 }