luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Remove use of compressionutil from activitylog segments. We can leave it in for the precomputed queries since they're JSON, not protobuf. (#14239)

This commit is contained in:
Nick Cabatoff 2022-02-23 17:33:24 -05:00 committed by GitHub
parent 61313d86e0
commit 0421b6895f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
vault/activity_log.go
View File

@ -18,7 +18,6 @@ import (
"github.com/hashicorp/vault/helper/metricsutil"
"github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/timeutil"
"github.com/hashicorp/vault/sdk/helper/compressutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/vault/activity"
)
@ -359,9 +358,9 @@ func (a *ActivityLog) saveCurrentSegmentToStorageLocked(ctx context.Context, for
// :force: forces a save of tokens/entities even if the in-memory log is empty
func (a *ActivityLog) saveCurrentSegmentInternal(ctx context.Context, force bool) error {
entityPath := fmt.Sprintf("log/entity/%d/%d", a.currentSegment.startTimestamp, a.currentSegment.clientSequenceNumber)
entityPath := fmt.Sprintf("%s%d/%d", activityEntityBasePath, a.currentSegment.startTimestamp, a.currentSegment.clientSequenceNumber)
// RFC (VLT-120) defines this as 1-indexed, but it should be 0-indexed
tokenPath := fmt.Sprintf("log/directtokens/%d/0", a.currentSegment.startTimestamp)
tokenPath := fmt.Sprintf("%s%d/0", activityTokenBasePath, a.currentSegment.startTimestamp)
for _, client := range a.currentSegment.currentClients.Clients {
// Explicitly catch and throw clear error message if client ID creation and storage
@ -377,22 +376,10 @@ func (a *ActivityLog) saveCurrentSegmentInternal(ctx context.Context, force bool
return err
}
// Compress the contents of the segment. compressutil uses a prepended
// canary to the encoded message. This way the decompression can be made
// backwards compatible. This works by checking the presence of
// canaries; absence of canaries will fallback to processing
// uncompressed data.
compressedClients, err := compressutil.Compress(clients, &compressutil.CompressionConfig{
Type: compressutil.CompressionTypeLZ4,
})
if err != nil {
return err
}
a.logger.Trace("writing segment", "path", entityPath)
err = a.view.Put(ctx, &logical.StorageEntry{
Key: entityPath,
Value: compressedClients,
Value: clients,
})
if err != nil {
return err
@ -540,18 +527,8 @@ func (a *ActivityLog) WalkEntitySegments(ctx context.Context,
continue
}
value, notCompressed, err := compressutil.Decompress(raw.Value)
if err != nil {
return err
}
// Fallback to uncompressed value, if compression was not done.
if notCompressed {
value = raw.Value
}
out := &activity.EntityActivityLog{}
err = proto.Unmarshal(value, out)
err = proto.Unmarshal(raw.Value, out)
if err != nil {
return fmt.Errorf("unable to parse segment %v%v: %w", basePath, path, err)
}

10
vault/activity_log_test.go
View File

@ -18,7 +18,6 @@ import (
"github.com/hashicorp/vault/helper/constants"
"github.com/hashicorp/vault/helper/namespace"
"github.com/hashicorp/vault/helper/timeutil"
"github.com/hashicorp/vault/sdk/helper/compressutil"
"github.com/hashicorp/vault/sdk/logical"
"github.com/hashicorp/vault/vault/activity"
"github.com/mitchellh/mapstructure"
@ -230,15 +229,6 @@ func readSegmentFromStorage(t *testing.T, c *Core, path string) *logical.Storage
t.Fatalf("expected non-nil log segment at %q", path)
}
value, notCompressed, err := compressutil.Decompress(logSegment.Value)
// If the data wasn't compressed, fallback to old behavior
if !notCompressed {
logSegment.Value = value
}
if err != nil {
return logSegment
}
return logSegment
}