Skip to content

Feat: improved oauth support #4871

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

Merged
merged 2 commits into from
Sep 21, 2023
Merged

Feat: improved oauth support #4871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ead2e4
chore: add error message to debug log
PeterSchafer Sep 21, 2023
da0a9cf
chore: improve debug logging
PeterSchafer Sep 21, 2023
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
4 changes: 3 additions & 1 deletion cliv2/cmd/cliv2/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ func logHeaderAuthorizationInfo(

err := networkAccess.AddHeaders(apiRequest)
if err != nil {
return authorization, oauthEnabled, userAgent
debugLogger.Print(err)
}

authHeader := apiRequest.Header.Get("Authorization")
Expand All @@ -370,6 +370,8 @@ func logHeaderAuthorizationInfo(
token, err := auth.GetOAuthToken(config)
if token != nil && err == nil {
tokenDetails = fmt.Sprintf(" (type=oauth; expiry=%v)", token.Expiry.UTC())
temp := sha256.Sum256([]byte(token.AccessToken))
tokenShaSum = hex.EncodeToString(temp[0:16]) + "[...]"
}
}

Expand Down
7 changes: 4 additions & 3 deletions cliv2/internal/proxy/proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@ import (

"github.com/google/uuid"

"github.com/snyk/cli/cliv2/internal/constants"
"github.com/snyk/cli/cliv2/internal/utils"
"github.com/snyk/go-application-framework/pkg/networking/certs"
"github.com/snyk/go-httpauth/pkg/httpauth"

"github.com/snyk/cli/cliv2/internal/constants"
"github.com/snyk/cli/cliv2/internal/utils"

"github.com/elazarl/goproxy"
"github.com/elazarl/goproxy/ext/auth"
)
Expand Down Expand Up @@ -136,7 +137,7 @@ func (p *WrapperProxy) ProxyInfo() *ProxyInfo {
func (p *WrapperProxy) replaceVersionHandler(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
err := p.addHeaderFunc(r)
if err != nil {
p.DebugLogger.Printf("Failed to add header")
p.DebugLogger.Printf("Failed to add header: %s", err)
}

return r, nil
Expand Down