Merge branch 'master' into eric-issue-4509

its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/EslintCustomRulesTest.java

@@ -127,7 +127,7 @@ void test() {
       )
     )
       .isEmpty();
-    assertThat(buildResult.getLogsLines(l -> l.contains("TS API in custom rule: TS version 5.3.3")))
+    assertThat(buildResult.getLogsLines(l -> l.contains("TS API in custom rule: TS version 5.4.3")))
       .hasSize(2);
     List<Issue> issues = findIssues("eslint-custom-rules:sqKey", orchestrator);
     assertThat(issues).hasSize(2);

its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/HtmlSecurityTest.java

@@ -0,0 +1,103 @@
+/*
+ * SonarQube JavaScript Plugin
+ * Copyright (C) 2012-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package com.sonar.javascript.it.plugin;
+
+import static com.sonar.javascript.it.plugin.OrchestratorStarter.JAVASCRIPT_PLUGIN_LOCATION;
+import static com.sonar.javascript.it.plugin.OrchestratorStarter.getSonarScanner;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.sonar.javascript.it.plugin.assertj.BuildResultAssert;
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.build.SonarScanner;
+import com.sonar.orchestrator.container.Edition;
+import com.sonar.orchestrator.junit5.OrchestratorExtension;
+import com.sonar.orchestrator.locator.FileLocation;
+import com.sonar.orchestrator.locator.MavenLocation;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Map;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+class HtmlSecurityTest {
+
+  private static Orchestrator orchestrator;
+
+  @Test
+  void should_not_generate_ucfgs_for_html() throws IOException {
+    var projectKey = "html-project";
+    var projectPath = TestUtils.projectDir(projectKey);
+
+    OrchestratorStarter.setProfiles(
+      orchestrator,
+      projectKey,
+      Map.of("html-security-profile", "js")
+    );
+
+    var result = orchestrator.executeBuild(getScanner(projectPath, projectKey));
+    assertThat(result.isSuccess()).isTrue();
+
+    var stream = Files.find(
+      projectPath.toPath().resolve(".scannerwork"),
+      3,
+      BuildResultAssert::isUcfgFile
+    );
+    assertThat(stream.toList()).isEmpty();
+  }
+
+  @BeforeAll
+  public static void startOrchestrator() {
+    var builder = OrchestratorExtension
+      .builderEnv()
+      .useDefaultAdminCredentialsForBuilds(true)
+      .setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
+      .addPlugin(JAVASCRIPT_PLUGIN_LOCATION)
+      .setEdition(Edition.DEVELOPER)
+      .activateLicense()
+      .addPlugin(MavenLocation.of("com.sonarsource.security", "sonar-security-plugin", "DEV"))
+      .addPlugin(
+        MavenLocation.of("com.sonarsource.security", "sonar-security-js-frontend-plugin", "DEV")
+      )
+      .addPlugin(MavenLocation.of("org.sonarsource.html", "sonar-html-plugin", "LATEST_RELEASE"))
+      .restoreProfileAtStartup(FileLocation.ofClasspath("/html-security-profile.xml"));
+
+    orchestrator = builder.build();
+    // Installation of SQ server in orchestrator is not thread-safe, so we need to synchronize
+    synchronized (OrchestratorStarter.class) {
+      orchestrator.start();
+    }
+  }
+
+  @AfterAll
+  public static void stopOrchestrator() {
+    orchestrator.stop();
+  }
+
+  private static SonarScanner getScanner(File projectDir, String projectKey) {
+    return getSonarScanner()
+      .setProjectKey(projectKey)
+      .setSourceEncoding("UTF-8")
+      .setDebugLogs(true)
+      .setSourceDirs(".")
+      .setProjectDir(projectDir);
+  }
+}

its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/TypeScriptRuleTest.java

@@ -133,6 +133,5 @@ void test() throws Exception {
       new String(Files.readAllBytes(Paths.get("target/differences")), StandardCharsets.UTF_8)
     )
       .isEmpty();
-    // assertPerfMonitoringAvailable(perfMonitoringDir);
   }
 }

its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/YamlSecurityTest.java

@@ -0,0 +1,105 @@
+/*
+ * SonarQube JavaScript Plugin
+ * Copyright (C) 2012-2024 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package com.sonar.javascript.it.plugin;
+
+import static com.sonar.javascript.it.plugin.OrchestratorStarter.JAVASCRIPT_PLUGIN_LOCATION;
+import static com.sonar.javascript.it.plugin.OrchestratorStarter.getSonarScanner;
+import static org.assertj.core.api.Assertions.assertThat;
+
+import com.sonar.javascript.it.plugin.assertj.BuildResultAssert;
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.build.SonarScanner;
+import com.sonar.orchestrator.container.Edition;
+import com.sonar.orchestrator.junit5.OrchestratorExtension;
+import com.sonar.orchestrator.locator.FileLocation;
+import com.sonar.orchestrator.locator.MavenLocation;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Map;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+class YamlSecurityTest {
+
+  private static Orchestrator orchestrator;
+
+  @Test
+  void should_generate_ucfgs_for_yaml() throws IOException {
+    var projectKey = "yaml-aws-lambda-analyzed";
+    var projectPath = TestUtils.projectDir(projectKey);
+
+    OrchestratorStarter.setProfiles(
+      orchestrator,
+      projectKey,
+      Map.of("yaml-security-profile", "js")
+    );
+
+    var result = orchestrator.executeBuild(getScanner(projectPath, projectKey));
+    assertThat(result.isSuccess()).isTrue();
+
+    var stream = Files.find(
+      projectPath.toPath().resolve(".scannerwork"),
+      3,
+      BuildResultAssert::isUcfgFile
+    );
+    assertThat(stream.toList()).hasSize(1);
+  }
+
+  @BeforeAll
+  public static void startOrchestrator() {
+    var builder = OrchestratorExtension
+      .builderEnv()
+      .useDefaultAdminCredentialsForBuilds(true)
+      .setSonarVersion(System.getProperty("sonar.runtimeVersion", "LATEST_RELEASE"))
+      .addPlugin(JAVASCRIPT_PLUGIN_LOCATION)
+      .setEdition(Edition.DEVELOPER)
+      .activateLicense()
+      .addPlugin(MavenLocation.of("com.sonarsource.security", "sonar-security-plugin", "DEV"))
+      .addPlugin(
+        MavenLocation.of("com.sonarsource.security", "sonar-security-js-frontend-plugin", "DEV")
+      )
+      .addPlugin(
+        MavenLocation.of("org.sonarsource.config", "sonar-config-plugin", "LATEST_RELEASE")
+      )
+      .restoreProfileAtStartup(FileLocation.ofClasspath("/yaml-security-profile.xml"));
+
+    orchestrator = builder.build();
+    // Installation of SQ server in orchestrator is not thread-safe, so we need to synchronize
+    synchronized (OrchestratorStarter.class) {
+      orchestrator.start();
+    }
+  }
+
+  @AfterAll
+  public static void stopOrchestrator() {
+    orchestrator.stop();
+  }
+
+  private static SonarScanner getScanner(File projectDir, String projectKey) {
+    return getSonarScanner()
+      .setProjectKey(projectKey)
+      .setSourceEncoding("UTF-8")
+      .setDebugLogs(true)
+      .setSourceDirs(".")
+      .setProjectDir(projectDir);
+  }
+}

its/plugin/tests/src/test/java/com/sonar/javascript/it/plugin/assertj/BuildResultAssert.java

@@ -82,7 +82,7 @@ private static List<Path> findUcfgFilesIn(Path projectPath) throws IOException {
     }
   }
 
-  private static boolean isUcfgFile(Path path, BasicFileAttributes attrs) {
+  public static boolean isUcfgFile(Path path, BasicFileAttributes attrs) {
     return attrs.isRegularFile() && path.getFileName().toString().endsWith(".ucfgs");
   }
 

its/plugin/tests/src/test/resources/html-security-profile.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profile>
+  <name>html-security-profile</name>
+  <language>js</language>
+  <rules>
+    <rule>
+      <repositoryKey>javascript</repositoryKey>
+      <key>S1116</key> <!-- empty statement -->
+      <priority>INFO</priority>
+    </rule>
+    <rule>
+      <repositoryKey>jssecurity</repositoryKey>
+      <key>S2076</key> <!-- OSCommandInjectionCheck -->
+      <priority>INFO</priority>
+    </rule>
+  </rules>
+</profile>

its/plugin/tests/src/test/resources/yaml-security-profile.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profile>
+  <name>yaml-security-profile</name>
+  <language>js</language>
+  <rules>
+    <rule>
+      <repositoryKey>javascript</repositoryKey>
+      <key>S1116</key> <!-- empty statement -->
+      <priority>INFO</priority>
+    </rule>
+    <rule>
+      <repositoryKey>jssecurity</repositoryKey>
+      <key>S2076</key> <!-- OSCommandInjectionCheck -->
+      <priority>INFO</priority>
+    </rule>
+  </rules>
+</profile>

its/ruling/src/test/expected/jsts/Joust/typescript-S6582.json

@@ -55,5 +55,8 @@
 ],
 "Joust:ts/protocol/HSReplayDecoder.ts": [
 422
+],
+"Joust:ts/state/GameStateScrubber.ts": [
+234
 ]
 }

its/ruling/src/test/expected/jsts/TypeScript/typescript-S4325.json

@@ -1,4 +1,7 @@
 {
+"TypeScript:scripts/tslint/noIncrementDecrementRule.ts": [
+31
+],
 "TypeScript:src/compiler/binder.ts": [
 236,
 298,
@@ -306,6 +309,7 @@
 2043
 ],
 "TypeScript:src/harness/fourslash.ts": [
+427,
 1500,
 2773,
 2782
@@ -367,6 +371,7 @@
 ],
 "TypeScript:src/services/findAllReferences.ts": [
 835,
+942,
 1021,
 1525,
 1624