From 453f415cc493e358c5cf0a7050e271059c51c072 Mon Sep 17 00:00:00 2001 From: Jesse Lang Date: Tue, 19 Dec 2017 20:08:55 -0600 Subject: [PATCH] Validate DRONE_HOST to ensure it contains a scheme and not a trailing slash --- cmd/drone-server/server.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/cmd/drone-server/server.go b/cmd/drone-server/server.go index d9c081ff8..02fc15078 100644 --- a/cmd/drone-server/server.go +++ b/cmd/drone-server/server.go @@ -477,6 +477,18 @@ func server(c *cli.Context) error { logrus.Fatalln("DRONE_HOST is not properly configured") } + if !strings.Contains(c.String("server-host"), "://") { + logrus.Fatalln( + "DRONE_HOST must be :// format", + ) + } + + if !strings.HasSuffix(c.String("server-host"), "/") { + logrus.Fatalln( + "DRONE_HOST must not have trailing slash", + ) + } + remote_, err := SetupRemote(c) if err != nil { logrus.Fatal(err)