DeforaNetworks/corteza
3
0
Fork 0
Code Activity

Validate font file for avatar generation

Browse Source 
and fix the tests that we're broken by the new avatar feature
This commit is contained in:
Mumbi Francis
2023-03-14 18:55:36 +03:00
committed by Mumbi Francis
parent 5b3b584c8f
commit e7c2fdcb11
5 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/auth/handlers/handle_profile.go
View File

@@ -3,9 +3,11 @@ package handlers
import (
"fmt"
"github.com/cortezaproject/corteza/server/auth/request"
"github.com/cortezaproject/corteza/server/pkg/options"
"github.com/cortezaproject/corteza/server/system/service"
"github.com/cortezaproject/corteza/server/system/types"
"go.uber.org/zap"
"strings"
)
func (h *AuthHandlers) profileForm(req *request.AuthReq) (err error) {
@@ -32,7 +34,7 @@ func (h *AuthHandlers) profileForm(req *request.AuthReq) (err error) {
}
}
avatarUrl = fmt.Sprintf("%sapi/system/attachment/avatar/%d/original/%s", GetLinks().Base, u.Meta.AvatarID, types.AttachmentKindAvatar)
avatarUrl = fmt.Sprintf("%s/system/attachment/avatar/%d/original/%s", getApiFullPath(), u.Meta.AvatarID, types.AttachmentKindAvatar)
if form := req.PopKV(); len(form) > 0 {
req.Data["form"] = form
@@ -137,7 +139,7 @@ func (h *AuthHandlers) profileProc(req *request.AuthReq) error {
return nil
}
avatarUrl := fmt.Sprintf("%sapi/system/attachment/avatar/%d/original/%s", GetLinks().Base, u.Meta.AvatarID, types.AttachmentKindAvatar)
avatarUrl := fmt.Sprintf("%s/system/attachment/avatar/%d/original/%s", getApiFullPath(), u.Meta.AvatarID, types.AttachmentKindAvatar)
switch {
case
service.UserErrInvalidID().Is(err),
@@ -172,3 +174,7 @@ func (h *AuthHandlers) profileProc(req *request.AuthReq) error {
return err
}
}
func getApiFullPath() (path string) {
return fmt.Sprintf("/%s", strings.TrimPrefix(options.CleanBase(options.HttpServer().BaseUrl, options.HttpServer().ApiBaseUrl), "/"))
}

12
server/auth/handlers/handle_profile_test.go
View File

@@ -46,7 +46,7 @@ func Test_profileForm(t *testing.T) {
authHandlers.UserService = userService
authReq = prepareClientAuthReq(authHandlers, req, user)
avatarUrl := fmt.Sprintf("/api/system/attachment/avatar/%d/original/%s", user.Meta.AvatarID, types.AttachmentKindAvatar)
avatarUrl := fmt.Sprintf("//system/attachment/avatar/%d/original/%s", user.Meta.AvatarID, types.AttachmentKindAvatar)
userForm := map[string]string{
"email": user.Email,
@@ -123,7 +123,7 @@ func Test_profileFormProc(t *testing.T) {
"name": "name",
"initialBgColor": "",
"initialTextColor": "",
"avatarUrl": "/api/system/attachment/avatar/0/original/avatar",
"avatarUrl": "//system/attachment/avatar/0/original/avatar",
},
fn: func(_ *settings.Settings) {
req.PostForm.Add("handle", "handle")
@@ -154,7 +154,7 @@ func Test_profileFormProc(t *testing.T) {
"name": "name",
"initialBgColor": "",
"initialTextColor": "",
"avatarUrl": "/api/system/attachment/avatar/0/original/avatar",
"avatarUrl": "//system/attachment/avatar/0/original/avatar",
},
fn: func(_ *settings.Settings) {
req.PostForm.Add("handle", "handle")
@@ -185,7 +185,7 @@ func Test_profileFormProc(t *testing.T) {
"name": "name",
"initialBgColor": "",
"initialTextColor": "",
"avatarUrl": "/api/system/attachment/avatar/0/original/avatar",
"avatarUrl": "//system/attachment/avatar/0/original/avatar",
},
fn: func(_ *settings.Settings) {
req.PostForm.Add("handle", "handle")
@@ -216,7 +216,7 @@ func Test_profileFormProc(t *testing.T) {
"name": "name",
"initialBgColor": "",
"initialTextColor": "",
"avatarUrl": "/api/system/attachment/avatar/0/original/avatar",
"avatarUrl": "//system/attachment/avatar/0/original/avatar",
},
fn: func(_ *settings.Settings) {
req.PostForm.Add("handle", "handle")
@@ -247,7 +247,7 @@ func Test_profileFormProc(t *testing.T) {
"name": "name",
"initialBgColor": "",
"initialTextColor": "",
"avatarUrl": "/api/system/attachment/avatar/0/original/avatar",
"avatarUrl": "//system/attachment/avatar/0/original/avatar",
},
fn: func(_ *settings.Settings) {
req.PostForm.Add("handle", "handle")

32
server/system/service/attachment.go
View File

@@ -3,6 +3,7 @@ package service
import (
"bytes"
"context"
"errors"
"fmt"
"github.com/cortezaproject/corteza/server/pkg/actionlog"
intAuth "github.com/cortezaproject/corteza/server/pkg/auth"
@@ -269,12 +270,12 @@ func (svc attachment) CreateAvatarInitialsAttachment(ctx context.Context, initia
dc.SetHexColor(bgColor)
dc.Clear()
// Get the font face properties
fontBytes, err := os.ReadFile(svc.opt.AvatarInitialsFontPath)
fontBytes, err := svc.processFontsFile()
if err != nil {
fmt.Println(err.Error())
return nil, err
}
// Get the font face properties
f, _ := truetype.Parse(fontBytes)
face := truetype.NewFace(f, &truetype.Options{
@@ -521,3 +522,28 @@ func (svc attachment) processImage(original io.ReadSeeker, att *types.Attachment
return svc.files.Save(att.PreviewUrl, buf)
}
// processFontsFile validates the file path provided in the AVATAR_INITIALS_FONT_PATH environment variable,
// It checks if the file exists and has the correct file extension, then reads and returns the file content
func (svc attachment) processFontsFile() (fontBytes []byte, err error) {
aux, err := filepath.Glob(svc.opt.AvatarInitialsFontPath)
if err != nil {
return nil, err
}
if aux == nil || len(aux) != 1 {
return nil, errors.New("font file not found, please ensure that the correct AVATAR_INITIALS_FONT_PATH is set")
}
ext := strings.ToLower(filepath.Ext(aux[0]))
if ext != ".ttf" {
return nil, errors.New("invalid font file extension, please provide a truetype font (.ttf) file")
}
fontBytes, err = os.ReadFile(aux[0])
if err != nil {
return nil, err
}
return fontBytes, nil
}

12
server/system/service/user.go
View File

@@ -431,7 +431,7 @@ func (svc user) Update(ctx context.Context, upd *types.User) (u *types.User, err
return UserErrInvalidEmail()
}
if u, err = svc.FindByID(ctx, upd.ID); err != nil {
if u, err = loadUser(ctx, svc.store, upd.ID); err != nil {
return
}
@@ -461,7 +461,7 @@ func (svc user) Update(ctx context.Context, upd *types.User) (u *types.User, err
}
if err = svc.generateUserAvatarInitial(ctx, u); err != nil {
return err
return
}
if err = svc.eventbus.WaitFor(ctx, event.UserBeforeUpdate(upd, u)); err != nil {
@@ -1073,6 +1073,10 @@ func (svc user) UploadAvatar(ctx context.Context, userID uint64, upload *multipa
return
}
if !svc.ac.CanUpdateUser(ctx, u) {
return UserErrNotAllowedToUpdate()
}
if u.Meta.AvatarID != 0 {
if err = svc.att.DeleteByID(ctx, u.Meta.AvatarID); err != nil {
return
@@ -1236,6 +1240,10 @@ func (svc user) GenerateAvatar(ctx context.Context, userID uint64, bgColor strin
return
}
if !svc.ac.CanUpdateUser(ctx, u) {
return UserErrNotAllowedToUpdate()
}
u.Meta.AvatarColor = initialColor
u.Meta.AvatarBgColor = bgColor
if err = svc.generateUserAvatarInitial(ctx, u); err != nil {

1
server/tests/system/main_test.go
View File

@@ -99,6 +99,7 @@ func InitTestApp() {
sm = request.NewSessionManager(service.DefaultStore, app.Opt.Auth, service.DefaultLogger)
app.Opt.Attachment.AvatarInitialsFontPath = "../../auth/assets/public/fonts/poppins/Poppins-Regular.ttf"
return nil
})