add noAuthServiceName. skip OAuth for testing.

Author: fujiwara

authenticator.go

@@ -2,14 +2,14 @@ package main
 
 import (
 	"encoding/json"
+	"fmt"
 	"github.com/go-martini/martini"
 	gooauth2 "github.com/golang/oauth2"
 	"github.com/martini-contrib/oauth2"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"strings"
-	"fmt"
 )
 
 type Authenticator interface {
@@ -53,7 +53,7 @@ func GithubGeneral(opts *gooauth2.Options, conf *Conf) martini.Handler {
 
 type BaseAuth struct {
 	handler martini.Handler
-	conf *Conf
+	conf    *Conf
 }
 
 func (b *BaseAuth) Handler() martini.Handler {

conf.go

@@ -6,6 +6,10 @@ import (
 	"io/ioutil"
 )
 
+const (
+	noAuthServiceName = "nothing" // for testing only (undocumented)
+)
+
 type Conf struct {
 	Addr         string      `yaml:"address"`
 	SSL          SSLConf     `yaml:"ssl"`

httpd.go

@@ -42,17 +42,19 @@ func NewServer(conf *Conf) *Server {
 
 func (s *Server) Run() error {
 	m := martini.Classic()
-	a := NewAuthenticator(s.Conf)
 
 	cookieStore := sessions.NewCookieStore([]byte(s.Conf.Auth.Session.Key))
 	if domain := s.Conf.Auth.Session.CookieDomain; domain != "" {
 		cookieStore.Options(sessions.Options{Domain: domain})
 	}
 	m.Use(sessions.Sessions("session", cookieStore))
-	m.Use(a.Handler())
 
-	m.Use(loginRequired())
-	m.Use(restrictRequest(s.Conf.Restrictions, a))
+	if s.Conf.Auth.Info.Service != noAuthServiceName {
+		a := NewAuthenticator(s.Conf)
+		m.Use(a.Handler())
+		m.Use(loginRequired())
+		m.Use(restrictRequest(s.Conf.Restrictions, a))
+	}
 
 	backendsFor := make(map[string][]Backend)
 	backendIndex := make([]string, len(s.Conf.Proxies))