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
71 lines
2.9 KiB
Rust
71 lines
2.9 KiB
Rust
use crate::pb::archive_service_client::ArchiveServiceClient;
|
|
use crate::pb::*;
|
|
|
|
use super::{GitksService, cache, into_status};
|
|
|
|
remote_client!(remote_archive_client, ArchiveServiceClient<tonic::transport::Channel>, "archive");
|
|
|
|
#[tonic::async_trait]
|
|
impl archive_service_server::ArchiveService for GitksService {
|
|
type GetArchiveStream =
|
|
tokio_stream::wrappers::ReceiverStream<Result<ArchiveChunk, tonic::Status>>;
|
|
|
|
async fn get_archive(
|
|
&self,
|
|
request: tonic::Request<ArchiveRequest>,
|
|
) -> Result<tonic::Response<Self::GetArchiveStream>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let span = tracing::info_span!("archive.get_archive", %repo);
|
|
let _enter = span.enter();
|
|
let gb = match self.resolve(inner.repository.as_ref()) {
|
|
Ok(gb) => gb,
|
|
Err(err) if err.code() == tonic::Code::NotFound => {
|
|
if let Some(mut client) =
|
|
remote_archive_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
let resp = client.get_archive(inner).await?;
|
|
let stream = super::bridge_server_stream(resp.into_inner());
|
|
return Ok(tonic::Response::new(stream));
|
|
}
|
|
return Err(err);
|
|
}
|
|
Err(err) => return Err(err),
|
|
};
|
|
let stream = gb.get_archive_stream(inner)?;
|
|
tracing::info!(%repo, "archive streaming started");
|
|
Ok(tonic::Response::new(stream))
|
|
}
|
|
|
|
async fn list_archive_entries(
|
|
&self,
|
|
request: tonic::Request<ListArchiveEntriesRequest>,
|
|
) -> Result<tonic::Response<ListArchiveEntriesResponse>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let span = tracing::info_span!("archive.list_archive_entries", %repo);
|
|
let _enter = span.enter();
|
|
let gb = match self.resolve(inner.repository.as_ref()) {
|
|
Ok(gb) => gb,
|
|
Err(err) if err.code() == tonic::Code::NotFound => {
|
|
if let Some(mut client) =
|
|
remote_archive_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
return client.list_archive_entries(inner).await;
|
|
}
|
|
return Err(err);
|
|
}
|
|
Err(err) => return Err(err),
|
|
};
|
|
let resp = if cache::selector_is_oid(&inner.treeish) {
|
|
cache::cached_response("archive.list_archive_entries", &inner, || {
|
|
gb.list_archive_entries(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else {
|
|
gb.list_archive_entries(inner).map_err(into_status)?
|
|
};
|
|
tracing::info!(%repo, count = resp.entries.len(), "list_archive_entries done");
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
}
|