Merge pull request #17816 from callthingsoff/simplify_isValidPermissi…

…onRange server/auth: simplify code for isValidPermissionRange
etcd-io · Apr 20, 2024 · 0b7bae2 · 0b7bae2
2 parents e246bb8 + aafe229
commit 0b7bae2
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/server/auth/range_perm_cache.go b/server/auth/range_perm_cache.go
@@ -189,7 +189,7 @@ func isValidPermissionRange(key, rangeEnd []byte) bool {
 	if len(key) == 0 {
 		return false
 	}
-	if rangeEnd == nil || len(rangeEnd) == 0 { // ensure rule b1
+	if len(rangeEnd) == 0 { // ensure rule b1
 		return true
 	}
 
@@ -199,9 +199,5 @@ func isValidPermissionRange(key, rangeEnd []byte) bool {
 		return true
 	}
 
-	if isOpenEnded(rangeEnd) {
-		return true
-	}
-
-	return false
+	return isOpenEnded(rangeEnd)
 }