admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug #3226

Browse Source 
Signed-off-by: wanjunlei <wanjunlei@yunify.com>
This commit is contained in:
wanjunlei
2020-12-25 11:39:10 +08:00
parent d814d5db7b
commit ea34bda865
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/apiserver/auditing/types.go
View File

@@ -23,7 +23,8 @@ import (
"fmt" "fmt"
"github.com/google/uuid" "github.com/google/uuid"
"io/ioutil" "io/ioutil"
"k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/api/authentication/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/apis/audit"
@@ -139,7 +140,7 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo
Stage: audit.StageResponseComplete, Stage: audit.StageResponseComplete,
ImpersonatedUser: nil, ImpersonatedUser: nil,
UserAgent: req.UserAgent(), UserAgent: req.UserAgent(),
RequestReceivedTimestamp: v1.NowMicro(), RequestReceivedTimestamp: metav1.NowMicro(),
Annotations: nil, Annotations: nil,
ObjectRef: &audit.ObjectReference{ ObjectRef: &audit.ObjectReference{
Resource: info.Resource, Resource: info.Resource,
@@ -183,6 +184,7 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo
e.User.UID = user.GetUID() e.User.UID = user.GetUID()
e.User.Groups = user.GetGroups() e.User.Groups = user.GetGroups()
e.User.Extra = make(map[string]v1.ExtraValue)
for k, v := range user.GetExtra() { for k, v := range user.GetExtra() {
e.User.Extra[k] = v e.User.Extra[k] = v
} }
@@ -215,8 +217,8 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo
func (a *auditing) LogResponseObject(e *auditv1alpha1.Event, resp *ResponseCapture) { func (a *auditing) LogResponseObject(e *auditv1alpha1.Event, resp *ResponseCapture) {
e.StageTimestamp = v1.NowMicro() e.StageTimestamp = metav1.NowMicro()
e.ResponseStatus = &v1.Status{Code: int32(resp.StatusCode())} e.ResponseStatus = &metav1.Status{Code: int32(resp.StatusCode())}
if e.Level.GreaterOrEqual(audit.LevelRequestResponse) { if e.Level.GreaterOrEqual(audit.LevelRequestResponse) {
e.ResponseObject = &runtime.Unknown{Raw: resp.Bytes()} e.ResponseObject = &runtime.Unknown{Raw: resp.Bytes()}
} }

1
pkg/apiserver/auditing/types_test.go
View File

@@ -197,6 +197,7 @@ func TestAuditing_LogRequestObject(t *testing.T) {
Groups: []string{ Groups: []string{
"system", "system",
}, },
Extra: make(map[string]v1.ExtraValue),
}, },
SourceIPs: []string{ SourceIPs: []string{
"192.168.0.2", "192.168.0.2",