Skip to content

Fix account type IsValid bug. #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auxten merged 1 commit into from
May 23, 2019
Merged

Fix account type IsValid bug. #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion types/account.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@ const (
Write
// Super defines the super user permission.
Super
// Invalid defines the invalid permission
Invalid

// ReadOnly defines the reader user permission.
ReadOnly = Read
Expand Down Expand Up @@ -172,7 +174,7 @@ func (up *UserPermission) HasSuperPermission() bool {

// IsValid returns whether the permission object is valid or not.
func (up *UserPermission) IsValid() bool {
return up != nil && up.Role != 0
return up != nil && (up.Role >= Void && up.Role < Invalid)
}

// HasDisallowedQueryPatterns returns whether the queries are permitted.
Expand Down
4 changes: 3 additions & 1 deletion types/account_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,13 @@ func TestUserPermission(t *testing.T) {
So(UserPermissionFromRole(Admin).HasSuperPermission(), ShouldBeTrue)
})
Convey("is valid", t, func() {
So(UserPermissionFromRole(Void).IsValid(), ShouldBeFalse)
So(UserPermissionFromRole(Void).IsValid(), ShouldBeTrue)
So(UserPermissionFromRole(Read).IsValid(), ShouldBeTrue)
So(UserPermissionFromRole(Write).IsValid(), ShouldBeTrue)
So(UserPermissionFromRole(ReadWrite).IsValid(), ShouldBeTrue)
So(UserPermissionFromRole(Admin).IsValid(), ShouldBeTrue)
So(UserPermissionFromRole(-1).IsValid(), ShouldBeFalse)
So(UserPermissionFromRole(Invalid).IsValid(), ShouldBeFalse)
})
Convey("query patterns", t, func() {
// empty patterns limitation
Expand Down