fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgit2: Improve HTTP redirection observability 

Git repositories may be redirected to different URLs
when they are accessed via HTTP. The two most obvious
scenarios are from HTTP to HTTPS and when the .git suffix
is missing.
By improving the logging on this process users can identify
changes required to their GitRepository objects.

Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
This commit is contained in:
Paulo Gomes 2022-06-08 09:29:11 +01:00
parent d48f4b4800
commit 23b337f6be
No known key found for this signature in database
GPG Key ID: 9995233870E99BEE
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/git/libgit2/managed/http.go
View File

@ -165,7 +165,7 @@ func (t *httpSmartSubtransport) Action(transportOptionsURL string, action git2go
// Therefore, on the initial GET operation we update the target URL to include the // Therefore, on the initial GET operation we update the target URL to include the
// new target, so the subsequent actions include the correct target URL. // new target, so the subsequent actions include the correct target URL.
// Example of this is trying to access a Git repository without the .git suffix. // Example of this is trying to access a Git repository without the .git suffix.
if req.Response != nil && req.Response.StatusCode == http.StatusMovedPermanently { if req.Response != nil {
if newURL, err := req.Response.Location(); err == nil && newURL != nil { if newURL, err := req.Response.Location(); err == nil && newURL != nil {
if strings.EqualFold(newURL.Host, req.URL.Host) && strings.EqualFold(newURL.Port(), req.URL.Port()) { if strings.EqualFold(newURL.Host, req.URL.Host) && strings.EqualFold(newURL.Port(), req.URL.Port()) {
opts, _ := getTransportOptions(transportOptionsURL) opts, _ := getTransportOptions(transportOptionsURL)
@ -175,6 +175,9 @@ func (t *httpSmartSubtransport) Action(transportOptionsURL string, action git2go
opts.TargetURL = trimActionSuffix(newURL.String()) opts.TargetURL = trimActionSuffix(newURL.String())
AddTransportOptions(transportOptionsURL, *opts) AddTransportOptions(transportOptionsURL, *opts)
debugLog.Info("[http]: server responded with redirect",
"newURL", opts.TargetURL, "StatusCode", req.Response.StatusCode)
} }
} }
} }
@ -419,7 +422,6 @@ func (self *httpSmartSubtransportStream) sendRequest() error {
return err return err
} }
traceLog.Info("[http]: POST redirect", "URL", self.req.URL)
continue continue
} }
@ -435,7 +437,7 @@ func (self *httpSmartSubtransportStream) sendRequest() error {
return err return err
} }
return fmt.Errorf("Unhandled HTTP error %s", resp.Status) return fmt.Errorf("unhandled HTTP error %s", resp.Status)
} }
self.resp = resp self.resp = resp