SONARJAVA-5135 Update rules metadata (#4889)

irina-batinic-sonarsource · web-flow · commit f48532975b1b · 2024-09-27T13:46:24.000Z
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S112.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S112.json
@@ -29,5 +29,5 @@
       397
     ]
   },
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1133.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1133.json
@@ -19,5 +19,5 @@
   "ruleSpecification": "RSPEC-1133",
   "sqKey": "S1133",
   "scope": "Main",
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1135.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1135.json
@@ -24,5 +24,5 @@
       546
     ]
   },
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1448.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1448.json
@@ -19,5 +19,5 @@
   "ruleSpecification": "RSPEC-1448",
   "sqKey": "S1448",
   "scope": "Main",
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1479.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1479.json
@@ -19,5 +19,5 @@
   "ruleSpecification": "RSPEC-1479",
   "sqKey": "S1479",
   "scope": "Main",
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1696.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1696.html
@@ -33,6 +33,7 @@ <h2>Resources</h2>
 <ul>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/395">CWE-395 - Use of NullPointerException Catch to Detect NULL Pointer Dereference</a>
   </li>
-  <li> <a href="https://tinyurl.com/y6r4amg3">CERT, ERR08-J.</a> - Do not catch NullPointerException or any of its ancestors </li>
+  <li> CERT - <a href="https://wiki.sei.cmu.edu/confluence/display/java/ERR08-J.+Do+not+catch+NullPointerException+or+any+of+its+ancestors">ERR08-J.
+  Do not catch NullPointerException or any of its ancestors</a> </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1699.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1699.json
@@ -20,7 +20,7 @@
   "ruleSpecification": "RSPEC-1699",
   "sqKey": "S1699",
   "scope": "Main",
