New json structure implemented #853

lib/common/collections/wp_items/detectable.rb

@@ -172,19 +172,19 @@ class WpItems < Array
 
       case type
       when :vulnerable
-        item_names = json.select { |item| !item['vulnerabilities'].empty? }.map {|item| item['name'] }
+        items = json.select { |item| !json[item]['vulnerabilities'].empty? }
       when :popular
-        item_names = json.select { |item| item['popular'] == true }.map {|item| item['name'] }
+        items = json.select { |item| json[item]['popular'] == true }
       when :all
-        item_names = [*json].map { |item| item['name'] }
+        items = [*json]
       else
         raise "Unknown type #{type}"
       end
 
-      item_names.each do |item_name|
+      items.each do |item|
         targets << create_item(
           item_class,
-          item_name,
+          item[0],
           wp_target,
           vulns_file
         )

lib/common/models/wp_item/vulnerable.rb

@@ -12,19 +12,13 @@ class WpItem
       json = json(vulns_file)
       vulnerabilities = Vulnerabilities.new
 
-      json.each do |item|
+      return vulnerabilities if json.empty?
-        asset = item['version'] || item['name']
 
-        next unless asset == identifier
+      json[identifier]['vulnerabilities'].each do |vulnerability|
-
-        item['vulnerabilities'].each do |vulnerability|
         vulnerability = Vulnerability.load_from_json_item(vulnerability)
         vulnerabilities << vulnerability if vulnerable_to?(vulnerability)
       end
 
-        break # No need to iterate any further
-      end
-
       vulnerabilities
     end
 

spec/samples/common/collections/wp_items/detectable/vulns.json

@@ -1,6 +1,5 @@
-[
 {
-      "name": "mr-smith",
+   "mr-smith": {
       "vulnerabilities":[
          {
             "id":2989,
@@ -48,8 +47,7 @@
          }
       ]
    },
-   {
+   "neo": {
-      "name": "neo",
       "vulnerabilities":[
          {
             "id":2993,
@@ -63,4 +61,4 @@
          }
       ]
    }
-]
+}

spec/samples/common/collections/wp_plugins/detectable/vulns.json

@@ -1,6 +1,5 @@
-[
 {
-      "name": "mr-smith",
+   "mr-smith": {
       "vulnerabilities":[
          {
             "id":2989,
@@ -48,8 +47,7 @@
          }
       ]
    },
-   {
+   "neo": {
-      "name":"neo",
       "vulnerabilities":[
          {
             "id":2993,
@@ -63,4 +61,4 @@
          }
       ]
    }
-]
+}

spec/samples/common/collections/wp_themes/detectable/vulns.json

@@ -1,6 +1,5 @@
-[
 {
-      "name": "shopperpress",
+   "shopperpress": {
       "vulnerabilities":[
          {
             "id":2989,
@@ -48,8 +47,7 @@
          }
       ]
    },
-   {
+   "webfolio": {
-      "name": "webfolio",
       "vulnerabilities":[
          {
             "id":2993,
@@ -63,4 +61,5 @@
          }
       ]
    }
-]
+}
+

spec/samples/common/models/wp_item/vulnerable/items_vulns.json

@@ -1,6 +1,5 @@
-[
 {
-      "name": "not-this-one",
+   "not-this-one": {
       "vulnerabilities":[
          {
             "id":2989,
@@ -13,8 +12,7 @@
          }
       ]
    },
-   {
+   "neo": {
-      "name": "neo",
       "vulnerabilities":[
          {
             "id":2993,
@@ -34,4 +32,4 @@
          }
       ]
    }
-]
+}

spec/samples/common/models/wp_plugin/vulnerable/plugins.json

@@ -1,6 +1,5 @@
-[
 {
-      "name": "mr-smith",
+    "mr-smith": {
       "vulnerabilities":[
          {
             "id":2993,
@@ -36,8 +35,7 @@
          }
          ]
       },
-   {
+        "white-rabbit": {
-      "name": "white-rabbit",
            "vulnerabilities": [
         {
            "id":2993,
@@ -57,4 +55,4 @@
         }
      ]
   }
-]
+}

spec/samples/common/models/wp_theme/vulnerable/themes_vulns.json

@@ -1,6 +1,5 @@
-[
 {
-      "name": "mr-smith",
+   "mr-smith": {
       "vulnerabilities":[
          {
             "id":2989,
@@ -36,8 +35,7 @@
          }
          ]
       },
-   {
+      "the-oracle": {
-      "name": "the-oracle",
          "vulnerabilities":[
             {
                "id":2993,
@@ -57,4 +55,5 @@
             }
          ]
    }
-]
+}
+

spec/samples/common/models/wp_version/vulnerable/versions_vulns.json

@@ -1,6 +1,5 @@
-[
 {
-      "version": "3.5",
+   "3.5": {
       "vulnerabilities":[
          {
             "id":2989,
@@ -20,8 +19,7 @@
          }
       ]
      },
-   {
+     "3.2": {
-      "version": "3.2",
       "vulnerabilities":[
          {
             "id":2993,
@@ -41,4 +39,4 @@
          }
       ]
    }
-]
+}