feat(server): add repository prefix path configuration and service struct

- Add REPO_PREFIX_PATH environment variable support in Dockerfile and main.rs
- Introduce GitksService struct with repo_prefix field to manage repository paths
- Implement resolve and resolve_for_init methods for repository path handling
- Add path traversal protection and validation for repository operations
- Update all service implementations to use self.resolve instead of global resolve
- Modify serve function to accept repo_prefix parameter and pass to GitksService
- Remove global resolve functions and integrate them into GitksService struct
- Add proper initialization of repo directory from environment variable
This commit is contained in:
zhenyi
2026-06-04 14:18:12 +08:00
parent 4a87ea475d
commit 729604f13b
13 changed files with 166 additions and 115 deletions
+15 -15
View File
@@ -1,6 +1,6 @@
use crate::pb::*;
use super::{GitksService, git_cmd, into_status, repository_maint, resolve, resolve_for_init};
use super::{GitksService, git_cmd, into_status, repository_maint};
fn default_branch_name(gb: &crate::bare::GitBare) -> String {
git_cmd(gb, &["symbolic-ref", "HEAD"])
@@ -21,7 +21,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<GetRepositoryRequest>,
) -> Result<tonic::Response<Repository>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let bare = gb.bare_dir.join("HEAD").exists();
let object_format = gb.object_format();
Ok(tonic::Response::new(Repository {
@@ -38,7 +38,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<InitRepositoryRequest>,
) -> Result<tonic::Response<Repository>, tonic::Status> {
let inner = request.into_inner();
let bare_dir = resolve_for_init(inner.repository.as_ref())?;
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
let gb = crate::bare::GitBare { bare_dir };
gb.init_repository(inner.bare).map_err(into_status)?;
Ok(tonic::Response::new(Repository {
@@ -53,7 +53,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<DeleteRepositoryRequest>,
) -> Result<tonic::Response<()>, tonic::Status> {
let inner = request.into_inner();
let bare_dir = resolve_for_init(inner.repository.as_ref())?;
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
std::fs::remove_dir_all(&bare_dir).map_err(|e| tonic::Status::internal(e.to_string()))?;
Ok(tonic::Response::new(()))
}
@@ -63,7 +63,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<RepositoryExistsRequest>,
) -> Result<tonic::Response<RepositoryExistsResponse>, tonic::Status> {
let inner = request.into_inner();
let bare_dir = resolve_for_init(inner.repository.as_ref())?;
let bare_dir = self.resolve_for_init(inner.repository.as_ref())?;
let exists = bare_dir.exists() && bare_dir.is_dir() && bare_dir.join("HEAD").exists();
Ok(tonic::Response::new(RepositoryExistsResponse { exists }))
}
@@ -73,7 +73,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<RepositoryObjectFormatRequest>,
) -> Result<tonic::Response<RepositoryObjectFormatResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
Ok(tonic::Response::new(RepositoryObjectFormatResponse {
object_format: gb.object_format() as i32,
}))
@@ -84,7 +84,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<GetDefaultBranchRequest>,
) -> Result<tonic::Response<GetDefaultBranchResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
Ok(tonic::Response::new(GetDefaultBranchResponse {
name: default_branch_name(&gb),
}))
@@ -95,7 +95,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<SetDefaultBranchRequest>,
) -> Result<tonic::Response<()>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let refname = format!("refs/heads/{}", inner.name);
let out = git_cmd(&gb, &["symbolic-ref", "HEAD", &refname])?;
if !out.status.success() {
@@ -111,7 +111,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<GetRepositoryConfigRequest>,
) -> Result<tonic::Response<GetRepositoryConfigResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let mut entries = Vec::new();
if inner.keys.is_empty() {
let out = git_cmd(&gb, &["config", "--list"])?;
@@ -156,7 +156,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<SetRepositoryConfigRequest>,
) -> Result<tonic::Response<()>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
for entry in &inner.entries {
if entry.values.is_empty() {
git_cmd(&gb, &["config", "--unset-all", &entry.key])?;
@@ -178,7 +178,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<RepositoryStatisticsRequest>,
) -> Result<tonic::Response<RepositoryStatistics>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
Ok(tonic::Response::new(repository_maint::get_statistics(&gb)))
}
@@ -187,7 +187,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<RepositoryHealthRequest>,
) -> Result<tonic::Response<RepositoryHealthResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
Ok(tonic::Response::new(repository_maint::check_health(
&gb,
inner.connectivity_only,
@@ -199,7 +199,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<GarbageCollectRequest>,
) -> Result<tonic::Response<RepositoryMaintenanceResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
Ok(tonic::Response::new(repository_maint::run_gc(
&gb,
inner.prune,
@@ -212,7 +212,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<RepackRequest>,
) -> Result<tonic::Response<RepositoryMaintenanceResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
Ok(tonic::Response::new(repository_maint::run_repack(
&gb,
inner.full,
@@ -226,7 +226,7 @@ impl repository_service_server::RepositoryService for GitksService {
request: tonic::Request<WriteCommitGraphRequest>,
) -> Result<tonic::Response<RepositoryMaintenanceResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
Ok(tonic::Response::new(
repository_maint::run_commit_graph_write(&gb, inner.split, inner.replace)?,
))