zakariamaaraki#38 check sourcecode extension before compilation

Author: zakariamaaraki

.idea/workspace.xml

@@ -23,6 +23,7 @@ public enum Language {
             WellKnownFiles.PYTHON_FILE_NAME,
             WellKnownCommands.PYTHON_COMMAND_LINE,
             WellKnownMetrics.PYTHON_COUNTER_NAME,
+            ".py",
             false),
     /**
      * C language.
@@ -31,6 +32,7 @@ public enum Language {
             WellKnownFiles.C_FILE_NAME,
             WellKnownCommands.C_COMMAND_LINE,
             WellKnownMetrics.C_COUNTER_NAME,
+            ".c",
             true),
     /**
      * Cpp language.
@@ -39,6 +41,7 @@ public enum Language {
             WellKnownFiles.CPP_FILE_NAME,
             WellKnownCommands.CPP_COMMAND_LINE,
             WellKnownMetrics.CPP_COUNTER_NAME,
+            ".cpp",
             true),
     /**
      * Java language.
@@ -47,6 +50,7 @@ public enum Language {
             WellKnownFiles.JAVA_FILE_NAME,
             WellKnownCommands.JAVA_COMMAND_LINE,
             WellKnownMetrics.JAVA_COUNTER_NAME,
+            ".java",
             true),
     /**
      * Golang language.
@@ -55,6 +59,7 @@ public enum Language {
             WellKnownFiles.GO_FILE_NAME,
             WellKnownCommands.GO_COMMAND_LINE,
             WellKnownMetrics.GO_COUNTER_NAME,
+            ".go",
             true),
     /**
      * Cs language.
@@ -63,6 +68,7 @@ public enum Language {
             WellKnownFiles.CS_FILE_NAME,
             WellKnownCommands.CS_COMMAND_LINE,
             WellKnownMetrics.CS_COUNTER_NAME,
+            ".cs",
             true),
     /**
      * Kotlin language.
@@ -71,6 +77,7 @@ public enum Language {
             WellKnownFiles.KOTLIN_FILE_NAME,
             WellKnownCommands.KOTLIN_COMMAND_LINE,
             WellKnownMetrics.KOTLIN_COUNTER_NAME,
+            ".kt",
             true),
 
     /**
@@ -80,6 +87,7 @@ public enum Language {
             WellKnownFiles.SCALA_FILE_NAME,
             WellKnownCommands.SCALA_COMMAND_LINE,
             WellKnownMetrics.SCALA_COUNTER_NAME,
+            ".scala",
             true),
 
     /**
@@ -89,6 +97,7 @@ public enum Language {
             WellKnownFiles.RUST_FILE_NAME,
             WellKnownCommands.RUST_COMMAND_LINE,
             WellKnownMetrics.RUST_COUNTER_NAME,
+            ".rs",
             true),
 
     /**
@@ -98,6 +107,7 @@ public enum Language {
             WellKnownFiles.RUBY_FILE_NAME,
             WellKnownCommands.RUBY_COMMAND_LINE,
             WellKnownMetrics.RUBY_COUNTER_NAME,
+            ".rb",
             false),
 
     /**
@@ -107,24 +117,34 @@ public enum Language {
             WellKnownFiles.HASKELL_FILE_NAME,
             WellKnownCommands.HASKELL_COMMAND_LINE,
             WellKnownMetrics.HASKELL_COUNTER_NAME,
+            ".hs",
             true);
 
     /**
      * The execution folder name.
      */
     private String folderName;
+    
     /**
      * The source code file name.
      */
-    private String defaultSourceCodeFileName;
+    private String defaultSourcecodeFileName;
+    
     /**
      * The compilation command.
      */
     private String compilationCommand;
+    
     /**
      * The execution counter name
      */
     private String executionCounter;
+    
+    /**
+     * The sourcecode extension
+     */
+    private String sourcecodeExtension;
+    
     /**
      * Is the language compiled or interpreted
      */

src/main/java/com/cp/compiler/models/Language.java

