Skip to content

fix(amazonq): add boundary check to UserModificationTracker to prevent IndexOutOfBoundsException #5312

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 3, 2025
Merged

fix(amazonq): add boundary check to UserModificationTracker to prevent IndexOutOfBoundsException #5312

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
119954b
add boundary check for userModificationTracker
evanliu048 Jan 29, 2025
af729cb
add chaneglog
evanliu048 Jan 30, 2025
929edc7
Update bugfix-24d6621e-32d3-45c5-a996-66232724e425.json
rli Jan 31, 2025
2bbf1ba
Merge branch 'main' into reviseUserModTracker
rli Jan 31, 2025
8bdd4ad
Merge branch 'main' into reviseUserModTracker
evanliu048 Jan 31, 2025
d9453ea
delete log for incorrect range
evanliu048 Jan 31, 2025
99d3ed6
Revert "delete log for incorrect range"
evanliu048 Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-24d6621e-32d3-45c5-a996-66232724e425.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Amazon Q: Prevent IndexOutOfBoundsException by adding boundary checks for invalid range markers"
}
17 changes: 16 additions & 1 deletion ...olkits/jetbrains/services/codewhisperer/telemetry/CodeWhispererUserModificationTracker.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import org.assertj.core.util.VisibleForTesting
import software.amazon.awssdk.services.codewhispererruntime.model.CodeWhispererRuntimeException
import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.core.utils.warn
import software.aws.toolkits.jetbrains.core.credentials.ToolkitConnection
import software.aws.toolkits.jetbrains.services.codewhisperer.credentials.CodeWhispererClientAdaptor
import software.aws.toolkits.jetbrains.services.codewhisperer.customization.CodeWhispererModelConfigurator
Expand Down Expand Up @@ -154,14 +155,28 @@ class CodeWhispererUserModificationTracker(private val project: Project) : Dispo
private fun emitTelemetryOnSuggestion(acceptedSuggestion: AcceptedSuggestionEntry) {
val file = acceptedSuggestion.vFile

if (file == null || (!file.isValid)) {
if (file == null || (!file.isValid) || !acceptedSuggestion.range.isValid) {
sendModificationTelemetry(acceptedSuggestion, null)
sendUserModificationTelemetryToServiceAPI(acceptedSuggestion)
} else {
// Will remove this later when we truly don't need toolkit user modification telemetry anymore
val document = runReadAction {
FileDocumentManager.getInstance().getDocument(file)
}
val start = acceptedSuggestion.range.startOffset
val end = acceptedSuggestion.range.endOffset
if (document != null) {
if (start < 0 || end < start || end > document.textLength) {
LOG.warn {
"Invalid range for suggestion ${acceptedSuggestion.requestId}: " +
"start=$start, end=$end, docLength=${document.textLength}"
}
sendModificationTelemetry(acceptedSuggestion, null)
sendUserModificationTelemetryToServiceAPI(acceptedSuggestion)
return
}
}

val currentString = document?.getText(
TextRange(acceptedSuggestion.range.startOffset, acceptedSuggestion.range.endOffset)
)
Expand Down
Loading