Merge pull request #4 from solsson/wildcard-hosts

Add support for wildcard hosts

Author: ryanm101

cmd/git-remote-https+iap/main.go

@@ -126,11 +126,23 @@ func configureIAP(cmd *cobra.Command, args []string) {
 	git.SetGlobalConfig(https, "iap", "clientID", clientID)
 
 	// let users manipulate standard 'https://' urls
-	httpsIAP := fmt.Sprintf("https+iap://%s", repo.Host)
-	git.SetGlobalConfig(httpsIAP, "url", "insteadOf", https)
+	insteadOf := &git.GitConfig{
+		Url:     fmt.Sprintf("https+iap://%s", repo.Host),
+		Section: "url",
+		Key:     "insteadOf",
+		Value:   https,
+	}
+	if strings.Contains(repo.Host, "*") {
+		log.Warn().Msg("While config is valid for wildcard hosts, transparent support for https:// remotes require \"insteadOf\" config")
+		log.Info().Msg("Actual hosts must be manually configured as follows (with * replaced by subdomain):")
+		log.Info().Msg(insteadOf.CommandSuggestGlobal())
+	} else {
+		git.SetConfigGlobal(insteadOf)
+	}
 
 	// set cookie path
 	domainSlug := strings.ReplaceAll(repo.Host, ".", "-")
+	domainSlug = strings.ReplaceAll(domainSlug, "*", "_wildcard_")
 	cookiePath := fmt.Sprintf("~/.config/gcp-iap/%s.cookie", domainSlug)
 	git.SetGlobalConfig(https, "http", "cookieFile", cookiePath)
 }

internal/git/git.go

@@ -17,6 +17,25 @@ const (
 	GitBinary = "git"
 )
 
+type GitConfig struct {
+	Url     string
+	Section string
+	Key     string
+	Value   string
+}
+
+func (c *GitConfig) Name() string {
+	return fmt.Sprintf("%s.%s.%s", c.Section, c.Url, c.Key)
+}
+
+func (c *GitConfig) ArgsGlobal() []string {
+	return []string{"config", "--global", c.Name(), c.Value}
+}
+
+func (c *GitConfig) CommandSuggestGlobal() string {
+	return fmt.Sprintf("git %s", strings.Join(c.ArgsGlobal(), " "))
+}
+
 // ConfigGetURLMatch call 'git config --get-urlmatch' underneath
 func ConfigGetURLMatch(key, url string) string {
 	var stdout bytes.Buffer
@@ -32,16 +51,23 @@ func ConfigGetURLMatch(key, url string) string {
 	return strings.TrimSpace(string(stdout.Bytes()))
 }
 
+// SetConfigGlobal is a new signature for SetGlobalConfig
+func SetConfigGlobal(config *GitConfig) {
+	cmd := exec.Command(GitBinary, config.ArgsGlobal()...)
+	if err := cmd.Run(); err != nil {
+		log.Fatal().Msgf("SetGlobalConfig - could not set config '%s': %s", config.Name(), err)
+	}
+}
+
 // SetGlobalConfig allows to set system-wide Git configuration.
 // The application exits in case of error.
 func SetGlobalConfig(url, section, key, value string) {
-	x := fmt.Sprintf("%s.%s.%s", section, url, key)
-	args := []string{"config", "--global", x, value}
-	cmd := exec.Command(GitBinary, args...)
-
-	if err := cmd.Run(); err != nil {
-		log.Fatal().Msgf("SetGlobalConfig - could not set config '%s': %s", x, err)
-	}
+	SetConfigGlobal(&GitConfig{
+		Url:     url,
+		Section: section,
+		Key:     key,
+		Value:   value,
+	})
 }
 
 // PassThruRemoteHTTPSHelper exec the git-remote-https helper,