mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 03:11:40 +00:00
Merge pull request #111125 from tallclair/audit-cleanup
Delete dead audit code
This commit is contained in:
Kubernetes Prow Robot
GitHub
commit
4c213e8d3a
@ -1,53 +0,0 @@
|
||||
/*
|
||||
Copyright 2018 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package policy
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"k8s.io/apiserver/pkg/apis/audit"
|
||||
)
|
||||
|
||||
// EnforcePolicy drops any part of the event that doesn't conform to a policy level
|
||||
// or omitStages and sets the event level accordingly
|
||||
func EnforcePolicy(event *audit.Event, level audit.Level, omitStages []audit.Stage) (*audit.Event, error) {
|
||||
for _, stage := range omitStages {
|
||||
if event.Stage == stage {
|
||||
return nil, nil
|
||||
}
|
||||
}
|
||||
return enforceLevel(event, level)
|
||||
}
|
||||
|
||||
func enforceLevel(event *audit.Event, level audit.Level) (*audit.Event, error) {
|
||||
switch level {
|
||||
case audit.LevelMetadata:
|
||||
event.Level = audit.LevelMetadata
|
||||
event.ResponseObject = nil
|
||||
event.RequestObject = nil
|
||||
case audit.LevelRequest:
|
||||
event.Level = audit.LevelRequest
|
||||
event.ResponseObject = nil
|
||||
case audit.LevelRequestResponse:
|
||||
event.Level = audit.LevelRequestResponse
|
||||
case audit.LevelNone:
|
||||
return nil, nil
|
||||
default:
|
||||
return nil, fmt.Errorf("level unknown: %s", level)
|
||||
}
|
||||
return event, nil
|
||||
}
|
||||
@ -1,146 +0,0 @@
|
||||
/*
|
||||
Copyright 2018 The Kubernetes Authors.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package policy
|
||||
|
||||
import (
|
||||
"math/rand"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
"k8s.io/apiserver/pkg/apis/audit"
|
||||
auditfuzz "k8s.io/apiserver/pkg/apis/audit/fuzzer"
|
||||
)
|
||||
|
||||
func TestEnforcePolicy(t *testing.T) {
|
||||
scheme := runtime.NewScheme()
|
||||
audit.SchemeBuilder.AddToScheme(scheme)
|
||||
codecs := runtimeserializer.NewCodecFactory(scheme)
|
||||
rs := rand.NewSource(time.Now().UnixNano())
|
||||
objectFuzzer := fuzzer.FuzzerFor(auditfuzz.Funcs, rs, codecs)
|
||||
|
||||
for _, tc := range []struct {
|
||||
name string
|
||||
level audit.Level
|
||||
omitStages []audit.Stage
|
||||
}{
|
||||
{
|
||||
name: "level metadata",
|
||||
level: audit.LevelMetadata,
|
||||
},
|
||||
{
|
||||
name: "level request",
|
||||
level: audit.LevelRequest,
|
||||
},
|
||||
{
|
||||
name: "level requestresponse",
|
||||
level: audit.LevelRequestResponse,
|
||||
},
|
||||
{
|
||||
name: "level none",
|
||||
level: audit.LevelNone,
|
||||
},
|
||||
{
|
||||
name: "level unknown",
|
||||
level: audit.Level("unknown"),
|
||||
},
|
||||
{
|
||||
name: "stage valid",
|
||||
level: audit.LevelRequest,
|
||||
omitStages: []audit.Stage{audit.StageRequestReceived},
|
||||
},
|
||||
{
|
||||
name: "stage unknown",
|
||||
level: audit.LevelRequest,
|
||||
omitStages: []audit.Stage{"unknown"},
|
||||
},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
events := make([]audit.Event, 20)
|
||||
omitSet := sets.NewString(ConvertStagesToStrings(tc.omitStages)...)
|
||||
for i := range events {
|
||||
e := &events[i]
|
||||
objectFuzzer.Fuzz(e)
|
||||
ev, err := EnforcePolicy(e, tc.level, tc.omitStages)
|
||||
if omitSet.Has(string(e.Stage)) {
|
||||
require.NoError(t, err)
|
||||
require.Nil(t, ev)
|
||||
return
|
||||
}
|
||||
switch tc.level {
|
||||
case audit.LevelNone:
|
||||
require.Nil(t, ev)
|
||||
case audit.LevelMetadata:
|
||||
expected := &audit.Event{
|
||||
TypeMeta: e.TypeMeta,
|
||||
Level: tc.level,
|
||||
AuditID: e.AuditID,
|
||||
Stage: e.Stage,
|
||||
RequestURI: e.RequestURI,
|
||||
Verb: e.Verb,
|
||||
User: e.User,
|
||||
ImpersonatedUser: e.ImpersonatedUser,
|
||||
SourceIPs: e.SourceIPs,
|
||||
UserAgent: e.UserAgent,
|
||||
ObjectRef: e.ObjectRef,
|
||||
ResponseStatus: e.ResponseStatus,
|
||||
RequestReceivedTimestamp: e.RequestReceivedTimestamp,
|
||||
StageTimestamp: e.StageTimestamp,
|
||||
Annotations: e.Annotations,
|
||||
RequestObject: nil,
|
||||
ResponseObject: nil,
|
||||
}
|
||||
require.Equal(t, expected, ev)
|
||||
case audit.LevelRequest:
|
||||
expected := &audit.Event{
|
||||
TypeMeta: e.TypeMeta,
|
||||
Level: tc.level,
|
||||
AuditID: e.AuditID,
|
||||
Stage: e.Stage,
|
||||
RequestURI: e.RequestURI,
|
||||
Verb: e.Verb,
|
||||
User: e.User,
|
||||
ImpersonatedUser: e.ImpersonatedUser,
|
||||
SourceIPs: e.SourceIPs,
|
||||
UserAgent: e.UserAgent,
|
||||
ObjectRef: e.ObjectRef,
|
||||
ResponseStatus: e.ResponseStatus,
|
||||
RequestReceivedTimestamp: e.RequestReceivedTimestamp,
|
||||
StageTimestamp: e.StageTimestamp,
|
||||
Annotations: e.Annotations,
|
||||
RequestObject: e.RequestObject,
|
||||
ResponseObject: nil,
|
||||
}
|
||||
require.Equal(t, expected, ev)
|
||||
case audit.LevelRequestResponse:
|
||||
expected := e.DeepCopy()
|
||||
expected.Level = tc.level
|
||||
require.Equal(t, expected, ev)
|
||||
default:
|
||||
require.Error(t, err)
|
||||
return
|
||||
}
|
||||
require.NoError(t, err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user