Feat: ConfigFiles for Multiple GitHub Action Provider Environments #2992
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| package com.yahoo.athenz.instance.provider.impl; | ||
|
|
||
| import com.nimbusds.jwt.proc.ConfigurableJWTProcessor; | ||
| import com.yahoo.athenz.auth.token.jwts.JwtsHelper; | ||
| import com.yahoo.athenz.auth.token.jwts.JwtsSigningKeyResolver; | ||
|
|
||
| import com.nimbusds.jose.proc.SecurityContext; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
|
|
||
| public class InstanceGithubActionsProp { | ||
|
|
||
| private final Map<String, Prop> properties = new HashMap<>(); | ||
|
|
||
| // Inner class to hold property data | ||
| private static class Prop { | ||
| String audience; | ||
| String enterprise; | ||
| Set<String> dnsSuffixes; | ||
| String jwksUri; | ||
| ConfigurableJWTProcessor<SecurityContext> jwtProcessor; | ||
|
|
||
| Prop(String dnsSuffix, String audience, String enterprise, String jwksUri) { | ||
| dnsSuffixes = Set.of(dnsSuffix.split(",")); | ||
| this.audience = audience; | ||
| this.enterprise = enterprise; | ||
| this.jwksUri = jwksUri; | ||
| this.jwtProcessor = JwtsHelper.getJWTProcessor(new JwtsSigningKeyResolver(jwksUri, null)); | ||
| } | ||
| } | ||
|
|
||
| // No-argument constructor | ||
| public InstanceGithubActionsProp() { | ||
| } | ||
|
|
||
| // Method to add properties | ||
| public void addProperties(String issuer, String providerDnsSuffix, String audience, String enterprise, String jwksUri) { | ||
| if (issuer == null || providerDnsSuffix == null || audience == null || jwksUri == null) { | ||
|
Collaborator
There was a problem hiding this comment. do we only care about nulls or should we also check for empty strings? |
||
| throw new IllegalArgumentException("One of the required properties is null"); | ||
| } | ||
| properties.put(issuer, new Prop(providerDnsSuffix, audience, enterprise, jwksUri)); | ||
|
Collaborator
There was a problem hiding this comment. we should add a check to see if the issuer is already set or not. otherwise, if the admin makes a mistake and specifies the same issuer in two different blocks, then the second one will override the first one and there would be no indication that it has taken place until the end users complain about their actions not working. e.g. both blocks have the same issuer:
also please add a corresponding test case for it. |
||
| } | ||
|
|
||
| public Boolean hasIssuer(String issuer) { | ||
| if (issuer == null || issuer.isEmpty()) { | ||
| return false; | ||
| } | ||
| return properties.containsKey(issuer); | ||
| } | ||
|
|
||
| // Getter methods | ||
| public Set<String> getDnsSuffixes(String issuer) { | ||
| if (!properties.containsKey(issuer)) { | ||
| return null; | ||
| } | ||
| return properties.get(issuer).dnsSuffixes; | ||
| } | ||
|
|
||
| public String getAudience(String issuer) { | ||
| if (!properties.containsKey(issuer)) { | ||
| return null; | ||
| } | ||
| return properties.get(issuer).audience; | ||
| } | ||
|
|
||
| public String getEnterprise(String issuer) { | ||
| if (!properties.containsKey(issuer)) { | ||
| return null; | ||
| } | ||
| return properties.get(issuer).enterprise; | ||
| } | ||
|
|
||
| public Boolean hasEnterprise (String issuer) { | ||
|
Collaborator
There was a problem hiding this comment. please remove the space after the method name |
||
| String enterprise = getEnterprise(issuer); | ||
| return enterprise != null && !enterprise.isEmpty(); | ||
| } | ||
|
|
||
| public String getJwksUri(String issuer) { | ||
| if (!properties.containsKey(issuer)) { | ||
| return null; | ||
| } | ||
| return properties.get(issuer).jwksUri; | ||
| } | ||
|
|
||
| public ConfigurableJWTProcessor<SecurityContext> getJwtProcessor(String issuer) { | ||
| if (!properties.containsKey(issuer)) { | ||
| return null; | ||
| } | ||
| return properties.get(issuer).jwtProcessor; | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please add the Athenz Authors header block (see other files in the repo)