fix: review fixes — path traversal guard, trust_style consistency, edge cases
Address code review findings: Security (Medium): - Path traversal guard in OptionalSkillSource.fetch() — resolve() and validate that the path stays within optional-skills/ before reading Bug fixes (Medium): - Add 'builtin' to trust_style dicts in do_inspect() and _resolve_short_name() — official skills now show bright_cyan 'official' label consistently across all display functions (5/5 dicts fixed) Edge cases (Low): - Clamp page_size to [1, 100] in do_browse() to prevent ZeroDivisionError - Update SkillMeta.source docstring to include 'official' - Add browse command to optional-skills/DESCRIPTION.md
This commit is contained in:
parent
ec0fe3242a
commit
f6f3d1de9b
3 changed files with 25 additions and 8 deletions
|
|
@ -63,7 +63,7 @@ class SkillMeta:
|
|||
"""Minimal metadata returned by search results."""
|
||||
name: str
|
||||
description: str
|
||||
source: str # "github", "clawhub", "claude-marketplace", "lobehub"
|
||||
source: str # "official", "github", "clawhub", "claude-marketplace", "lobehub"
|
||||
identifier: str # source-specific ID (e.g. "openai/skills/skill-creator")
|
||||
trust_level: str # "builtin" | "trusted" | "community"
|
||||
repo: Optional[str] = None
|
||||
|
|
@ -987,12 +987,22 @@ class OptionalSkillSource(SkillSource):
|
|||
rel = identifier.split("/", 1)[-1] if identifier.startswith("official/") else identifier
|
||||
skill_dir = self._optional_dir / rel
|
||||
|
||||
if not skill_dir.is_dir():
|
||||
# Guard against path traversal (e.g. "official/../../etc")
|
||||
try:
|
||||
resolved = skill_dir.resolve()
|
||||
if not str(resolved).startswith(str(self._optional_dir.resolve())):
|
||||
return None
|
||||
except (OSError, ValueError):
|
||||
return None
|
||||
|
||||
if not resolved.is_dir():
|
||||
# Try searching by skill name only (last segment)
|
||||
skill_name = rel.rsplit("/", 1)[-1]
|
||||
skill_dir = self._find_skill_dir(skill_name)
|
||||
if not skill_dir:
|
||||
return None
|
||||
else:
|
||||
skill_dir = resolved
|
||||
|
||||
files: Dict[str, str] = {}
|
||||
for f in skill_dir.rglob("*"):
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue