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
74 lines
2.6 KiB
Rust
74 lines
2.6 KiB
Rust
use crate::bare::GitBare;
|
|
use crate::error::{GitError, GitResult};
|
|
use crate::pb::{Commit, GetCommitRequest};
|
|
use crate::resolve_revision;
|
|
|
|
impl GitBare {
|
|
pub fn get_commit(&self, request: GetCommitRequest) -> GitResult<Commit> {
|
|
let repo = self.gix_repo()?;
|
|
let revision = resolve_revision!(request.revision);
|
|
let id = repo.rev_parse_single(revision.as_str())?;
|
|
let commit = id
|
|
.object()?
|
|
.try_into_commit()
|
|
.map_err(|e| GitError::Gix(e.to_string()))?;
|
|
let hex = commit.id.to_string();
|
|
let tree_hex = commit.tree_id()?.to_string();
|
|
let message = commit.message_raw()?.to_string();
|
|
let (subject, body) = message
|
|
.split_once('\n')
|
|
.map(|(s, b)| (s.to_string(), b.trim_start_matches('\n').to_string()))
|
|
.unwrap_or_else(|| (message.clone(), String::new()));
|
|
let author_sig = commit.author().ok();
|
|
let committer_sig = commit.committer().ok();
|
|
Ok(Commit {
|
|
oid: Some(self.oid_to_pb(hex.clone())),
|
|
abbreviated_oid: commit
|
|
.short_id()
|
|
.map(|s| s.to_string())
|
|
.unwrap_or_else(|_| hex.chars().take(7).collect()),
|
|
parent_oids: commit
|
|
.parent_ids()
|
|
.map(|p| self.oid_to_pb(p.to_string()))
|
|
.collect(),
|
|
tree_oid: Some(self.oid_to_pb(tree_hex)),
|
|
author: author_sig.as_ref().map(gix_sig_to_pb),
|
|
committer: committer_sig.as_ref().map(gix_sig_to_pb),
|
|
subject,
|
|
body,
|
|
message,
|
|
trailers: Vec::new(),
|
|
signature: None,
|
|
stats: None,
|
|
authored_at: author_sig.as_ref().map(|s| prost_types::Timestamp {
|
|
seconds: s.seconds(),
|
|
nanos: 0,
|
|
}),
|
|
committed_at: committer_sig.as_ref().map(|s| prost_types::Timestamp {
|
|
seconds: s.seconds(),
|
|
nanos: 0,
|
|
}),
|
|
raw: if request.include_raw {
|
|
commit.data.clone()
|
|
} else {
|
|
Vec::new()
|
|
},
|
|
})
|
|
}
|
|
}
|
|
|
|
pub(crate) fn gix_sig_to_pb(sig: &gix::actor::SignatureRef<'_>) -> crate::pb::Signature {
|
|
let time = sig.time().ok();
|
|
crate::pb::Signature {
|
|
identity: Some(crate::pb::Identity {
|
|
name: sig.name.to_string(),
|
|
email: sig.email.to_string(),
|
|
}),
|
|
when: Some(prost_types::Timestamp {
|
|
seconds: sig.seconds(),
|
|
nanos: 0,
|
|
}),
|
|
timezone_offset: time.map(|t| t.offset / 60).unwrap_or(0),
|
|
}
|
|
}
|