Skip to content

Commit

Permalink
feat: update few more entries to lowercase comparison
Browse files Browse the repository at this point in the history
  • Loading branch information
m0nhawk committed Jul 1, 2024
1 parent 0d33383 commit b36d6de
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions arborist/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -258,14 +258,14 @@ func authorizeUser(request *AuthRequest) (*AuthResponse, error) {
) _
`,
&authorized,
request.Username, // $1
request.Service, // $2
request.Method, // $3
len(request.Policies) == 0, // $4
pq.Array(request.Policies), // $5
resource, // $6
AnonymousGroup, // $7
LoggedInGroup, // $8
strings.ToLower(request.Username), // $1
request.Service, // $2
request.Method, // $3
len(request.Policies) == 0, // $4
pq.Array(request.Policies), // $5
resource, // $6
AnonymousGroup, // $7
LoggedInGroup, // $8
)
} else if tag != "" {
err = request.stmts.Select(
Expand Down Expand Up @@ -302,14 +302,14 @@ func authorizeUser(request *AuthRequest) (*AuthResponse, error) {
) _
`,
&authorized,
request.Username, // $1
request.Service, // $2
request.Method, // $3
len(request.Policies) == 0, // $4
pq.Array(request.Policies), // $5
tag, // $6
AnonymousGroup, // $7
LoggedInGroup, // $8
strings.ToLower(request.Username), // $1
request.Service, // $2
request.Method, // $3
len(request.Policies) == 0, // $4
pq.Array(request.Policies), // $5
tag, // $6
AnonymousGroup, // $7
LoggedInGroup, // $8
)
} else {
err = errors.New("missing resource in auth request")
Expand Down Expand Up @@ -543,9 +543,9 @@ func authorizedResources(db *sqlx.DB, request *AuthRequest) ([]ResourceFromQuery
err := db.Select(
&resources,
stmt,
request.Username, // $1
AnonymousGroup, // $2
LoggedInGroup, // $3
strings.ToLower(request.Username), // $1
AnonymousGroup, // $2
LoggedInGroup, // $3
)
if err != nil {
errResponse := newErrorResponse(
Expand Down Expand Up @@ -593,7 +593,7 @@ func authorizedResources(db *sqlx.DB, request *AuthRequest) ([]ResourceFromQuery
INNER JOIN resource AS roots ON roots.id = policy_resource.resource_id
LEFT JOIN resource ON resource.path <@ roots.path
`
err := db.Select(&resources, stmt, request.Username, request.ClientID)
err := db.Select(&resources, stmt, strings.ToLower(request.Username), request.ClientID)
if err != nil {
errResponse := newErrorResponse(
"resources query (using username + client) failed",
Expand Down

0 comments on commit b36d6de

Please sign in to comment.