#getFullPath was not correctly identifying non-existing assets depend…

…ing on the name.
Eviradnus · May 16, 2013 · be05d76 · be05d76
1 parent fcaadf9
commit be05d76
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/org/webjars/WebJarAssetLocator.java b/src/main/java/org/webjars/WebJarAssetLocator.java
@@ -183,6 +183,12 @@ public WebJarAssetLocator(final SortedMap<String, String> fullPathIndex) {
         this.fullPathIndex = fullPathIndex;
     }
 
+    private String throwNotFoundException(final String partialPath) {
+        throw new IllegalArgumentException(
+                partialPath
+                        + " could not be found. Make sure you've added the corresponding WebJar and please check for typos.");
+    }
+
     /**
      * Given a distinct path within the WebJar index passed in return the full
      * path of the resource.
@@ -200,14 +206,16 @@ public String getFullPath(final String partialPath) {
                 .tailMap(reversePartialPath);
 
         if (fullPathTail.size() == 0) {
-            throw new IllegalArgumentException(
-                    partialPath
-                            + " could not be found. Make sure you've added the corresponding WebJar and please check for typos.");
+            throwNotFoundException(partialPath);
         }
 
         final Iterator<Entry<String, String>> fullPathTailIter = fullPathTail
                 .entrySet().iterator();
-        final String fullPath = fullPathTailIter.next().getValue();
+        final Entry<String, String> fullPathEntry = fullPathTailIter.next();
+        if (!fullPathEntry.getKey().startsWith(reversePartialPath)) {
+            throwNotFoundException(partialPath);
+        }
+        final String fullPath = fullPathEntry.getValue();
 
         if (fullPathTailIter.hasNext()
                 && fullPathTailIter.next().getKey()

diff --git a/src/test/java/org/webjars/WebJarAssetLocatorTest.java b/src/test/java/org/webjars/WebJarAssetLocatorTest.java
@@ -45,6 +45,13 @@ public void get_full_path_from_partial_path_with_folders() {
 
   @Test
   public void should_throw_exception_when_asset_not_found() {
+    try {
+      new WebJarAssetLocator().getFullPath("asset-unknown.js");
+      fail("Exception should have been thrown!");
+    } catch (IllegalArgumentException e) {
+      assertEquals("asset-unknown.js could not be found. Make sure you've added the corresponding WebJar and please check for typos.", e.getMessage());
+    }
+
     try {
       new WebJarAssetLocator().getFullPath("unknown.js");
       fail("Exception should have been thrown!");