eyjhb/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

remove custom contains funcs for slices.Contains (#2015)

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2024-07-19 09:04:04 +02:00 • committed by GitHub
parent 9e523d4687
commit 11fde62b8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 7 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hscontrol/oidc.go
View file

@ -10,6 +10,7 @@ import (
"fmt"
"html/template"
"net/http"
"slices"
"strings"
"time"
@ -365,7 +366,7 @@ func validateOIDCAllowedDomains(
) error {
if len(allowedDomains) > 0 {
if at := strings.LastIndex(claims.Email, "@"); at < 0 ||
!util.IsStringInSlice(allowedDomains, claims.Email[at+1:]) {
!slices.Contains(allowedDomains, claims.Email[at+1:]) {
log.Trace().Msg("authenticated principal does not match any allowed domain")
writer.Header().Set("Content-Type", "text/plain; charset=utf-8")
@ -393,7 +394,7 @@ func validateOIDCAllowedGroups(
) error {
if len(allowedGroups) > 0 {
for _, group := range allowedGroups {
if util.IsStringInSlice(claims.Groups, group) {
if slices.Contains(claims.Groups, group) {
return nil
}
}
@ -420,7 +421,7 @@ func validateOIDCAllowedUsers(
claims *IDTokenClaims,
) error {
if len(allowedUsers) > 0 &&
!util.IsStringInSlice(allowedUsers, claims.Email) {
!slices.Contains(allowedUsers, claims.Email) {
log.Trace().Msg("authenticated principal does not match any allowed user")
writer.Header().Set("Content-Type", "text/plain; charset=utf-8")
writer.WriteHeader(http.StatusBadRequest)