Skip to content

fix: resolve executor compile regressions#267

Closed
KooshaPari wants to merge 1 commit intorouter-for-me:mainfrom
KooshaPari:ci-compile-fix-clean-single4
Closed

fix: resolve executor compile regressions#267
KooshaPari wants to merge 1 commit intorouter-for-me:mainfrom
KooshaPari:ci-compile-fix-clean-single4

Conversation

@KooshaPari
Copy link
Copy Markdown

Backports targeted compile fixes from previous work with minimal diff (4 files changed), including:\n\n- Kiro token path sanitization in Claude token save\n- Kiro OIDC region normalization/validation\n- Codex websocket disconnect logging signature cleanup\n- Kiro model fallback return path cleanup to keep map function parsing valid

@gemini-code-assist
Copy link
Copy Markdown

Summary of Changes

Hello @KooshaPari, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses several compile regressions by backporting targeted fixes across four files. The changes focus on improving security by sanitizing file paths, enhancing robustness through OIDC region validation, and refining code quality by cleaning up logging signatures and streamlining model fallback logic. The overall impact is a more stable and secure codebase.

Highlights

  • Claude Token Path Sanitization: Implemented a new function to sanitize token file paths before saving Claude tokens, enhancing security and preventing potential path traversal vulnerabilities.
  • Kiro OIDC Region Normalization and Validation: Added a regular expression-based validation and normalization step for OIDC regions in Kiro authentication, ensuring that only valid region formats are processed.
  • Codex Websocket Logging Signature Cleanup: Refactored the function signature for logging Codex websocket disconnections, improving code readability and consistency.
  • Kiro Model Fallback Refinement: Removed an unnecessary default fallback for unknown Sonnet models in the Kiro executor, simplifying the model mapping logic.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Changelog
  • internal/auth/claude/token.go
    • Added token file path sanitization to prevent potential path traversal issues when saving Claude tokens.
  • internal/auth/kiro/sso_oidc.go
    • Imported the regexp package for pattern matching.
    • Defined a regular expression oidcRegionPattern for validating AWS OIDC region formats.
    • Implemented a normalizeOIDCRegion function to trim and validate region strings, returning an error for invalid formats.
    • Integrated the normalizeOIDCRegion function into CreateTokenWithRegion to ensure only valid and normalized regions are used.
  • internal/runtime/executor/codex_websockets_executor.go
    • Updated the logCodexWebsocketDisconnected function signature to use shorthand parameter declaration for improved conciseness.
  • internal/runtime/executor/kiro_executor.go
    • Removed a redundant fallback to 'claude-sonnet-4' for unknown Sonnet models, streamlining the model mapping logic.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request backports several compile fixes, improving security and robustness. The changes include path sanitization for token saving, OIDC region validation, a logging signature cleanup, and a model fallback path cleanup. My review includes a suggestion to remove a redundant and potentially insecure log statement and a minor improvement to an error message for better clarity.

return fmt.Errorf("invalid token file path: %w", err)
}

misc.LogSavingCredentials(safePath)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

This log statement correctly logs the sanitized path. However, there is a redundant log statement on line 51 that logs the original, unsanitized authFilePath. This could be a security risk as it might expose sensitive information or be vulnerable to log injection. Please remove the log statement on line 51.

return defaultIDCRegion, nil
}
if !oidcRegionPattern.MatchString(trimmed) {
return "", fmt.Errorf("invalid OIDC region %q", region)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The error message uses the original region string, but the validation is performed on the trimmed string. For clarity and to avoid confusion when the region string contains leading or trailing whitespace, it's better to use the trimmed string in the error message.

Suggested change
return "", fmt.Errorf("invalid OIDC region %q", region)
return "", fmt.Errorf("invalid OIDC region %q", trimmed)

@KooshaPari

This comment was marked as spam.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant