dgf1988/codewhale
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Potential fix for pull request finding 'CodeQL / Uncontrolled data used in path expression'"

Browse Source 
This reverts commit 326a1dacb9.
This commit is contained in:
Hunter Bown
2026-05-08 19:38:14 -05:00
parent 326a1dacb9
commit 51f2f04b47
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/tui/src/runtime_api.rs
+2 -14
View File
@@ -1658,30 +1658,18 @@ fn run_git(workspace: &std::path::Path, args: &[&str]) -> Option<String> {
} }
fn resolve_skills_dir(config: &Config, workspace: &std::path::Path) -> PathBuf { fn resolve_skills_dir(config: &Config, workspace: &std::path::Path) -> PathBuf {
let configured_skills_dir = config.skills_dir(); let workspace = fs::canonicalize(workspace).unwrap_or_else(|_| workspace.to_path_buf());
let trusted_root = fs::canonicalize(&configured_skills_dir).unwrap_or(configured_skills_dir.clone());
let workspace = match fs::canonicalize(workspace) {
Ok(path) => path,
Err(_) => return configured_skills_dir,
};
if !workspace.starts_with(&trusted_root) {
return configured_skills_dir;
}
for candidate in [ for candidate in [
workspace.join(".agents").join("skills"), workspace.join(".agents").join("skills"),
workspace.join("skills"), workspace.join("skills"),
] { ] {
if let Ok(candidate) = fs::canonicalize(candidate) if let Ok(candidate) = fs::canonicalize(candidate)
&& candidate.starts_with(&trusted_root)
&& candidate.is_dir() && candidate.is_dir()
{ {
return candidate; return candidate;
} }
} }
configured_skills_dir config.skills_dir()
} }
fn load_mcp_config_or_default(path: &std::path::Path) -> Result<McpConfig, ApiError> { fn load_mcp_config_or_default(path: &std::path::Path) -> Result<McpConfig, ApiError> {