github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more dynamic registration

pull/210/head
Justin Richer 2012-08-27 16:00:47 -04:00
parent 140de779fd
commit 9f84126cb8
3 changed files with 182 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openid-connect-server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ClientDetailsEntityService.java
View File

@ -63,7 +63,8 @@ public class DefaultOAuth2ClientDetailsEntityService implements ClientDetailsEnt
return null; // TODO: throw exception?
}
// assign a random clientid and secret if they're empty
// assign a random clientid if it's empty
// NOTE: don't assign a random client secret without asking, since public clients have no secret
if (Strings.isNullOrEmpty(client.getClientId())) {
client = generateClientId(client);
}

2
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
View File

@ -100,6 +100,8 @@ public class ClientAPI {
// set owners as current logged in user
//client.setOwner(principal.getName());
//TODO: owner has been replaced by a list of contacts, which should be styled as email addresses.
client.setDynamicallyRegistered(false);
m.addAttribute("entity", clientService.saveNewClient(client));
return "jsonClientView";

220
openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientDynamicRegistrationEndpoint.java
View File

@ -1,46 +1,176 @@
package org.mitre.openid.connect.web;
import java.awt.Component;
import java.awt.Graphics;
import java.awt.Rectangle;
import java.beans.PropertyChangeListener;
import java.beans.PropertyEditor;
import java.beans.PropertyEditorSupport;
import java.util.Map;
import java.util.Set;
import org.mitre.jwt.encryption.JweAlgorithms;
import org.mitre.jwt.signer.JwsAlgorithm;
import org.mitre.oauth2.exception.ClientNotFoundException;
import org.mitre.oauth2.model.ClientDetailsEntity;
import org.mitre.oauth2.model.ClientDetailsEntity.AppType;
import org.mitre.oauth2.model.ClientDetailsEntity.AuthType;
import org.mitre.oauth2.model.ClientDetailsEntity.UserIdType;
import org.mitre.oauth2.service.ClientDetailsEntityService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.oauth2.common.exceptions.UnauthorizedClientException;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import com.google.common.base.Joiner;
import com.google.common.base.Objects;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Sets;
@Controller
@RequestMapping(value = "register", method = RequestMethod.POST)
@RequestMapping(value = "register"/*, method = RequestMethod.POST*/)
public class ClientDynamicRegistrationEndpoint {
@Autowired
private ClientDetailsEntityService clientService;
@InitBinder
public void initBinder(WebDataBinder binder) {
binder.registerCustomEditor(AppType.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text) throws IllegalArgumentException {
if (Strings.isNullOrEmpty(text)) {
setValue(null);
} else {
setValue(AppType.getByValue(text));
}
}
@Override
public String getAsText() {
AppType at = (AppType) getValue();
return at == null ? null : at.getValue();
}
});
binder.registerCustomEditor(AuthType.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text) throws IllegalArgumentException {
if (Strings.isNullOrEmpty(text)) {
setValue(null);
} else {
setValue(AuthType.getByValue(text));
}
}
@Override
public String getAsText() {
AuthType at = (AuthType) getValue();
return at == null ? null : at.getValue();
}
});
binder.registerCustomEditor(UserIdType.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text) throws IllegalArgumentException {
if (Strings.isNullOrEmpty(text)) {
setValue(null);
} else {
setValue(UserIdType.getByValue(text));
}
}
@Override
public String getAsText() {
UserIdType ut = (UserIdType) getValue();
return ut == null ? null : ut.getValue();
}
});
binder.registerCustomEditor(JwsAlgorithm.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text) throws IllegalArgumentException {
if (Strings.isNullOrEmpty(text)) {
setValue(null);
} else {
setValue(JwsAlgorithm.getByJwaName(text));
}
}
@Override
public String getAsText() {
JwsAlgorithm alg = (JwsAlgorithm) getValue();
return alg == null ? null : alg.getJwaName();
}
});
// FIXME: JWE needs to be handled much better than it is right now
/*
binder.registerCustomEditor(JweAlgorithms.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text) throws IllegalArgumentException {
if (Strings.isNullOrEmpty(text)) {
setValue(null);
} else {
setValue(JweAlgorithms.getByJwaName(text));
}
}
@Override
public String getAsText() {
JweAlgorithms alg = (JweAlgorithms) getValue();
return alg == null ? null : alg.getJwaName();
}
});
*/
binder.registerCustomEditor(Set.class, new PropertyEditorSupport() {
@Override
public void setAsText(String text) throws IllegalArgumentException {
if (Strings.isNullOrEmpty(text)) {
setValue(null);
} else {
setValue(Sets.newHashSet(Splitter.on(" ").split(text)));
}
}
@Override
public String getAsText() {
Set<String> set = (Set<String>) getValue();
return set == null ? null : Joiner.on(" ").join(set);
}
});
}
@RequestMapping(params = "type=client_associate")
public String clientAssociate(
// TODO: use @InitBinding or @ModelAttribute to clean up this data processing
@RequestParam(value = "contacts", required = false) String contacts,
@RequestParam(value = "application_type", required = false) String applicationType,
@RequestParam(value = "contacts", required = false) Set<String> contacts,
@RequestParam(value = "application_type", required = false) AppType applicationType,
@RequestParam(value = "application_name", required = false) String applicationName,
@RequestParam(value = "logo_url", required = false) String logoUrl,
@RequestParam(value = "redirect_uris", required = false) String redirectUris,
@RequestParam(value = "token_endpoint_auth_type", required = false) String tokenEndpointAuthType,
@RequestParam(value = "redirect_uris", required = false) Set<String> redirectUris,
@RequestParam(value = "token_endpoint_auth_type", required = false) AuthType tokenEndpointAuthType,
@RequestParam(value = "policy_url", required = false) String policyUrl,
@RequestParam(value = "jwk_url", required = false) String jwkUrl,
@RequestParam(value = "jwk_encryption_url", required = false) String jwkEncryptionUrl,
@RequestParam(value = "x509_url", required = false) String x509Url,
@RequestParam(value = "x509_encryption_url", required = false) String x509EncryptionUrl,
@RequestParam(value = "sector_identifier_url", required = false) String sectorIdentifierUrl,
@RequestParam(value = "user_id_type", required = false) String userIdType,
@RequestParam(value = "require_signed_request_object", required = false) String requireSignedRequestObject,
@RequestParam(value = "user_id_type", required = false) UserIdType userIdType,
@RequestParam(value = "require_signed_request_object", required = false) JwsAlgorithm requireSignedRequestObject,
// TODO: JWE needs to be handled properly, see @InitBinder above -- we'll ignore these right now
/*
@RequestParam(value = "userinfo_signed_response_alg", required = false) String userinfoSignedResponseAlg,
@RequestParam(value = "userinfo_encrypted_response_alg", required = false) String userinfoEncryptedResponseAlg,
@RequestParam(value = "userinfo_encrypted_response_enc", required = false) String userinfoEncryptedResponseEnc,
@ -49,10 +179,12 @@ public class ClientDynamicRegistrationEndpoint {
@RequestParam(value = "idtoken_encrypted_response_alg", required = false) String idtokenEncryptedResponseAlg,
@RequestParam(value = "idtoken_encrypted_response_enc", required = false) String idtokenEncryptedResponseEnc,
@RequestParam(value = "idtoken_encrypted_response_int", required = false) String idtokenEncryptedResponseInt,
*/
@RequestParam(value = "default_max_age", required = false) Integer defaultMaxAge,
@RequestParam(value = "require_auth_time", required = false) Boolean requireAuthTime,
@RequestParam(value = "default_acr", required = false) String defaultAcr,
@RequestParam Map<String, String> parameters
ModelMap model
) {
@ -60,52 +192,56 @@ public class ClientDynamicRegistrationEndpoint {
ClientDetailsEntity client = new ClientDetailsEntity();
// always generate a new client ID and secret for this client
client = clientService.generateClientId(client);
// always generate a secret for this client
client = clientService.generateClientSecret(client);
parameters.containsKey(key)
client.setContacts(contacts);
client.setApplicationType(applicationType);
client.setApplicationName(applicationName);
client.setLogoUrl(logoUrl);
client.setRegisteredRedirectUri(redirectUris);
client.setTokenEndpointAuthType(tokenEndpointAuthType);
client.setPolicyUrl(policyUrl);
client.setJwkUrl(jwkUrl);
client.setJwkEncryptionUrl(jwkEncryptionUrl);
client.setX509Url(x509Url);
client.setX509EncryptionUrl(x509EncryptionUrl);
client.setSectorIdentifierUrl(sectorIdentifierUrl);
client.setUserIdType(userIdType);
client.setRequireSignedRequestObject(requireSignedRequestObject);
client.setDefaultMaxAge(defaultMaxAge);
client.setRequireAuthTime(requireAuthTime);
client.setDefaultACR(defaultAcr);
client.setDynamicallyRegistered(true);
if (!Strings.isNullOrEmpty(contacts)) {
// space-separated list
client.setContacts(Sets.newHashSet(Splitter.on(" ").split(contacts)));
}
ClientDetailsEntity saved = clientService.saveNewClient(client);
if (!Strings.isNullOrEmpty(applicationType)) {
client.setApplicationType(AppType.getByValue(applicationType));
}
if (!Strings.isNullOrEmpty(applicationName)) {
client.setApplicationName(applicationName);
}
if (!Strings.isNullOrEmpty(logoUrl)) {
client.setLogoUrl(logoUrl);
}
if (!Strings.isNullOrEmpty(redirectUris)) {
// space-separated list
client.setRegisteredRedirectUri(Sets.newHashSet(Splitter.on(" ").split(redirectUris)));
}
if (!Strings.isNullOrEmpty(tokenEndpointAuthType)) {
client.setTokenEndpointAuthType(AuthType.getByValue(tokenEndpointAuthType));
}
if (!Strings.isNullOrEmpty(policyUrl)) {
client.setPolicyUrl(policyUrl);
}
if (!Strings.is)
model.put("client", saved);
return "clientAssociate";
}
@RequestMapping(params = "type=rotate_secret")
public String rotateSecret(@RequestParam("client_id") String clientId, @RequestParam("client_secret") String clientSecret) {
public String rotateSecret(@RequestParam("client_id") String clientId, @RequestParam("client_secret") String clientSecret, ModelMap model) {
ClientDetailsEntity client = clientService.loadClientByClientId(clientId);
if (client == null) {
throw new ClientNotFoundException("Could not find client: " + clientId);
}
if (!Objects.equal(client.getClientSecret(), clientSecret)) {
throw new UnauthorizedClientException("Client secret did not match");
}
// rotate the secret
client = clientService.generateClientSecret(client);
ClientDetailsEntity saved = clientService.updateClient(client, client);
model.put("client", saved);
return "clientAssociate";
}