Merge pull request #474 from mitre-attack/develop

Update website to 4.0.8
mitre-attack · Nov 22, 2023 · 6e1c079 · 6e1c079
2 parents d721e92 + 5376b90
commit 6e1c079
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# v4.0.8 (2023-11-22)
+
+## Bugfixes
+
+* Add mobile datasources to excel output.
+
+## Misc
+
+* Updated Caldera description.
+* Enforce better SSL security practices when building the website.
+
 # v4.0.7 (2023-11-14)
 
 ## Features

diff --git a/modules/tests/linkchecker.py b/modules/tests/linkchecker.py
@@ -230,7 +230,7 @@ def internal_external_link_checker(filepath, html_str):
                 # Consider status 404 and unreachable as broken.
                 # Unreachable will be triggered by the except clause
                 try:
-                    r = requests.head(link, headers=headers, verify=False, timeout=5)
+                    r = requests.head(link, headers=headers, timeout=5)
                     if r.status_code != 200:
                         links_list[link] = r.status_code
                         problems.append(f"[{r.status_code}] {link}")

diff --git a/modules/util/stixhelpers.py b/modules/util/stixhelpers.py
@@ -392,8 +392,6 @@ def get_domain_resources(types):
 
 def get_stix_memory_stores():
     """Read the json files for each domain and create a dict that contains the memory stores for each domain."""
-    # suppress InsecureRequestWarning: Unverified HTTPS request is being made
-    urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
     ms = {}
     srcs = []
@@ -481,7 +479,7 @@ def download_stix_file(url, filepath):
     s = requests.Session()
     retries = Retry(total=10, backoff_factor=0.1, status_forcelist=[500, 502, 503, 504])
     s.mount("http", HTTPAdapter(max_retries=retries))
-    response = s.get(url, verify=False, proxies=proxyDict, auth=auth)
+    response = s.get(url, proxies=proxyDict, auth=auth)
 
     if response.status_code == 200:
         stix_json = response.json()

diff --git a/pyproject.toml b/pyproject.toml
@@ -6,7 +6,7 @@ profile = "black"
 
 [tool.towncrier]
     name = "ATT&CK website"
-    version = "4.0.7"
+    version = "4.0.8"
     filename = "CHANGELOG.md"
     issue_format = "[#{issue}](https://github.com/mitre-attack/attack-website/issues/{issue})"
     template = ".towncrier.template.md"

diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,7 @@ bleach==6.0.0
 colorama==0.4.6
 future==0.18.3
 loguru==0.6.0
-mitreattack-python==3.0.1
+mitreattack-python==3.0.2
 pelican==4.8.0
 pyScss==1.4.0
 python-dotenv==1.0.0
@@ -13,7 +13,6 @@ stix2==3.0.1
 stix2-validator==3.1.3
 toml==0.10.2
 towncrier==22.12.0
-urllib3==1.26.17
 webassets==2.0
 
 # dev dependencies