Infra-Mirrors/ots
1
0
Fork 0
mirror of https://github.com/Luzifer/ots.git synced 2025-08-02 11:16:25 -04:00
Code Issues Projects Releases Packages Wiki Activity

[#154] Improve UX for rejected / allowed files

Browse source 
Signed-off-by: Knut Ahlers <knut@ahlers.me>
This commit is contained in:
Knut Ahlers 2023-12-01 18:54:46 +01:00
parent dc47bf0861
commit 3ebc896169
No known key found for this signature in database
GPG key ID: D91C3E91E4CAD6F5
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
pkg/client/sanity.go
View file

@ -73,12 +73,15 @@ func SanityCheck(instanceURL string, secret Secret) error {
func attachmentAllowed(file SecretAttachment, allowed []string) bool {
mimeType, _, _ := strings.Cut(file.Type, ";")
logger := Logger.WithField("content-type", mimeType)
for _, a := range allowed {
switch {
case mimeRegex.MatchString(a):
// That's a mime type
if glob.Glob(a, mimeType) {
// The mime "glob" matches the file type
logger.WithField("allowed_by", a).Debug("attachment allowed")
return true
}
@ -86,12 +89,13 @@ func attachmentAllowed(file SecretAttachment, allowed []string) bool {
// That's a file extension
if strings.HasSuffix(file.Name, a) {
// The filename has the right extension
logger.WithField("allowed_by", a).Debug("attachment allowed")
return true
}
}
}
Logger.WithField("content-type", mimeType).Debug("attachment type not allowed")
logger.Debug("attachment type not allowed")
return false
}