Implement correct handling of data URLs (#81)

* Implement correct handling of data URLs * Small fixes * Small fixes
v3xlabs · Feb 23, 2024 · 4ff8b7f · 4ff8b7f
1 parent bc1df65
commit 4ff8b7f
Show file tree

Hide file tree

Showing 16 changed files with 364 additions and 184 deletions.
diff --git a/server/Cargo.lock b/server/Cargo.lock
diff --git a/server/src/routes/header.rs b/server/src/routes/header.rs
@@ -1,12 +1,14 @@
 use std::sync::Arc;
 
 use axum::extract::{Path, Query, State};
-use axum::response::Redirect;
+use axum::http::header::CONTENT_TYPE;
+use axum::http::StatusCode;
+use axum::response::{AppendHeaders, IntoResponse, Redirect};
 use enstate_shared::core::error::ProfileError;
 use enstate_shared::core::lookup_data::LookupInfo;
 use enstate_shared::models::lookup::ENSLookup;
 
-use crate::routes::{profile_http_error_mapper, FreshQuery, RouteError};
+use crate::routes::{FreshQuery, http_simple_status_error, profile_http_error_mapper, RouteError};
 
 // #[utoipa::path(
 //     get,
@@ -25,7 +27,7 @@ pub async fn get(
     Path(name_or_address): Path<String>,
     Query(query): Query<FreshQuery>,
     State(state): State<Arc<crate::AppState>>,
-) -> Result<Redirect, RouteError> {
+) -> Result<impl IntoResponse, RouteError> {
     let info = LookupInfo::guess(name_or_address)
         .map_err(|_| profile_http_error_mapper(ProfileError::NotFound))?;
 
@@ -35,5 +37,17 @@ pub async fn get(
         .await
         .map_err(profile_http_error_mapper)?;
 
-    Ok(Redirect::to(header.as_str()))
+    if let Some(processed) = enstate_shared::utils::data_url::process_data_url_image(&header) {
+        let Ok(processed) = processed else {
+            return Err(http_simple_status_error(StatusCode::UNSUPPORTED_MEDIA_TYPE).into());
+        };
+
+        return Ok((
+            AppendHeaders([(CONTENT_TYPE, processed.mimetype)]),
+            processed.data,
+        )
+            .into_response());
+    }
+
+    Ok(Redirect::to(header.as_str()).into_response())
 }
diff --git a/server/src/routes/image.rs b/server/src/routes/image.rs
@@ -1,12 +1,14 @@
 use std::sync::Arc;
 
 use axum::extract::{Path, Query, State};
-use axum::response::Redirect;
+use axum::http::header::CONTENT_TYPE;
+use axum::http::StatusCode;
+use axum::response::{AppendHeaders, IntoResponse, Redirect};
 use enstate_shared::core::error::ProfileError;
 use enstate_shared::core::lookup_data::LookupInfo;
 use enstate_shared::models::lookup::ENSLookup;
 
-use crate::routes::{profile_http_error_mapper, FreshQuery, RouteError};
+use crate::routes::{FreshQuery, http_simple_status_error, profile_http_error_mapper, RouteError};
 
 // #[utoipa::path(
 //     get,
@@ -25,15 +27,27 @@ pub async fn get(
     Path(name_or_address): Path<String>,
     Query(query): Query<FreshQuery>,
     State(state): State<Arc<crate::AppState>>,
-) -> Result<Redirect, RouteError> {
+) -> Result<impl IntoResponse, RouteError> {
     let info = LookupInfo::guess(name_or_address)
         .map_err(|_| profile_http_error_mapper(ProfileError::NotFound))?;
 
     let avatar = state
         .service
-        .resolve_record_simple(info, ENSLookup::Image("avatar".to_string()), query.fresh)
+        .resolve_record_simple(info, ENSLookup::StaticImage("avatar"), query.fresh)
         .await
         .map_err(profile_http_error_mapper)?;
 
-    Ok(Redirect::to(avatar.as_str()))
+    if let Some(processed) = enstate_shared::utils::data_url::process_data_url_image(&avatar) {
+        let Ok(processed) = processed else {
+            return Err(http_simple_status_error(StatusCode::UNSUPPORTED_MEDIA_TYPE).into());
+        };
+
+        return Ok((
+            AppendHeaders([(CONTENT_TYPE, processed.mimetype)]),
+            processed.data,
+        )
+            .into_response());
+    }
+
+    Ok(Redirect::to(avatar.as_str()).into_response())
 }
diff --git a/shared/Cargo.lock b/shared/Cargo.lock
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -36,6 +36,8 @@ reqwest = "0.11.22"
 ethers-ccip-read = { git = "https://github.com/ensdomains/ethers-ccip-read" }
 build-info = "0.0.34"
 itertools = "0.12.0"
+url = "2.5.0"
+data-url = "0.3.1"
 
 # needed to enable the "js" feature for compatibility with wasm,
 # see https://docs.rs/getrandom/#webassembly-support

diff --git a/shared/src/models/eip155/mod.rs b/shared/src/models/eip155/mod.rs
@@ -2,16 +2,16 @@ use ethers::middleware::Middleware;
 use ethers::providers::ProviderError;
 use ethers_core::{
     abi::{ParamType, Token},
-    types::{transaction::eip2718::TypedTransaction, Bytes, H160, U256},
+    types::{Bytes, H160, transaction::eip2718::TypedTransaction, U256},
 };
 use thiserror::Error;
 use tracing::info;
 
-use crate::models::ipfs::{URLFetchError, OPENSEA_BASE_PREFIX};
+use crate::models::eip155::url::{OPENSEA_BASE_PREFIX, URLFetchError, URLParseError, URLUnparsed};
 use crate::models::lookup::LookupState;
 use crate::models::multicoin::cointype::evm::ChainId;
 
-use super::ipfs::IPFSURLUnparsed;
+mod url;
 
 #[derive(Error, Debug)]
 pub enum EIP155Error {
@@ -24,6 +24,9 @@ pub enum EIP155Error {
     #[error("Metadata fetch error: {0}")]
     MetadataFetchError(#[from] URLFetchError),
 
+    #[error("Not a valid URL: {0}")]
+    InvalidURL(#[from] URLParseError),
+
     #[error("Implementation error: {0}")]
     ImplementationError(String),
 
@@ -112,15 +115,15 @@ pub async fn resolve_eip155(
     info!("Token Metadata URL: {}", token_metadata_url);
 
     // TODO: Validate URL here
-    let token_metadata_url = IPFSURLUnparsed::from_unparsed(token_metadata_url);
+    let token_metadata_url = URLUnparsed::from_unparsed(&token_metadata_url)?;
 
     let token_metadata = token_metadata_url.fetch(state).await?;
 
     let image = token_metadata.image.ok_or(EIP155Error::Other)?;
 
     info!("Image: {}", image);
 
-    let token_image_url = IPFSURLUnparsed::from_unparsed(image).to_url_or_gateway(state);
+    let token_image_url = URLUnparsed::from_unparsed(&image)?.to_url_or_ipfs_gateway(state);
 
     Ok(token_image_url)
 }