gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-09-05 11:06:23 -07:00
Code Releases Activity

Make upload extensions registerable by plugins

Browse source
This commit is contained in:
Eggbertx 2023-07-13 09:01:28 -07:00
parent 8eb3d2ef22
commit cfbe7a8ffb
5 changed files with 52 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

92
pkg/posting/uploads/attach.go
View file

@ -21,8 +21,31 @@ import (
"github.com/gochan-org/gochan/pkg/gcutil"
"github.com/gochan-org/gochan/pkg/server"
"github.com/gochan-org/gochan/pkg/server/serverutil"
"github.com/rs/zerolog"
)
var (
uploadHandlers map[string]UploadHandler
)
type UploadHandler func(upload *gcsql.Upload, post *gcsql.Post, board string, filePath string, thumbPath string, catalogThumbPath string, infoEv *zerolog.Event, accessEv *zerolog.Event, errEv *zerolog.Event) error
func RegisterUploadHandler(ext string, handler UploadHandler) {
gcutil.LogInfo().Str("ext", ext).Msg("Registering upload extension handler")
uploadHandlers[ext] = handler
}
func init() {
uploadHandlers = make(map[string]UploadHandler)
RegisterUploadHandler(".gif", processImage)
RegisterUploadHandler(".jpg", processImage)
RegisterUploadHandler(".jpeg", processImage)
RegisterUploadHandler(".png", processImage)
RegisterUploadHandler(".webp", processImage)
RegisterUploadHandler(".mp4", processVideo)
RegisterUploadHandler(".webm", processVideo)
}
// AttachUploadFromRequest reads an incoming HTTP request and processes any incoming files.
// It returns the upload (if there was one) and whether or not any errors were served (meaning
// that it should stop processing the post
@ -86,6 +109,10 @@ func AttachUploadFromRequest(request *http.Request, writer http.ResponseWriter,
ext := strings.ToLower(filepath.Ext(upload.OriginalFilename))
upload.Filename = getNewFilename() + ext
errorMap := map[string]any{
"filename": upload.Filename,
"originalFilename": upload.OriginalFilename,
}
documentRoot := config.GetSystemCriticalConfig().DocumentRoot
filePath := path.Join(documentRoot, postBoard.Dir, "src", upload.Filename)
@ -101,20 +128,14 @@ func AttachUploadFromRequest(request *http.Request, writer http.ResponseWriter,
if err = os.WriteFile(filePath, data, config.GC_FILE_MODE); err != nil {
errEv.Err(err).Caller().Send()
server.ServeError(writer, fmt.Sprintf("Couldn't write file %q", upload.OriginalFilename), wantsJSON, map[string]interface{}{
"filename": upload.Filename,
"originalFilename": upload.OriginalFilename,
})
server.ServeError(writer, fmt.Sprintf("Couldn't write file %q", upload.OriginalFilename), wantsJSON, errorMap)
return nil, true
}
gcutil.LogStr("stripImageMetadata", boardConfig.StripImageMetadata, errEv, infoEv)
if err = stripImageMetadata(filePath, boardConfig); err != nil {
errEv.Err(err).Caller().Msg("Unable to strip metadata")
server.ServeError(writer, "Unable to strip metadata from image", wantsJSON, map[string]interface{}{
"filename": upload.Filename,
"originalFilename": upload.OriginalFilename,
})
server.ServeError(writer, "Unable to strip metadata from image", wantsJSON, errorMap)
return nil, true
}
@ -127,56 +148,31 @@ func AttachUploadFromRequest(request *http.Request, writer http.ResponseWriter,
return nil, true
}
if err != nil {
server.ServeError(writer, err.Error(), wantsJSON, map[string]interface{}{
"filename": upload.Filename,
"originalFilename": upload.OriginalFilename,
})
server.ServeError(writer, err.Error(), wantsJSON, errorMap)
return nil, true
}
infoEv.Str("referer", request.Referer()).Str("filename", handler.Filename).Send()
access := gcutil.LogAccess(request).
accessEv := gcutil.LogAccess(request).
Str("filename", handler.Filename).
Str("referer", request.Referer())
upload.IsSpoilered = request.FormValue("spoiler") == "on"
switch ext {
// images
case ".gif":
fallthrough
case ".jpg":
fallthrough
case ".jpeg":
fallthrough
case ".png":
fallthrough
case ".webp":
if err = processImage(upload, post, postBoard.Dir, filePath, thumbPath, catalogThumbPath, infoEv, errEv); err != nil {
server.ServeError(writer, "Error processing image: "+err.Error(), wantsJSON, map[string]interface{}{
"filename": upload.OriginalFilename,
})
}
access.Str("handler", "image").Send()
// videos
case ".mp4":
fallthrough
case ".webm":
if err = processVideo(upload, post, postBoard.Dir, filePath, thumbPath, catalogThumbPath, infoEv, errEv); err != nil {
server.ServeError(writer, "Error processing video: "+err.Error(), wantsJSON, map[string]interface{}{
"filename": upload.OriginalFilename,
})
}
access.Str("handler", "video").Send()
default:
// other (.pdf, .zip, etc)
if err = processOther(upload, post, postBoard.Dir, filePath, thumbPath, catalogThumbPath, infoEv, errEv); err != nil {
server.ServeError(writer, "Error processing file: "+err.Error(), wantsJSON, map[string]interface{}{
"filename": upload.OriginalFilename,
})
}
access.Str("handler", "other").Send()
uploadHandler, ok := uploadHandlers[ext]
if !ok {
// ext isn't registered by default (jpg, jpeg, png, gif, webp, mp4, webm) or by a plugin,
// it's either unsupported or a static thumb as set in configuration
uploadHandler = processOther
}
if err = uploadHandler(upload, post, postBoard.Dir, filePath, thumbPath, catalogThumbPath, infoEv, accessEv, errEv); err != nil {
server.ServeError(writer, "Error processing upload: "+err.Error(), wantsJSON, map[string]interface{}{
"filename": upload.OriginalFilename,
})
return nil, true
}
accessEv.Send()
return upload, false
}

3
pkg/posting/uploads/processimage.go
View file

@ -46,7 +46,7 @@ func numImageFrames(imgPath string) (int, error) {
return len(g.Image), nil
}
func processImage(upload *gcsql.Upload, post *gcsql.Post, board string, filePath string, thumbPath string, catalogThumbPath string, infoEv *zerolog.Event, errEv *zerolog.Event) error {
func processImage(upload *gcsql.Upload, post *gcsql.Post, board string, filePath string, thumbPath string, catalogThumbPath string, infoEv *zerolog.Event, accessEv *zerolog.Event, errEv *zerolog.Event) error {
img, err := imaging.Open(filePath)
if err != nil {
os.Remove(filePath)
@ -133,5 +133,6 @@ func processImage(upload *gcsql.Upload, post *gcsql.Post, board string, filePath
}
}
}
accessEv.Str("handler", "image")
return nil
}

3
pkg/posting/uploads/processother.go
View file

@ -14,7 +14,7 @@ var (
ErrUnsupportedFileExt = errors.New("unsupported file extension")
)
func processOther(upload *gcsql.Upload, post *gcsql.Post, board string, filePath string, thumbPath string, catalogThumbPath string, infoEv *zerolog.Event, errEv *zerolog.Event) error {
func processOther(upload *gcsql.Upload, post *gcsql.Post, board string, filePath string, thumbPath string, catalogThumbPath string, infoEv *zerolog.Event, accessEv *zerolog.Event, errEv *zerolog.Event) error {
boardConfig := config.GetBoardConfig(board)
ext := path.Ext(filePath)
cfgThumb, ok := boardConfig.AllowOtherExtensions[ext]
@ -62,5 +62,6 @@ func processOther(upload *gcsql.Upload, post *gcsql.Post, board string, filePath
return err
}
}
accessEv.Str("handler", "video")
return nil
}

3
pkg/posting/uploads/processvideo.go
View file

@ -11,7 +11,7 @@ import (
"github.com/rs/zerolog"
)
func processVideo(upload *gcsql.Upload, post *gcsql.Post, board string, filePath string, thumbPath string, catalogThumbPath string, infoEv *zerolog.Event, errEv *zerolog.Event) error {
func processVideo(upload *gcsql.Upload, post *gcsql.Post, board string, filePath string, thumbPath string, catalogThumbPath string, infoEv *zerolog.Event, accessEv *zerolog.Event, errEv *zerolog.Event) error {
boardConfig := config.GetBoardConfig(board)
infoEv.Str("post", "withVideo")
var err error
@ -69,5 +69,6 @@ func processVideo(upload *gcsql.Upload, post *gcsql.Post, board string, filePath
upload.ThumbnailWidth, upload.ThumbnailHeight = getThumbnailSize(
upload.Width, upload.Height, board, thumbType)
}
accessEv.Str("handler", "video")
return nil
}

2
pkg/posting/uploads/thumbnails.go
View file

@ -8,6 +8,8 @@ import (
"strconv"
"strings"
_ "golang.org/x/image/webp"
"github.com/disintegration/imaging"
"github.com/gochan-org/gochan/pkg/config"
"github.com/gochan-org/gochan/pkg/gcutil"