Merge branch 'sorah-customizable-oauth2-path'

Conflicts:
	config_test.go

Author: typester

conf.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"gopkg.in/yaml.v1"
 	"io/ioutil"
+	"github.com/martini-contrib/oauth2"
 )
 
 const (
@@ -16,6 +17,7 @@ type Conf struct {
 	Auth         AuthConf    `yaml:"auth"`
 	Restrictions []string    `yaml:"restrictions"`
 	Proxies      []ProxyConf `yaml:"proxy"`
+	Paths        PathConf    `yaml:"paths"`
 	Htdocs       string      `yaml:"htdocs"`
 }
 
@@ -50,6 +52,13 @@ type ProxyConf struct {
 	Host  string `yaml:"host"`
 }
 
+type PathConf struct {
+	Login    string `yaml:"login"`
+	Logout   string `yaml:"logout"`
+	Callback string `yaml:"callback"`
+	Error    string `yaml:"error"`
+}
+
 func ParseConf(path string) (*Conf, error) {
 	data, err := ioutil.ReadFile(path)
 	if err != nil {
@@ -94,3 +103,18 @@ func ParseConf(path string) (*Conf, error) {
 
 	return c, nil
 }
+
+func (c *Conf) SetOAuth2Paths() {
+	if c.Paths.Login != "" {
+		oauth2.PathLogin = c.Paths.Login
+	}
+	if c.Paths.Logout != "" {
+		oauth2.PathLogout = c.Paths.Logout
+	}
+	if c.Paths.Callback != "" {
+		oauth2.PathCallback = c.Paths.Callback
+	}
+	if c.Paths.Error != "" {
+		oauth2.PathError = c.Paths.Error
+	}
+}

config_test.go

@@ -4,6 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 	"testing"
+	"github.com/martini-contrib/oauth2"
 )
 
 func TestParse(t *testing.T) {
@@ -202,3 +203,57 @@ proxy:
 		t.Errorf("unexpected proxy[1]: %#v", ifdb)
 	}
 }
+
+func TestPathConf(t *testing.T) {
+	f, err := ioutil.TempFile("", "")
+	if err != nil {
+		t.Error(err)
+	}
+	defer func() {
+		f.Close()
+		os.Remove(f.Name())
+	}()
+
+	data := `---
+address: ":9999"
+
+auth:
+  session:
+    key: secret
+
+  info:
+    service: 'github'
+    client_id: 'secret client id'
+    client_secret: 'secret client secret'
+    redirect_url: 'http://example.com/_gate_callback'
+
+paths:
+    login: "/_gate_login"
+    logout: "/_gate_logout"
+    callback: "/_gate_callback"
+    error: "/_gate_error"
+`
+	if err := ioutil.WriteFile(f.Name(), []byte(data), 0644); err != nil {
+		t.Error(err)
+	}
+
+	conf, err := ParseConf(f.Name())
+	if err != nil {
+		t.Error(err)
+	}
+
+	conf.SetOAuth2Paths()
+
+	if oauth2.PathLogin != "/_gate_login" {
+		t.Errorf("unexpected oauth2.PathLogin: %s", oauth2.PathLogin)
+	}
+	if oauth2.PathLogout != "/_gate_logout" {
+		t.Errorf("unexpected oauth2.PathLogout: %s", oauth2.PathLogout)
+	}
+	if oauth2.PathCallback != "/_gate_callback" {
+		t.Errorf("unexpected oauth2.PathCallback: %s", oauth2.PathCallback)
+	}
+	if oauth2.PathError != "/_gate_error" {
+		t.Errorf("unexpected oauth2.PathError: %s", oauth2.PathError)
+	}
+}

main.go

@@ -17,6 +17,8 @@ func main() {
 		panic(err)
 	}
 
+	conf.SetOAuth2Paths()
+
 	server := NewServer(conf)
 	log.Fatal(server.Run())
 }