From 713c646bfdd7c3ae0d1c4db07730a3eb1425d567 Mon Sep 17 00:00:00 2001 From: wanjunlei Date: Mon, 27 Jul 2020 22:53:53 +0800 Subject: [PATCH] make ws admin aware of anything happened in its workspace. Signed-off-by: wanjunlei --- pkg/apiserver/apiserver.go | 3 +- pkg/apiserver/auditing/types.go | 41 +++++++++--- pkg/apiserver/auditing/types_test.go | 43 +++++++----- pkg/models/auditing/events.go | 6 +- pkg/models/tenant/tenant.go | 67 +++++++++++++++++++ .../auditing/elasticsearch/elasticsearch.go | 19 +++++- pkg/simple/client/auditing/interface.go | 1 + 7 files changed, 150 insertions(+), 30 deletions(-) diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go index dc928afc1..64c129daf 100644 --- a/pkg/apiserver/apiserver.go +++ b/pkg/apiserver/apiserver.go @@ -260,8 +260,7 @@ func (s *APIServer) buildHandlerChain(stopCh <-chan struct{}) { if s.Config.AuditingOptions.Enable { handler = filters.WithAuditing(handler, - audit.NewAuditing(s.InformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Lister(), - s.Config.AuditingOptions.WebhookUrl, stopCh)) + audit.NewAuditing(s.InformerFactory, s.Config.AuditingOptions.WebhookUrl, stopCh)) } var authorizers authorizer.Authorizer diff --git a/pkg/apiserver/auditing/types.go b/pkg/apiserver/auditing/types.go index d03d09800..13112f5c7 100644 --- a/pkg/apiserver/auditing/types.go +++ b/pkg/apiserver/auditing/types.go @@ -12,9 +12,13 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apiserver/pkg/apis/audit" "k8s.io/klog" + devopsv1alpha3 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha3" auditv1alpha1 "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" + "kubesphere.io/kubesphere/pkg/apiserver/query" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/client/listers/auditing/v1alpha1" + "kubesphere.io/kubesphere/pkg/informers" + resourcesv1alpha3 "kubesphere.io/kubesphere/pkg/models/resources/v1alpha3/resource" "kubesphere.io/kubesphere/pkg/utils/iputil" "net" "net/http" @@ -37,16 +41,18 @@ type Auditing interface { } type auditing struct { - lister v1alpha1.WebhookLister - cache chan *auditv1alpha1.EventList - backend *Backend + lister v1alpha1.WebhookLister + resourceGetter *resourcesv1alpha3.ResourceGetter + cache chan *auditv1alpha1.EventList + backend *Backend } -func NewAuditing(lister v1alpha1.WebhookLister, url string, stopCh <-chan struct{}) Auditing { +func NewAuditing(informers informers.InformerFactory, url string, stopCh <-chan struct{}) Auditing { a := &auditing{ - lister: lister, - cache: make(chan *auditv1alpha1.EventList, DefaultCacheCapacity), + lister: informers.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Lister(), + resourceGetter: resourcesv1alpha3.NewResourceGetter(informers), + cache: make(chan *auditv1alpha1.EventList, DefaultCacheCapacity), } a.backend = NewBackend(url, ChannelCapacity, a.cache, SendTimeout, stopCh) @@ -115,7 +121,7 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo Stage: audit.StageResponseComplete, ImpersonatedUser: nil, UserAgent: req.UserAgent(), - RequestReceivedTimestamp: v1.NewMicroTime(time.Now()), + RequestReceivedTimestamp: v1.NowMicro(), Annotations: nil, ObjectRef: &audit.ObjectReference{ Resource: info.Resource, @@ -141,6 +147,25 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo if len(info.Parts) >= 4 { e.ObjectRef.Name = info.Parts[3] } + + // Get the workspace which the devops project be in. + if len(e.Workspace) == 0 { + res, err := a.resourceGetter.List(devopsv1alpha3.ResourcePluralDevOpsProject, "", query.New()) + if err != nil { + klog.Error(err) + } + + for _, obj := range res.Items { + d := obj.(*devopsv1alpha3.DevOpsProject) + + if d.Name == e.Devops { + e.Workspace = d.Labels["kubesphere.io/workspace"] + } else if d.Status.AdminNamespace == e.Devops { + e.Workspace = d.Labels["kubesphere.io/workspace"] + e.Devops = d.Name + } + } + } } ips := make([]string, 1) @@ -185,7 +210,7 @@ func (a *auditing) LogRequestObject(req *http.Request, info *request.RequestInfo func (a *auditing) LogResponseObject(e *auditv1alpha1.Event, resp *ResponseCapture) { - e.StageTimestamp = v1.NewMicroTime(time.Now()) + e.StageTimestamp = v1.NowMicro() e.ResponseStatus = &v1.Status{Code: int32(resp.StatusCode())} if e.Level.GreaterOrEqual(audit.LevelRequestResponse) { e.ResponseObject = &runtime.Unknown{Raw: resp.Bytes()} diff --git a/pkg/apiserver/auditing/types_test.go b/pkg/apiserver/auditing/types_test.go index ffd87f27d..9c947be7f 100644 --- a/pkg/apiserver/auditing/types_test.go +++ b/pkg/apiserver/auditing/types_test.go @@ -9,11 +9,12 @@ import ( "k8s.io/apiserver/pkg/apis/audit" "k8s.io/apiserver/pkg/authentication/user" k8srequest "k8s.io/apiserver/pkg/endpoints/request" + fakek8s "k8s.io/client-go/kubernetes/fake" auditingv1alpha1 "kubesphere.io/kubesphere/pkg/apis/auditing/v1alpha1" v1alpha12 "kubesphere.io/kubesphere/pkg/apiserver/auditing/v1alpha1" "kubesphere.io/kubesphere/pkg/apiserver/request" "kubesphere.io/kubesphere/pkg/client/clientset/versioned/fake" - ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions" + "kubesphere.io/kubesphere/pkg/informers" "kubesphere.io/kubesphere/pkg/utils/iputil" "net/http" "net/http/httptest" @@ -37,13 +38,15 @@ func TestGetAuditLevel(t *testing.T) { }, } - informer := ksinformers.NewSharedInformerFactory(fake.NewSimpleClientset(), noResyncPeriodFunc()) + ksClient := fake.NewSimpleClientset() + k8sClient := fakek8s.NewSimpleClientset() + fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, nil, nil, nil, nil) a := auditing{ - lister: informer.Auditing().V1alpha1().Webhooks().Lister(), + lister: fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Lister(), } - err := informer.Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) + err := fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) if err != nil { panic(err) } @@ -64,13 +67,15 @@ func TestAuditing_Enabled(t *testing.T) { }, } - informer := ksinformers.NewSharedInformerFactory(fake.NewSimpleClientset(), noResyncPeriodFunc()) + ksClient := fake.NewSimpleClientset() + k8sClient := fakek8s.NewSimpleClientset() + fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, nil, nil, nil, nil) a := auditing{ - lister: informer.Auditing().V1alpha1().Webhooks().Lister(), + lister: fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Lister(), } - err := informer.Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) + err := fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) if err != nil { panic(err) } @@ -92,13 +97,15 @@ func TestAuditing_K8sAuditingEnabled(t *testing.T) { }, } - informer := ksinformers.NewSharedInformerFactory(fake.NewSimpleClientset(), noResyncPeriodFunc()) + ksClient := fake.NewSimpleClientset() + k8sClient := fakek8s.NewSimpleClientset() + fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, nil, nil, nil, nil) a := auditing{ - lister: informer.Auditing().V1alpha1().Webhooks().Lister(), + lister: fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Lister(), } - err := informer.Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) + err := fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) if err != nil { panic(err) } @@ -120,13 +127,15 @@ func TestAuditing_LogRequestObject(t *testing.T) { }, } - informer := ksinformers.NewSharedInformerFactory(fake.NewSimpleClientset(), noResyncPeriodFunc()) + ksClient := fake.NewSimpleClientset() + k8sClient := fakek8s.NewSimpleClientset() + fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, nil, nil, nil, nil) a := auditing{ - lister: informer.Auditing().V1alpha1().Webhooks().Lister(), + lister: fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Lister(), } - err := informer.Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) + err := fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) if err != nil { panic(err) } @@ -208,13 +217,15 @@ func TestAuditing_LogResponseObject(t *testing.T) { }, } - informer := ksinformers.NewSharedInformerFactory(fake.NewSimpleClientset(), noResyncPeriodFunc()) + ksClient := fake.NewSimpleClientset() + k8sClient := fakek8s.NewSimpleClientset() + fakeInformerFactory := informers.NewInformerFactories(k8sClient, ksClient, nil, nil, nil, nil) a := auditing{ - lister: informer.Auditing().V1alpha1().Webhooks().Lister(), + lister: fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Lister(), } - err := informer.Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) + err := fakeInformerFactory.KubeSphereSharedInformerFactory().Auditing().V1alpha1().Webhooks().Informer().GetIndexer().Add(webhook) if err != nil { panic(err) } diff --git a/pkg/models/auditing/events.go b/pkg/models/auditing/events.go index 9e7a2ac70..36530e763 100644 --- a/pkg/models/auditing/events.go +++ b/pkg/models/auditing/events.go @@ -70,19 +70,19 @@ func (eo *eventsOperator) Events(queryParam *v1alpha1.Query, var err error switch queryParam.Operation { case "histogram": - if len(filter.ObjectRefNamespaceMap) == 0 { + if len(filter.ObjectRefNamespaceMap) == 0 && len(filter.ObjectRefWorkspaceMap) == 0 { ar.Histogram = &auditing.Histogram{} } else { ar.Histogram, err = eo.client.CountOverTime(filter, queryParam.Interval) } case "statistics": - if len(filter.ObjectRefNamespaceMap) == 0 { + if len(filter.ObjectRefNamespaceMap) == 0 && len(filter.ObjectRefWorkspaceMap) == 0 { ar.Statistics = &auditing.Statistics{} } else { ar.Statistics, err = eo.client.StatisticsOnResources(filter) } default: - if len(filter.ObjectRefNamespaceMap) == 0 { + if len(filter.ObjectRefNamespaceMap) == 0 && len(filter.ObjectRefWorkspaceMap) == 0 { ar.Events = &auditing.Events{} } else { ar.Events, err = eo.client.SearchAuditingEvent(filter, queryParam.From, queryParam.Size, queryParam.Sort) diff --git a/pkg/models/tenant/tenant.go b/pkg/models/tenant/tenant.go index b8bbb27a8..b8780dc40 100644 --- a/pkg/models/tenant/tenant.go +++ b/pkg/models/tenant/tenant.go @@ -608,6 +608,40 @@ func (t *tenantOperator) listIntersectedNamespaces(workspaces, workspaceSubstrs, return iNamespaces, nil } +// listIntersectedWorkspaces returns a list of workspaces that MUST meet ALL the following filters: +// 1. If `workspaces` is not empty, the workspace SHOULD be one of the specified workpsaces. +// 2. Else f `workspaceSubstrs` is not empty, the workspace SHOULD be contains one of the specified substrings. +// 3. Else, return all workspace in the cluster. +func (t *tenantOperator) listIntersectedWorkspaces(workspaces, workspaceSubstrs []string) ([]*tenantv1alpha1.Workspace, error) { + var ( + workspaceSet = stringSet(workspaces) + iWorkspaces []*tenantv1alpha1.Workspace + ) + + result, err := t.resourceGetter.List("workspaces", "", query.New()) + if err != nil { + return nil, err + } + for _, obj := range result.Items { + ws, ok := obj.(*tenantv1alpha1.Workspace) + if !ok { + continue + } + + if len(workspaceSet) > 0 { + if _, ok := workspaceSet[ws.Name]; !ok { + continue + } + } + if len(workspaceSubstrs) > 0 && !stringContains(ws.Name, workspaceSubstrs) { + continue + } + + iWorkspaces = append(iWorkspaces, ws) + } + return iWorkspaces, nil +} + func (t *tenantOperator) Events(user user.Info, queryParam *eventsv1alpha1.Query) (*eventsv1alpha1.APIResponse, error) { iNamespaces, err := t.listIntersectedNamespaces( stringutils.Split(queryParam.WorkspaceFilter, ","), @@ -805,7 +839,16 @@ func (t *tenantOperator) Auditing(user user.Info, queryParam *auditingv1alpha1.Q return nil, err } + iWorkspaces, err := t.listIntersectedWorkspaces( + stringutils.Split(queryParam.WorkspaceFilter, ","), + stringutils.Split(queryParam.WorkspaceSearch, ",")) + if err != nil { + klog.Error(err) + return nil, err + } + namespaceCreateTimeMap := make(map[string]time.Time) + workspaceCreateTimeMap := make(map[string]time.Time) // Now auditing and event have the same authorization mechanism, so we can determine whether the user // has permission to view the auditing log in ns by judging whether the user has the permission to view the event in ns. @@ -829,6 +872,28 @@ func (t *tenantOperator) Auditing(user user.Info, queryParam *auditingv1alpha1.Q namespaceCreateTimeMap[ns.Name] = ns.CreationTimestamp.Time } } + + for _, ws := range iWorkspaces { + listEvts := authorizer.AttributesRecord{ + User: user, + Verb: "list", + APIGroup: "", + APIVersion: "v1", + Workspace: ws.Name, + Resource: "events", + ResourceRequest: true, + ResourceScope: request.WorkspaceScope, + } + decision, _, err := t.authorizer.Authorize(listEvts) + if err != nil { + klog.Error(err) + return nil, err + } + if decision == authorizer.DecisionAllow { + workspaceCreateTimeMap[ws.Name] = ws.CreationTimestamp.Time + } + } + // If there are no ns and ws query conditions, // those events with empty `objectRef.namespace` will also be listed when user can list all events if len(queryParam.WorkspaceFilter) == 0 && len(queryParam.ObjectRefNamespaceFilter) == 0 && @@ -849,11 +914,13 @@ func (t *tenantOperator) Auditing(user user.Info, queryParam *auditingv1alpha1.Q } if decision == authorizer.DecisionAllow { namespaceCreateTimeMap[""] = time.Time{} + workspaceCreateTimeMap[""] = time.Time{} } } return t.auditing.Events(queryParam, func(filter *auditingclient.Filter) { filter.ObjectRefNamespaceMap = namespaceCreateTimeMap + filter.ObjectRefWorkspaceMap = workspaceCreateTimeMap }) } diff --git a/pkg/simple/client/auditing/elasticsearch/elasticsearch.go b/pkg/simple/client/auditing/elasticsearch/elasticsearch.go index 967d9a5e1..82a6c45dc 100644 --- a/pkg/simple/client/auditing/elasticsearch/elasticsearch.go +++ b/pkg/simple/client/auditing/elasticsearch/elasticsearch.go @@ -305,7 +305,7 @@ func parseToQueryPart(f *auditing.Filter) interface{} { "bool": &b, } - if len(f.ObjectRefNamespaceMap) > 0 { + if len(f.ObjectRefNamespaceMap) > 0 || len(f.ObjectRefWorkspaceMap) > 0 { bi := BoolBody{MinimumShouldMatch: &mini} for k, v := range f.ObjectRefNamespaceMap { bi.Should = append(bi.Should, map[string]interface{}{ @@ -322,6 +322,23 @@ func parseToQueryPart(f *auditing.Filter) interface{} { }, }) } + + for k, v := range f.ObjectRefWorkspaceMap { + bi.Should = append(bi.Should, map[string]interface{}{ + "bool": &BoolBody{ + Filter: []map[string]interface{}{{ + "match_phrase": map[string]string{"Workspace.keyword": k}, + }, { + "range": map[string]interface{}{ + "RequestReceivedTimestamp": map[string]interface{}{ + "gte": v, + }, + }, + }}, + }, + }) + } + if len(bi.Should) > 0 { b.Filter = append(b.Filter, map[string]interface{}{"bool": &bi}) } diff --git a/pkg/simple/client/auditing/interface.go b/pkg/simple/client/auditing/interface.go index 4e8ded20d..1a55a6991 100644 --- a/pkg/simple/client/auditing/interface.go +++ b/pkg/simple/client/auditing/interface.go @@ -28,6 +28,7 @@ type Client interface { type Filter struct { ObjectRefNamespaceMap map[string]time.Time + ObjectRefWorkspaceMap map[string]time.Time ObjectRefNames []string ObjectRefNameFuzzy []string Levels []string