mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-28 00:39:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

audit: workaround unstable prototext string representation

Browse Source 
The prototext formater (used by '.String()') inserts spaces randomly
(see: https://protobuf.dev/reference/go/faq/#unstable-text).
This commit is contained in:
Ralf Haferkamp
2024-07-11 16:15:38 +02:00
parent ff6674f97b
commit 537bceb9d8
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/audit/pkg/types/conversion.go
View File

@@ -2,6 +2,7 @@ package types
import (
"fmt"
"strings"
"time"
"github.com/cs3org/reva/v2/pkg/events"
@@ -81,7 +82,7 @@ func LinkCreated(ev events.LinkCreated) AuditEventShareCreated {
ShareType: typ,
ExpirationDate: formatTime(ev.Expiration),
SharePass: ev.PasswordProtected,
Permissions: ev.Permissions.String(),
Permissions: normalizeString(ev.Permissions.GetPermissions().String()),
ShareToken: ev.Token,
// NOTE: those values are not in the event and can therefore not be filled at the moment
@@ -99,7 +100,7 @@ func ShareUpdated(ev events.ShareUpdated) AuditEventShareUpdated {
ShareOwner: uid,
ShareWith: with,
ShareType: typ,
Permissions: ev.Permissions.Permissions.String(),
Permissions: normalizeString(ev.Permissions.GetPermissions().String()),
// NOTE: those values are not in the event and can therefore not be filled at the moment
ItemType: "",
@@ -119,7 +120,7 @@ func LinkUpdated(ev events.LinkUpdated) AuditEventShareUpdated {
ShareOwner: uid,
ShareWith: with,
ShareType: typ,
Permissions: ev.Permissions.Permissions.String(),
Permissions: normalizeString(ev.Permissions.GetPermissions().String()),
ExpirationDate: formatTime(ev.Expiration),
SharePass: ev.PasswordProtected,
ShareToken: ev.Token,
@@ -555,3 +556,11 @@ func updateType(u string) string {
return ""
}
}
// normalizeString tries to create a somewhat stable string
// from a prototext string. The prototext strings are unstable
// on purpose an insert additional spaces randomly.
// See: https://protobuf.dev/reference/go/faq/#unstable-text
func normalizeString(str string) string {
return strings.Join(strings.Fields(str), " ")
}