Merge pull request #3136 from tphoney/config-trim_hostname_prefixes

(fix) trim http/s prefixes from config hostnames

cmd/drone-server/config/config.go

@@ -144,7 +144,7 @@ type (
 
 	// Starlark configures the starlark plugin
 	Starlark struct {
-		Enabled bool `envconfig:"DRONE_STARLARK_ENABLED"`
+		Enabled   bool   `envconfig:"DRONE_STARLARK_ENABLED"`
 		StepLimit uint64 `envconfig:"DRONE_STARLARK_STEP_LIMIT"`
 	}
 
@@ -488,17 +488,28 @@ func (c *Config) IsStash() bool {
 	return c.Stash.Server != ""
 }
 
+func cleanHostname(hostname string) string {
+	hostname = strings.ToLower(hostname)
+	hostname = strings.TrimPrefix(hostname, "http://")
+	hostname = strings.TrimPrefix(hostname, "https://")
+
+	return hostname
+}
+
 func defaultAddress(c *Config) {
 	if c.Server.Key != "" || c.Server.Cert != "" || c.Server.Acme {
 		c.Server.Port = ":443"
 		c.Server.Proto = "https"
 	}
+	c.Server.Host = cleanHostname(c.Server.Host)
 	c.Server.Addr = c.Server.Proto + "://" + c.Server.Host
 }
 
 func defaultProxy(c *Config) {
 	if c.Proxy.Host == "" {
 		c.Proxy.Host = c.Server.Host
+	} else {
+		c.Proxy.Host = cleanHostname(c.Proxy.Host)
 	}
 	if c.Proxy.Proto == "" {
 		c.Proxy.Proto = c.Server.Proto

cmd/drone-server/config/config_test.go

@@ -0,0 +1,48 @@
+// Copyright 2019 Drone IO, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package config
+
+import "testing"
+
+func Test_cleanHostname(t *testing.T) {
+	tests := []struct {
+		name     string
+		hostname string
+		want     string
+	}{
+		{
+			name:     "no prefix",
+			hostname: "drone.io",
+			want:     "drone.io",
+		},
+		{
+			name:     "http prefix",
+			hostname: "http://drone.io",
+			want:     "drone.io",
+		},
+		{
+			name:     "https prefix",
+			hostname: "https://drone.io",
+			want:     "drone.io",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := cleanHostname(tt.hostname); got != tt.want {
+				t.Errorf("cleanHostname() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}