Skip to content

Commit c4c5183

Browse files
committed
fix: over regex surrounding (by copilot code review)
Signed-off-by: Sebastian Gaviria Tangarife <sgt.911@outlook.com>
1 parent b64679e commit c4c5183

2 files changed

Lines changed: 5 additions & 14 deletions

File tree

pkg/regexp/regexp.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,3 +74,7 @@ func HasArbitraryWildcard(pattern string) (bool, error) {
7474

7575
return inspectForWildcardSegments(ast), nil
7676
}
77+
78+
func SurroundRedirectURIRegexp(uri string) string {
79+
return `\A(?:` + uri + `)\z`
80+
}

server/authflow/request.go

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func validateRegexpRedirectURI(redirectURIs []string, redirectURI string, allowW
146146
continue
147147
}
148148

149-
rgx, err := regexp.Compile(surroundRedirectURIRegexp(uri))
149+
rgx, err := regexp.Compile(dexRegexp.SurroundRedirectURIRegexp(uri))
150150
if err != nil {
151151
continue
152152
}
@@ -159,19 +159,6 @@ func validateRegexpRedirectURI(redirectURIs []string, redirectURI string, allowW
159159
return false
160160
}
161161

162-
func surroundRedirectURIRegexp(uri string) (result string) {
163-
result = uri
164-
if result[0] != '^' {
165-
result = "^" + result
166-
}
167-
168-
if result[len(result)-1] != '$' {
169-
result = result + "$"
170-
}
171-
172-
return
173-
}
174-
175162
func validateConnectorID(connectors []storage.Connector, connectorID string) bool {
176163
for _, c := range connectors {
177164
if c.ID == connectorID {

0 commit comments

Comments
 (0)