Skip to content

Commit 13ce0d6

Browse files
authored
fix(sql): incorrect JWK query (#3499)
`persister_grant_jwk` had an OR statement without bracket leading to not using the last part of the query.
1 parent 5751fae commit 13ce0d6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

persistence/sql/persister_grant_jwk.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (p *Persister) GetPublicKey(ctx context.Context, issuer string, subject str
113113
var data trust.SQLData
114114
query := p.QueryWithNetwork(ctx).
115115
Where("issuer = ?", issuer).
116-
Where("subject = ? OR allow_any_subject IS TRUE", subject).
116+
Where("(subject = ? OR allow_any_subject IS TRUE)", subject).
117117
Where("key_id = ?", keyId).
118118
Where("nid = ?", p.NetworkID(ctx))
119119
if err := query.First(&data); err != nil {
@@ -135,7 +135,7 @@ func (p *Persister) GetPublicKeys(ctx context.Context, issuer string, subject st
135135
grantsData := make([]trust.SQLData, 0)
136136
query := p.QueryWithNetwork(ctx).
137137
Where("issuer = ?", issuer).
138-
Where("subject = ? OR allow_any_subject IS TRUE", subject).
138+
Where("(subject = ? OR allow_any_subject IS TRUE)", subject).
139139
Where("nid = ?", p.NetworkID(ctx))
140140

141141
if err := query.All(&grantsData); err != nil {
@@ -170,7 +170,7 @@ func (p *Persister) GetPublicKeyScopes(ctx context.Context, issuer string, subje
170170
var data trust.SQLData
171171
query := p.QueryWithNetwork(ctx).
172172
Where("issuer = ?", issuer).
173-
Where("subject = ? OR allow_any_subject IS TRUE", subject).
173+
Where("(subject = ? OR allow_any_subject IS TRUE)", subject).
174174
Where("key_id = ?", keyId).
175175
Where("nid = ?", p.NetworkID(ctx))
176176

0 commit comments

Comments
 (0)