happyz
/
memos
mirror of https://github.com/usememos/memos.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge caabd396ef into b623162d37

This commit is contained in:
Manak Raj 2026-02-09 06:17:30 +01:00 committed by GitHub
parent b623162d37 caabd396ef
commit 3699bd04f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/router/api/v1/memo_service_converter.go
View File

@ -4,9 +4,12 @@ import (
"context"
"fmt"
"time"
"unicode/utf8"
"github.com/pkg/errors"
"google.golang.org/protobuf/types/known/timestamppb"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
v1pb "github.com/usememos/memos/proto/gen/api/v1"
storepb "github.com/usememos/memos/proto/gen/store"
@ -25,6 +28,13 @@ func (s *APIV1Service) convertMemoFromStore(ctx context.Context, memo *store.Mem
name := fmt.Sprintf("%s%s", MemoNamePrefix, memo.UID)
memoMessage := &v1pb.Memo{
if !utf8.ValidString(memo.Content) {
return nil, status.Errorf(
codes.Internal,
"memo %s contains invalid UTF-8 content",
memo.UID,
)
}
Name: name,
State: convertStateFromStore(memo.RowStatus),
Creator: fmt.Sprintf("%s%d", UserNamePrefix, memo.CreatorID),
@ -67,6 +77,13 @@ func (s *APIV1Service) convertMemoFromStore(ctx context.Context, memo *store.Mem
}
snippet, err := s.getMemoContentSnippet(memo.Content)
if !utf8.ValidString(snippet) {
return nil, status.Errorf(
codes.Internal,
"memo %s contains invalid UTF-8 snippet",
memo.UID,
)
}
if err != nil {
return nil, errors.Wrap(err, "failed to get memo content snippet")
}