Fix a bug in sqlpage.read_file_as_data_url

Author: lovasoa

CHANGELOG.md

@@ -11,6 +11,7 @@
  - new handlebars helper for [custom components](https://sql.ophir.dev/custom_components.sql): `{{app_config 'property'}}` to access the configuration object from the handlebars template.
  - Prevent form validation and give a helpful error message when an user tries to submit a form with a file upload field that is above the maximum file size.
    - ![file upload too large](https://github.com/lovasoa/SQLpage/assets/552629/1c684d33-49bd-4e49-9ee0-ed3f0d454ced)
+ - Fix a bug in [`sqlpage.read_file_as_data_url`](https://sql.ophir.dev/functions.sql?function=read_file_as_data_url#function) where it would truncate the mime subtype of the file. This would cause the browser to refuse to display SVG files, for instance.
 
 ## 0.23.0 (2024-06-09)
 

src/webserver/database/sqlpage_functions/functions.rs

@@ -300,7 +300,7 @@ async fn read_file_as_data_url<'a>(
         || Cow::Owned(mime_guess_from_filename(&file_path)),
         Cow::Borrowed,
     );
-    let mut data_url = format!("data:{}/{};base64,", mime.type_(), mime.subtype());
+    let mut data_url = format!("data:{mime};base64,");
     base64::Engine::encode_string(
         &base64::engine::general_purpose::STANDARD,
         bytes,

tests/index.rs

@@ -295,9 +295,9 @@ async fn test_upload_file_data_url() -> actix_web::Result<()> {
         .set_payload(
             "--1234567890\r\n\
             Content-Disposition: form-data; name=\"my_file\"; filename=\"testfile.txt\"\r\n\
-            Content-Type: application/json\r\n\
+            Content-Type: image/svg+xml\r\n\
             \r\n\
-            {\"a\": 1}\r\n\
+            <svg></svg>\r\n\
             --1234567890--\r\n",
         )
         .to_srv_request();
@@ -307,7 +307,7 @@ async fn test_upload_file_data_url() -> actix_web::Result<()> {
     let body_str = String::from_utf8(body.to_vec()).unwrap();
     // The file name suffix was ".txt", but the content type was "application/json"
     // so the file should be treated as a JSON file
-    assert_eq!(body_str, "data:application/json;base64,eyJhIjogMX0=");
+    assert_eq!(body_str, "data:image/svg+xml;base64,PHN2Zz48L3N2Zz4=");
     Ok(())
 }