Merge main into feature/build-execute

Author: aws-toolkit-automation

.changes/next-release/bugfix-d14f113a-e931-4247-aecb-26e8dd713467.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "/review: normalize relative file path before unzipping"
+}

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/sessionconfig/CodeScanSessionConfig.kt

@@ -30,13 +30,13 @@ import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.utils.Ama
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.CodeWhispererProgrammingLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.languages.CodeWhispererUnknownLanguage
 import software.aws.toolkits.jetbrains.services.codewhisperer.language.programmingLanguage
-import software.aws.toolkits.jetbrains.services.codewhisperer.telemetry.CodeWhispererTelemetryService
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CODE_SCAN_CREATE_PAYLOAD_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.CodeAnalysisScope
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_CODE_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.DEFAULT_PAYLOAD_LIMIT_IN_BYTES
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.EXPRESS_SCAN_TIMEOUT_IN_SECONDS
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants.FILE_SCAN_PAYLOAD_SIZE_LIMIT_IN_BYTES
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getNormalizedRelativePath
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.GitIgnoreFilteringUtil
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.isWithin
 import software.aws.toolkits.resources.message
@@ -196,12 +196,9 @@ class CodeScanSessionConfig(
     private fun zipFiles(files: List<Path>, codeDiff: String? = null): File = createTemporaryZipFile {
         files.forEach { file ->
             try {
-                val relativePath = "${project.name}/${file.relativeTo(projectRoot.toNioPath())}"
-                if (relativePath.contains("../") || relativePath.contains("..\\")) {
-                    CodeWhispererTelemetryService.getInstance().sendInvalidZipEvent(file, projectRoot.toNioPath(), relativePath)
-                }
+                val relativePath = getNormalizedRelativePath(project.name, file.relativeTo(projectRoot.toNioPath()))
                 LOG.debug { "Selected file for truncation: $file" }
-                it.putNextEntry(relativePath.toString(), file)
+                it.putNextEntry(relativePath, file)
             } catch (e: Exception) {
                 cannotFindFile("Zipping error: ${e.message}", file.pathString)
             }

plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/util/CodeWhispererUtil.kt

@@ -56,6 +56,8 @@ import software.aws.toolkits.resources.message
 import software.aws.toolkits.telemetry.CodewhispererCompletionType
 import software.aws.toolkits.telemetry.CodewhispererGettingStartedTask
 import software.aws.toolkits.telemetry.CredentialSourceId
+import java.nio.file.Path
+import java.nio.file.Paths
 
 // Controls the condition to send telemetry event to CodeWhisperer service, currently:
 // 1. It will be sent for Builder ID users, only if they have optin telemetry sharing.
@@ -329,6 +331,9 @@ object CodeWhispererUtil {
             WindowManager.getInstance().setAlphaModeRatio(it, alpha)
         }
     }
+
+    fun getNormalizedRelativePath(projectName: String, relativePath: Path): String =
+        Paths.get(projectName).resolve(relativePath).normalize().toString()
 }
 
 enum class CaretMovement {

plugins/amazonq/codewhisperer/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/codewhisperer/codescan/CodeWhispererProjectCodeScanTest.kt

@@ -14,11 +14,13 @@ import org.mockito.kotlin.spy
 import org.mockito.kotlin.stub
 import software.aws.toolkits.jetbrains.services.codewhisperer.codescan.sessionconfig.CodeScanSessionConfig
 import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererConstants
+import software.aws.toolkits.jetbrains.services.codewhisperer.util.CodeWhispererUtil.getNormalizedRelativePath
 import software.aws.toolkits.jetbrains.utils.rules.PythonCodeInsightTestFixtureRule
 import software.aws.toolkits.jetbrains.utils.rules.addFileToModule
 import software.aws.toolkits.jetbrains.utils.rules.addModule
 import software.aws.toolkits.telemetry.CodewhispererLanguage
 import java.io.BufferedInputStream
+import java.nio.file.Paths
 import java.util.zip.ZipInputStream
 import kotlin.io.path.relativeTo
 import kotlin.test.assertNotNull
@@ -108,6 +110,16 @@ class CodeWhispererProjectCodeScanTest : CodeWhispererCodeScanTestBase(PythonCod
         assertE2ERunsSuccessfully(sessionConfigSpy, project, totalLines, 10, totalSize, 1)
     }
 
+    @Test
+    fun `test getNormalizedRelativePath()`() {
+        assertThat(
+            listOf("projectName\\src\\PackageName", "projectName/src/PackageName")
+        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/PackageName")))
+        assertThat(
+            listOf("projectName\\src\\Package2", "projectName/src/Package2")
+        ).contains(getNormalizedRelativePath("projectName", Paths.get("src/./Package1/../Package2")))
+    }
+
     private fun setupCsharpProject() {
         val testModule = projectRule.fixture.addModule("testModule")
         val testModule2 = projectRule.fixture.addModule("testModule2")