Skip to content

Commit

Permalink
Backport fixes to v2.39.1 (dexidp#3471)
Browse files Browse the repository at this point in the history
Signed-off-by: Denys Romanenko <65756796+RomanenkoDenys@users.noreply.github.com>
Signed-off-by: Maksim Nabokikh <max.nabokih@gmail.com>
Signed-off-by: m.nabokikh <maksim.nabokikh@flant.com>
Co-authored-by: Denys Romanenko <65756796+RomanenkoDenys@users.noreply.github.com>
  • Loading branch information
nabokihms and RomanenkoDenys committed Apr 9, 2024
1 parent f611470 commit 071d1bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 0 additions & 1 deletion connector/ldap/ldap.go
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,6 @@ func (c *ldapConnector) Login(ctx context.Context, s connector.Scopes, username,
)

username = ldap.EscapeFilter(username)
password = ldap.EscapeFilter(password)

err = c.do(ctx, func(conn *ldap.Conn) error {
entry, found, err := c.userEntry(conn, username)
Expand Down
3 changes: 2 additions & 1 deletion storage/kubernetes/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ func offlineTokenName(userID string, connID string, h func() hash.Hash) string {
return strings.TrimRight(encoding.EncodeToString(hash.Sum(nil)), "=")
}

const kubeResourceMaxLen = 63
// https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#dns-subdomain-names
const kubeResourceMaxLen = 253

var kubeResourceNameRegex = regexp.MustCompile(`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)

Expand Down

0 comments on commit 071d1bb

Please sign in to comment.