Skip to content
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.

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

fix: empty subnet #5426

Merged
merged 1 commit into from
Feb 27, 2025
Merged
Changes from all commits
Commits
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
28 changes: 15 additions & 13 deletions service/aiproxy/middleware/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,21 @@ func TokenAuth(c *gin.Context) {

SetLogTokenFields(log.Data, token, useInternalToken)

if ok, err := network.IsIPInSubnets(c.ClientIP(), token.Subnets); err != nil {
abortLogWithMessage(c, http.StatusInternalServerError, err.Error())
return
} else if !ok {
abortLogWithMessage(c, http.StatusForbidden,
fmt.Sprintf("token (%s[%d]) can only be used in the specified subnets: %v, current ip: %s",
token.Name,
token.ID,
token.Subnets,
c.ClientIP(),
),
)
return
if len(token.Subnets) > 0 {
if ok, err := network.IsIPInSubnets(c.ClientIP(), token.Subnets); err != nil {
abortLogWithMessage(c, http.StatusInternalServerError, err.Error())
return
} else if !ok {
abortLogWithMessage(c, http.StatusForbidden,
fmt.Sprintf("token (%s[%d]) can only be used in the specified subnets: %v, current ip: %s",
token.Name,
token.ID,
token.Subnets,
c.ClientIP(),
),
)
return
}
}

var group *model.GroupCache
Expand Down