diff --git a/Document/index.md b/Document/index.md
index 6d055ab71e..d895a8b0d5 100644
--- a/Document/index.md
+++ b/Document/index.md
@@ -25,7 +25,7 @@ Start exploring the MASTG:
:material-flask-outline: Demos
:octicons-tools-24: Tools
:octicons-code-square-24: Apps
-:material-bandage: Mitigations (v2 Beta)
+:material-shield-check: Best Practices (v2 Beta)
:blue_heart:{ .pump } Support the project by purchasing the [OWASP MASTG on leanpub.com](https://leanpub.com/owasp-mastg). All funds raised through sales of this book go directly into the project budget and will be used to for technical editing and designing the book and fund production of future releases.
diff --git a/mitigations/MASTG-MITIG-0001.md b/best-practices/MASTG-BEST-0001.md
similarity index 91%
rename from mitigations/MASTG-MITIG-0001.md
rename to best-practices/MASTG-BEST-0001.md
index 798356f212..d8900086f5 100644
--- a/mitigations/MASTG-MITIG-0001.md
+++ b/best-practices/MASTG-BEST-0001.md
@@ -1,7 +1,7 @@
---
-title: Use Secure Random Number Generators APIs
+title: Use Secure Random Number Generator APIs
alias: android-use-secure-random
-id: MASTG-MITIG-0001
+id: MASTG-BEST-0001
platform: android
---
diff --git a/mitigations/MASTG-MITIG-0002.md b/best-practices/MASTG-BEST-0002.md
similarity index 99%
rename from mitigations/MASTG-MITIG-0002.md
rename to best-practices/MASTG-BEST-0002.md
index 0896119abd..dd29b6ba13 100644
--- a/mitigations/MASTG-MITIG-0002.md
+++ b/best-practices/MASTG-BEST-0002.md
@@ -1,7 +1,7 @@
---
title: Remove Logging Code
alias: remove-logging-code
-id: MASTG-MITIG-0002
+id: MASTG-BEST-0002
platform: android
---
diff --git a/mitigations/MASTG-MITIG-0003.md b/best-practices/MASTG-BEST-0003.md
similarity index 99%
rename from mitigations/MASTG-MITIG-0003.md
rename to best-practices/MASTG-BEST-0003.md
index 2e2d66a90b..0b701af0d3 100644
--- a/mitigations/MASTG-MITIG-0003.md
+++ b/best-practices/MASTG-BEST-0003.md
@@ -1,7 +1,7 @@
---
title: Comply with Privacy Regulations and Best Practices
alias: comply-with-privacy-regulations
-id: MASTG-MITIG-0003
+id: MASTG-BEST-0003
platform: android
---
diff --git a/mitigations/MASTG-MITIG-0004.md b/best-practices/MASTG-BEST-0004.md
similarity index 97%
rename from mitigations/MASTG-MITIG-0004.md
rename to best-practices/MASTG-BEST-0004.md
index bd40281e57..f84628deeb 100644
--- a/mitigations/MASTG-MITIG-0004.md
+++ b/best-practices/MASTG-BEST-0004.md
@@ -1,7 +1,7 @@
---
title: Exclude Sensitive Data from Backups
alias: exclude-sensitive-data-from-backups
-id: MASTG-MITIG-0004
+id: MASTG-BEST-0004
platform: android
---
diff --git a/mitigations/MASTG-MITIG-0005.md b/best-practices/MASTG-BEST-0005.md
similarity index 97%
rename from mitigations/MASTG-MITIG-0005.md
rename to best-practices/MASTG-BEST-0005.md
index dc7abe4578..b2bc38bb77 100644
--- a/mitigations/MASTG-MITIG-0005.md
+++ b/best-practices/MASTG-BEST-0005.md
@@ -1,7 +1,7 @@
---
title: Use Secure Encryption Modes
alias: use-secure-encryption-modes
-id: MASTG-MITIG-0005
+id: MASTG-BEST-0005
platform: android
---
diff --git a/mitigations/MASTG-MITIG-0006.md b/best-practices/MASTG-BEST-0006.md
similarity index 97%
rename from mitigations/MASTG-MITIG-0006.md
rename to best-practices/MASTG-BEST-0006.md
index 19715ead00..aeb4ce4af1 100644
--- a/mitigations/MASTG-MITIG-0006.md
+++ b/best-practices/MASTG-BEST-0006.md
@@ -1,7 +1,7 @@
---
title: Use Up-to-Date APK Signing Schemes
alias: use-up-to-date-apk-signing-schemes
-id: MASTG-MITIG-0006
+id: MASTG-BEST-0006
platform: android
---
diff --git a/best-practices/index.md b/best-practices/index.md
new file mode 100644
index 0000000000..b4b9052ae3
--- /dev/null
+++ b/best-practices/index.md
@@ -0,0 +1,11 @@
+---
+hide: toc
+title: Best Practices (v2 - Beta)
+status: new
+---
+
+??? info "About the MASTG Best Practices"
+
+ The MASTG Best Practices are a collection of specific strategies and practices that can be used to prevent or mitigate security and privacy risks in mobile apps.
+
+ Each Best Practices is designed to be simple and focused and may apply to one or multiple tests in the MASTG.
diff --git a/demos/index.md b/demos/index.md
index 6f72844c65..6838bd9a2d 100644
--- a/demos/index.md
+++ b/demos/index.md
@@ -1,6 +1,6 @@
---
hide: toc
-title: MASTG Demos
+title: MASTG Demos (v2 Beta)
status: new
---
diff --git a/docs/hooks/add-cross-references.py b/docs/hooks/add-cross-references.py
index 6b1a413d5c..680fbe6642 100644
--- a/docs/hooks/add-cross-references.py
+++ b/docs/hooks/add-cross-references.py
@@ -33,7 +33,7 @@ def generate_cross_references():
cross_references = {
"weaknesses": {},
"tests": {},
- "mitigations": {}
+ "best-practices": {}
}
for test_id, test_meta in tests.items():
@@ -41,7 +41,7 @@ def generate_cross_references():
test_path = test_meta.get("path")
test_title = test_meta.get("title")
test_platform = test_meta.get("platform")
- mitigations_ids = test_meta.get("mitigations")
+ best_practices_ids = test_meta.get("best-practices")
# Create cross-references for weaknesses listing all tests that reference each weakness ID
if weakness_id:
@@ -49,12 +49,12 @@ def generate_cross_references():
cross_references["weaknesses"][weakness_id] = []
cross_references["weaknesses"][weakness_id].append({"id": test_id, "path": test_path, "title": test_title, "platform": test_platform})
- # Create cross-references for mitigations listing all tests that reference each mitigation ID
- if mitigations_ids:
- for mitigation_id in mitigations_ids:
- if mitigation_id not in cross_references["mitigations"]:
- cross_references["mitigations"][mitigation_id] = []
- cross_references["mitigations"][mitigation_id].append({"id": test_id, "path": test_path, "title": test_title, "platform": test_platform})
+ # Create cross-references for best_practices listing all tests that reference each best_practice ID
+ if best_practices_ids:
+ for best_practice_id in best_practices_ids:
+ if best_practice_id not in cross_references["best-practices"]:
+ cross_references["best-practices"][best_practice_id] = []
+ cross_references["best-practices"][best_practice_id].append({"id": test_id, "path": test_path, "title": test_title, "platform": test_platform})
for demo_id, demo_meta in demos.items():
test_id = demo_meta.get("test")
@@ -108,6 +108,20 @@ def on_page_markdown(markdown, page, config, **kwargs):
markdown += f"\n\n{tests_section}"
if "MASTG-TEST-" in path:
+
+ # Add best_practices section to tests as a bullet point list with IDs, links are resolved in a separate hook
+ # ORIGIN: Test metadata
+
+ best_practices = meta.get('best-practices')
+ if best_practices:
+ best_practices_section = "## Mitigations\n\n"
+ for best_practice_id in best_practices:
+ best_practice_path = f"MASTG/best-practices/{best_practice_id}.md"
+ relPath = os.path.relpath(best_practice_path, os.path.dirname(path))
+ best_practices_section += f"- @{best_practice_id}\n"
+
+ markdown += f"\n\n{best_practices_section}"
+
test_id = meta.get('id')
# Add Demos section to tests as buttons
@@ -123,35 +137,22 @@ def on_page_markdown(markdown, page, config, **kwargs):
demos_section += f"[{get_platform_icon(demo['platform'])} {demo['id']}: {demo['title']}]({relPath}){{: .mas-demo-button}} "
markdown += f"\n\n{demos_section}"
-
- # Add Mitigations section to tests as a bullet point list with IDs, links are resolved in a separate hook
- # ORIGIN: Test metadata
-
- mitigations = meta.get('mitigations')
- if mitigations:
- mitigations_section = "## Mitigations\n\n"
- for mitigation_id in mitigations:
- mitigation_path = f"MASTG/mitigations/{mitigation_id}.md"
- relPath = os.path.relpath(mitigation_path, os.path.dirname(path))
- mitigations_section += f"- @{mitigation_id}\n"
-
- markdown += f"\n\n{mitigations_section}"
- if "MASTG-MITIG" in path:
- mitig_id = meta.get('id')
+ if "MASTG-BEST" in path:
+ best_practice_id = meta.get('id')
- # Add Tests section to mitigations as buttons
+ # Add Tests section to best_practices as buttons
# ORIGIN: Cross-references from this script
- if mitig_id in cross_references["mitigations"]:
- mitigations = cross_references["mitigations"].get(mitig_id)
- meta['mitigations'] = mitigations
- if mitigations:
- mitigations_section = "## Tests\n\n"
- for mitigation in mitigations:
- relPath = os.path.relpath(mitigation['path'], os.path.dirname(path))
- mitigations_section += f"[{get_platform_icon(mitigation['platform'])} {mitigation['id']}: {mitigation['title']}]({relPath}){{: .mas-test-button}} "
+ if best_practice_id in cross_references["best-practices"]:
+ best_practices = cross_references["best-practices"].get(best_practice_id)
+ meta['best-practices'] = best_practices
+ if best_practices:
+ best_practices_section = "## Tests\n\n"
+ for best_practice in best_practices:
+ relPath = os.path.relpath(best_practice['path'], os.path.dirname(path))
+ best_practices_section += f"[{get_platform_icon(best_practice['platform'])} {best_practice['id']}: {best_practice['title']}]({relPath}){{: .mas-test-button}} "
- markdown += f"\n\n{mitigations_section}"
+ markdown += f"\n\n{best_practices_section}"
return markdown
\ No newline at end of file
diff --git a/docs/hooks/create_dynamic_tables.py b/docs/hooks/create_dynamic_tables.py
index 0984d3e65f..a7a5848bb9 100644
--- a/docs/hooks/create_dynamic_tables.py
+++ b/docs/hooks/create_dynamic_tables.py
@@ -263,13 +263,13 @@ def get_all_mitigations_beta():
mitigations = []
- for file in glob.glob("docs/MASTG/mitigations/**/MASTG-MITIG-*.md", recursive=True):
+ for file in glob.glob("docs/MASTG/best-practices/**/MASTG-BEST-*.md", recursive=True):
with open(file, 'r') as f:
content = f.read()
frontmatter = next(yaml.load_all(content, Loader=yaml.FullLoader))
- frontmatter['path'] = f"/MASTG/mitigations/{os.path.splitext(os.path.relpath(file, 'docs/MASTG/mitigations'))[0]}"
+ frontmatter['path'] = f"/MASTG/best-practices/{os.path.splitext(os.path.relpath(file, 'docs/MASTG/best-practices'))[0]}"
mitigation_id = frontmatter['id']
frontmatter['id'] = mitigation_id
frontmatter['title'] = f"@{mitigation_id}"
@@ -322,7 +322,7 @@ def on_page_markdown(markdown, page, **kwargs):
return append_to_page(markdown, list_of_dicts_to_md_table(demos_beta_columns_reordered, column_titles))
- elif path.endswith("mitigations/index.md"):
+ elif path.endswith("best-practices/index.md"):
# mitigations-beta/index.md
column_titles = {'id': 'ID', 'title': 'Title', 'platform': "Platform"}
diff --git a/docs/hooks/maswe-beta-banner.py b/docs/hooks/maswe-beta-banner.py
index 1a6dd53dde..b06a271761 100644
--- a/docs/hooks/maswe-beta-banner.py
+++ b/docs/hooks/maswe-beta-banner.py
@@ -117,7 +117,7 @@ def on_page_markdown(markdown, page, **kwargs):
banners = []
- if any(substring in path for substring in ["MASWE/", "MASTG/tests-beta/", "MASTG/demos/"]):
+ if any(substring in path for substring in ["MASWE/", "MASTG/tests-beta/", "MASTG/demos/", "MASTG/best-practices/"]):
banners.append(beta_banner)
if "MASWE/" in path and page.meta.get('status') == 'draft':
diff --git a/docs/hooks/resolve_references.py b/docs/hooks/resolve_references.py
index d5aeef9c32..eab538e43c 100644
--- a/docs/hooks/resolve_references.py
+++ b/docs/hooks/resolve_references.py
@@ -7,7 +7,7 @@
log = logging.getLogger('mkdocs')
-mapping = {"TECH":{}, "TOOL":{}, "TEST": {}, "APP": {}, "MASWE": {}, "MASVS": {}, "DEMO": {}, "MITIG": {}}
+mapping = {"TECH":{}, "TOOL":{}, "TEST": {}, "APP": {}, "MASWE": {}, "MASVS": {}, "DEMO": {}, "BEST": {}}
@mkdocs.plugins.event_priority(-50)
def on_page_markdown(markdown, page, config, **kwargs):
@@ -17,7 +17,7 @@ def on_page_markdown(markdown, page, config, **kwargs):
icons_for_text = {key.upper(): f":{value.replace('/', '-')}: " for key, value in icons.items()}
- pageRefs = {"TECH": [], "TOOL": [], "TEST": [], "APP": [], "MASWE": [], "MASVS": [], "DEMO": [], "MITIG": []}
+ pageRefs = {"TECH": [], "TOOL": [], "TEST": [], "APP": [], "MASWE": [], "MASVS": [], "DEMO": [], "BEST": []}
def replaceReference(match):
refType = match.group(2)
@@ -57,7 +57,7 @@ def replaceReferenceMASVS(match):
return f"_[{icon}{mapping[refType][match]['title']}]({mapping[refType][match]['file']})_"
- updated_markdown = re.sub(r'@(MASTG-(TECH|TOOL|TEST|APP|DEMO|MITIG)-\d{3,})', replaceReference, markdown)
+ updated_markdown = re.sub(r'@(MASTG-(TECH|TOOL|TEST|APP|DEMO|BEST)-\d{3,})', replaceReference, markdown)
updated_markdown = re.sub(r'@(MASWE-\d{3,})', replaceReferenceMASWE, updated_markdown)
updated_markdown = re.sub(r'@(MASVS-\w+)', replaceReferenceMASVS, updated_markdown)
diff --git a/docs/hooks/update_titles.py b/docs/hooks/update_titles.py
index 06a89b6f71..e0fbb8c0ef 100644
--- a/docs/hooks/update_titles.py
+++ b/docs/hooks/update_titles.py
@@ -13,7 +13,7 @@ def set_page_icon(page, config, component_type=None):
def on_page_markdown(markdown, page, config, **kwargs):
path = page.file.src_uri
- if any(keyword in path for keyword in ["MASTG-TEST-", "MASTG-TOOL-", "MASTG-TECH-", "MASTG-APP-", "MASTG-DEMO-", "MASTG-MITIG-"]):
+ if any(keyword in path for keyword in ["MASTG-TEST-", "MASTG-TOOL-", "MASTG-TECH-", "MASTG-APP-", "MASTG-DEMO-", "MASTG-BEST-"]):
# TODO the component ID is the file basename without the extension; ensure that all components have id in the future
page.meta['id'] = path.split('/')[-1].split('.')[0]
component_type = page.meta['id'].split('-')[1].lower()
diff --git a/mitigations/index.md b/mitigations/index.md
deleted file mode 100644
index 84f29f3fec..0000000000
--- a/mitigations/index.md
+++ /dev/null
@@ -1,11 +0,0 @@
----
-hide: toc
-title: Mitigations (v2 - Beta)
-status: new
----
-
-??? info "About the MASTG Mitigations"
-
- The MASTG Mitigations are a collection of specific strategies and best practices that can be used to mitigate security and privacy risks in mobile apps.
-
- Each mitigation is designed to be simple and focused and may apply to one or multiple tests in the MASTG.
diff --git a/mkdocs.yml b/mkdocs.yml
index 066b600d24..cb403224af 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -41,6 +41,9 @@ nav:
- ... | flat | MASTG/0x05*.md
- iOS Security Testing:
- ... | flat | MASTG/0x06*.md
+ - Best Practices (v2 Beta):
+ - MASTG/best-practices/index.md
+ - ... | flat | MASTG/best-practices/*.md
- Tests:
- MASTG/tests/index.md
- Android:
@@ -86,31 +89,31 @@ nav:
- ... | flat | MASTG/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-*.md
# - MASVS-AUTH:
# - ... | flat | MASTG/tests-beta/android/MASVS-AUTH/MASTG-TEST-*.md
- # - MASVS-NETWORK:
- # - ... | flat | MASTG/tests-beta/android/MASVS-NETWORK/MASTG-TEST-*.md
+ - MASVS-NETWORK:
+ - ... | flat | MASTG/tests-beta/android/MASVS-NETWORK/MASTG-TEST-*.md
# - MASVS-PLATFORM:
# - ... | flat | MASTG/tests-beta/android/MASVS-PLATFORM/MASTG-TEST-*.md
- # - MASVS-CODE:
- # - ... | flat | MASTG/tests-beta/android/MASVS-CODE/MASTG-TEST-*.md
- # - MASVS-RESILIENCE:
- # - ... | flat | MASTG/tests-beta/android/MASVS-RESILIENCE/MASTG-TEST-*.md
+ - MASVS-CODE:
+ - ... | flat | MASTG/tests-beta/android/MASVS-CODE/MASTG-TEST-*.md
+ - MASVS-RESILIENCE:
+ - ... | flat | MASTG/tests-beta/android/MASVS-RESILIENCE/MASTG-TEST-*.md
- MASVS-PRIVACY:
- ... | flat | MASTG/tests-beta/android/MASVS-PRIVACY/MASTG-TEST-*.md
- # - iOS:
- # - MASVS-STORAGE:
- # - ... | flat | MASTG/tests-beta/ios/MASVS-STORAGE/MASTG-TEST-*.md
- # - MASVS-CRYPTO:
- # - ... | flat | MASTG/tests-beta/ios/MASVS-CRYPTO/MASTG-TEST-*.md
+ - iOS:
+ - MASVS-STORAGE:
+ - ... | flat | MASTG/tests-beta/ios/MASVS-STORAGE/MASTG-TEST-*.md
+ - MASVS-CRYPTO:
+ - ... | flat | MASTG/tests-beta/ios/MASVS-CRYPTO/MASTG-TEST-*.md
# - MASVS-AUTH:
# - ... | flat | MASTG/tests-beta/ios/MASVS-AUTH/MASTG-TEST-*.md
# - MASVS-NETWORK:
# - ... | flat | MASTG/tests-beta/ios/MASVS-NETWORK/MASTG-TEST-*.md
# - MASVS-PLATFORM:
# - ... | flat | MASTG/tests-beta/ios/MASVS-PLATFORM/MASTG-TEST-*.md
- # - MASVS-CODE:
- # - ... | flat | MASTG/tests-beta/ios/MASVS-CODE/MASTG-TEST-*.md
- # - MASVS-RESILIENCE:
- # - ... | flat | MASTG/tests-beta/ios/MASVS-RESILIENCE/MASTG-TEST-*.md
+ - MASVS-CODE:
+ - ... | flat | MASTG/tests-beta/ios/MASVS-CODE/MASTG-TEST-*.md
+ - MASVS-RESILIENCE:
+ - ... | flat | MASTG/tests-beta/ios/MASVS-RESILIENCE/MASTG-TEST-*.md
# - MASVS-PRIVACY:
# - ... | flat | MASTG/tests-beta/ios/MASVS-PRIVACY/MASTG-TEST-*.md
- Demos (v2 Beta):
@@ -132,26 +135,23 @@ nav:
# - ... | flat | MASTG/demos/android/MASVS-RESILIENCE/**/MASTG-DEMO-*.md
- MASVS-PRIVACY:
- ... | flat | MASTG/demos/android/MASVS-PRIVACY/**/MASTG-DEMO-*.md
- # - iOS:
- # - MASVS-STORAGE:
- # - ... | flat | MASTG/demos/ios/MASVS-STORAGE/**/MASTG-DEMO-*.md
- # - MASVS-CRYPTO:
- # - ... | flat | MASTG/demos/ios/MASVS-CRYPTO/**/MASTG-DEMO-*.md
- # - MASVS-AUTH:
- # - ... | flat | MASTG/demos/ios/MASVS-AUTH/**/MASTG-DEMO-*.md
- # - MASVS-NETWORK:
- # - ... | flat | MASTG/demos/ios/MASVS-NETWORK/**/MASTG-DEMO-*.md
- # - MASVS-PLATFORM:
- # - ... | flat | MASTG/demos/ios/MASVS-PLATFORM/**/MASTG-DEMO-*.md
- # - MASVS-CODE:
- # - ... | flat | MASTG/demos/ios/MASVS-CODE/**/MASTG-DEMO-*.md
- # - MASVS-RESILIENCE:
- # - ... | flat | MASTG/demos/ios/MASVS-RESILIENCE/**/MASTG-DEMO-*.md
- # - MASVS-PRIVACY:
- # - ... | flat | MASTG/demos/ios/MASVS-PRIVACY/**/MASTG-DEMO-*.md
- - Mitigations:
- - MASTG/mitigations/index.md
- - ... | flat | MASTG/mitigations/*.md
+ - iOS:
+ - MASVS-STORAGE:
+ - ... | flat | MASTG/demos/ios/MASVS-STORAGE/**/MASTG-DEMO-*.md
+ - MASVS-CRYPTO:
+ - ... | flat | MASTG/demos/ios/MASVS-CRYPTO/**/MASTG-DEMO-*.md
+ # - MASVS-AUTH:
+ # - ... | flat | MASTG/demos/ios/MASVS-AUTH/**/MASTG-DEMO-*.md
+ # - MASVS-NETWORK:
+ # - ... | flat | MASTG/demos/ios/MASVS-NETWORK/**/MASTG-DEMO-*.md
+ # - MASVS-PLATFORM:
+ # - ... | flat | MASTG/demos/ios/MASVS-PLATFORM/**/MASTG-DEMO-*.md
+ # - MASVS-CODE:
+ # - ... | flat | MASTG/demos/ios/MASVS-CODE/**/MASTG-DEMO-*.md
+ # - MASVS-RESILIENCE:
+ # - ... | flat | MASTG/demos/ios/MASVS-RESILIENCE/**/MASTG-DEMO-*.md
+ # - MASVS-PRIVACY:
+ # - ... | flat | MASTG/demos/ios/MASVS-PRIVACY/**/MASTG-DEMO-*.md
- Techniques:
- MASTG/techniques/index.md
- Generic:
@@ -252,7 +252,7 @@ theme:
app: octicons/code-square-24
demo: material/flask-outline
tech: material/magic-staff # fontawesome/solid/wand-magic-sparkles
- mitig: material/bandage
+ best: material/shield-check
maswe: octicons/shield-24
masvs: simple/owasp
features:
@@ -378,7 +378,7 @@ extra:
tech: tech
maswe: maswe
masvs: masvs
- mitig: mitig
+ best: best
status:
draft: This page is in draft.
new: New in this beta!
diff --git a/src/scripts/structure_mastg.sh b/src/scripts/structure_mastg.sh
index 0792b56c07..5bdc0bd095 100755
--- a/src/scripts/structure_mastg.sh
+++ b/src/scripts/structure_mastg.sh
@@ -4,7 +4,7 @@ set -euo pipefail
mkdir -p docs/MASTG
mkdir -p docs/MASWE
-directories=("tests" "techniques" "tools" "apps" "tests-beta" "demos" "rules" "mitigations")
+directories=("tests" "techniques" "tools" "apps" "tests-beta" "demos" "rules" "best-practices")
for dir in "${directories[@]}"; do
rm -rf "docs/MASTG/$dir"
diff --git a/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0204.md b/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0204.md
index f633d35022..cd69d7a1c4 100644
--- a/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0204.md
+++ b/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0204.md
@@ -3,7 +3,7 @@ platform: android
title: Insecure Random API Usage
id: MASTG-TEST-0204
type: [static]
-mitigations: [MASTG-MITIG-0001]
+best-practices: [MASTG-BEST-0001]
prerequisites:
- identify-sensitive-data
- identify-security-relevant-contexts
diff --git a/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0205.md b/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0205.md
index 94aa4b7ede..14a4f1b248 100644
--- a/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0205.md
+++ b/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0205.md
@@ -3,7 +3,7 @@ platform: android
title: Non-random Sources Usage
id: MASTG-TEST-0205
type: [static]
-mitigations: [MASTG-MITIG-0001]
+best-practices: [MASTG-BEST-0001]
prerequisites:
- identify-sensitive-data
- identify-security-relevant-contexts
diff --git a/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0232.md b/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0232.md
index 594a1a4395..cc1dc83f20 100644
--- a/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0232.md
+++ b/tests-beta/android/MASVS-CRYPTO/MASTG-TEST-0232.md
@@ -4,7 +4,7 @@ platform: android
id: MASTG-TEST-0232
type: [static, dynamic]
weakness: MASWE-0020
-mitigations: [MASTG-MITIG-0005]
+best-practices: [MASTG-BEST-0005]
---
## Overview
diff --git a/tests-beta/android/MASVS-RESILIENCE/MASTG-TEST-0224.md b/tests-beta/android/MASVS-RESILIENCE/MASTG-TEST-0224.md
index c2c52815f0..5e9e5f0a34 100644
--- a/tests-beta/android/MASVS-RESILIENCE/MASTG-TEST-0224.md
+++ b/tests-beta/android/MASVS-RESILIENCE/MASTG-TEST-0224.md
@@ -5,7 +5,7 @@ id: MASTG-TEST-0224
type: [static]
available_since: 24
weakness: MASWE-0104
-mitigations: [MASTG-MITIG-0006]
+best-practices: [MASTG-BEST-0006]
---
## Overview
diff --git a/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0203.md b/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0203.md
index 11e52b98e0..c4eab837aa 100644
--- a/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0203.md
+++ b/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0203.md
@@ -5,7 +5,7 @@ id: MASTG-TEST-0203
apis: [Log, Logger, System.out.print, System.err.print, java.lang.Throwable#printStackTrace]
type: [dynamic]
weakness: MASWE-0001
-mitigations: [MASTG-MITIG-0002]
+best-practices: [MASTG-BEST-0002]
---
## Overview
diff --git a/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0216.md b/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0216.md
index 7e242275f3..9449efd522 100644
--- a/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0216.md
+++ b/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0216.md
@@ -4,7 +4,7 @@ title: Sensitive Data Not Excluded From Backup
id: MASTG-TEST-0216
type: [dynamic, filesystem]
weakness: MASWE-0004
-mitigations: [MASTG-MITIG-0004]
+best-practices: [MASTG-BEST-0004]
---
## Overview
diff --git a/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0231.md b/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0231.md
index ff4c9b41af..f8752dbb8d 100644
--- a/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0231.md
+++ b/tests-beta/android/MASVS-STORAGE/MASTG-TEST-0231.md
@@ -5,7 +5,7 @@ id: MASTG-TEST-0231
apis: [Log, Logger, System.out.print, System.err.print, java.lang.Throwable#printStackTrace, android.util.Log]
type: [static]
weakness: MASWE-0001
-mitigations: [MASTG-MITIG-0002]
+best-practices: [MASTG-BEST-0002]
---
## Overview
diff --git a/tests-beta/index.md b/tests-beta/index.md
index dc191ceca9..68e27e9359 100644
--- a/tests-beta/index.md
+++ b/tests-beta/index.md
@@ -1,6 +1,6 @@
---
hide: toc
-title: MASTG Tests (v2 - Beta)
+title: MASTG Tests (v2 Beta)
status: new
---