Refactor the leftovers from Device-Security-Access

demos/android/MASVS-CODE/MASTG-DEMO-0025/MASTG-DEMO-0025.md

@@ -16,7 +16,7 @@ The following example checks the version of the operating system.
 
 Let's run @MASTG-TOOL-0110 rules against the sample code.
 
-{{ ../../../../rules/mastg-android-device-access-security-sdk-version.yml }}
+{{ ../../../../rules/mastg-android-sdk-version.yml }}
 
 {{ run.sh }}
 

demos/android/MASVS-CODE/MASTG-DEMO-0025/run.sh

@@ -1 +1 @@
-NO_COLOR=true semgrep -c ../../../../rules/mastg-android-device-access-security-sdk-version.yml ./MastgTest_reversed.java --text -o output_version.txt
+NO_COLOR=true semgrep -c ../../../../rules/mastg-android-sdk-version.yml ./MastgTest_reversed.java --text -o output_version.txt

demos/android/MASVS-STORAGE/MASTG-DEMO-0021/MASTG-DEMO-0021.md

@@ -3,7 +3,7 @@ platform: android
 title: Uses of KeyguardManager.isDeviceSecure with semgrep
 id: MASTG-DEMO-0021
 code: [kotlin]
-test: MASTG-TEST-0216
+test: MASTG-TEST-0242
 ---
 
 ### Sample
@@ -16,7 +16,7 @@ The following example checks if the device has a passcode set.
 
 Let's run @MASTG-TOOL-0110 rules against the sample code.
 
-{{ ../../../../rules/mastg-android-device-access-security-passcode.yml }}
+{{ ../../../../rules/mastg-android-device-passcode-present.yml }}
 
 {{ run.sh }}
 
@@ -28,4 +28,4 @@ The output files show usages of API that verifies the presence of passcode.
 
 ### Evaluation
 
-The test succeeds because the output file shows references to Device-Access-Security APIs
+The test succeeds because the output file shows references to API that verifies the presence of passcode.

demos/android/MASVS-STORAGE/MASTG-DEMO-0021/run.sh

@@ -1 +1 @@
-NO_COLOR=true semgrep -c ../../../../rules/mastg-android-device-access-security-passcode.yml ./MastgTest_reversed.java --text -o output_passcode.txt
+NO_COLOR=true semgrep -c ../../../../rules/mastg-android-device-passcode-present.yml ./MastgTest_reversed.java --text -o output_passcode.txt

rules/mastg-android-device-access-security-passcode.yml → rules/mastg-android-device-passcode-present.yml

@@ -1,10 +1,10 @@
 rules:
-  - id: device-access-security-passcode
+  - id: mastg-android-device-passcode-present
     languages:
       - java
     severity: ERROR
     metadata:
-      summary: This rule scans for Device-Access-Security to make sure the app runs on a secure environment protected with passcode
+      summary: This rule searches for API that checks whether the device passcode is set.
     message: "[MASVS-STORAGE] Make sure to verify that your app runs on a device with a passcode set"
     patterns:
       - pattern: $X.getSystemService("keyguard");

rules/mastg-android-sdk-version.yml

@@ -0,0 +1,10 @@
+rules:
+  - id: mastg-android-sdk-version
+    languages:
+      - java
+    severity: WARNING
+    metadata:
+      summary: This rule scans for API that checks the version of the operating system
+    message: "[MASVS-PLATFORM] Make sure to verify that your app runs on a device with an up-to-date OS version to make sure it satisfy your security requirements"
+    patterns:
+      - pattern: Build.VERSION.SDK_INT