Hypernet/Passport
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix compare perm node function

Browse Source
This commit is contained in:
LittleSheep 2024-08-25 18:36:19 +08:00
parent 0f2b45352c
commit 476ef57236
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/workspace.xml
View File

@ -4,7 +4,7 @@
<option name="autoReloadType" value="ALL" /> <option name="autoReloadType" value="ALL" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix query issue"> <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix compare perm node panic">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/pkg/internal/services/perms.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/perms.go" afterDir="false" /> <change beforePath="$PROJECT_DIR$/pkg/internal/services/perms.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/perms.go" afterDir="false" />
</list> </list>
@ -153,7 +153,6 @@
</option> </option>
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value=":rotating_light: Fix ts lint issue" />
<MESSAGE value=":poop: Remove mis-imported cgo" /> <MESSAGE value=":poop: Remove mis-imported cgo" />
<MESSAGE value=":bug: Bug fixes" /> <MESSAGE value=":bug: Bug fixes" />
<MESSAGE value=":bug: Fix oauth ticket need mfa" /> <MESSAGE value=":bug: Fix oauth ticket need mfa" />
@ -178,7 +177,8 @@
<MESSAGE value=":sparkles: Return affiliated to and automated by in userinfo grpc call" /> <MESSAGE value=":sparkles: Return affiliated to and automated by in userinfo grpc call" />
<MESSAGE value=":sparkles: Pagination bots api" /> <MESSAGE value=":sparkles: Pagination bots api" />
<MESSAGE value=":bug: Fix query issue" /> <MESSAGE value=":bug: Fix query issue" />
<option name="LAST_COMMIT_MESSAGE" value=":bug: Fix query issue" /> <MESSAGE value=":bug: Fix compare perm node panic" />
<option name="LAST_COMMIT_MESSAGE" value=":bug: Fix compare perm node panic" />
</component> </component>
<component name="VgoProject"> <component name="VgoProject">
<settings-migrated>true</settings-migrated> <settings-migrated>true</settings-migrated>

30
pkg/internal/services/perms.go
View File

@ -22,18 +22,28 @@ func HasPermNodeWithDefault(perms map[string]any, requiredKey string, requiredVa
} }
func ComparePermNode(held any, required any) bool { func ComparePermNode(held any, required any) bool {
isNumeric := func(val reflect.Value) bool {
kind := val.Kind()
return kind >= reflect.Int && kind <= reflect.Uint64 || kind >= reflect.Float32 && kind <= reflect.Float64
}
toFloat64 := func(val reflect.Value) float64 {
switch val.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
return float64(val.Int())
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
return float64(val.Uint())
case reflect.Float32, reflect.Float64:
return val.Float()
default:
panic(fmt.Sprintf("non-numeric value of kind %s", val.Kind()))
}
}
heldValue := reflect.ValueOf(held) heldValue := reflect.ValueOf(held)
requiredValue := reflect.ValueOf(required) requiredValue := reflect.ValueOf(required)
switch heldValue.Kind() { switch heldValue.Kind() {
case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
if heldValue.Int() >= requiredValue.Int() {
return true
}
case reflect.Float32, reflect.Float64:
if heldValue.Float() >= requiredValue.Float() {
return true
}
case reflect.String: case reflect.String:
if heldValue.String() == requiredValue.String() { if heldValue.String() == requiredValue.String() {
return true return true
@ -45,6 +55,10 @@ func ComparePermNode(held any, required any) bool {
} }
} }
default: default:
if isNumeric(heldValue) && isNumeric(requiredValue) {
return toFloat64(heldValue) >= toFloat64(requiredValue)
}
if reflect.DeepEqual(held, required) { if reflect.DeepEqual(held, required) {
return true return true
} }