Merge pull request #24 from ghostiam/fix_IsGranted_panic

fix panic if permission is nil
mikespook · Jan 9, 2019 · a989d0e · a989d0e
2 parents 9833b83 + 4c20fe6
commit a989d0e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/rbac_test.go b/rbac_test.go
@@ -126,6 +126,10 @@ func TestRbacPermission(t *testing.T) {
 	if rbac.IsGranted("role-c", pB, nil) {
 		t.Fatalf("role-c should not have %s because of the unbinding with role-b", pB)
 	}
+
+	if rbac.IsGranted("role-a", nil, nil) {
+		t.Fatal("role-a should not have nil permission")
+	}
 }
 
 func BenchmarkRbacGranted(b *testing.B) {

diff --git a/role.go b/role.go
@@ -48,6 +48,10 @@ func (role *StdRole) Assign(p Permission) error {
 
 // Permit returns true if the role has specific permission.
 func (role *StdRole) Permit(p Permission) (rslt bool) {
+	if p == nil {
+		return false
+	}
+
 	role.RLock()
 	for _, rp := range role.permissions {
 		if rp.Match(p) {