github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-16 10:03:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #292 from bettercap/refactored-http-headers

Browse source 
Refactored http headers
This commit is contained in:
Simone Margaritelli 2018-06-15 11:45:37 +02:00 • committed by GitHub
commit 92169f4fab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 85 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

75
modules/http_proxy_js_request.go
View file

@ -7,13 +7,9 @@ import (
"net/http"
"net/url"
"strings"
"regexp"
)
type JSHeader struct {
Name string
Value string
}
type JSRequest struct {
Client string
Method string
@ -23,7 +19,7 @@ type JSRequest struct {
Query string
Hostname string
ContentType string
Headers []JSHeader
Headers string
Body string
req *http.Request
@ -31,15 +27,17 @@ type JSRequest struct {
bodyRead bool
}
var header_regexp = regexp.MustCompile(`(.*?): (.*)`)
func NewJSRequest(req *http.Request) *JSRequest {
headers := make([]JSHeader, 0)
headers := ""
cType := ""
for name, values := range req.Header {
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
}
}
@ -65,10 +63,7 @@ func NewJSRequest(req *http.Request) *JSRequest {
}
func (j *JSRequest) NewHash() string {
hash := fmt.Sprintf("%s.%s.%s.%s.%s.%s.%s.%s", j.Client, j.Method, j.Version, j.Scheme, j.Hostname, j.Path, j.Query, j.ContentType)
for _, h := range j.Headers {
hash += fmt.Sprintf(".%s-%s", h.Name, h.Value)
}
hash := fmt.Sprintf("%s.%s.%s.%s.%s.%s.%s.%s.%s", j.Client, j.Method, j.Version, j.Scheme, j.Hostname, j.Path, j.Query, j.ContentType, j.Headers)
hash += "." + j.Body
return hash
}
@ -87,31 +82,44 @@ func (j *JSRequest) WasModified() bool {
}
func (j *JSRequest) GetHeader(name, deflt string) string {
name = strings.ToLower(name)
for _, h := range j.Headers {
if name == strings.ToLower(h.Name) {
return h.Value
headers := strings.Split(j.Headers, "\r\n")
for i := 0; i < len(headers); i++ {
header_name := header_regexp.ReplaceAllString(headers[i], "$1")
header_value := header_regexp.ReplaceAllString(headers[i], "$2")
if strings.ToLower(name) == strings.ToLower(header_name) {
return header_value
}
}
return deflt
}
func (j *JSRequest) SetHeader(name, value string) {
name = strings.ToLower(name)
for i, h := range j.Headers {
if name == strings.ToLower(h.Name) {
j.Headers[i].Value = value
headers := strings.Split(j.Headers, "\r\n")
for i := 0; i < len(headers); i++ {
header_name := header_regexp.ReplaceAllString(headers[i], "$1")
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
}
}
j.Headers = append(j.Headers, JSHeader{name, value})
j.Headers += name + ": " + value + "\r\n"
}
func (j *JSRequest) RemoveHeader(name string) {
name = strings.ToLower(name)
for i, h := range j.Headers {
if name == strings.ToLower(h.Name) {
j.Headers = append(j.Headers[:i], j.Headers[i+1:]...)
headers := strings.Split(j.Headers, "\r\n")
for i := 0; i < len(headers); i++ {
header_name := header_regexp.ReplaceAllString(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
}
}
}
@ -162,10 +170,17 @@ func (j *JSRequest) ToRequest() (req *http.Request) {
}
hadType := false
for _, h := range j.Headers {
req.Header.Set(h.Name, h.Value)
if h.Name == "Content-Type" {
hadType = true
headers := strings.Split(j.Headers, "\r\n")
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")
req.Header.Set(header_name, header_value)
if strings.ToLower(header_name) == "content-type" {
hadType = true
}
}
}

65
modules/http_proxy_js_response.go
View file

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