minor updates

cves/2020/CVE-2020-9054.yaml

@@ -4,8 +4,8 @@ info:
   name: ZyXEL NAS RCE
   author: dhiyaneshDk
   severity: critical
-  reference: https://www.cvebase.com/cve/2020/9054
-  tags: cve,cve2020,rce,intrusive
+  reference: https://nvd.nist.gov/vuln/detail/CVE-2020-9054
+  tags: cve,cve2020,rce
 
 requests:
   - method: GET

cves/2020/CVE-2020-9315.yaml

@@ -5,20 +5,28 @@ info:
   author: dhiyaneshDk
   severity: high
   reference: https://www.cvebase.com/cve/2020/9315
-  tags: cve,cve2020
+  tags: cve,cve2020,oracle
 
 requests:
-  - raw:
-      - |
-        GET /admingui/version/serverTasksGeneral?serverTasksGeneral.GeneralWebserverTabs.TabHref=2 HTTP/1.1
-        User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Firefox/55
+  - method: GET
+    path:
+      - "{{BaseURL}}/admingui/version/serverTasksGeneral?serverTasksGeneral.GeneralWebserverTabs.TabHref=2"
+      - "{{BaseURL}}/admingui/version/serverConfigurationsGeneral?serverConfigurationsGeneral.GeneralWebserverTabs.TabHref=4"
+    headers:
+      User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Firefox/55
 
-      - |
-        GET /admingui/version/serverConfigurationsGeneral?serverConfigurationsGeneral.GeneralWebserverTabs.TabHref=4 HTTP/1.1
-        User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Firefox/55
-    req-condition: true
+    matchers-condition: and
     matchers:
-      - type: dsl
-        dsl:
-          - 'contains(body_1, "serverConfigurationsGeneral")'
-          - 'contains(body_2, "serverCertificatesGeneral")'
+      - type: word
+        words:
+          - "Admin Console"
+
+      - type: word
+        words:
+          - "serverConfigurationsGeneral"
+          - "serverCertificatesGeneral"
+        condition: or
+
+      - type: status
+        status: 
+          - 200