testing

jehiah · jehiah · commit 42f539109ede · 2012-12-17T13:38:33.000-05:00
diff --git a/htpasswd.go b/htpasswd.go
@@ -4,6 +4,7 @@ import (
 	"crypto/sha1"
 	"encoding/base64"
 	"encoding/csv"
+	"io"
 	"log"
 	"os"
 )
@@ -15,26 +16,30 @@ type HtpasswdFile struct {
 	Users map[string]string
 }
 
-func NewHtpasswdFile(path string) *HtpasswdFile {
+func NewHtpasswdFromFile(path string) (*HtpasswdFile, error) {
 	log.Printf("using htpasswd file %s", path)
 	r, err := os.Open(path)
 	if err != nil {
-		log.Fatalf("failed opening %v, %s", path, err.Error())
+		return nil, err
 	}
-	csv_reader := csv.NewReader(r)
+	return NewHtpasswd(r)
+}
+
+func NewHtpasswd(file io.Reader) (*HtpasswdFile, error) {
+	csv_reader := csv.NewReader(file)
 	csv_reader.Comma = ':'
 	csv_reader.Comment = '#'
 	csv_reader.TrimLeadingSpace = true
 
 	records, err := csv_reader.ReadAll()
 	if err != nil {
-		log.Fatalf("Failed reading file %s", err.Error())
+		return nil, err
 	}
 	h := &HtpasswdFile{Users: make(map[string]string)}
 	for _, record := range records {
 		h.Users[record[0]] = record[1]
 	}
-	return h
+	return h, nil
 }
 
 func (h *HtpasswdFile) Validate(user string, password string) bool {
diff --git a/htpasswd_test.go b/htpasswd_test.go
@@ -0,0 +1,16 @@
+package main
+
+import (
+	"bytes"
+	"github.com/bmizerany/assert"
+	"testing"
+)
+
+func TestHtpasswd(t *testing.T) {
+	file := bytes.NewBuffer([]byte("testuser:{SHA}PaVBVZkYqAjCQCu6UBL2xgsnZhw=\n"))
+	h, err := NewHtpasswd(file)
+	assert.Equal(t, err, nil)
+
+	valid := h.Validate("testuser", "asdf")
+	assert.Equal(t, valid, true)
+}
diff --git a/main.go b/main.go
@@ -2,12 +2,12 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
 	"net"
 	"net/http"
 	"net/url"
 	"strings"
-	"fmt"
 )
 
 const VERSION = "0.0.1"
@@ -72,7 +72,10 @@ func main() {
 		oauthproxy.SignInMessage = fmt.Sprintf("using a %s email address", *googleAppsDomain)
 	}
 	if *htpasswdFile != "" {
-		oauthproxy.HtpasswdFile = NewHtpasswdFile(*htpasswdFile)
+		oauthproxy.HtpasswdFile, err = NewHtpasswdFromFile(*htpasswdFile)
+		if err != nil {
+			log.Fatalf("FATAL: unable to open %s %s", *htpasswdFile, err.Error())
+		}
 	}
 	listener, err := net.Listen("tcp", *httpAddr)
 	if err != nil {
diff --git a/oauthproxy.go b/oauthproxy.go
@@ -169,11 +169,11 @@ func (p *OauthProxy) ErrorPage(rw http.ResponseWriter, code int, title string, m
 	rw.WriteHeader(code)
 	templates := getTemplates()
 	t := struct {
-		Title         string
-		Message       string
+		Title   string
+		Message string
 	}{
-		Title:         fmt.Sprintf("%d %s", code, title),
-		Message:       message,
+		Title:   fmt.Sprintf("%d %s", code, title),
+		Message: message,
 	}
 	templates.ExecuteTemplate(rw, "error.html", t)
 }
@@ -254,7 +254,7 @@ func (p *OauthProxy) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 			return
 		}
 	}
-	
+
 	cookie, err := req.Cookie(p.CookieKey)
 	var ok bool
 	var email string
diff --git a/templates.go b/templates.go
@@ -18,7 +18,7 @@ func getTemplates() *template.Template {
 	if err != nil {
 		log.Fatalf("failed parsing template %s", err.Error())
 	}
-	
+
 	t, err = t.Parse(`{{define "error.html"}}
 <html><head><title>{{.Title}}</title></head>
 <body>
diff --git a/templates_test.go b/templates_test.go
@@ -0,0 +1,12 @@
+package main
+
+import (
+	"github.com/bmizerany/assert"
+	"testing"
+)
+
+func TestTemplatesCompile(t *testing.T) {
+	templates := getTemplates()
+	assert.NotEqual(t, templates, nil)
+
+}
diff --git a/validator.go b/validator.go
@@ -1,10 +1,10 @@
 package main
 
 import (
-	"os"
-	"log"
 	"encoding/csv"
 	"fmt"
+	"log"
+	"os"
 	"strings"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -169,11 +169,11 @@ func (p *OauthProxy) ErrorPage(rw http.ResponseWriter, code int, title string, m`
`169`	`169`	`rw.WriteHeader(code)`
`170`	`170`	`templates := getTemplates()`
`171`	`171`	`t := struct {`
`172`		`- Title string`
`173`		`- Message string`
	`172`	`+ Title string`
	`173`	`+ Message string`
`174`	`174`	`}{`
`175`		`- Title: fmt.Sprintf("%d %s", code, title),`
`176`		`- Message: message,`
	`175`	`+ Title: fmt.Sprintf("%d %s", code, title),`
	`176`	`+ Message: message,`
`177`	`177`	`}`
`178`	`178`	`templates.ExecuteTemplate(rw, "error.html", t)`
`179`	`179`	`}`
`@@ -254,7 +254,7 @@ func (p OauthProxy) ServeHTTP(rw http.ResponseWriter, req http.Request) {`
`254`	`254`	`return`
`255`	`255`	`}`
`256`	`256`	`}`
`257`		`-`
	`257`	`+`
`258`	`258`	`cookie, err := req.Cookie(p.CookieKey)`
`259`	`259`	`var ok bool`
`260`	`260`	`var email string`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ func getTemplates() *template.Template {`
`18`	`18`	`if err != nil {`
`19`	`19`	`log.Fatalf("failed parsing template %s", err.Error())`
`20`	`20`	`}`
`21`		`-`
	`21`	`+`
`22`	`22`	t, err = t.Parse(`{{define "error.html"}}
`23`	`23`	`<html><head><title>{{.Title}}</title></head>`
`24`	`24`	`<body>`