MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-28 23:16:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

add auditing for healing objects (#19379)

Browse Source
This commit is contained in:
Harshavardhana 2024-03-28 16:46:19 -07:00 committed by GitHub
parent 4e670458b8
commit feb9d8480b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cmd/erasure-healing.go
View File

@ -210,6 +210,24 @@ func (fi FileInfo) DataMov() bool {
return ok return ok
} }
func auditHealObject(ctx context.Context, bucket, object, versionID string, err error) {
if len(logger.AuditTargets()) == 0 {
return
}
opts := AuditLogOptions{
Event: "HealObject",
Bucket: bucket,
Object: object,
VersionID: versionID,
}
if err != nil {
opts.Error = err.Error()
}
auditLogInternal(ctx, opts)
}
// Heals an object by re-writing corrupt/missing erasure blocks. // Heals an object by re-writing corrupt/missing erasure blocks.
func (er *erasureObjects) healObject(ctx context.Context, bucket string, object string, versionID string, opts madmin.HealOpts) (result madmin.HealResultItem, err error) { func (er *erasureObjects) healObject(ctx context.Context, bucket string, object string, versionID string, opts madmin.HealOpts) (result madmin.HealResultItem, err error) {
dryRun := opts.DryRun dryRun := opts.DryRun
@ -218,6 +236,8 @@ func (er *erasureObjects) healObject(ctx context.Context, bucket string, object
storageDisks := er.getDisks() storageDisks := er.getDisks()
storageEndpoints := er.getEndpoints() storageEndpoints := er.getEndpoints()
defer auditHealObject(ctx, bucket, object, versionID, err)
if globalTrace.NumSubscribers(madmin.TraceHealing) > 0 { if globalTrace.NumSubscribers(madmin.TraceHealing) > 0 {
startTime := time.Now() startTime := time.Now()
defer func() { defer func() {

15
cmd/utils.go
View File

@ -60,7 +60,7 @@ import (
"github.com/minio/mux" "github.com/minio/mux"
"github.com/minio/pkg/v2/certs" "github.com/minio/pkg/v2/certs"
"github.com/minio/pkg/v2/env" "github.com/minio/pkg/v2/env"
pkgAudit "github.com/minio/pkg/v2/logger/message/audit" xaudit "github.com/minio/pkg/v2/logger/message/audit"
xnet "github.com/minio/pkg/v2/net" xnet "github.com/minio/pkg/v2/net"
"golang.org/x/oauth2" "golang.org/x/oauth2"
) )
@ -946,21 +946,18 @@ func auditLogInternal(ctx context.Context, opts AuditLogOptions) {
if len(logger.AuditTargets()) == 0 { if len(logger.AuditTargets()) == 0 {
return return
} }
entry := audit.NewEntry(globalDeploymentID()) entry := audit.NewEntry(globalDeploymentID())
entry.Trigger = opts.Event entry.Trigger = opts.Event
entry.Event = opts.Event entry.Event = opts.Event
entry.Error = opts.Error entry.Error = opts.Error
entry.API.Name = opts.APIName entry.API.Name = opts.APIName
entry.API.Bucket = opts.Bucket entry.API.Bucket = opts.Bucket
entry.API.Objects = []pkgAudit.ObjectVersion{{ObjectName: opts.Object, VersionID: opts.VersionID}} entry.API.Objects = []xaudit.ObjectVersion{{ObjectName: opts.Object, VersionID: opts.VersionID}}
entry.API.Status = opts.Status entry.API.Status = opts.Status
if len(opts.Tags) > 0 { entry.Tags = make(map[string]interface{}, len(opts.Tags))
entry.Tags = make(map[string]interface{}, len(opts.Tags)) for k, v := range opts.Tags {
for k, v := range opts.Tags { entry.Tags[k] = v
entry.Tags[k] = v
}
} else {
entry.Tags = make(map[string]interface{})
} }
// Merge tag information if found - this is currently needed for tags // Merge tag information if found - this is currently needed for tags