Merge pull request #2111 from CVEProject/content-rjr-2107

#2107 Update 1/remove 1 CNA + 2 News items
CVEProject · Aug 2, 2023 · 2909388 · 2909388
2 parents 4c4fe53 + e1c400e
commit 2909388
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 62 deletions.
diff --git a/src/assets/data/CNAsList.json b/src/assets/data/CNAsList.json
@@ -4970,62 +4970,6 @@
     },
     "country": "Switzerland"
   },
-  {
-    "shortName": "marklogic",
-    "cnaID": "CNA-2016-0014",
-    "organizationName": "MarkLogic Corporation",
-    "scope": "MarkLogic issues only",
-    "contact": [
-      {
-        "email": [
-          {
-            "label": "Email",
-            "emailAddr": "[email protected]"
-          }
-        ],
-        "contact": [],
-        "form": []
-      }
-    ],
-    "disclosurePolicy": [
-      {
-        "label": "Policy",
-        "language": "",
-        "url": "https://www.marklogic.com/security-reporting/"
-      }
-    ],
-    "securityAdvisories": {
-      "alerts": [],
-      "advisories": [
-        {
-          "label": "Advisories",
-          "url": "https://www.marklogic.com/bulletins/"
-        }
-      ]
-    },
-    "resources": [],
-    "CNA": {
-      "isRoot": false,
-      "root": {
-        "shortName": "n/a",
-        "organizationName": "n/a"
-      },
-      "type": [
-        "Vendor"
-      ],
-      "TLR": {
-        "shortName": "mitre",
-        "organizationName": "MITRE Corporation"
-      },
-      "roles": [
-        {
-          "helpText": "",
-          "role": "CNA"
-        }
-      ]
-    },
-    "country": "USA"
-  },
   {
     "shortName": "Mattermost",
     "cnaID": "CNA-2020-0028",
@@ -17777,19 +17721,28 @@
               }
             ],
             "contact": [],
-            "form": []
+            "form": [
+              {
+                "label": "CERT.PL contact form (Polish)",
+                "url": "https://incydent.cert.pl/#!/lang=pl,entityType=notObligatedEntity,easyIncidentType=vulnerability"
+              },
+              {
+                "label": "CERT.PL contact form (English)",
+                "url": "https://incydent.cert.pl/#!/lang=en,entityType=notObligatedEntity,easyIncidentType=vulnerability"
+              }
+            ]
           }
         ],
         "disclosurePolicy": [
           {
             "label": "Policy (Polish)",
             "language": "Polish",
-            "url": "https://incydent.cert.pl/#!/lang=pl,entityType=notObligatedEntity,easyIncidentType=vulnerability"
+            "url": "https://cert.pl/en/cvd/"
           },
           {
             "label": "Policy (English)",
             "language": "English",
-            "url": "https://incydent.cert.pl/#!/lang=en,entityType=notObligatedEntity,easyIncidentType=vulnerability"
+            "url": "https://cert.pl/cvd/"
           }
         ],
         "securityAdvisories": {
@@ -17801,7 +17754,7 @@
             },
             {
               "label": "Advisories (English)",
-              "url": "https://cert.pl/en/cve/ "
+              "url": "https://cert.pl/en/cve/"
             }
           ]
         },

diff --git a/src/assets/data/news.json b/src/assets/data/news.json
@@ -13,7 +13,7 @@
         },
         {
           "contentnewsType": "paragraph",
-          "content": "To date, <a href='/PartnerInformation/ListofPartners'>309 organizations</a> from <a href='/ProgramOrganization/CNAs'>37 countries</a> have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities."
+          "content": "To date, <a href='/PartnerInformation/ListofPartners'>308 organizations</a> from <a href='/ProgramOrganization/CNAs'>37 countries</a> have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities."
         },
         {
           "contentnewsType": "paragraph",
@@ -34,7 +34,7 @@
         },
         {
           "contentnewsType": "paragraph",
-          "content": "To date, <a href='/PartnerInformation/ListofPartners'>308 organizations</a> from <a href='/ProgramOrganization/CNAs'>36 countries</a> have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities."
+          "content": "To date, <a href='/PartnerInformation/ListofPartners'>307 organizations</a> from <a href='/ProgramOrganization/CNAs'>36 countries</a> have partnered with the CVE Program. CNAs are organizations from around the world that are authorized to assign <a href='/ResourcesSupport/Glossary?activeTerm=glossaryCVEID'>CVE Identifiers (CVE IDs)</a> and publish <a href='/ResourcesSupport/Glossary?activeTerm=glossaryRecord'>CVE Records</a> for vulnerabilities affecting products within their distinct, agreed-upon scope, for inclusion in first-time public announcements of new vulnerabilities."
         },
         {
           "contentnewsType": "paragraph",