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
202 lines
7.9 KiB
Rust
202 lines
7.9 KiB
Rust
use crate::pb::tree_service_client::TreeServiceClient;
|
|
use crate::pb::*;
|
|
|
|
use super::{GitksService, cache, into_status, into_stream};
|
|
|
|
remote_client!(remote_tree_client, TreeServiceClient<tonic::transport::Channel>, "tree");
|
|
|
|
#[tonic::async_trait]
|
|
impl tree_service_server::TreeService for GitksService {
|
|
type GetRawBlobStream =
|
|
tokio_stream::wrappers::ReceiverStream<Result<GetRawBlobResponse, tonic::Status>>;
|
|
|
|
async fn list_tree(
|
|
&self,
|
|
request: tonic::Request<ListTreeRequest>,
|
|
) -> Result<tonic::Response<ListTreeResponse>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let span = tracing::info_span!("tree.list_tree", %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_tree_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
return client.list_tree(inner).await;
|
|
}
|
|
return Err(err);
|
|
}
|
|
Err(err) => return Err(err),
|
|
};
|
|
let resp = if cache::selector_is_oid(&inner.revision) {
|
|
cache::cached_response("tree.list_tree", &inner, || {
|
|
gb.list_tree(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else {
|
|
gb.list_tree(inner).map_err(into_status)?
|
|
};
|
|
tracing::info!(%repo, count = resp.entries.len(), "list_tree done");
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn get_tree(
|
|
&self,
|
|
request: tonic::Request<GetTreeRequest>,
|
|
) -> Result<tonic::Response<Tree>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let span = tracing::info_span!("tree.get_tree", %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_tree_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
return client.get_tree(inner).await;
|
|
}
|
|
return Err(err);
|
|
}
|
|
Err(err) => return Err(err),
|
|
};
|
|
let resp = if cache::selector_is_oid(&inner.revision) {
|
|
cache::cached_response("tree.get_tree", &inner, || {
|
|
gb.get_tree(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else {
|
|
gb.get_tree(inner).map_err(into_status)?
|
|
};
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn get_blob(
|
|
&self,
|
|
request: tonic::Request<GetBlobRequest>,
|
|
) -> Result<tonic::Response<Blob>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let path = inner.path.clone();
|
|
let span = tracing::info_span!("tree.get_blob", %repo, %path);
|
|
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_tree_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
return client.get_blob(inner).await;
|
|
}
|
|
return Err(err);
|
|
}
|
|
Err(err) => return Err(err),
|
|
};
|
|
let resp = if cache::selector_is_oid(&inner.revision) {
|
|
cache::cached_response("tree.get_blob", &inner, || {
|
|
gb.get_blob(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else {
|
|
gb.get_blob(inner).map_err(into_status)?
|
|
};
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn get_raw_blob(
|
|
&self,
|
|
request: tonic::Request<GetRawBlobRequest>,
|
|
) -> Result<tonic::Response<Self::GetRawBlobStream>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let span = tracing::info_span!("tree.get_raw_blob", %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_tree_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
let resp = client.get_raw_blob(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 items = if inner.oid.is_some() {
|
|
cache::cached_vec_response("tree.get_raw_blob", &inner, || {
|
|
gb.get_raw_blob(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else if cache::selector_is_oid(&inner.revision) {
|
|
cache::cached_vec_response("tree.get_raw_blob", &inner, || {
|
|
gb.get_raw_blob(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else {
|
|
gb.get_raw_blob(inner).map_err(into_status)?
|
|
};
|
|
Ok(tonic::Response::new(into_stream(items)))
|
|
}
|
|
|
|
async fn get_file_metadata(
|
|
&self,
|
|
request: tonic::Request<GetFileMetadataRequest>,
|
|
) -> Result<tonic::Response<FileMetadata>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let span = tracing::info_span!("tree.get_file_metadata", %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_tree_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
return client.get_file_metadata(inner).await;
|
|
}
|
|
return Err(err);
|
|
}
|
|
Err(err) => return Err(err),
|
|
};
|
|
let resp = if cache::selector_is_oid(&inner.revision) {
|
|
cache::cached_response("tree.get_file_metadata", &inner, || {
|
|
gb.get_file_metadata(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else {
|
|
gb.get_file_metadata(inner).map_err(into_status)?
|
|
};
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
|
|
async fn find_files(
|
|
&self,
|
|
request: tonic::Request<FindFilesRequest>,
|
|
) -> Result<tonic::Response<FindFilesResponse>, tonic::Status> {
|
|
let inner = request.into_inner();
|
|
let repo = self.repo_label(inner.repository.as_ref());
|
|
let span = tracing::info_span!("tree.find_files", %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_tree_client(self, inner.repository.as_ref(), false).await?
|
|
{
|
|
return client.find_files(inner).await;
|
|
}
|
|
return Err(err);
|
|
}
|
|
Err(err) => return Err(err),
|
|
};
|
|
let resp = if cache::selector_is_oid(&inner.revision) {
|
|
cache::cached_response("tree.find_files", &inner, || {
|
|
gb.find_files(inner.clone()).map_err(into_status)
|
|
})?
|
|
} else {
|
|
gb.find_files(inner).map_err(into_status)?
|
|
};
|
|
tracing::info!(%repo, count = resp.files.len(), "find_files done");
|
|
Ok(tonic::Response::new(resp))
|
|
}
|
|
}
|