Skip to content

fix: use char-count truncation in parse_skill_metadata to prevent panic on multi-byte UTF-8 #2

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

Open
nxxxsooo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: use char-count truncation in parse_skill_metadata to prevent panic on multi-byte UTF-8 #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 21 additions & 19 deletions src-tauri/src/store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ fn app_cli_dir_aliases(app_id: &str) -> Option<&'static [&'static str]> {
}

fn app_cli_dirs(base_path: &Path, app_id: &str) -> Result<Vec<PathBuf>, String> {
let aliases =
app_cli_dir_aliases(app_id).ok_or_else(|| format!("未知的应用: {}", app_id))?;
let aliases = app_cli_dir_aliases(app_id).ok_or_else(|| format!("未知的应用: {}", app_id))?;
Ok(aliases.iter().map(|alias| base_path.join(alias)).collect())
}

Expand Down Expand Up @@ -570,7 +569,10 @@ fn dedupe_managed_skill_resources(library: &mut RepoLibrary) -> HashMap<String,
for indexes in grouped_indexes.values().filter(|indexes| indexes.len() > 1) {
let mut canonical_index = indexes[0];
for &index in indexes.iter().skip(1) {
if should_prefer_skill_resource(&library.resources[index], &library.resources[canonical_index]) {
if should_prefer_skill_resource(
&library.resources[index],
&library.resources[canonical_index],
) {
canonical_index = index;
}
}
Expand Down Expand Up @@ -671,10 +673,7 @@ fn load_repo_library_for_legacy_skills(

fn is_backup_eligible_skill_resource(resource: &Resource) -> bool {
is_managed_skill_resource(resource)
&& !resource
.tags
.iter()
.any(|tag| tag.starts_with("_remote:"))
&& !resource.tags.iter().any(|tag| tag.starts_with("_remote:"))
}

fn parse_skill_front_matter(content: &str) -> (Option<String>, Option<String>, Vec<String>) {
Expand Down Expand Up @@ -986,7 +985,9 @@ fn sync_backup_eligible_skills_from_backup_repo(
.collect::<HashSet<_>>();

if !removed_ids.is_empty() {
library.resources.retain(|resource| !removed_ids.contains(&resource.id));
library
.resources
.retain(|resource| !removed_ids.contains(&resource.id));
for resource_id in &removed_ids {
detach_resource_from_all_profiles(&mut library.project_profiles, resource_id);
}
Expand All @@ -1008,7 +1009,9 @@ fn sync_backup_eligible_skills_from_backup_repo(
Ok(())
}

fn detach_backup_git_metadata_from_live_skill_sources(app: &tauri::AppHandle) -> Result<Vec<String>, String> {
fn detach_backup_git_metadata_from_live_skill_sources(
app: &tauri::AppHandle,
) -> Result<Vec<String>, String> {
let source_root = skill_sources_dir(app)?;
if !source_root.exists() {
return Ok(Vec::new());
Expand Down Expand Up @@ -4206,10 +4209,12 @@ fn parse_skill_metadata(content: &str) -> (String, Option<String>) {

if !desc_lines.is_empty() {
description = Some(desc_lines.join(" "));
// Truncate description if too long
// Truncate description if too long (char-count based to avoid
// panicking on multi-byte UTF-8 boundaries such as CJK text)
if let Some(ref desc) = description {
if desc.len() > 200 {
description = Some(format!("{}...", &desc[..197]));
if desc.chars().count() > 200 {
let truncated: String = desc.chars().take(197).collect();
description = Some(format!("{}...", truncated));
}
}
}
Expand Down Expand Up @@ -4536,11 +4541,9 @@ mod tests {

#[test]
fn rejects_invalid_standard_skill_directory() {
let error = validate_standard_skill_directories(&[
"scripts".to_string(),
"agents".to_string(),
])
.expect_err("invalid directory should fail validation");
let error =
validate_standard_skill_directories(&["scripts".to_string(), "agents".to_string()])
.expect_err("invalid directory should fail validation");

assert!(error.contains("agents"));
}
Expand Down Expand Up @@ -4584,8 +4587,7 @@ mod tests {

let file = fs::File::create(&zip_path).expect("zip file should be created");
let mut zip = ZipWriter::new(file);
let options =
SimpleFileOptions::default().compression_method(CompressionMethod::Deflated);
let options = SimpleFileOptions::default().compression_method(CompressionMethod::Deflated);

write_directory_to_zip(&mut zip, &skill_root, &skill_root, options)
.expect("zip helper should succeed");
Expand Down