gitdata.ai/gitks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
server/merge.rs
+6 -6
View File
@@ -1,6 +1,6 @@
use crate::pb::*;
use super::{GitksService, into_status, resolve};
use super::{GitksService, into_status};
#[tonic::async_trait]
impl merge_service_server::MergeService for GitksService {
@@ -9,7 +9,7 @@ impl merge_service_server::MergeService for GitksService {
request: tonic::Request<CheckMergeRequest>,
) -> Result<tonic::Response<MergeResult>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let resp = gb.check_merge(inner).map_err(into_status)?;
Ok(tonic::Response::new(resp))
}
@@ -19,7 +19,7 @@ impl merge_service_server::MergeService for GitksService {
request: tonic::Request<MergeRequest>,
) -> Result<tonic::Response<MergeResult>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let resp = gb.merge(inner).map_err(into_status)?;
Ok(tonic::Response::new(resp))
}
@@ -29,7 +29,7 @@ impl merge_service_server::MergeService for GitksService {
request: tonic::Request<ListMergeConflictsRequest>,
) -> Result<tonic::Response<ListMergeConflictsResponse>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let resp = gb.list_merge_conflicts(inner).map_err(into_status)?;
Ok(tonic::Response::new(resp))
}
@@ -39,7 +39,7 @@ impl merge_service_server::MergeService for GitksService {
request: tonic::Request<ResolveMergeConflictsRequest>,
) -> Result<tonic::Response<MergeResult>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let resp = gb.resolve_merge_conflicts(inner).map_err(into_status)?;
Ok(tonic::Response::new(resp))
}
@@ -49,7 +49,7 @@ impl merge_service_server::MergeService for GitksService {
request: tonic::Request<RebaseRequest>,
) -> Result<tonic::Response<RebaseResult>, tonic::Status> {
let inner = request.into_inner();
let gb = resolve(inner.repository.as_ref())?;
let gb = self.resolve(inner.repository.as_ref())?;
let resp = gb.rebase(inner).map_err(into_status)?;
Ok(tonic::Response::new(resp))
}