Fix S3 save thumbnail upload

Author: patapancakes

db/s3.go

@@ -25,10 +25,11 @@ func GetContentFile(id int) (*s3.GetObjectOutput, error) {
 
 func PutThumbnail(id int, data io.Reader) error {
 	_, err := s3client.PutObject(context.TODO(), &s3.PutObjectInput{
-		Bucket: aws.String("flatgrass-toybox-image"),
-		Key:    aws.String(fmt.Sprintf("%d_thumb_128.png", id)),
-		ACL:    types.ObjectCannedACLAuthenticatedRead,
-		Body:   data,
+		Bucket:         aws.String("flatgrass-toybox-image"),
+		Key:            aws.String(fmt.Sprintf("%d_thumb_128.png", id)),
+		ACL:            types.ObjectCannedACLPublicRead,
+		Body:           data,
+		ChecksumSHA256: aws.String("UNSIGNED-PAYLOAD"), // required otherwise OVH S3 rejects
 	})
 	if err != nil {
 		return err

go.mod

@@ -3,15 +3,15 @@ module github.com/flatgrassdotnet/cloudbox
 go 1.24.0
 
 require (
+	github.com/aws/aws-sdk-go-v2 v1.36.3
 	github.com/aws/aws-sdk-go-v2/config v1.29.9
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.78.2
 	github.com/blezek/tga v0.0.0-20150626111426-80720cbc1017
-	github.com/go-sql-driver/mysql v1.8.1
+	github.com/go-sql-driver/mysql v1.9.0
 )
 
 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.62 // indirect
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
@@ -26,6 +26,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
-	github.com/aws/smithy-go v1.22.2 // indirect
+	github.com/aws/smithy-go v1.22.3 // indirect
 	github.com/ftrvxmtrx/tga v0.0.0-20150524081124-bd8e8d5be13a // indirect
 )

go.sum

@@ -36,9 +36,13 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 h1:PZV5W8yk4OtH1JAuhV2PXwwO9v5
 github.com/aws/aws-sdk-go-v2/service/sts v1.33.17/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
+github.com/aws/smithy-go v1.22.3 h1:Z//5NuZCSW6R4PhQ93hShNbyBbn8BWCmCVCt+Q8Io5k=
+github.com/aws/smithy-go v1.22.3/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
 github.com/blezek/tga v0.0.0-20150626111426-80720cbc1017 h1:TWk6m6k3qegbUZsdsHk/ix22ANqPgLau40bPwiNQN40=
 github.com/blezek/tga v0.0.0-20150626111426-80720cbc1017/go.mod h1:WnX8JiQN+UtyUPq/1EIUaB2WVX3wdAmOBH5K52NyOO0=
 github.com/ftrvxmtrx/tga v0.0.0-20150524081124-bd8e8d5be13a h1:eSqaRmdlZ9JsJ7JuWfDr3ym3monToXRczohBOL+heVQ=
 github.com/ftrvxmtrx/tga v0.0.0-20150524081124-bd8e8d5be13a/go.mod h1:US5WvgEHtG+BvWNNs6gk937h0QL2g2x+r7RH8m3g80Y=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-sql-driver/mysql v1.9.0 h1:Y0zIbQXhQKmQgTp44Y1dp3wTXcn804QoTptLZT1vtvo=
+github.com/go-sql-driver/mysql v1.9.0/go.mod h1:pDetrLJeA3oMujJuvXc8RJoasr589B6A9fwzD3QMrqw=

ingame/publishsave/publish.go

@@ -55,12 +55,12 @@ func Publish(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	name := r.URL.Query().Get("name")
+	name := r.PostForm.Get("name")
 	if name == "" {
 		name = "No Name"
 	}
 
-	desc := r.URL.Query().Get("desc")
+	desc := r.PostForm.Get("desc")
 
 	ticket, err := base64.StdEncoding.DecodeString(r.Header.Get("TICKET"))
 	if err != nil {
@@ -101,12 +101,7 @@ func Publish(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	err = db.DeleteUpload(id)
-	if err != nil {
-		utils.WriteError(w, r, fmt.Sprintf("failed to delete upload: %s", err))
-		return
-	}
-
+	// thumbnail
 	thumb, err := db.FetchUpload(sid)
 	if err != nil {
 		utils.WriteError(w, r, fmt.Sprintf("failed to fetch upload: %s", err))
@@ -126,18 +121,26 @@ func Publish(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = db.DeleteUpload(sid)
+	err = db.PutThumbnail(pkgID, buf)
+	if err != nil {
+		utils.WriteError(w, r, fmt.Sprintf("failed to upload thumbnail: %s", err))
+		return
+	}
+
+	// clean up
+	err = db.DeleteUpload(id)
 	if err != nil {
 		utils.WriteError(w, r, fmt.Sprintf("failed to delete upload: %s", err))
 		return
 	}
 
-	err = db.PutThumbnail(id, buf)
+	err = db.DeleteUpload(sid)
 	if err != nil {
-		utils.WriteError(w, r, fmt.Sprintf("failed to upload thumbnail: %s", err))
+		utils.WriteError(w, r, fmt.Sprintf("failed to delete upload: %s", err))
 		return
 	}
 
+	// execute template
 	err = tp.Execute(w, nil)
 	if err != nil {
 		utils.WriteError(w, r, fmt.Sprintf("failed to execute template: %s", err))