Add ZDOTDIR after JWT token for WSL commands #1546
Conversation
WalkthroughThe pull request introduces modifications to the Changes
Poem
Tip CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
pkg/shellexec/shellexec.go (1)
Line range hint
484-488: Consider more precise shell detectionThe current implementation using
strings.Containsmight have edge cases with similarly named shells. Consider using more precise matching:func isZshShell(shellPath string) bool { shellBase := filepath.Base(shellPath) - return strings.Contains(shellBase, "zsh") + // Match exact names or common variants + return shellBase == "zsh" || shellBase == "zsh-static" || strings.HasPrefix(shellBase, "zsh-") }
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
pkg/shellexec/shellexec.go(1 hunks)
🔇 Additional comments (2)
pkg/shellexec/shellexec.go (2)
Line range hint 397-399: LGTM! Consistent implementation with WSL shell handling
The ZDOTDIR setting follows the same pattern as the WSL implementation, maintaining consistency across different shell environments.
216-219: Verify path handling for WSL environments
While the ZDOTDIR setting is correctly placed after the JWT token, we should ensure proper handling of paths containing spaces in WSL environments.
Let's verify the path handling in similar WSL commands:
✅ Verification successful
Based on the gathered evidence, I can now provide a final response:
ZDOTDIR path handling is secure in WSL environment
The implementation is safe for paths with spaces because:
- WSL's GetHomeDir properly handles path retrieval using
echo "$HOME"with proper quoting - The ZDOTDIR environment variable is set using fmt.Sprintf with proper quoting:
ZDOTDIR="%s/.waveterm/%s" - The path construction follows the same pattern used throughout the codebase for other shell integrations
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Search for similar path handling patterns in WSL commands
rg -A 2 'wsl\.exe.*--.*homeDir.*"'
# Search for existing ZDOTDIR usage patterns
rg 'ZDOTDIR.*=.*".*"'
Length of output: 337
Script:
#!/bin/bash
# Let's check how WSL paths are handled in the codebase
rg -A 5 'wsl\.exe.*--.*'
# Check how homeDir is processed before being used in WSL context
ast-grep --pattern 'homeDir := $$$'
Length of output: 321
Script:
#!/bin/bash
# Let's check how WSL's GetHomeDir handles path processing
ast-grep --pattern 'func GetHomeDir($$$) {
$$$
}'
# Check for any path escaping or sanitization utilities
rg -A 3 'func.*Path|func.*Escape'
Length of output: 14965
Script:
#!/bin/bash
# Let's check the WSL GetHomeDir implementation and path handling
ast-grep --pattern 'func (client *Distro) WslCommand($$$) string'
# Check how homeDir is used in WSL context
rg -A 5 'wsl\.GetHomeDir'
Length of output: 411
Script:
#!/bin/bash
# Let's check the implementation of wsl.GetHomeDir
rg -A 10 'func GetHomeDir.*Context.*Distro'
# Check for any WSL-specific path transformations
rg -A 5 'wsl.*path|path.*wsl' -i
Length of output: 3532
Summary by CodeRabbit
New Features
Bug Fixes
Documentation