From c190d80d4aeebd959333d7cdeb738acc23f9f997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alby=20Hern=C3=A1ndez?= Date: Fri, 17 Dec 2021 22:02:44 +0000 Subject: [PATCH] Avoid overwriting the host port on http requests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove the overwrite of the repositoryURL.Host variable to include Git servers deployed on non-standard https ports Co-authored-by: Sebastián Vargas Signed-off-by: Alby Hernández Signed-off-by: Alby Hernández --- cmd/flux/bootstrap_git.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/flux/bootstrap_git.go b/cmd/flux/bootstrap_git.go index 4a754764..91738ae5 100644 --- a/cmd/flux/bootstrap_git.go +++ b/cmd/flux/bootstrap_git.go @@ -161,10 +161,15 @@ func bootstrapGitCmdRun(cmd *cobra.Command, args []string) error { secretOpts.CAFilePath = bootstrapArgs.caFile } + // Remove port of the given host when not syncing over HTTP/S to not assume port for protocol + // This _might_ be overwritten later on by e.g. --ssh-hostname + if repositoryURL.Scheme != "https" && repositoryURL.Scheme != "http" { + repositoryURL.Host = repositoryURL.Hostname() + } + // Configure repository URL to match auth config for sync. repositoryURL.User = nil repositoryURL.Scheme = "https" - repositoryURL.Host = repositoryURL.Hostname() } else { secretOpts.PrivateKeyAlgorithm = sourcesecret.PrivateKeyAlgorithm(bootstrapArgs.keyAlgorithm) secretOpts.Password = gitArgs.password