Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
context: .
platforms: linux/amd64
push: ${{ github.event_name != 'pull_request' }}
tags: ghcr.io/fg-devs/attachment-service:latest
tags: ghcr.io/survivalquestmc/attachment-service:latest
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ tower-http = { version = "0.2.5", features = ["fs", "trace"] }
tracing = "0.1.34"
tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
uuid = { version = "0.8.2", features = ["v4"] }
url = "2.2.2"

[build-dependencies]
tonic-build = "0.7.0"
10 changes: 9 additions & 1 deletion src/grpc/attachments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::env;
use tonic::{Request, Response, Status};
use tracing::*;
use uuid::Uuid;
use url::Url;

use crate::Files;
pub use attachments_proto::attachments_server::AttachmentsServer;
Expand All @@ -24,7 +25,14 @@ impl Attachments for ImplementedAttachmentsServer {
info!("received create attachment request");

trace!("parsing url");
let file_url = request.into_inner().url;
let mut file_url = request.into_inner().url;

// Parse the URL and strip off the query parameters
if let Ok(mut parsed_url) = Url::parse(&file_url) {
parsed_url.set_query(None);
file_url = parsed_url.to_string();
}

debug!("finished parsing url: {}", file_url);

let ext = Files::get_extension(&file_url)?;
Expand Down