Skip to content
This repository was archived by the owner on Mar 16, 2024. It is now read-only.

fix(transport): fix request body not send again when not authorized #73

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
44 changes: 39 additions & 5 deletions registry/tokentransport.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
package registry

import (
"bytes"
"encoding/json"
"fmt"
"io"
"io/ioutil"
"net/http"
"net/url"
)
Expand All @@ -13,16 +16,47 @@ type TokenTransport struct {
Password string
}

func (t *TokenTransport) RoundTrip(req *http.Request) (*http.Response, error) {
resp, err := t.Transport.RoundTrip(req)
func (t *TokenTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {

err = t.complementRequestGetBodyFunction(req)
if err != nil {
return
}

resp, err = t.Transport.RoundTrip(req)
if err != nil {
return resp, err
return
}

if authService := isTokenDemand(resp); authService != nil {
resp.Body.Close()
_ = resp.Body.Close()
if req.GetBody != nil {
req.Body, err = req.GetBody()
if err != nil {
return
}
}
resp, err = t.authAndRetry(authService, req)
}
return resp, err
return
}

func (t *TokenTransport) complementRequestGetBodyFunction(req *http.Request) (err error) {
if req.GetBody != nil || req.Body == nil {
return
}

var snapshot []byte
snapshot, err = ioutil.ReadAll(req.Body)
if err != nil {
return
}

req.Body = ioutil.NopCloser(bytes.NewReader(snapshot))
req.GetBody = func() (io.ReadCloser, error) {
return ioutil.NopCloser(bytes.NewReader(snapshot)), nil
}
return
}

type authToken struct {
Expand Down