zhenyi
d243dce027
- Replaced manual remote client functions with remote_client! macro for archive, blame, branch, commit, and diff services - Simplified remote client creation logic using declarative macro approach - Maintained same functionality while reducing code duplication across services security(bare): enhance path traversal protection with comprehensive validation - Added early relative_path validation to prevent path traversal attacks - Implemented unified path validation to avoid TOCTOU race conditions - Enhanced canonicalization checks for both existing and non-existent paths - Added detailed logging for path traversal detection attempts feat(cache): migrate from CLruCache to Moka with TTL and invalidation support - Replaced clru dependency with moka for improved caching capabilities - Added 300-second time-to-live for cache entries - Implemented repository-specific cache invalidation mechanism - Enhanced cache operations with thread-safe async support refactor(commit): improve security validation for commit operations - Added ref name validation to prevent command injection in cherry_pick_commit - Implemented revision validation for commit selectors - Added comprehensive input validation for create_commit parameters - Enhanced file path validation to prevent traversal
94 lines
3.6 KiB
Rust
94 lines
3.6 KiB
Rust
use gix::object::tree::EntryKind;
|
|
|
|
use crate::bare::GitBare;
|
|
use crate::error::{GitError, GitResult};
|
|
use crate::paginate;
|
|
use crate::pb::{ListTreeRequest, ListTreeResponse, TreeEntry, object_selector, tree_entry};
|
|
|
|
impl GitBare {
|
|
pub fn list_tree(&self, request: ListTreeRequest) -> GitResult<ListTreeResponse> {
|
|
let repo = self.gix_repo()?;
|
|
let revision = match request.revision.clone().and_then(|s| s.selector) {
|
|
Some(object_selector::Selector::Oid(oid)) => oid.hex,
|
|
Some(object_selector::Selector::Revision(name)) => {
|
|
crate::sanitize::validate_revision(&name.revision)?;
|
|
name.revision
|
|
}
|
|
None => "HEAD".into(),
|
|
};
|
|
let mut tree = repo
|
|
.rev_parse_single(format!("{}^{{tree}}", revision).as_str())?
|
|
.object()?
|
|
.try_into_tree()
|
|
.map_err(|e| GitError::Gix(e.to_string()))?;
|
|
if !request.path.is_empty() {
|
|
let entry = tree
|
|
.lookup_entry_by_path(&request.path)?
|
|
.ok_or_else(|| GitError::NotFound(request.path.clone()))?;
|
|
tree = entry
|
|
.object()?
|
|
.try_into_tree()
|
|
.map_err(|e| GitError::Gix(e.to_string()))?;
|
|
}
|
|
|
|
let base = request.path.trim_matches('/').to_string();
|
|
let mut entries = Vec::new();
|
|
for entry in tree.iter() {
|
|
let entry = entry?;
|
|
let name = String::from_utf8_lossy(entry.filename()).into_owned();
|
|
let path = if base.is_empty() {
|
|
name.clone()
|
|
} else {
|
|
format!("{base}/{name}")
|
|
};
|
|
let kind = entry.kind();
|
|
let hex = entry.id().to_string();
|
|
entries.push(TreeEntry {
|
|
name,
|
|
path,
|
|
oid: Some(self.oid_to_pb(hex)),
|
|
r#type: entry_type(kind) as i32,
|
|
mode: u32::from_str_radix(&format!("{:o}", entry.mode()), 8).unwrap_or(0),
|
|
size: entry_size(&repo, entry.id().to_string().as_str()).unwrap_or(0),
|
|
is_lfs: false,
|
|
recent_commit: None, // populated on demand, not per-entry subprocess
|
|
});
|
|
|
|
if request.recursive && matches!(kind, EntryKind::Tree) {
|
|
let child_path = entries.last().unwrap().path.clone();
|
|
let child = self.list_tree(ListTreeRequest {
|
|
repository: request.repository.clone(),
|
|
revision: request.revision.clone(),
|
|
path: child_path,
|
|
recursive: true,
|
|
pagination: None,
|
|
})?;
|
|
entries.extend(child.entries);
|
|
}
|
|
}
|
|
|
|
let (entries, page_info) = paginate::paginate(&entries, request.pagination.as_ref());
|
|
Ok(ListTreeResponse {
|
|
entries,
|
|
page_info: Some(page_info),
|
|
truncated: false,
|
|
})
|
|
}
|
|
}
|
|
|
|
fn entry_type(kind: EntryKind) -> tree_entry::EntryType {
|
|
match kind {
|
|
EntryKind::Tree => tree_entry::EntryType::TreeEntryTypeTree,
|
|
EntryKind::Blob => tree_entry::EntryType::TreeEntryTypeBlob,
|
|
EntryKind::BlobExecutable => tree_entry::EntryType::TreeEntryTypeExecutable,
|
|
EntryKind::Link => tree_entry::EntryType::TreeEntryTypeSymlink,
|
|
EntryKind::Commit => tree_entry::EntryType::TreeEntryTypeCommit,
|
|
}
|
|
}
|
|
|
|
fn entry_size(repo: &gix::Repository, oid: &str) -> Option<i64> {
|
|
let id = gix::hash::ObjectId::from_hex(oid.as_bytes()).ok()?;
|
|
let object = repo.find_object(id).ok()?;
|
|
object.data.len().try_into().ok()
|
|
}
|