Skip to content

Commit

Permalink
more renaming from tenant to client
Browse files Browse the repository at this point in the history
  • Loading branch information
@hebelsan
hebelsan committed Oct 6, 2023
1 parent 2fbc4da commit 21fbd3d
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
12 changes: 6 additions & 6 deletions oidcclient/jwk.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,13 @@ func (ks *OIDCTenant) readJWKsFromMemory(clientInfo ClientInfo) (jwk.Set, error)
ks.mu.RLock()
defer ks.mu.RUnlock()

isTenantAccepted, isTenantKnown := ks.acceptedClients[clientInfo]
isClientAccepted, isClientKnown := ks.acceptedClients[clientInfo]

if time.Now().Before(ks.jwksExpiry) && isTenantKnown {
if isTenantAccepted {
if time.Now().Before(ks.jwksExpiry) && isClientKnown {
if isClientAccepted {
return ks.jwks, nil
}
return nil, fmt.Errorf("tenant credentials: %+v are not accepted by the identity service", clientInfo)
return nil, fmt.Errorf("client credentials: %+v are not accepted by the identity service", clientInfo)
}
return nil, nil
}
Expand Down Expand Up @@ -129,10 +129,10 @@ func (ks *OIDCTenant) getJWKsFromServer(clientInfo ClientInfo) (r interface{}, e
resp, err := io.ReadAll(resp.Body)
if err != nil {
return result, fmt.Errorf(
"failed to fetch jwks from remote for tenant credentials %+v: %v", clientInfo, err)
"failed to fetch jwks from remote for client credentials %+v: %v", clientInfo, err)
}
return result, fmt.Errorf(
"failed to fetch jwks from remote for tenant credentials %+v: (%s)", clientInfo, resp)
"failed to fetch jwks from remote for client credentials %+v: (%s)", clientInfo, resp)
}
ks.acceptedClients[clientInfo] = true
jwks, err := jwk.ParseReader(resp.Body)
Expand Down
58 changes: 29 additions & 29 deletions oidcclient/jwk_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ func TestProviderJSON_assertMandatoryFieldsPresent(t *testing.T) {
func TestOIDCTenant_ReadJWKs(t *testing.T) {
type fields struct {
Duration time.Duration
Tenant ClientInfo
Client ClientInfo
ExpectedErrorMsg string
}
tests := []struct {
Expand All @@ -76,19 +76,19 @@ func TestOIDCTenant_ReadJWKs(t *testing.T) {
wantProviderJSON bool
}{
{
name: "read from cache with accepted tenant credentials",
name: "read from cache with accepted client credentials",
fields: fields{
Duration: 2 * time.Second,
Tenant: ClientInfo{"client-id", "app-tid", "azp"},
Client: ClientInfo{"client-id", "app-tid", "azp"},
},
wantErr: false,
wantProviderJSON: false,
}, {
name: "read from cache with invalid tenant credentials",
name: "read from cache with invalid client credentials",
fields: fields{
Duration: 2 * time.Second,
Tenant: ClientInfo{"invalid-client-id", "invalid-app-tid", "invalid-azp"},
ExpectedErrorMsg: "tenant credentials: {ClientID:invalid-client-id AppTID:invalid-app-tid Azp:invalid-azp} " +
Client: ClientInfo{"invalid-client-id", "invalid-app-tid", "invalid-azp"},
ExpectedErrorMsg: "client credentials: {ClientID:invalid-client-id AppTID:invalid-app-tid Azp:invalid-azp} " +
"are not accepted by the identity service",
},
wantErr: true,
Expand All @@ -97,8 +97,8 @@ func TestOIDCTenant_ReadJWKs(t *testing.T) {
name: "read token endpoint with invalid client_id",
fields: fields{
Duration: 2 * time.Second,
Tenant: ClientInfo{"invalid-client-id", "app-tid", "azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote for tenant credentials " +
Client: ClientInfo{"invalid-client-id", "app-tid", "azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote for client credentials " +
"{ClientID:invalid-client-id AppTID:app-tid Azp:azp}: ({\"msg\":\"Invalid x-client_id or x-app_tid provided\"})",
},
wantErr: true,
Expand All @@ -107,8 +107,8 @@ func TestOIDCTenant_ReadJWKs(t *testing.T) {
name: "read token endpoint with invalid app_tid",
fields: fields{
Duration: 2 * time.Second,
Tenant: ClientInfo{"client-id", "invalid-app-tid", "azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote for tenant credentials " +
Client: ClientInfo{"client-id", "invalid-app-tid", "azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote for client credentials " +
"{ClientID:client-id AppTID:invalid-app-tid Azp:azp}: ({\"msg\":\"Invalid x-client_id or x-app_tid provided\"})",
},
wantErr: true,
Expand All @@ -117,46 +117,46 @@ func TestOIDCTenant_ReadJWKs(t *testing.T) {
name: "read token endpoint with invalid azp",
fields: fields{
Duration: 2 * time.Second,
Tenant: ClientInfo{"client-id", "app-tid", "invalid-azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote for tenant credentials " +
Client: ClientInfo{"client-id", "app-tid", "invalid-azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote for client credentials " +
"{ClientID:client-id AppTID:app-tid Azp:invalid-azp}: ({\"msg\":\"Invalid x-azp provided\"})",
},
wantErr: true,
wantProviderJSON: true,
}, {
name: "read from token keys endpoint with accepted tenant credentials",
name: "read from token keys endpoint with accepted client credentials",
fields: fields{
Duration: 0,
Tenant: ClientInfo{"client-id", "app-tid", "azp"},
Client: ClientInfo{"client-id", "app-tid", "azp"},
},
wantErr: false,
wantProviderJSON: true,
}, {
name: "read from token keys endpoint with denied tenant credentials",
name: "read from token keys endpoint with denied client credentials",
fields: fields{
Duration: 0,
Tenant: ClientInfo{"invalid-client-id", "invalid-app-tid", "invalid-azp"},
Client: ClientInfo{"invalid-client-id", "invalid-app-tid", "invalid-azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote " +
"for tenant credentials {ClientID:invalid-client-id AppTID:invalid-app-tid Azp:invalid-azp}",
"for client credentials {ClientID:invalid-client-id AppTID:invalid-app-tid Azp:invalid-azp}",
},
wantErr: true,
wantProviderJSON: true,
}, {
name: "read from token keys endpoint with accepted tenant credentials provoking parsing error",
name: "read from token keys endpoint with accepted client credentials provoking parsing error",
fields: fields{
Duration: 0,
Tenant: ClientInfo{ClientID: "provide-invalidJWKS"},
Client: ClientInfo{ClientID: "provide-invalidJWKS"},
ExpectedErrorMsg: "error updating JWKs: failed to parse JWK set: failed to unmarshal JWK set",
},
wantErr: true, // as jwks endpoint returns no JSON
wantProviderJSON: true,
}, {
name: "read from token keys endpoint with deleted tenant credentials",
name: "read from token keys endpoint with deleted client credentials",
fields: fields{
Duration: 0,
Tenant: ClientInfo{"deleted-client-id", "deleted-app-tid", "deleted-azp"},
Client: ClientInfo{"deleted-client-id", "deleted-app-tid", "deleted-azp"},
ExpectedErrorMsg: "error updating JWKs: failed to fetch jwks from remote for " +
"tenant credentials {ClientID:deleted-client-id AppTID:deleted-app-tid Azp:deleted-azp}",
"client credentials {ClientID:deleted-client-id AppTID:deleted-app-tid Azp:deleted-azp}",
},
wantErr: true,
wantProviderJSON: true,
Expand Down Expand Up @@ -186,16 +186,16 @@ func TestOIDCTenant_ReadJWKs(t *testing.T) {
jwks: jwksJSON,
ProviderJSON: providerJSON,
}
jwks, err := tenant.GetJWKs(tt.fields.Tenant)
jwks, err := tenant.GetJWKs(tt.fields.Client)
if tt.wantErr {
if err == nil {
t.Errorf("GetJWKs() does not provide error = %v, tenantCredentials %+v", err, tt.fields.Tenant)
t.Errorf("GetJWKs() does not provide error = %v, tenantCredentials %+v", err, tt.fields.Client)
}
if !strings.HasPrefix(err.Error(), tt.fields.ExpectedErrorMsg) {
t.Errorf("GetJWKs() does not provide expected error message = %v", err.Error())
}
} else if jwks == nil {
t.Errorf("GetJWKs() returns nil = %v, tenantCredentials %+v", err, tt.fields.Tenant)
t.Errorf("GetJWKs() returns nil = %v, tenantCredentials %+v", err, tt.fields.Client)
}
})
}
Expand All @@ -204,9 +204,9 @@ func TestOIDCTenant_ReadJWKs(t *testing.T) {
func NewRouter() (r *mux.Router) {
r = mux.NewRouter()
r.HandleFunc("/oauth2/certs", ReturnJWKS).Methods(http.MethodGet).Headers(clientIDHeader, "client-id", appTIDHeader, "app-tid", azpHeader, "azp")
r.HandleFunc("/oauth2/certs", ReturnInvalidTenant).Methods(http.MethodGet).Headers(clientIDHeader, "invalid-client-id")
r.HandleFunc("/oauth2/certs", ReturnInvalidTenant).Methods(http.MethodGet).Headers(appTIDHeader, "invalid-app-tid")
r.HandleFunc("/oauth2/certs", ReturnInvalidTenant).Methods(http.MethodGet).Headers(azpHeader, "invalid-azp")
r.HandleFunc("/oauth2/certs", ReturnInvalidClient).Methods(http.MethodGet).Headers(clientIDHeader, "invalid-client-id")
r.HandleFunc("/oauth2/certs", ReturnInvalidClient).Methods(http.MethodGet).Headers(appTIDHeader, "invalid-app-tid")
r.HandleFunc("/oauth2/certs", ReturnInvalidClient).Methods(http.MethodGet).Headers(azpHeader, "invalid-azp")
r.HandleFunc("/oauth2/certs", ReturnInvalidHeaders).Methods(http.MethodGet).Headers(clientIDHeader, "deleted-client-id", appTIDHeader, "deleted-app-tid", azpHeader, "deleted-azp")
r.HandleFunc("/oauth2/certs", ReturnInvalidJWKS).Methods(http.MethodGet).Headers(clientIDHeader, "provide-invalidJWKS")
return r
Expand All @@ -224,7 +224,7 @@ func ReturnInvalidHeaders(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(400)
}

func ReturnInvalidTenant(w http.ResponseWriter, r *http.Request) {
func ReturnInvalidClient(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(400)
w.Header().Set("Content-Type", "application/json")
if r.Header.Get(azpHeader) == "invalid-azp" {
Expand Down

0 comments on commit 21fbd3d

Please sign in to comment.