Update to Casbin 2.x

gin-contrib · Aug 3, 2019 · b2abe43 · b2abe43
1 parent 749041b
commit b2abe43
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/authz.go b/authz.go
@@ -40,7 +40,13 @@ func (a *BasicAuthorizer) CheckPermission(r *http.Request) bool {
 	user := a.GetUserName(r)
 	method := r.Method
 	path := r.URL.Path
-	return a.enforcer.Enforce(user, path, method)
+
+	allowed, err := a.enforcer.Enforce(user, path, method)
+	if err != nil {
+		panic(err)
+	}
+
+	return allowed
 }
 
 // RequirePermission returns the 403 Forbidden to the client

diff --git a/authz_test.go b/authz_test.go
@@ -26,7 +26,8 @@ func testAuthzRequest(t *testing.T, router *gin.Engine, user string, path string
 
 func TestBasic(t *testing.T) {
 	router := gin.New()
-	router.Use(NewAuthorizer(casbin.NewEnforcer("authz_model.conf", "authz_policy.csv")))
+	e, _ := casbin.NewEnforcer("authz_model.conf", "authz_policy.csv")
+	router.Use(NewAuthorizer(e))
 	router.Any("/*anypath", func(c *gin.Context) {
 		c.Status(200)
 	})
@@ -39,7 +40,8 @@ func TestBasic(t *testing.T) {
 
 func TestPathWildcard(t *testing.T) {
 	router := gin.New()
-	router.Use(NewAuthorizer(casbin.NewEnforcer("authz_model.conf", "authz_policy.csv")))
+	e, _ := casbin.NewEnforcer("authz_model.conf", "authz_policy.csv")
+	router.Use(NewAuthorizer(e))
 	router.Any("/*anypath", func(c *gin.Context) {
 		c.Status(200)
 	})
@@ -61,7 +63,7 @@ func TestPathWildcard(t *testing.T) {
 
 func TestRBAC(t *testing.T) {
 	router := gin.New()
-	e := casbin.NewEnforcer("authz_model.conf", "authz_policy.csv")
+	e, _ := casbin.NewEnforcer("authz_model.conf", "authz_policy.csv")
 	router.Use(NewAuthorizer(e))
 	router.Any("/*anypath", func(c *gin.Context) {
 		c.Status(200)