Merge pull request hoisie#195 from hoisie/basic-auth-crash

hoisie · web-flow · commit 07b29866943a · 2016-07-30T12:56:16.000-07:00
Add check for 'Authorization' header in GetBasicAuth
diff --git a/helpers.go b/helpers.go
@@ -91,9 +91,12 @@ func NewCookie(name string, value string, age int64) *http.Cookie {
 	return &http.Cookie{Name: name, Value: value, Expires: utctime}
 }
 
-// GetBasicAuth is a helper method of *Context that returns the decoded
-// user and password from the *Context's authorization header
+// GetBasicAuth returns the decoded user and password from the context's
+// 'Authorization' header.
 func (ctx *Context) GetBasicAuth() (string, string, error) {
+	if len(ctx.Request.Header["Authorization"]) == 0 {
+		return "", "", errors.New("No Authorization header provided")
+	}
 	authHeader := ctx.Request.Header["Authorization"][0]
 	authString := strings.Split(string(authHeader), " ")
 	if authString[0] != "Basic" {
diff --git a/web_test.go b/web_test.go
@@ -248,6 +248,7 @@ var tests = []Test{
 	{"POST", "/parsejson", map[string][]string{"Content-Type": {"application/json"}}, `{"a":"hello", "b":"world"}`, 200, "hello world"},
 	//{"GET", "/testenv", "", 200, "hello world"},
 	{"GET", "/authorization", map[string][]string{"Authorization": {BuildBasicAuthCredentials("foo", "bar")}}, "", 200, "foobar"},
+	{"GET", "/authorization", nil, "", 200, "fail"},
 }
 
 func buildTestRequest(method string, path string, body string, headers map[string][]string, cookies []*http.Cookie) *http.Request {

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ var tests = []Test{`
`248`	`248`	{"POST", "/parsejson", map[string][]string{"Content-Type": {"application/json"}}, `{"a":"hello", "b":"world"}`, 200, "hello world"},
`249`	`249`	`//{"GET", "/testenv", "", 200, "hello world"},`
`250`	`250`	`{"GET", "/authorization", map[string][]string{"Authorization": {BuildBasicAuthCredentials("foo", "bar")}}, "", 200, "foobar"},`
	`251`	`+ {"GET", "/authorization", nil, "", 200, "fail"},`
`251`	`252`	`}`
`252`	`253`
`253`	`254`	`func buildTestRequest(method string, path string, body string, headers map[string][]string, cookies []http.Cookie) http.Request {`