mirror of
https://github.com/grafana/grafana.git
synced 2025-02-14 17:43:35 -06:00
* svg fun * #50597: add proto * #50597: add sanitizer methods * #50597: add provider * #50597: use sanitizer * #50597: use sanitizer * update grafana to match new api * add comments * add capability check * add timing * update sanitize path * improve log message * strings.HasPrefix rather than filepath.IsAbs * filepath.Clean + filepath.ToSlash for windows * read 404 * remove `path.clean` from `getPathAndScope` * add resp body close * remove unneeded prop * Update pkg/services/rendering/rendering.go Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com> * remove test files * filepath.ToSlash correct wrapping * filepath.ToSlash correct wrapping * filepath.ToSlash comment * compilation error * lint fix * fix error message * Update pkg/services/rendering/rendering.go Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com> * add `image/svg+xml` mime type * refactored log * refactored log Co-authored-by: Agnès Toulet <35176601+AgnesToulet@users.noreply.github.com>
53 lines
1.6 KiB
Go
53 lines
1.6 KiB
Go
package store
|
|
|
|
import (
|
|
"context"
|
|
"path/filepath"
|
|
|
|
"github.com/grafana/grafana/pkg/infra/filestorage"
|
|
"github.com/grafana/grafana/pkg/models"
|
|
"github.com/grafana/grafana/pkg/services/rendering"
|
|
"github.com/grafana/grafana/pkg/services/store/sanitizer"
|
|
)
|
|
|
|
func (s *standardStorageService) sanitizeContents(ctx context.Context, user *models.SignedInUser, req *UploadRequest, storagePath string) ([]byte, error) {
|
|
if req.EntityType == EntityTypeImage {
|
|
ext := filepath.Ext(req.Path)
|
|
if ext == ".svg" {
|
|
resp, err := sanitizer.SanitizeSVG(ctx, &rendering.SanitizeSVGRequest{
|
|
Filename: storagePath,
|
|
Content: req.Contents,
|
|
})
|
|
if err != nil {
|
|
if s.cfg.allowUnsanitizedSvgUpload {
|
|
grafanaStorageLogger.Debug("allowing unsanitized svg upload", "filename", req.Path, "sanitizationError", err)
|
|
return req.Contents, nil
|
|
} else {
|
|
grafanaStorageLogger.Debug("disallowing unsanitized svg upload", "filename", req.Path, "sanitizationError", err)
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
return resp.Sanitized, nil
|
|
}
|
|
}
|
|
|
|
return req.Contents, nil
|
|
}
|
|
|
|
func (s *standardStorageService) sanitizeUploadRequest(ctx context.Context, user *models.SignedInUser, req *UploadRequest, storagePath string) (*filestorage.UpsertFileCommand, error) {
|
|
contents, err := s.sanitizeContents(ctx, user, req, storagePath)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return &filestorage.UpsertFileCommand{
|
|
Path: storagePath,
|
|
Contents: contents,
|
|
MimeType: req.MimeType,
|
|
CacheControl: req.CacheControl,
|
|
ContentDisposition: req.ContentDisposition,
|
|
Properties: req.Properties,
|
|
}, nil
|
|
}
|