Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update website to 4.0.8 #474

Merged
merged 3 commits into from
Nov 22, 2023
Merged

Update website to 4.0.8 #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a95877
update to 4.0.8
adpare Nov 22, 2023
75049d7
remove poor ssl practices
adpare Nov 22, 2023
5376b90
updated changelog
adpare Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/tests/linkchecker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down
4 changes: 1 addition & 3 deletions modules/util/stixhelpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down