Debugging
This commit is contained in:
@@ -1,59 +1,59 @@
|
||||
package auth
|
||||
// package auth
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
// import (
|
||||
// "errors"
|
||||
// "net/http"
|
||||
|
||||
"git.1248.nz/1248/Otfe/models"
|
||||
)
|
||||
// "git.technical.kiwi/go/otfe/models"
|
||||
// )
|
||||
|
||||
type auth func(http.ResponseWriter, *http.Request, models.User)
|
||||
// type auth func(http.ResponseWriter, *http.Request, models.User)
|
||||
|
||||
func User(h auth) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
user, _ := getUserSession(r)
|
||||
h(w, r, user)
|
||||
}
|
||||
}
|
||||
// func User(h auth) http.HandlerFunc {
|
||||
// return func(w http.ResponseWriter, r *http.Request) {
|
||||
// user, _ := getUserSession(r)
|
||||
// h(w, r, user)
|
||||
// }
|
||||
// }
|
||||
|
||||
func Perm(handler auth, fallback auth, perm string) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
user, err := getUserSession(r)
|
||||
if err != nil {
|
||||
http.Redirect(w, r, "/login", http.StatusFound)
|
||||
return
|
||||
}
|
||||
if user.HasPermission(perm) {
|
||||
handler(w, r, user)
|
||||
} else {
|
||||
if fallback == nil {
|
||||
UnAuth(w)
|
||||
} else {
|
||||
fallback(w, r, user)
|
||||
}
|
||||
}
|
||||
// func Perm(handler auth, fallback auth, perm string) http.HandlerFunc {
|
||||
// return func(w http.ResponseWriter, r *http.Request) {
|
||||
// user, err := getUserSession(r)
|
||||
// if err != nil {
|
||||
// http.Redirect(w, r, "/login", http.StatusFound)
|
||||
// return
|
||||
// }
|
||||
// if user.HasPermission(perm) {
|
||||
// handler(w, r, user)
|
||||
// } else {
|
||||
// if fallback == nil {
|
||||
// UnAuth(w)
|
||||
// } else {
|
||||
// fallback(w, r, user)
|
||||
// }
|
||||
// }
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
func getUserSession(r *http.Request) (models.User, error) {
|
||||
var session models.Session
|
||||
var user models.User
|
||||
//Check for session in db
|
||||
err := session.Get(r)
|
||||
if err == nil {
|
||||
//Get user associated with the session
|
||||
err = user.Read("_id", session.UserID)
|
||||
if err == nil {
|
||||
return user, nil
|
||||
// func getUserSession(r *http.Request) (models.User, error) {
|
||||
// var session models.Session
|
||||
// var user models.User
|
||||
// //Check for session in db
|
||||
// err := session.Get(r)
|
||||
// if err == nil {
|
||||
// //Get user associated with the session
|
||||
// err = user.Read("_id", session.UserID)
|
||||
// if err == nil {
|
||||
// return user, nil
|
||||
|
||||
}
|
||||
}
|
||||
return user, errors.New("User not logged in")
|
||||
}
|
||||
// }
|
||||
// }
|
||||
// return user, errors.New("User not logged in")
|
||||
// }
|
||||
|
||||
func UnAuth(w http.ResponseWriter) {
|
||||
http.Error(w, "You are not authorized to view this page",
|
||||
http.StatusForbidden)
|
||||
}
|
||||
// func UnAuth(w http.ResponseWriter) {
|
||||
// http.Error(w, "You are not authorized to view this page",
|
||||
// http.StatusForbidden)
|
||||
// }
|
||||
|
||||
@@ -1,113 +1,113 @@
|
||||
package auth
|
||||
// package auth
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"strings"
|
||||
"testing"
|
||||
// import (
|
||||
// "fmt"
|
||||
// "net/http"
|
||||
// "net/http/httptest"
|
||||
// "strings"
|
||||
// "testing"
|
||||
|
||||
"git.1248.nz/1248/Otfe/misc/helpers"
|
||||
"git.1248.nz/1248/Otfe/misc/helpers/cookie"
|
||||
"git.1248.nz/1248/Otfe/models"
|
||||
"github.com/globalsign/mgo/bson"
|
||||
)
|
||||
// "git.technical.kiwi/go/otfe/misc/helpers"
|
||||
// "git.technical.kiwi/go/otfe/misc/helpers/cookie"
|
||||
// "git.technical.kiwi/go/otfe/models"
|
||||
// "github.com/globalsign/mgo/bson"
|
||||
// )
|
||||
|
||||
func TestUser(t *testing.T) {
|
||||
//Setup user with session
|
||||
recorder := httptest.NewRecorder()
|
||||
user, session := userSession(t)
|
||||
request := request(t, session)
|
||||
u := User(handler)
|
||||
//Run
|
||||
u(recorder, request)
|
||||
//Check
|
||||
body := recorder.Body.String()
|
||||
if !strings.Contains(body, user.ID.Hex()) {
|
||||
t.Fail()
|
||||
}
|
||||
//Setup without session
|
||||
recorder = httptest.NewRecorder()
|
||||
request, _ = http.NewRequest("GET", "/", nil)
|
||||
//Run
|
||||
u(recorder, request)
|
||||
//Check
|
||||
helpers.Equals(t, recorder.Body.String(),
|
||||
"{ObjectIdHex(\"\") ObjectIdHex(\"\") []}")
|
||||
// func TestUser(t *testing.T) {
|
||||
// //Setup user with session
|
||||
// recorder := httptest.NewRecorder()
|
||||
// user, session := userSession(t)
|
||||
// request := request(t, session)
|
||||
// u := User(handler)
|
||||
// //Run
|
||||
// u(recorder, request)
|
||||
// //Check
|
||||
// body := recorder.Body.String()
|
||||
// if !strings.Contains(body, user.ID.Hex()) {
|
||||
// t.Fail()
|
||||
// }
|
||||
// //Setup without session
|
||||
// recorder = httptest.NewRecorder()
|
||||
// request, _ = http.NewRequest("GET", "/", nil)
|
||||
// //Run
|
||||
// u(recorder, request)
|
||||
// //Check
|
||||
// helpers.Equals(t, recorder.Body.String(),
|
||||
// "{ObjectIdHex(\"\") ObjectIdHex(\"\") []}")
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
func TestPerm(t *testing.T) {
|
||||
p := Perm(handler, UnAuth, "perm")
|
||||
recorder := httptest.NewRecorder()
|
||||
user, session := userSession(t)
|
||||
request := request(t, session)
|
||||
p(recorder, request)
|
||||
if !strings.Contains(recorder.Body.String(),
|
||||
"You are not authorized to view this page") {
|
||||
t.Log("Authorization fail")
|
||||
t.Fail()
|
||||
}
|
||||
// func TestPerm(t *testing.T) {
|
||||
// p := Perm(handler, UnAuth, "perm")
|
||||
// recorder := httptest.NewRecorder()
|
||||
// user, session := userSession(t)
|
||||
// request := request(t, session)
|
||||
// p(recorder, request)
|
||||
// if !strings.Contains(recorder.Body.String(),
|
||||
// "You are not authorized to view this page") {
|
||||
// t.Log("Authorization fail")
|
||||
// t.Fail()
|
||||
// }
|
||||
|
||||
p = Perm(handler, UnAuth, "test")
|
||||
recorder = httptest.NewRecorder()
|
||||
p(recorder, request)
|
||||
if !strings.Contains(recorder.Body.String(), user.ID.Hex()) {
|
||||
t.Log("Has permission fail")
|
||||
t.Fail()
|
||||
}
|
||||
// p = Perm(handler, UnAuth, "test")
|
||||
// recorder = httptest.NewRecorder()
|
||||
// p(recorder, request)
|
||||
// if !strings.Contains(recorder.Body.String(), user.ID.Hex()) {
|
||||
// t.Log("Has permission fail")
|
||||
// t.Fail()
|
||||
// }
|
||||
|
||||
recorder = httptest.NewRecorder()
|
||||
request, err := http.NewRequest("GET", "/", nil)
|
||||
helpers.Ok(t, err)
|
||||
p(recorder, request)
|
||||
if !strings.Contains(recorder.Body.String(), "login") {
|
||||
t.Log("Login fail")
|
||||
t.Fail()
|
||||
}
|
||||
// recorder = httptest.NewRecorder()
|
||||
// request, err := http.NewRequest("GET", "/", nil)
|
||||
// helpers.Ok(t, err)
|
||||
// p(recorder, request)
|
||||
// if !strings.Contains(recorder.Body.String(), "login") {
|
||||
// t.Log("Login fail")
|
||||
// t.Fail()
|
||||
// }
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
func TestGetUserSession(t *testing.T) {
|
||||
user, session := userSession(t)
|
||||
request := request(t, session)
|
||||
//Test
|
||||
user2, err := getUserSession(request)
|
||||
helpers.Ok(t, err)
|
||||
helpers.Equals(t, user, user2)
|
||||
// func TestGetUserSession(t *testing.T) {
|
||||
// user, session := userSession(t)
|
||||
// request := request(t, session)
|
||||
// //Test
|
||||
// user2, err := getUserSession(request)
|
||||
// helpers.Ok(t, err)
|
||||
// helpers.Equals(t, user, user2)
|
||||
|
||||
}
|
||||
// }
|
||||
|
||||
func userSession(t *testing.T) (models.User, models.Session) {
|
||||
models.DBWipeCollection("user", "session", "group")
|
||||
// func userSession(t *testing.T) (models.User, models.Session) {
|
||||
// models.DBWipeCollection("user", "session", "group")
|
||||
|
||||
group := models.NewGroup("test")
|
||||
group.ID = bson.NewObjectId()
|
||||
group.Permissions["test"] = true
|
||||
//group.Admin = true
|
||||
helpers.Ok(t, group.Create())
|
||||
// group := models.NewGroup("test")
|
||||
// group.ID = bson.NewObjectId()
|
||||
// group.Permissions["test"] = true
|
||||
// //group.Admin = true
|
||||
// helpers.Ok(t, group.Create())
|
||||
|
||||
user := models.User{Name: "test",
|
||||
Email: "test"}
|
||||
user.ID = bson.NewObjectId()
|
||||
user.PrimaryGroup = group.ID
|
||||
helpers.Ok(t, user.Create())
|
||||
// user := models.User{Name: "test",
|
||||
// Email: "test"}
|
||||
// user.ID = bson.NewObjectId()
|
||||
// user.PrimaryGroup = group.ID
|
||||
// helpers.Ok(t, user.Create())
|
||||
|
||||
session := models.Session{UserID: user.ID}
|
||||
session.ID = bson.NewObjectId()
|
||||
helpers.Ok(t, session.Create())
|
||||
return user, session
|
||||
}
|
||||
// session := models.Session{UserID: user.ID}
|
||||
// session.ID = bson.NewObjectId()
|
||||
// helpers.Ok(t, session.Create())
|
||||
// return user, session
|
||||
// }
|
||||
|
||||
func request(t *testing.T, s models.Session) *http.Request {
|
||||
cookie := &http.Cookie{Name: "session",
|
||||
Value: cookie.Encode(s.ID.Hex())}
|
||||
request, err := http.NewRequest("GET", "/", nil)
|
||||
helpers.Ok(t, err)
|
||||
request.AddCookie(cookie)
|
||||
return request
|
||||
}
|
||||
// func request(t *testing.T, s models.Session) *http.Request {
|
||||
// cookie := &http.Cookie{Name: "session",
|
||||
// Value: cookie.Encode(s.ID.Hex())}
|
||||
// request, err := http.NewRequest("GET", "/", nil)
|
||||
// helpers.Ok(t, err)
|
||||
// request.AddCookie(cookie)
|
||||
// return request
|
||||
// }
|
||||
|
||||
func handler(w http.ResponseWriter, r *http.Request, u models.User) {
|
||||
fmt.Fprint(w, u)
|
||||
}
|
||||
// func handler(w http.ResponseWriter, r *http.Request, u models.User) {
|
||||
// fmt.Fprint(w, u)
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user