-  "quickfix": "unknown",
+  "quickfix": "infeasible",
   "securityStandards": {
     "CERT": [
       "MET05-J.",
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1820.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1820.json
@@ -19,5 +19,5 @@
   "ruleSpecification": "RSPEC-1820",
   "sqKey": "S1820",
   "scope": "Main",
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1871.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1871.json
@@ -20,5 +20,5 @@
   "ruleSpecification": "RSPEC-1871",
   "sqKey": "S1871",
   "scope": "Main",
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1874.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S1874.json
@@ -32,5 +32,5 @@
       "1.14.6"
     ]
   },
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2053.html
@@ -51,7 +51,7 @@ <h4>Compliant solution</h4>
 
 public void hash() {
     SecureRandom random = new SecureRandom();
-    byte[] salt = new byte[16];
+    byte[] salt = new byte[32];
     random.nextBytes(salt);
 
     PBEParameterSpec cipherSpec = new PBEParameterSpec(salt, 10000);
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2159.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2159.json
@@ -1,5 +1,5 @@
 {
-  "title": "Silly equality checks should not be made",
+  "title": "Unnecessary equality checks should not be made",
   "type": "BUG",
   "code": {
     "impacts": {
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2245.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2245.html
@@ -41,8 +41,7 @@ <h2>See</h2>
   <li> OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
-  Verification Standard - Cryptography Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">Mobile Top 10 2016 Category M5 -
   Insufficient Cryptography</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/338">CWE-338 - Use of Cryptographically Weak Pseudo-Random Number Generator (PRNG)</a>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2260.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2260.json
@@ -13,5 +13,5 @@
   "ruleSpecification": "RSPEC-2260",
   "sqKey": "S2260",
   "scope": "Main",
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2275.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2275.html
@@ -50,8 +50,4 @@ <h3>Compliant solution</h3>
 org.apache.logging.log4j.Logger log4jLog;
 log4jLog.debug("message {}", 1);
 </pre>
-<h2>Resources</h2>
-<ul>
-  <li> <a href="https://www.securecoding.cert.org/confluence/x/wQA1">CERT, FIO47-C.</a> - Use valid format strings </li>
-</ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2390.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S2390.html
@@ -24,8 +24,8 @@ <h3>Noncompliant code example</h3>
 </pre>
 <h2>Resources</h2>
 <ul>
-  <li> <a href="https://www.securecoding.cert.org/confluence/display/java/DCL00-J.+Prevent+class+initialization+cycles">CERT, DCL00-J.</a> - Prevent
-  class initialization cycles </li>
+  <li> CERT - <a href="https://wiki.sei.cmu.edu/confluence/display/java/DCL00-J.+Prevent+class+initialization+cycles">DCL00-J. Prevent class
+  initialization cycles</a> </li>
   <li> <a href="https://docs.oracle.com/javase/specs/jls/se17/html/jls-12.html#jls-12.4">Section 12.4: Initialization of Classes and Interfaces</a> -
   Java Language Specification </li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3329.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S3329.html
@@ -43,20 +43,20 @@ <h4>Noncompliant code example</h4>
 import java.security.InvalidKeyException;
 import java.security.InvalidAlgorithmParameterException;
 import javax.crypto.Cipher;
-import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.crypto.NoSuchPaddingException;
 
 public void encrypt(String key, String plainText) {
 
     byte[] RandomBytes = "7cVgr5cbdCZVw5WY".getBytes(StandardCharsets.UTF_8);
 
-    GCMParameterSpec iv   = new GCMParameterSpec(128, RandomBytes);
+    IvParameterSpec iv   = new IvParameterSpec(RandomBytes);
     SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
 
     try {
-        Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
-        cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv); // Noncompliant
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
 
     } catch(NoSuchAlgorithmException|InvalidKeyException|
             NoSuchPaddingException|InvalidAlgorithmParameterException e) {
@@ -73,21 +73,21 @@ <h4>Compliant solution</h4>
 import java.security.InvalidKeyException;
 import java.security.InvalidAlgorithmParameterException;
 import javax.crypto.Cipher;
-import javax.crypto.spec.GCMParameterSpec;
+import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.crypto.NoSuchPaddingException;
 
 public void encrypt(String key, String plainText) {
 
     SecureRandom random = new SecureRandom();
-    byte[] randomBytes  = new byte[16];
+    byte[] randomBytes  = new byte[128];
     random.nextBytes(randomBytes);
 
-    GCMParameterSpec iv   = new GCMParameterSpec(128, randomBytes);
+    IvParameterSpec iv   = new IvParameterSpec(randomBytes);
     SecretKeySpec keySpec = new SecretKeySpec(key.getBytes(StandardCharsets.UTF_8), "AES");
 
     try {
-        Cipher cipher = Cipher.getInstance("AES/CBC/NoPadding");
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
         cipher.init(Cipher.ENCRYPT_MODE, keySpec, iv);
 
     } catch(NoSuchAlgorithmException|InvalidKeyException|
@@ -118,8 +118,7 @@ <h3>Standards</h3>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/780">CWE-780 - Use of RSA Algorithm without OAEP</a> </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38a.pdf">NIST, SP-800-38A</a> - Recommendation for Block Cipher
   Modes of Operation </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
-  Verification Standard - Cryptography Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">Mobile Top 10 2016 Category M5 -
   Insufficient Cryptography</a> </li>
 </ul>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4144.json b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4144.json
@@ -21,5 +21,5 @@
   "ruleSpecification": "RSPEC-4144",
   "sqKey": "S4144",
   "scope": "All",
-  "quickfix": "unknown"
+  "quickfix": "infeasible"
 }
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4423.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4423.html
@@ -136,8 +136,7 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/327">CWE-327 - Use of a Broken or Risky Cryptographic Algorithm</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
-  Verification Standard - Cryptography Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">Mobile Top 10 2016 Category M5 -
   Insufficient Cryptography</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/327">CWE-327 - Use of a Broken or Risky Cryptographic Algorithm</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4426.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4426.html
@@ -206,8 +206,7 @@ <h3>Standards</h3>
   Exposure</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
-  Verification Standard - Cryptography Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">Mobile Top 10 2016 Category M5 -
   Insufficient Cryptography</a> </li>
   <li> <a href="https://nvlpubs.nist.gov/nistpubs/SpecialPublications/NIST.SP.800-131Ar1.pdf">NIST 800-131A</a> - Recommendation for Transitioning the
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4502.html
@@ -56,8 +56,10 @@ <h2>See</h2>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/352">CWE-352 - Cross-Site Request Forgery (CSRF)</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
-  <li> <a href="https://owasp.org/www-community/attacks/csrf">OWASP: Cross-Site Request Forgery</a> </li>
+  <li> OWASP - <a href="https://owasp.org/www-community/attacks/csrf">Cross-Site Request Forgery</a> </li>
   <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222603">Application Security and
   Development: V-222603</a> - The application must protect from Cross-Site Request Forgery (CSRF) vulnerabilities. </li>
+  <li> PortSwigger - <a href="https://portswigger.net/research/web-storage-the-lesser-evil-for-session-tokens">Web storage: the lesser evil for
+  session tokens</a> </li>
 </ul>
 
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4790.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4790.html
@@ -30,8 +30,7 @@ <h2>See</h2>
   Exposure</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
-  Verification Standard - Cryptography Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">Mobile Top 10 2016 Category M5 -
   Insufficient Cryptography</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/1240">CWE-1240 - Use of a Risky Cryptographic Primitive</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S4830.html
@@ -67,8 +67,8 @@ <h3>Standards</h3>
   Misconfiguration</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">Mobile Top 10 2016 Category M3 - Insecure
   Communication</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x10-v5-network_communication_requirements">Mobile AppSec
-  Verification Standard - Network Communication Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-NETWORK/">Mobile AppSec Verification Standard - Network Communication Requirements</a>
+  </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/295">CWE-295 - Improper Certificate Validation</a> </li>
   <li> STIG Viewer - <a href="https://stigviewer.com/stig/application_security_and_development/2023-06-08/finding/V-222550">Application Security and
   Development: V-222550</a> - The application must validate certificates by constructing a certification path to an accepted trust anchor. </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5320.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5320.html
@@ -72,8 +72,8 @@ <h2>Compliant Solution</h2>
 <h2>See</h2>
 <ul>
   <li> OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x11-v6-interaction_with_the_environment">Mobile AppSec
-  Verification Standard - Platform Interaction Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-PLATFORM/">Mobile AppSec Verification Standard - Platform Interaction Requirements</a>
+  </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m1-improper-platform-usage">Mobile Top 10 2016 Category M1 - Improper
   Platform Usage</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/927">CWE-927 - Use of Implicit Intent for Sensitive Communication</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5322.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5322.html
@@ -73,8 +73,8 @@ <h2>Compliant Solution</h2>
 </pre>
 <h2>See</h2>
 <ul>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x11-v6-interaction_with_the_environment">Mobile AppSec
-  Verification Standard - Platform Interaction Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-PLATFORM/">Mobile AppSec Verification Standard - Platform Interaction Requirements</a>
+  </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m1-improper-platform-usage">Mobile Top 10 2016 Category M1 - Improper
   Platform Usage</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/925">CWE-925 - Improper Verification of Intent by Broadcast Receiver</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5324.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5324.html
@@ -48,8 +48,8 @@ <h2>See</h2>
   <li> OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a> </li>
   <li> <a href="https://developer.android.com/privacy-and-security/security-tips#ExternalStorage">Android Security tips on external file storage</a>
   </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x07-v2-data_storage_and_privacy_requirements">Mobile AppSec
-  Verification Standard - Data Storage and Privacy Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-STORAGE/">Mobile AppSec Verification Standard - Data Storage and Privacy
+  Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m2-insecure-data-storage">Mobile Top 10 2016 Category M2 - Insecure
   Data Storage</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/312">CWE-312 - Cleartext Storage of Sensitive Information</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5332.html
@@ -137,8 +137,8 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
   Exposure</a> </li>
   <li> OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x10-v5-network_communication_requirements">Mobile AppSec
-  Verification Standard - Network Communication Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-NETWORK/">Mobile AppSec Verification Standard - Network Communication Requirements</a>
+  </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">Mobile Top 10 2016 Category M3 - Insecure
   Communication</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/200">CWE-200 - Exposure of Sensitive Information to an Unauthorized Actor</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5527.html
@@ -199,8 +199,8 @@ <h3>Standards</h3>
   Exposure</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x10-v5-network_communication_requirements">Mobile AppSec
-  Verification Standard - Network Communication Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-NETWORK/">Mobile AppSec Verification Standard - Network Communication Requirements</a>
+  </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m3-insecure-communication">Mobile Top 10 2016 Category M3 - Insecure
   Communication</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/297">CWE-297 - Improper Validation of Certificate with Host Mismatch</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5542.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S5542.html
@@ -128,8 +128,7 @@ <h3>Standards</h3>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A6_2017-Security_Misconfiguration">Top 10 2017 Category A6 - Security
   Misconfiguration</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/327">CWE-327 - Use of a Broken or Risky Cryptographic Algorithm</a> </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x08-v3-cryptography_verification_requirements">Mobile AppSec
-  Verification Standard - Cryptography Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-CRYPTO/">Mobile AppSec Verification Standard - Cryptography Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m5-insufficient-cryptography">Mobile Top 10 2016 Category M5 -
   Insufficient Cryptography</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/327">CWE-327 - Use of a Broken or Risky Cryptographic Algorithm</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6288.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6288.html
@@ -44,8 +44,8 @@ <h2>See</h2>
   <li> <a href="https://developer.android.com/privacy-and-security/keystore">developer.android.com</a> - Android keystore system </li>
   <li> <a href="https://developer.android.com/privacy-and-security/keystore#UserAuthentication">developer.android.com</a> - Require user
   authentication for key use </li>
-  <li> OWASP - <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x07-v2-data_storage_and_privacy_requirements">Mobile AppSec
-  Verification Standard - Authentication and Session Management Requirements</a> </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-STORAGE/">Mobile AppSec Verification Standard - Authentication and Session Management
+  Requirements</a> </li>
   <li> OWASP - <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m4-insecure-authentication">Mobile Top 10 2016 Category M4 - Insecure
   Authentication</a> </li>
   <li> CWE - <a href="https://cwe.mitre.org/data/definitions/522">CWE-522 - Insufficiently Protected Credentials</a> </li>
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6291.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6291.html
@@ -57,8 +57,8 @@ <h2>See</h2>
   <li> OWASP - <a href="https://owasp.org/Top10/A02_2021-Cryptographic_Failures/">Top 10 2021 Category A2 - Cryptographic Failures</a> </li>
   <li> OWASP - <a href="https://owasp.org/Top10/A04_2021-Insecure_Design/">Top 10 2021 Category A4 - Insecure Design</a> </li>
   <li> OWASP - <a href="https://owasp.org/Top10/A05_2021-Security_Misconfiguration/">Top 10 2021 Category A5 - Security Misconfiguration</a> </li>
-  <li> <a href="https://mobile-security.gitbook.io/masvs/security-requirements/0x07-v2-data_storage_and_privacy_requirements">Mobile AppSec
-  Verification Standard</a> - Data Storage and Privacy Requirements </li>
+  <li> OWASP - <a href="https://mas.owasp.org/checklists/MASVS-STORAGE/">Mobile AppSec Verification Standard</a> - Data Storage and Privacy
+  Requirements </li>
   <li> <a href="https://owasp.org/www-project-mobile-top-10/2016-risks/m2-insecure-data-storage">Mobile Top 10 2016 Category M2</a> - Insecure Data
   Storage </li>
   <li> OWASP - <a href="https://owasp.org/www-project-top-ten/2017/A3_2017-Sensitive_Data_Exposure">Top 10 2017 Category A3 - Sensitive Data
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6293.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6293.html
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6300.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6300.html
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6301.html
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6418.html
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6432.html
diff --git a/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6813.html b/sonar-java-plugin/src/main/resources/org/sonar/l10n/java/rules/java/S6813.html
diff --git a/sonarpedia.json b/sonarpedia.json

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,5 @@`
`29`	`29`	`397`
`30`	`30`	`]`
`31`	`31`	`},`
`32`		`- "quickfix": "unknown"`
	`32`	`+ "quickfix": "infeasible"`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,5 +19,5 @@`
`19`	`19`	`"ruleSpecification": "RSPEC-1133",`
`20`	`20`	`"sqKey": "S1133",`
`21`	`21`	`"scope": "Main",`
`22`		`- "quickfix": "unknown"`
	`22`	`+ "quickfix": "infeasible"`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@`
`24`	`24`	`546`
`25`	`25`	`]`
`26`	`26`	`},`
`27`		`- "quickfix": "unknown"`
	`27`	`+ "quickfix": "infeasible"`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,5 @@`
`20`	`20`	`"ruleSpecification": "RSPEC-1871",`
`21`	`21`	`"sqKey": "S1871",`
`22`	`22`	`"scope": "Main",`
`23`		`- "quickfix": "unknown"`
	`23`	`+ "quickfix": "infeasible"`
`24`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@`
`32`	`32`	`"1.14.6"`
`33`	`33`	`]`
`34`	`34`	`},`
`35`		`- "quickfix": "unknown"`
	`35`	`+ "quickfix": "infeasible"`
`36`	`36`	`}`