Skip to content

Includes Cookies in Debug Request Log #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Includes Cookies in Debug Request Log #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,11 +231,11 @@ func requestLogger(c *Client, r *Request) error {
}

reqLog := "\n---------------------- REQUEST LOG -----------------------\n" +
fmt.Sprintf("%s %s %s\n", r.Method, rr.URL.RequestURI(), rr.Proto) +
fmt.Sprintf("HOST : %s\n", rr.URL.Host) +
fmt.Sprintf("HEADERS:\n") +
composeHeaders(rl.Header) + "\n" +
fmt.Sprintf("BODY :\n%v\n", rl.Body) +
fmt.Sprintf("%s %s %s\n", r.Method, rr.URL.RequestURI(), rr.Proto) +
fmt.Sprintf("HOST: %s\n", rr.URL.Host) +
fmt.Sprintf("HEADERS:\n%s\n", composeHeaders(rl.Header)) +
fmt.Sprintf("COOKIES:\n%s\n", composeCookies(c.GetClient().Jar, *rr.URL)) +
Copy link
Member

@jeevatkm jeevatkm Sep 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@matthewpoer Just remembered one thing. This method focuses on Cookies from Jar and creates a section called COOKIES. Since cookies get separate section in the debug log. I think its better to read request header cookies added by the user into the cookies section finally remove the request header Cookie from headers section. Let me know your thoughts.

fmt.Sprintf("BODY:\n%v\n", rl.Body) +
"----------------------------------------------------------\n"

c.Log.Print(reqLog)
Expand Down
15 changes: 14 additions & 1 deletion util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"mime/multipart"
"net/http"
"net/textproto"
"net/url"
"os"
"path/filepath"
"reflect"
Expand Down Expand Up @@ -255,10 +256,22 @@ func closeq(v interface{}) {

func sliently(_ ...interface{}) {}

func composeCookies(jar http.CookieJar, url url.URL) string {
var str []string
for _, k := range jar.Cookies(&url) {
v := strings.TrimSpace(fmt.Sprintf("\t%s: %s", k.Name, k.Value))
str = append(str, "\t"+v)
}
return strings.Join(str, "\n")
}

func composeHeaders(hdrs http.Header) string {
var str []string
for _, k := range sortHeaderKeys(hdrs) {
str = append(str, fmt.Sprintf("%25s: %s", k, strings.Join(hdrs[k], ", ")))
v := strings.TrimSpace(fmt.Sprintf("%25s: %s", k, strings.Join(hdrs[k], ", ")))
if v != "" {
str = append(str, "\t"+v)
}
}
return strings.Join(str, "\n")
}
Expand Down