resolve conversation

formater

Signed-off-by: wanjunlei <wanjunlei@yunify.com>

debug

debug

Signed-off-by: wanjunlei <wanjunlei@yunify.com>

pkg/apiserver/auditing/backend.go

@@ -7,33 +7,39 @@ import (
 	"encoding/json"
 	"k8s.io/klog"
 	"net/http"
-	"os"
-	"os/signal"
 	"time"
 )
 
 const (
 	WaitTimeout = time.Second
-	WebhookURL  = "https://kube-auditing-webhook-svc.kubesphere-logging-system.svc:443"
+	WebhookURL  = "https://kube-auditing-webhook-svc.kubesphere-logging-system.svc:443/audit/webhook/event"
 )
 
 type Backend struct {
+	url             string
 	channelCapacity int
 	semCh           chan interface{}
 	cache           chan *EventList
 	client          http.Client
 	sendTimeout     time.Duration
 	waitTimeout     time.Duration
+	stopCh          <-chan struct{}
 }
 
-func NewBackend(channelCapacity int, cache chan *EventList, sendTimeout time.Duration) *Backend {
+func NewBackend(url string, channelCapacity int, cache chan *EventList, sendTimeout time.Duration, stopCh <-chan struct{}) *Backend {
 
 	b := Backend{
+		url:             url,
 		semCh:           make(chan interface{}, channelCapacity),
 		channelCapacity: channelCapacity,
 		waitTimeout:     WaitTimeout,
 		cache:           cache,
 		sendTimeout:     sendTimeout,
+		stopCh:          stopCh,
+	}
+
+	if len(b.url) == 0 {
+		b.url = WebhookURL
 	}
 
 	b.client = http.Client{
@@ -52,9 +58,6 @@ func NewBackend(channelCapacity int, cache chan *EventList, sendTimeout time.Dur
 
 func (b *Backend) worker() {
 
-	// Stop when receiver signal Interrupt.
-	stopCh := b.SetupSignalHandler()
-
 	for {
 
 		var event *EventList
@@ -63,7 +66,7 @@ func (b *Backend) worker() {
 			if event == nil {
 				break
 			}
-		case <-stopCh:
+		case <-b.stopCh:
 			break
 		}
 
@@ -88,7 +91,7 @@ func (b *Backend) worker() {
 				return
 			}
 
-			response, err := b.client.Post(WebhookURL, "application/json", bytes.NewBuffer(bs))
+			response, err := b.client.Post(b.url, "application/json", bytes.NewBuffer(bs))
 			if err != nil {
 				klog.Errorf("send audit event[%s] error, %s", event.Items[0].AuditID, err)
 				return
@@ -103,16 +106,3 @@ func (b *Backend) worker() {
 		go send(event)
 	}
 }
-
-func (b *Backend) SetupSignalHandler() (stopCh <-chan struct{}) {
-
-	stop := make(chan struct{})
-	c := make(chan os.Signal, 2)
-	signal.Notify(c, []os.Signal{os.Interrupt}...)
-	go func() {
-		<-c
-		close(stop)
-	}()
-
-	return stop
-}

pkg/apiserver/auditing/types.go

@@ -2,6 +2,7 @@ package auditing
 
 import (
 	"bytes"
+	"encoding/json"
 	"github.com/google/uuid"
 	"io/ioutil"
 	"k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -25,8 +26,8 @@ const (
 )
 
 type Auditing interface {
-	Enable() bool
-	K8sAuditingEnable() bool
+	Enabled() bool
+	K8sAuditingEnabled() bool
 	LogRequestObject(req *http.Request) *Event
 	LogResponseObject(e *Event, resp *ResponseCapture, info *request.RequestInfo)
 }
@@ -34,7 +35,7 @@ type Auditing interface {
 type Event struct {
 	//The workspace which this audit event happened
 	Workspace string
-	//The devops project which this audit event happened
+	//The cluster which this audit event happened
 	Cluster string
 
 	audit.Event
@@ -50,14 +51,14 @@ type auditing struct {
 	backend *Backend
 }
 
-func NewAuditing(lister v1alpha1.WebhookLister) Auditing {
+func NewAuditing(lister v1alpha1.WebhookLister, url string, stopCh <-chan struct{}) Auditing {
 
 	a := &auditing{
 		lister: lister,
 		cache:  make(chan *EventList, DefaultCacheCapacity),
 	}
 
-	a.backend = NewBackend(ChannelCapacity, a.cache, SendTimeout)
+	a.backend = NewBackend(url, ChannelCapacity, a.cache, SendTimeout, stopCh)
 	return a
 }
 
@@ -71,7 +72,7 @@ func (a *auditing) getAuditLevel() audit.Level {
 	return (audit.Level)(wh.Spec.AuditLevel)
 }
 
-func (a *auditing) Enable() bool {
+func (a *auditing) Enabled() bool {
 
 	level := a.getAuditLevel()
 	if level.Less(audit.LevelMetadata) {
@@ -80,14 +81,14 @@ func (a *auditing) Enable() bool {
 	return true
 }
 
-func (a *auditing) K8sAuditingEnable() bool {
+func (a *auditing) K8sAuditingEnabled() bool {
 	wh, err := a.lister.Get(DefaultWebhook)
 	if err != nil {
 		klog.Error(err)
 		return false
 	}
 
-	return wh.Spec.K8sAuditingEnable
+	return wh.Spec.K8sAuditingEnabled
 }
 
 func (a *auditing) LogRequestObject(req *http.Request) *Event {
@@ -135,7 +136,7 @@ func (a *auditing) LogRequestObject(req *http.Request) *Event {
 func (a *auditing) LogResponseObject(e *Event, resp *ResponseCapture, info *request.RequestInfo) {
 
 	// Auditing should igonre k8s request when k8s auditing is enabled.
-	if info.IsKubernetesRequest && a.K8sAuditingEnable() {
+	if info.IsKubernetesRequest && a.K8sAuditingEnabled() {
 		return
 	}
 
@@ -176,6 +177,11 @@ func (a *auditing) LogResponseObject(e *Event, resp *ResponseCapture, info *requ
 }
 
 func (a *auditing) cacheEvent(e Event) {
+	if klog.V(8) {
+		bs, _ := json.Marshal(e)
+		klog.Infof("%s", string(bs))
+	}
+
 	eventList := &EventList{}
 	eventList.Items = append(eventList.Items, e)
 	select {

pkg/apiserver/auditing/types_test.go

@@ -49,7 +49,7 @@ func TestGetAuditLevel(t *testing.T) {
 	assert.Equal(t, string(webhook.Spec.AuditLevel), string(a.getAuditLevel()))
 }
 
-func TestAuditing_Enable(t *testing.T) {
+func TestAuditing_Enabled(t *testing.T) {
 	webhook := &auditingv1alpha1.Webhook{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: auditingv1alpha1.SchemeGroupVersion.String(),
@@ -73,10 +73,10 @@ func TestAuditing_Enable(t *testing.T) {
 		panic(err)
 	}
 
-	assert.Equal(t, false, a.Enable())
+	assert.Equal(t, false, a.Enabled())
 }
 
-func TestAuditing_K8sAuditingEnable(t *testing.T) {
+func TestAuditing_K8sAuditingEnabled(t *testing.T) {
 	webhook := &auditingv1alpha1.Webhook{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: auditingv1alpha1.SchemeGroupVersion.String(),
@@ -85,8 +85,8 @@ func TestAuditing_K8sAuditingEnable(t *testing.T) {
 			Name: "kube-auditing-webhook",
 		},
 		Spec: auditingv1alpha1.WebhookSpec{
-			AuditLevel:        v1alpha1.LevelNone,
-			K8sAuditingEnable: true,
+			AuditLevel:         v1alpha1.LevelNone,
+			K8sAuditingEnabled: true,
 		},
 	}
 
@@ -101,7 +101,7 @@ func TestAuditing_K8sAuditingEnable(t *testing.T) {
 		panic(err)
 	}
 
-	assert.Equal(t, true, a.K8sAuditingEnable())
+	assert.Equal(t, true, a.K8sAuditingEnabled())
 }
 
 func TestAuditing_LogRequestObject(t *testing.T) {
@@ -113,8 +113,8 @@ func TestAuditing_LogRequestObject(t *testing.T) {
 			Name: "kube-auditing-webhook",
 		},
 		Spec: auditingv1alpha1.WebhookSpec{
-			AuditLevel:        v1alpha1.LevelRequestResponse,
-			K8sAuditingEnable: true,
+			AuditLevel:         v1alpha1.LevelRequestResponse,
+			K8sAuditingEnabled: true,
 		},
 	}
 
@@ -178,8 +178,8 @@ func TestAuditing_LogResponseObject(t *testing.T) {
 			Name: "kube-auditing-webhook",
 		},
 		Spec: auditingv1alpha1.WebhookSpec{
-			AuditLevel:        v1alpha1.LevelMetadata,
-			K8sAuditingEnable: true,
+			AuditLevel:         v1alpha1.LevelMetadata,
+			K8sAuditingEnabled: true,
 		},
 	}