zhenyi
729604f13b
- 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
57 lines
2.0 KiB
Rust
57 lines
2.0 KiB
Rust
use crate::pb::*;
|
|
|
|
use super::{GitksService, into_status};
|
|
|
|
#[tonic::async_trait]
|
|
impl merge_service_server::MergeService for GitksService {
|
|
async fn check_merge(
|
|
&self,
|
|
request: tonic::Request<CheckMergeRequest>,
|
|
) -> Result<tonic::Response<MergeResult>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let gb = self.resolve(inner.repository.as_ref())?;
|
|
let resp = gb.check_merge(inner).map_err(into_status)?;
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn merge(
|
|
&self,
|
|
request: tonic::Request<MergeRequest>,
|
|
) -> Result<tonic::Response<MergeResult>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let gb = self.resolve(inner.repository.as_ref())?;
|
|
let resp = gb.merge(inner).map_err(into_status)?;
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn list_merge_conflicts(
|
|
&self,
|
|
request: tonic::Request<ListMergeConflictsRequest>,
|
|
) -> Result<tonic::Response<ListMergeConflictsResponse>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let gb = self.resolve(inner.repository.as_ref())?;
|
|
let resp = gb.list_merge_conflicts(inner).map_err(into_status)?;
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn resolve_merge_conflicts(
|
|
&self,
|
|
request: tonic::Request<ResolveMergeConflictsRequest>,
|
|
) -> Result<tonic::Response<MergeResult>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let gb = self.resolve(inner.repository.as_ref())?;
|
|
let resp = gb.resolve_merge_conflicts(inner).map_err(into_status)?;
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn rebase(
|
|
&self,
|
|
request: tonic::Request<RebaseRequest>,
|
|
) -> Result<tonic::Response<RebaseResult>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let gb = self.resolve(inner.repository.as_ref())?;
|
|
let resp = gb.rebase(inner).map_err(into_status)?;
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
}
|