Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2016-02-11 18:55:33 +0300
committerKamil Trzcinski <ayufan@ayufan.eu>2016-02-11 18:55:33 +0300
commit9bc5a5ff0b4bbbf8ef2fab821bc974909d276982 (patch)
treeae5ab90fa93a4de98fc23d86c7d7464b53647cdd /domain_config.go
parent78672a4f8a99a3fda63ccd9119f63639827617ab (diff)
First bunch of tests
Diffstat (limited to 'domain_config.go')
-rw-r--r--domain_config.go16
1 files changed, 14 insertions, 2 deletions
diff --git a/domain_config.go b/domain_config.go
index d16ca9ad..feaceab5 100644
--- a/domain_config.go
+++ b/domain_config.go
@@ -4,6 +4,7 @@ import (
"encoding/json"
"os"
"path/filepath"
+ "strings"
)
type domainConfig struct {
@@ -16,10 +17,21 @@ type domainsConfig struct {
Domains []domainConfig
}
+func (c *domainConfig) Valid() bool {
+ if c.Domain == "" {
+ return false
+ }
+
+ // TODO: better sanitize domain
+ domain := strings.ToLower(c.Domain)
+ rootDomain := "." + strings.ToLower(*pagesDomain)
+ return !strings.HasSuffix(domain, rootDomain)
+}
+
func (c *domainsConfig) Read(group, project string) (err error) {
- configFile, err := os.Open(filepath.Join(*pagesRoot, project, group, "config.json"))
+ configFile, err := os.Open(filepath.Join(*pagesRoot, group, project, "config.json"))
if err != nil {
- return nil
+ return err
}
defer configFile.Close()