utils: Fix isCorrectExtension regression

This fixes a regression to fix and allow uploading of ISOs and templates
from the UI.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

utils/src/main/java/org/apache/cloudstack/utils/imagestore/ImageStoreUtil.java

@@ -18,11 +18,12 @@
  */
 package org.apache.cloudstack.utils.imagestore;
 
-import com.cloud.utils.UriUtils;
-import com.cloud.utils.script.Script;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
+import com.cloud.utils.UriUtils;
+import com.cloud.utils.script.Script;
+
 public class ImageStoreUtil {
     public static final Logger s_logger = Logger.getLogger(ImageStoreUtil.class.getName());
 
@@ -58,7 +59,7 @@ public static String checkTemplateFormat(String path, String uripath) {
             return "";
         }
         // raw
-        if ((output.contains("x86 boot") || output.contains("data")) && (isCorrectExtension(uripath, "raw"))) {
+        if ((output.contains("x86 boot") || output.contains("data")) && (isCorrectExtension(uripath, "raw") || isCorrectExtension(uripath, "img"))) {
             s_logger.debug("File at path " + path + " looks like a raw image :" + output);
             return "";
         }
@@ -93,10 +94,11 @@ public static String checkTemplateFormat(String path, String uripath) {
 
     public static boolean isCorrectExtension(String path, String format) {
         final String lowerCasePath = path.toLowerCase();
-        return UriUtils.getSupportedExtensions(format)
-                .stream()
-                .filter(ext -> !ext.equals(".metalink"))
-                .anyMatch(lowerCasePath::endsWith);
+        return lowerCasePath.endsWith(format) ||
+                UriUtils.getSupportedExtensions(format)
+                        .stream()
+                        .filter(ext -> !ext.equals(".metalink"))
+                        .anyMatch(lowerCasePath::endsWith);
     }
 
     public static boolean isCompressedExtension(String path) {

utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java

@@ -23,6 +23,7 @@
 import java.util.LinkedList;
 import java.util.Set;
 
+import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Test;
@@ -32,8 +33,6 @@
 
 import com.google.common.collect.ImmutableSet;
 
-import org.apache.cloudstack.utils.imagestore.ImageStoreUtil;
-
 @RunWith(Parameterized.class)
 public class UriUtilsParametrizedTest {
     @FunctionalInterface
@@ -62,10 +61,9 @@ public interface ThrowingBlock<E extends Exception> {
 
     private final static Set<String> ILLEGAL_EXTENSIONS = ImmutableSet.of(
             "rar",
-            "supernova",
-            "straw",
-            "miso",
-            "tartar"
+            "supernoba",
+            "straws",
+            "tarar"
     );
 
     private String format;