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
41 lines
1.4 KiB
Rust
41 lines
1.4 KiB
Rust
#![allow(clippy::collapsible_if)]
|
|
use std::process::Command;
|
|
|
|
use crate::bare::GitBare;
|
|
use crate::error::{GitError, GitResult};
|
|
use crate::pb::{Branch, GetBranchRequest, UpdateBranchTargetRequest};
|
|
|
|
impl GitBare {
|
|
pub fn update_branch_target(&self, request: UpdateBranchTargetRequest) -> GitResult<Branch> {
|
|
crate::sanitize::validate_ref_name(&request.name)?;
|
|
let new_oid = request
|
|
.new_oid
|
|
.as_ref()
|
|
.ok_or_else(|| GitError::InvalidArgument("new_oid is required".into()))?
|
|
.hex
|
|
.clone();
|
|
let refname = format!("refs/heads/{}", request.name);
|
|
let mut args = vec!["update-ref".to_string(), refname.clone(), new_oid];
|
|
if !request.force
|
|
&& let Some(old) = request.expected_old_oid.as_ref()
|
|
{
|
|
args.push(old.hex.clone());
|
|
}
|
|
let output = Command::new("git")
|
|
.arg("--git-dir")
|
|
.arg(&self.bare_dir)
|
|
.args(&args)
|
|
.output()?;
|
|
if !output.status.success() {
|
|
return Err(GitError::CommandFailed {
|
|
status_code: output.status.code(),
|
|
stderr: String::from_utf8_lossy(&output.stderr).into_owned(),
|
|
});
|
|
}
|
|
self.get_branch(GetBranchRequest {
|
|
repository: request.repository,
|
|
name: refname.trim_start_matches("refs/heads/").to_string(),
|
|
})
|
|
}
|
|
}
|