Merge pull request #515 from owasp-noir/issue-511-add-cache-scope

Add cache scope to Docker actions and fix #508

.github/workflows/ci.yml

@@ -50,8 +50,8 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: ${{ matrix.arch }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-from: type=gha,scope=${{ matrix.arch }}
+          cache-to: type=gha,mode=max,scope=${{ matrix.arch }}
   lint:
     runs-on: ubuntu-latest
     container:

spec/functional_test/fixtures/java/spring/src/ItemController2.java

@@ -0,0 +1,42 @@
+package com.test;
+import org.springframework.web.bind.annotation.*;
+import a.b.c.bind.annotation.*;
+import org.springframework.c.d.e.*;
+
+@RestController
+@RequestMapping("items2")
+public class ItemController {
+
+    @GetMapping("{id}")
+    public Item getItem(@PathVariable Long id) throws ItemNotFoundException {
+    }
+
+    @PostMapping("/create")
+    public Item createItem(@RequestBody Item item) {
+    }
+
+    @PutMapping("edit/")
+    public Item editItem(@RequestBody Item item) {
+    }
+}
+
+class Item {
+    int id;
+    String name;
+
+    public void setId(int _id) {
+        id = _id;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setName(String _name) {
+        name = _name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

spec/functional_test/testers/java/spring_spec.cr

@@ -16,7 +16,7 @@ extected_endpoints = [
   # ItemController.java
   Endpoint.new("/items/{id}", "GET", [Param.new("id", "", "path")]),
   Endpoint.new("/items/json/{id}", "GET", [Param.new("id", "", "path")]),
-  Endpoint.new("/items", "POST", [Param.new("id", "", "form"), Param.new("name", "", "form")]),
+  Endpoint.new("/items/", "POST", [Param.new("id", "", "form"), Param.new("name", "", "form")]),
   Endpoint.new("/items/update/{id}", "PUT", [Param.new("id", "", "path"), Param.new("id", "", "json"), Param.new("name", "", "json")]),
   Endpoint.new("/items/delete/{id}", "DELETE", [Param.new("id", "", "path")]),
   Endpoint.new("/items/requestmap/put", "PUT"),
@@ -34,8 +34,12 @@ extected_endpoints = [
     Param.new("b", "", "query"),
     Param.new("name", "", "query"),
   ]),
+  # ItemController2.java
+  Endpoint.new("/items2/{id}", "GET", [Param.new("id", "", "path")]),
+  Endpoint.new("/items2/create", "POST", [Param.new("id", "", "form"), Param.new("name", "", "form")]),
+  Endpoint.new("/items2/edit/", "PUT", [Param.new("id", "", "json"), Param.new("name", "", "json")]),
   # EmptyController.java
-  Endpoint.new("/empty", "GET"),
+  Endpoint.new("/empty/", "GET"),
 ]
 
 FunctionalTester.new("fixtures/java/spring/", {

src/analyzer/analyzer.cr

@@ -83,3 +83,7 @@ def analysis_endpoints(options : Hash(String, YAML::Any), techs, logger : NoirLo
   logger.info "Found #{result.size} endpoints"
   result
 end
+
+def join_paths(*paths : String) : String
+  File.join(paths)
+end

src/analyzer/analyzers/java/spring.cr

@@ -211,15 +211,15 @@ module Analyzer::Java
                         ["GET", "POST", "PUT", "DELETE", "PATCH"].each do |_request_method|
                           parameters = get_endpoint_parameters(parser, _request_method, method, parameter_format, class_map)
                           url_paths.each do |url_path|
-                            @result << Endpoint.new("#{webflux_base_path}#{url}#{url_path}", _request_method, parameters, details)
+                            @result << Endpoint.new(join_paths(webflux_base_path, url, url_path), _request_method, parameters, details)
                           end
                         end
                       else
                         # Create endpoints for annotated HTTP methods
                         url_paths.each do |url_path|
                           request_methods.each do |request_method|
                             parameters = get_endpoint_parameters(parser, request_method, method, parameter_format, class_map)
-                            @result << Endpoint.new("#{webflux_base_path}#{url}#{url_path}", request_method, parameters, details)
+                            @result << Endpoint.new(join_paths(webflux_base_path, url, url_path), request_method, parameters, details)
                           end
                         end
                       end
@@ -243,7 +243,7 @@ module Analyzer::Java
 
                         details = Details.new(PathInfo.new(path, line))
                         url_paths.each do |url_path|
-                          @result << Endpoint.new("#{webflux_base_path}#{url}#{url_path}", request_method, parameters, details)
+                          @result << Endpoint.new(join_paths(webflux_base_path, url, url_path), request_method, parameters, details)
                         end
                         break
                       end
@@ -261,7 +261,7 @@ module Analyzer::Java
                 method = match[2]
                 endpoint = match[3].gsub(/\n/, "")
                 details = Details.new(PathInfo.new(path))
-                @result << Endpoint.new("#{url}#{endpoint}", method, details)
+                @result << Endpoint.new(join_paths(url, endpoint), method, details)
               end
             end
           end