fix the bug "Cannot read property 'get' of undefined"
This commit is contained in:
@@ -1,8 +1,10 @@
|
|||||||
package auditing
|
package auditing
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bufio"
|
||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
"github.com/google/uuid"
|
"github.com/google/uuid"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"k8s.io/apimachinery/pkg/apis/meta/v1"
|
"k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
@@ -14,6 +16,7 @@ import (
|
|||||||
"kubesphere.io/kubesphere/pkg/apiserver/request"
|
"kubesphere.io/kubesphere/pkg/apiserver/request"
|
||||||
"kubesphere.io/kubesphere/pkg/client/listers/auditing/v1alpha1"
|
"kubesphere.io/kubesphere/pkg/client/listers/auditing/v1alpha1"
|
||||||
"kubesphere.io/kubesphere/pkg/utils/iputil"
|
"kubesphere.io/kubesphere/pkg/utils/iputil"
|
||||||
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -186,7 +189,6 @@ type ResponseCapture struct {
|
|||||||
wroteHeader bool
|
wroteHeader bool
|
||||||
status int
|
status int
|
||||||
body *bytes.Buffer
|
body *bytes.Buffer
|
||||||
StopCh chan interface{}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewResponseCapture(w http.ResponseWriter) *ResponseCapture {
|
func NewResponseCapture(w http.ResponseWriter) *ResponseCapture {
|
||||||
@@ -194,7 +196,6 @@ func NewResponseCapture(w http.ResponseWriter) *ResponseCapture {
|
|||||||
ResponseWriter: w,
|
ResponseWriter: w,
|
||||||
wroteHeader: false,
|
wroteHeader: false,
|
||||||
body: new(bytes.Buffer),
|
body: new(bytes.Buffer),
|
||||||
StopCh: make(chan interface{}, 1),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,10 +205,6 @@ func (c *ResponseCapture) Header() http.Header {
|
|||||||
|
|
||||||
func (c *ResponseCapture) Write(data []byte) (int, error) {
|
func (c *ResponseCapture) Write(data []byte) (int, error) {
|
||||||
|
|
||||||
defer func() {
|
|
||||||
c.StopCh <- struct{}{}
|
|
||||||
}()
|
|
||||||
|
|
||||||
c.WriteHeader(http.StatusOK)
|
c.WriteHeader(http.StatusOK)
|
||||||
c.body.Write(data)
|
c.body.Write(data)
|
||||||
return c.ResponseWriter.Write(data)
|
return c.ResponseWriter.Write(data)
|
||||||
@@ -216,6 +213,7 @@ func (c *ResponseCapture) Write(data []byte) (int, error) {
|
|||||||
func (c *ResponseCapture) WriteHeader(statusCode int) {
|
func (c *ResponseCapture) WriteHeader(statusCode int) {
|
||||||
if !c.wroteHeader {
|
if !c.wroteHeader {
|
||||||
c.status = statusCode
|
c.status = statusCode
|
||||||
|
c.ResponseWriter.WriteHeader(statusCode)
|
||||||
c.wroteHeader = true
|
c.wroteHeader = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -227,3 +225,14 @@ func (c *ResponseCapture) Bytes() []byte {
|
|||||||
func (c *ResponseCapture) StatusCode() int {
|
func (c *ResponseCapture) StatusCode() int {
|
||||||
return c.status
|
return c.status
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Hijack implements the http.Hijacker interface. This expands
|
||||||
|
// the Response to fulfill http.Hijacker if the underlying
|
||||||
|
// http.ResponseWriter supports it.
|
||||||
|
func (c *ResponseCapture) Hijack() (net.Conn, *bufio.ReadWriter, error) {
|
||||||
|
hijacker, ok := c.ResponseWriter.(http.Hijacker)
|
||||||
|
if !ok {
|
||||||
|
return nil, nil, fmt.Errorf("ResponseWriter doesn't support Hijacker interface")
|
||||||
|
}
|
||||||
|
return hijacker.Hijack()
|
||||||
|
}
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import (
|
|||||||
ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions"
|
ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions"
|
||||||
"kubesphere.io/kubesphere/pkg/utils/iputil"
|
"kubesphere.io/kubesphere/pkg/utils/iputil"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/http/httptest"
|
||||||
"net/url"
|
"net/url"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
"time"
|
||||||
@@ -248,7 +249,7 @@ func TestAuditing_LogResponseObject(t *testing.T) {
|
|||||||
|
|
||||||
e := a.LogRequestObject(req, info)
|
e := a.LogRequestObject(req, info)
|
||||||
|
|
||||||
resp := &ResponseCapture{}
|
resp := NewResponseCapture(httptest.NewRecorder())
|
||||||
resp.WriteHeader(200)
|
resp.WriteHeader(200)
|
||||||
|
|
||||||
a.LogResponseObject(e, resp, info)
|
a.LogResponseObject(e, resp, info)
|
||||||
|
|||||||
Reference in New Issue
Block a user