@@ -39,8 +39,8 @@ public class Request {
 
     public MultipartFile getSourceCode() throws IOException {
         return new MockMultipartFile(
-                language.getDefaultSourceCodeFileName(),
-                language.getDefaultSourceCodeFileName(),
+                language.getDefaultSourcecodeFileName(),
+                language.getDefaultSourcecodeFileName(),
                 null,
                 new ByteArrayInputStream(this.sourceCode.getBytes()));
     }

src/main/java/com/cp/compiler/models/Request.java

@@ -1,6 +1,7 @@
 package com.cp.compiler.services;
 
 import com.cp.compiler.executions.Execution;
+import com.cp.compiler.models.Language;
 import com.cp.compiler.wellknownconstants.WellKnownFiles;
 import com.cp.compiler.wellknownconstants.WellKnownMetrics;
 import com.cp.compiler.repositories.HooksRepository;
@@ -116,11 +117,19 @@ private ResponseEntity<Object> compileAndExecute(Execution execution) {
     }
 
     private Optional<ResponseEntity<Object>> validateRequest(Execution execution) {
+        
         if (!checkFileName(execution.getSourceCodeFile().getOriginalFilename())) {
             return Optional.of(buildOutputError(
-                    "Bad request, source code file must match the following regex "
+                    "Bad request, sourcecode file must match the following regex "
                             + WellKnownFiles.FILE_NAME_REGEX));
         }
+        
+        // sourcecode file format is correct, lets check the extension
+        if (!checkFileExtension(execution.getSourceCodeFile().getOriginalFilename(), execution.getLanguage())) {
+            return Optional.of(buildOutputError(
+                    "Bad request, sourcecode file extension is not correct, it should be: "
+                            + execution.getLanguage().getSourcecodeExtension()));
+        }
 
         if (!checkFileName(execution.getExpectedOutputFile().getOriginalFilename())) {
             return Optional.of(buildOutputError(
@@ -152,9 +161,14 @@ private Optional<ResponseEntity<Object>> validateRequest(Execution execution) {
 
             return Optional.of(buildOutputError(errorMessage));
         }
+        
         return Optional.ofNullable(null);
     }
 
+    private boolean checkFileExtension(String originalFilename, Language language) {
+        return originalFilename.endsWith(language.getSourcecodeExtension());
+    }
+    
     private ResponseEntity buildOutputError(String errorMessage) {
         log.info(errorMessage);
         return ResponseEntity.badRequest()

src/main/java/com/cp/compiler/services/CompilerProxy.java

@@ -6,6 +6,7 @@
 import com.cp.compiler.repositories.HooksRepository;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -42,11 +43,38 @@ class CompilerProxyServiceTests {
             (byte[]) null);
 
     private MultipartFile validFileName = new MockMultipartFile(
-            "test.txt",
-            "test.txt",
+            "test.java",
+            "test.java",
             null,
             (byte[]) null);
 
+    @Test
+    void extensionsInLanguageEnumAreCorrect() {
+        for (Language language : Language.values()) {
+            String expectedExtension = "." + language.getDefaultSourcecodeFileName().split("\\.")[1];
+            Assertions.assertEquals(expectedExtension, language.getSourcecodeExtension());
+        }
+    }
+    
+    @Test
+    void shouldReturnBadRequestIfTheExtensionIsNotValid() {
+        // Given
+        MultipartFile invalidExtension = new MockMultipartFile(
+                "test.c",
+                "test.c",
+                null,
+                (byte[]) null);
+        
+        Execution execution = ExecutionFactory.createExecution(
+                invalidExtension, validFileName, validFileName, 10, 500, Language.JAVA);
+    
+        // When
+        ResponseEntity responseEntity = compilerProxy.execute(execution);
+    
+        // Then
+        Assertions.assertEquals(BAD_REQUEST, responseEntity.getStatusCodeValue());
+    }
+    
     @Test
     void WhenInputFileNameIsInvalidShouldReturnBadRequest() {
         // Given