Skip to content

Commit

Permalink
Renamed
Browse files Browse the repository at this point in the history
  • Loading branch information
@strehle
strehle committed Aug 24, 2023
1 parent 5376079 commit a9cba87
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
8 changes: 4 additions & 4 deletions ...oauth/client/PrivateKeyChangeRequest.java → .../oauth/client/ClientJwtChangeRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;

import static org.cloudfoundry.identity.uaa.oauth.client.PrivateKeyChangeRequest.ChangeMode.ADD;
import static org.cloudfoundry.identity.uaa.oauth.client.ClientJwtChangeRequest.ChangeMode.ADD;

/**
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public class PrivateKeyChangeRequest {
public class ClientJwtChangeRequest {

public enum ChangeMode {
UPDATE,
Expand All @@ -28,10 +28,10 @@ public enum ChangeMode {
private String clientId;
private ChangeMode changeMode = ADD;

public PrivateKeyChangeRequest() {
public ClientJwtChangeRequest() {
}

public PrivateKeyChangeRequest(String clientId, String keyUrl, String keyConfig) {
public ClientJwtChangeRequest(String clientId, String keyUrl, String keyConfig) {
this.keyUrl = keyUrl;
this.keyConfig = keyConfig;
this.clientId = clientId;
Expand Down
8 changes: 4 additions & 4 deletions ...h/client/PrivateKeyChangeRequestTest.java → ...th/client/ClientJwtChangeRequestTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@

import static org.junit.jupiter.api.Assertions.assertNotEquals;

class PrivateKeyChangeRequestTest {
class ClientJwtChangeRequestTest {

@Test
void testRequestSerialization() {
PrivateKeyChangeRequest def = new PrivateKeyChangeRequest(null, null, null);
ClientJwtChangeRequest def = new ClientJwtChangeRequest(null, null, null);
def.setKeyId("key-1");
def.setChangeMode(PrivateKeyChangeRequest.ChangeMode.DELETE);
def.setChangeMode(ClientJwtChangeRequest.ChangeMode.DELETE);
def.setKeyUrl("http://localhost:8080/uaa/token_key");
def.setKeyConfig("{}");
def.setClientId("admin");
String jsonRequest = JsonUtils.writeValueAsString(def);
PrivateKeyChangeRequest request = JsonUtils.readValue(jsonRequest, PrivateKeyChangeRequest.class);
ClientJwtChangeRequest request = JsonUtils.readValue(jsonRequest, ClientJwtChangeRequest.class);
assertNotEquals(def, request);
}

Expand Down
12 changes: 6 additions & 6 deletions server/src/main/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpoints.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import org.cloudfoundry.identity.uaa.oauth.client.ClientConstants;
import org.cloudfoundry.identity.uaa.oauth.client.ClientDetailsCreation;
import org.cloudfoundry.identity.uaa.oauth.client.ClientDetailsModification;
import org.cloudfoundry.identity.uaa.oauth.client.PrivateKeyChangeRequest;
import org.cloudfoundry.identity.uaa.oauth.client.ClientJwtChangeRequest;
import org.cloudfoundry.identity.uaa.oauth.client.SecretChangeRequest;
import org.cloudfoundry.identity.uaa.resources.ActionResult;
import org.cloudfoundry.identity.uaa.resources.AttributeNameMapper;
Expand Down Expand Up @@ -536,9 +536,9 @@ public ActionResult changeSecret(@PathVariable String client_id, @RequestBody Se
return result;
}

@RequestMapping(value = "/oauth/clients/{client_id}/privatekey", method = RequestMethod.PUT)
@RequestMapping(value = "/oauth/clients/{client_id}/clientjwt", method = RequestMethod.PUT)
@ResponseBody
public ActionResult changePrivateKey(@PathVariable String client_id, @RequestBody PrivateKeyChangeRequest change) {
public ActionResult changeClientJwt(@PathVariable String client_id, @RequestBody ClientJwtChangeRequest change) {

ClientDetails clientDetails;
try {
Expand All @@ -560,7 +560,7 @@ public ActionResult changePrivateKey(@PathVariable String client_id, @RequestBod
case ADD :
if (change.getKey() != null) {
clientRegistrationService.addClientKeyConfig(client_id, change.getKey(), IdentityZoneHolder.get().getId(), false);
result = new ActionResult("ok", "Private key is added");
result = new ActionResult("ok", "Client jwt configuration is added");
} else {
result = new ActionResult("ok", "No key added");
}
Expand All @@ -571,12 +571,12 @@ public ActionResult changePrivateKey(@PathVariable String client_id, @RequestBod
if (clientKeyConfig != null && deleteString != null) {
clientRegistrationService.deleteClientKeyConfig(client_id, deleteString, IdentityZoneHolder.get().getId());
}
result = new ActionResult("ok", "Private key is deleted");
result = new ActionResult("ok", "Client jwt configuration is deleted");
break;

default:
clientRegistrationService.addClientKeyConfig(client_id, change.getKey(), IdentityZoneHolder.get().getId(), true);
result = new ActionResult("ok", "Private key updated");
result = new ActionResult("ok", "Client jwt configuration updated");
}
clientSecretChanges.incrementAndGet();

Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/cloudfoundry/identity/uaa/client/PrivateKeyJwtConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public String getCleanString() {
return JWKSet.parse(this.privateKeyJwt.getKeySetMap()).toString(true);
}
} catch (IllegalStateException | JsonUtils.JsonUtilException | ParseException e) {
throw new InvalidClientDetailsException("Private key configuration fails ", e);
throw new InvalidClientDetailsException("Client jwt configuration configuration fails ", e);
}
return null;
}
Expand Down Expand Up @@ -141,7 +141,7 @@ public static PrivateKeyJwtConfiguration parse(String privateKeyUrl, String priv
privateKeyJwtConfiguration = new PrivateKeyJwtConfiguration(null, JsonWebKeyHelper.deserialize(cleanJwtString));
privateKeyJwtConfiguration.validateJwkSet();
} catch (ParseException e) {
throw new InvalidClientDetailsException("Private key cannot be parsed", e);
throw new InvalidClientDetailsException("Client jwt configuration cannot be parsed", e);
}
}
return privateKeyJwtConfiguration;
Expand Down
32 changes: 16 additions & 16 deletions server/src/test/java/org/cloudfoundry/identity/uaa/client/ClientAdminEndpointsTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.cloudfoundry.identity.uaa.oauth.client.ClientConstants;
import org.cloudfoundry.identity.uaa.oauth.client.ClientDetailsCreation;
import org.cloudfoundry.identity.uaa.oauth.client.ClientDetailsModification;
import org.cloudfoundry.identity.uaa.oauth.client.PrivateKeyChangeRequest;
import org.cloudfoundry.identity.uaa.oauth.client.ClientJwtChangeRequest;
import org.cloudfoundry.identity.uaa.oauth.client.SecretChangeRequest;
import org.cloudfoundry.identity.uaa.resources.ActionResult;
import org.cloudfoundry.identity.uaa.resources.QueryableResourceManager;
Expand Down Expand Up @@ -1108,18 +1108,18 @@ void testAddPrivateKeyJwtConfigUri() {

when(clientDetailsService.retrieve(detail.getClientId(), IdentityZoneHolder.get().getId())).thenReturn(detail);

PrivateKeyChangeRequest change = new PrivateKeyChangeRequest();
ClientJwtChangeRequest change = new ClientJwtChangeRequest();
// https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata, see jwks_uri
String jwksUri = "https://any.domain.net/openid/jwks-uri";
change.setKeyUrl(jwksUri);
change.setChangeMode(PrivateKeyChangeRequest.ChangeMode.ADD);
change.setChangeMode(ClientJwtChangeRequest.ChangeMode.ADD);

ActionResult result = endpoints.changePrivateKey(detail.getClientId(), change);
assertEquals("Private key is added", result.getMessage());
ActionResult result = endpoints.changeClientJwt(detail.getClientId(), change);
assertEquals("Client jwt configuration is added", result.getMessage());
verify(clientRegistrationService, times(1)).addClientKeyConfig(detail.getClientId(), jwksUri, IdentityZoneHolder.get().getId(), false);

change.setKeyUrl(null);
result = endpoints.changePrivateKey(detail.getClientId(), change);
result = endpoints.changeClientJwt(detail.getClientId(), change);
assertEquals("No key added", result.getMessage());
}

Expand All @@ -1131,28 +1131,28 @@ void testChangeDeletePrivateKeyJwtConfigUri() {

when(clientDetailsService.retrieve(detail.getClientId(), IdentityZoneHolder.get().getId())).thenReturn(detail);

PrivateKeyChangeRequest change = new PrivateKeyChangeRequest();
ClientJwtChangeRequest change = new ClientJwtChangeRequest();
// https://openid.net/specs/openid-connect-discovery-1_0.html#ProviderMetadata, see jwks_uri
String jwksUri = "https://any.domain.net/openid/jwks-uri";
change.setKeyUrl(jwksUri);
change.setChangeMode(PrivateKeyChangeRequest.ChangeMode.ADD);
change.setChangeMode(ClientJwtChangeRequest.ChangeMode.ADD);

ActionResult result = endpoints.changePrivateKey(detail.getClientId(), change);
assertEquals("Private key is added", result.getMessage());
ActionResult result = endpoints.changeClientJwt(detail.getClientId(), change);
assertEquals("Client jwt configuration is added", result.getMessage());
verify(clientRegistrationService, times(1)).addClientKeyConfig(detail.getClientId(), jwksUri, IdentityZoneHolder.get().getId(), false);

jwksUri = "https://any.new.domain.net/openid/jwks-uri";
change.setChangeMode(PrivateKeyChangeRequest.ChangeMode.UPDATE);
change.setChangeMode(ClientJwtChangeRequest.ChangeMode.UPDATE);
change.setKeyUrl(jwksUri);
result = endpoints.changePrivateKey(detail.getClientId(), change);
assertEquals("Private key updated", result.getMessage());
result = endpoints.changeClientJwt(detail.getClientId(), change);
assertEquals("Client jwt configuration updated", result.getMessage());
verify(clientRegistrationService, times(1)).addClientKeyConfig(detail.getClientId(), jwksUri, IdentityZoneHolder.get().getId(), true);

PrivateKeyJwtConfiguration.parse(jwksUri).writeValue(detail);
change.setChangeMode(PrivateKeyChangeRequest.ChangeMode.DELETE);
change.setChangeMode(ClientJwtChangeRequest.ChangeMode.DELETE);
change.setKeyUrl(jwksUri);
result = endpoints.changePrivateKey(detail.getClientId(), change);
assertEquals("Private key is deleted", result.getMessage());
result = endpoints.changeClientJwt(detail.getClientId(), change);
assertEquals("Client jwt configuration is deleted", result.getMessage());
verify(clientRegistrationService, times(1)).deleteClientKeyConfig(detail.getClientId(), jwksUri, IdentityZoneHolder.get().getId());
}

Expand Down

0 comments on commit a9cba87

Please sign in to comment.