Fixed upload failing or showing incorrect filename for non-ASCII filenames #269, added option to base64 encode filename in API, fixed API documentation

Author: Forceu

build/go-generate/minifyStaticContent.go

@@ -137,6 +137,6 @@ func fileExists(filename string) bool {
 // Auto-generated content below, do not modify
 // Version codes can be changed in updateVersionNumbers.go
 
-const jsAdminVersion = 10
+const jsAdminVersion = 11
 const jsE2EVersion = 6
 const cssMainVersion = 5

build/go-generate/updateVersionNumbers.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 )
 
-const versionJsAdmin = 10
+const versionJsAdmin = 11
 const versionJsDropzone = 5
 const versionJsE2EAdmin = 6
 const versionCssMain = 5

cmd/gokapi/Main.go

@@ -34,7 +34,7 @@ import (
 
 // versionGokapi is the current version in readable form.
 // Other version numbers can be modified in /build/go-generate/updateVersionNumbers.go
-const versionGokapi = "2.0.0"
+const versionGokapi = "2.0.1"
 
 // The following calls update the version numbers, update documentation, minify Js/CSS and build the WASM modules
 //go:generate go run "../../build/go-generate/updateVersionNumbers.go"

internal/webserver/api/routing.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"encoding/base64"
 	"errors"
 	"github.com/forceu/gokapi/internal/models"
 	"github.com/forceu/gokapi/internal/storage"
@@ -18,6 +19,8 @@ type apiRoute struct {
 	execution     apiFunc
 }
 
+const base64Prefix = "base64:"
+
 func (r apiRoute) Continue(w http.ResponseWriter, request requestParser, user models.User) {
 	r.execution(w, request, user)
 }
@@ -469,6 +472,15 @@ func (p *paramChunkComplete) ProcessParameter(_ *http.Request) error {
 	if p.foundHeaders["expiryDays"] && p.ExpiryDays == 0 {
 		p.UnlimitedTime = true
 	}
+
+	if strings.HasPrefix(p.FileName, base64Prefix) {
+		decoded, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(p.FileName, base64Prefix))
+		if err != nil {
+			return err
+		}
+		p.FileName = string(decoded)
+	}
+
 	p.FileHeader = chunking.FileHeader{
 		Filename:    p.FileName,
 		ContentType: p.ContentType,

internal/webserver/web/static/apidocumentation/openapi.json

@@ -175,16 +175,71 @@
             "apikey": ["UPLOAD"]
           },
         ],
-        "requestBody": {
-          "content": {
-            "application/x-www-form-urlencoded": {
-              "schema": {
-                "$ref": "#/components/schemas/chunkingcomplete"
-              }
+         "parameters": [
+          {
+            "name": "uuid",
+            "in": "header",
+            "description": "The unique ID that was used for the uploaded chunks",
+            "required": true,
+            "schema": {
+              "type": "string"
             }
           },
-          "required": true
-        },
+          {
+            "name": "filename",
+            "in": "header",
+            "description": "The filename of the uploaded file. If the filename includes non-ANSI characters, you can encode them with base64, by adding 'base64:' at the beginning, e.g. 'base64:ZmlsZW5hbWU='",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "filesize",
+            "in": "header",
+            "description": "The total filesize of the uploaded file in bytes",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "contenttype",
+            "in": "header",
+            "description": "The MIME content type. If empty, application/octet-stream will be used.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "allowedDownloads",
+            "in": "header",
+            "description": "How many downloads are allowed. Default of 1 will be used if empty. Unlimited if 0 is passed.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "expiryDays",
+            "in": "header",
+            "description": "How many days the file will be stored. Default of 14 will be used if empty. Unlimited if 0 is passed.",
+            "required": false,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "password",
+            "in": "header",
+            "description": "Password for this file to be set. No password will be used if empty.",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "Operation successful",

internal/webserver/web/static/assets/dist/js/base64.min.js

@@ -114,14 +114,14 @@ async function apiAuthCreate() {
 
 async function apiChunkComplete(uuid, filename, filesize, realsize, contenttype, allowedDownloads, expiryDays, password, isE2E, nonblocking) {
     const apiUrl = './api/chunk/complete';
-
+    
     const requestOptions = {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
             'apikey': systemKey,
             'uuid': uuid,
-            'filename': filename,
+            'filename': 'base64:'+Base64.encode(filename),
             'filesize': filesize,
             'realsize': realsize,
             'contenttype': contenttype,

internal/webserver/web/static/js/admin_api.js

@@ -25,6 +25,7 @@
 	<link  href="./assets/dist/css/datatables.min.css" rel="stylesheet">
 	<link  href="./assets/dist/css/flatpickr.min.css" rel="stylesheet">
 	<link  href="./assets/dist/css/flatpickr.dark.min.css" rel="stylesheet">
+	<script src="./assets/dist/js/base64.min.js"></script>
 	<style>
 		.masthead-brand {
 			float: left;

…server/web/static/js/min/admin.min.10.js …server/web/static/js/min/admin.min.11.jsinternal/webserver/web/static/js/min/admin.min.10.js renamed to internal/webserver/web/static/js/min/admin.min.11.js internal/webserver/web/static/js/min/admin.min.10.js renamed to internal/webserver/web/static/js/min/admin.min.11.js

@@ -1,9 +1,9 @@
 // File contains auto-generated values. Do not change manually
-{{define "version"}}2.0.0{{end}}
+{{define "version"}}2.0.1{{end}}
 
 // Specifies the version of JS files, so that the browser doesn't
 // use a cached version, if the file has been updated
-{{define "js_admin_version"}}10{{end}}
+{{define "js_admin_version"}}11{{end}}
 {{define "js_dropzone_version"}}5{{end}}
 {{define "js_e2eversion"}}6{{end}}
 {{define "css_main"}}5{{end}}