Update http_proxy_js_response.go

This commit is contained in:
yungtravla 2018-06-15 14:08:37 +10:00 committed by GitHub
commit ff846bd6e5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -13,7 +13,7 @@ import (
type JSResponse struct { type JSResponse struct {
Status int Status int
ContentType string ContentType string
Headers []JSHeader Headers string
Body string Body string
refHash string refHash string
@ -24,16 +24,16 @@ type JSResponse struct {
func NewJSResponse(res *http.Response) *JSResponse { func NewJSResponse(res *http.Response) *JSResponse {
cType := "" cType := ""
headers := make([]JSHeader, 0) headers := ""
code := 200 code := 200
if res != nil { if res != nil {
code = res.StatusCode code = res.StatusCode
for name, values := range res.Header { for name, values := range res.Header {
for _, value := range values { for _, value := range values {
headers = append(headers, JSHeader{name, value}) headers += name + ": " + value + "\r\n"
if name == "Content-Type" { if strings.ToLower(name) == "content-type" {
cType = value cType = value
} }
} }
@ -54,11 +54,7 @@ func NewJSResponse(res *http.Response) *JSResponse {
} }
func (j *JSResponse) NewHash() string { func (j *JSResponse) NewHash() string {
hash := fmt.Sprintf("%d.%s", j.Status, j.ContentType) return fmt.Sprintf("%d.%s.%s", j.Status, j.ContentType, j.Headers)
for _, h := range j.Headers {
hash += fmt.Sprintf(".%s-%s", h.Name, h.Value)
}
return hash
} }
func (j *JSResponse) UpdateHash() { func (j *JSResponse) UpdateHash() {
@ -81,31 +77,44 @@ func (j *JSResponse) WasModified() bool {
} }
func (j *JSResponse) GetHeader(name, deflt string) string { func (j *JSResponse) GetHeader(name, deflt string) string {
name = strings.ToLower(name) headers := strings.Split(j.Headers, "\r\n")
for _, h := range j.Headers { for i := 0; i < len(headers); i++ {
if name == strings.ToLower(h.Name) { header_name := header_regexp.ReplaceAllString(headers[i], "$1")
return h.Value header_value := header_regexp.ReplaceAllString(headers[i], "$2")
if strings.ToLower(name) == strings.ToLower(header_name) {
return header_value
} }
} }
return deflt return deflt
} }
func (j *JSResponse) SetHeader(name, value string) { func (j *JSResponse) SetHeader(name, value string) {
name = strings.ToLower(name) headers := strings.Split(j.Headers, "\r\n")
for i, h := range j.Headers { for i := 0; i < len(headers); i++ {
if name == strings.ToLower(h.Name) { header_name := header_regexp.ReplaceAllString(headers[i], "$1")
j.Headers[i].Value = value header_value := header_regexp.ReplaceAllString(headers[i], "$2")
if strings.ToLower(name) == strings.ToLower(header_name) {
old_header := header_name + ": " + header_value + "\r\n"
new_header := header_name + ": " + value + "\r\n"
j.Headers = strings.Replace(j.Headers, old_header, new_header, 1)
return return
} }
} }
j.Headers = append(j.Headers, JSHeader{name, value}) j.Headers += name + ": " + value + "\r\n"
} }
func (j *JSResponse) RemoveHeader(name string) { func (j *JSResponse) RemoveHeader(name string) {
name = strings.ToLower(name) headers := strings.Split(j.Headers, "\r\n")
for i, h := range j.Headers { for i := 0; i < len(headers); i++ {
if name == strings.ToLower(h.Name) { header_name := header_regexp.ReplaceAllString(headers[i], "$1")
j.Headers = append(j.Headers[:i], j.Headers[i+1:]...) header_value := header_regexp.ReplaceAllString(headers[i], "$2")
if strings.ToLower(name) == strings.ToLower(header_name) {
removed_header := header_name + ": " + header_value + "\r\n"
j.Headers = strings.Replace(j.Headers, removed_header, "", 1)
return
} }
} }
} }
@ -117,11 +126,17 @@ func (j *JSResponse) ClearBody() {
func (j *JSResponse) ToResponse(req *http.Request) (resp *http.Response) { func (j *JSResponse) ToResponse(req *http.Request) (resp *http.Response) {
resp = goproxy.NewResponse(req, j.ContentType, j.Status, j.Body) resp = goproxy.NewResponse(req, j.ContentType, j.Status, j.Body)
if len(j.Headers) > 0 {
for _, h := range j.Headers { headers := strings.Split(j.Headers, "\r\n")
resp.Header.Add(h.Name, h.Value) for i := 0; i < len(headers); i++ {
if headers[i] != "" {
header_name := header_regexp.ReplaceAllString(headers[i], "$1")
header_value := header_regexp.ReplaceAllString(headers[i], "$2")
resp.Header.Add(header_name, header_value)
} }
} }
return return
} }