fix(security): validate attachment filenames (#5218)
This commit is contained in:
parent
1d7efb1580
commit
5f57f48673
1 changed files with 21 additions and 0 deletions
|
|
@ -64,6 +64,9 @@ func (s *APIV1Service) CreateAttachment(ctx context.Context, request *v1pb.Creat
|
||||||
if request.Attachment.Filename == "" {
|
if request.Attachment.Filename == "" {
|
||||||
return nil, status.Errorf(codes.InvalidArgument, "filename is required")
|
return nil, status.Errorf(codes.InvalidArgument, "filename is required")
|
||||||
}
|
}
|
||||||
|
if !validateFilename(request.Attachment.Filename) {
|
||||||
|
return nil, status.Errorf(codes.InvalidArgument, "filename contains invalid characters or format")
|
||||||
|
}
|
||||||
if request.Attachment.Type == "" {
|
if request.Attachment.Type == "" {
|
||||||
return nil, status.Errorf(codes.InvalidArgument, "type is required")
|
return nil, status.Errorf(codes.InvalidArgument, "type is required")
|
||||||
}
|
}
|
||||||
|
|
@ -325,6 +328,9 @@ func (s *APIV1Service) UpdateAttachment(ctx context.Context, request *v1pb.Updat
|
||||||
}
|
}
|
||||||
for _, field := range request.UpdateMask.Paths {
|
for _, field := range request.UpdateMask.Paths {
|
||||||
if field == "filename" {
|
if field == "filename" {
|
||||||
|
if !validateFilename(request.Attachment.Filename) {
|
||||||
|
return nil, status.Errorf(codes.InvalidArgument, "filename contains invalid characters or format")
|
||||||
|
}
|
||||||
update.Filename = &request.Attachment.Filename
|
update.Filename = &request.Attachment.Filename
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -701,3 +707,18 @@ func setResponseHeaders(ctx context.Context, headers map[string]string) error {
|
||||||
}
|
}
|
||||||
return grpc.SetHeader(ctx, metadata.Pairs(pairs...))
|
return grpc.SetHeader(ctx, metadata.Pairs(pairs...))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func validateFilename(filename string) bool {
|
||||||
|
// Reject path traversal attempts and make sure no additional directories are created
|
||||||
|
if !filepath.IsLocal(filename) || strings.ContainsAny(filename, "/\\") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
// Reject filenames starting or ending with spaces or periods
|
||||||
|
if strings.HasPrefix(filename, " ") || strings.HasSuffix(filename, " ") ||
|
||||||
|
strings.HasPrefix(filename, ".") || strings.HasSuffix(filename, ".") {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue