TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-01-13 01:33:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve error handling of asset api (#2177)

Browse Source
This commit is contained in:
Livio Amstutz 2021-08-11 10:49:08 +02:00 committed by GitHub
parent c066478231
commit cf8515598c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
internal/api/assets/asset.go
View File

@ -2,6 +2,7 @@ package assets
import ( import (
"context" "context"
"fmt"
"io/ioutil" "io/ioutil"
"net/http" "net/http"
"strconv" "strconv"
@ -15,7 +16,6 @@ import (
http_mw "github.com/caos/zitadel/internal/api/http/middleware" http_mw "github.com/caos/zitadel/internal/api/http/middleware"
"github.com/caos/zitadel/internal/command" "github.com/caos/zitadel/internal/command"
"github.com/caos/zitadel/internal/domain" "github.com/caos/zitadel/internal/domain"
caos_errs "github.com/caos/zitadel/internal/errors"
"github.com/caos/zitadel/internal/id" "github.com/caos/zitadel/internal/id"
"github.com/caos/zitadel/internal/management/repository" "github.com/caos/zitadel/internal/management/repository"
"github.com/caos/zitadel/internal/static" "github.com/caos/zitadel/internal/static"
@ -59,11 +59,11 @@ type Downloader interface {
BucketName(ctx context.Context, id string) string BucketName(ctx context.Context, id string) string
} }
type ErrorHandler func(http.ResponseWriter, *http.Request, error) type ErrorHandler func(http.ResponseWriter, *http.Request, error, int)
func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error) { func DefaultErrorHandler(w http.ResponseWriter, r *http.Request, err error, code int) {
logging.Log("ASSET-g5ef1").WithError(err).WithField("uri", r.RequestURI).Error("error occurred on asset api") logging.Log("ASSET-g5ef1").WithError(err).WithField("uri", r.RequestURI).Error("error occurred on asset api")
http.Error(w, err.Error(), http.StatusInternalServerError) http.Error(w, err.Error(), code)
} }
func NewHandler( func NewHandler(
@ -115,7 +115,7 @@ func UploadHandleFunc(s AssetsService, uploader Uploader) func(http.ResponseWrit
err := r.ParseMultipartForm(maxMemory) err := r.ParseMultipartForm(maxMemory)
file, handler, err := r.FormFile(paramFile) file, handler, err := r.FormFile(paramFile)
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) http.Error(w, err.Error(), http.StatusBadRequest)
return return
} }
defer func() { defer func() {
@ -125,28 +125,28 @@ func UploadHandleFunc(s AssetsService, uploader Uploader) func(http.ResponseWrit
contentType := handler.Header.Get("content-type") contentType := handler.Header.Get("content-type")
size := handler.Size size := handler.Size
if !uploader.ContentTypeAllowed(contentType) { if !uploader.ContentTypeAllowed(contentType) {
s.ErrorHandler()(w, r, caos_errs.ThrowInvalidArgumentf(nil, "UPLOAD-Dbvfs", "invalid content-type: %s", contentType)) s.ErrorHandler()(w, r, fmt.Errorf("invalid content-type: %s", contentType), http.StatusBadRequest)
return return
} }
if size > uploader.MaxFileSize() { if size > uploader.MaxFileSize() {
s.ErrorHandler()(w, r, caos_errs.ThrowInvalidArgumentf(nil, "UPLOAD-Bfb32", "file to big, max file size is %v", uploader.MaxFileSize())) s.ErrorHandler()(w, r, fmt.Errorf("file to big, max file size is %vKB", uploader.MaxFileSize()/1024), http.StatusBadRequest)
return return
} }
bucketName := uploader.BucketName(ctxData) bucketName := uploader.BucketName(ctxData)
objectName, err := uploader.ObjectName(ctxData) objectName, err := uploader.ObjectName(ctxData)
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) s.ErrorHandler()(w, r, fmt.Errorf("upload failed: %v", err), http.StatusInternalServerError)
return return
} }
info, err := s.Commands().UploadAsset(ctx, bucketName, objectName, contentType, file, size) info, err := s.Commands().UploadAsset(ctx, bucketName, objectName, contentType, file, size)
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) s.ErrorHandler()(w, r, fmt.Errorf("upload failed: %v", err), http.StatusInternalServerError)
return return
} }
err = uploader.Callback(ctx, info, ctxData.OrgID, s.Commands()) err = uploader.Callback(ctx, info, ctxData.OrgID, s.Commands())
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) s.ErrorHandler()(w, r, fmt.Errorf("upload failed: %v", err), http.StatusInternalServerError)
return return
} }
} }
@ -166,26 +166,26 @@ func DownloadHandleFunc(s AssetsService, downloader Downloader) func(http.Respon
} }
objectName, err := downloader.ObjectName(ctx, path) objectName, err := downloader.ObjectName(ctx, path)
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) s.ErrorHandler()(w, r, fmt.Errorf("download failed: %v", err), http.StatusInternalServerError)
return return
} }
if objectName == "" { if objectName == "" {
s.ErrorHandler()(w, r, caos_errs.ThrowNotFound(nil, "UPLOAD-adf4f", "file not found")) s.ErrorHandler()(w, r, fmt.Errorf("file not found: %v", objectName), http.StatusNotFound)
return return
} }
reader, getInfo, err := s.Storage().GetObject(ctx, bucketName, objectName) reader, getInfo, err := s.Storage().GetObject(ctx, bucketName, objectName)
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) s.ErrorHandler()(w, r, fmt.Errorf("download failed: %v", err), http.StatusInternalServerError)
return return
} }
data, err := ioutil.ReadAll(reader) data, err := ioutil.ReadAll(reader)
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) s.ErrorHandler()(w, r, fmt.Errorf("download failed: %v", err), http.StatusInternalServerError)
return return
} }
info, err := getInfo() info, err := getInfo()
if err != nil { if err != nil {
s.ErrorHandler()(w, r, err) s.ErrorHandler()(w, r, fmt.Errorf("download failed: %v", err), http.StatusInternalServerError)
return return
} }
w.Header().Set("content-length", strconv.FormatInt(info.Size, 10)) w.Header().Set("content-length", strconv.FormatInt(info.Size, 10))