diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
index 40494ec04..7a973e304 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/admin.js
@@ -631,6 +631,7 @@ var AppRouter = Backbone.Router.extend({
grantTypes: ["authorization_code"],
responseTypes: ["code"],
subjectType: "PUBLIC",
+ jwksType: "URI",
contacts: contacts
}, { silent: true });
@@ -669,6 +670,16 @@ var AppRouter = Backbone.Router.extend({
}, { silent: true });
}
+ if (client.get("jwks")) {
+ client.set({
+ jwksType: "VAL"
+ }, { silent: true });
+ } else {
+ client.set({
+ jwksType: "URI"
+ }, { silent: true });
+ }
+
client.set({
generateClientSecret:false,
displayClientSecret:false
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
index 3ac0674b8..ed9b0d601 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
+++ b/openid-connect-server-webapp/src/main/webapp/resources/js/client.js
@@ -47,7 +47,10 @@ var ClientModel = Backbone.Model.extend({
grantTypes:[],
responseTypes:[],
policyUri:"",
+
jwksUri:"",
+ jwks:null,
+ jwksType:"URI",
applicationType:null,
sectorIdentifierUri:"",
@@ -635,7 +638,8 @@ var ClientFormView = Backbone.View.extend({
"change #tokenEndpointAuthMethod input:radio":"toggleClientCredentials",
"change #displayClientSecret":"toggleDisplayClientSecret",
"change #generateClientSecret":"toggleGenerateClientSecret",
- "change #logoUri input":"previewLogo"
+ "change #logoUri input":"previewLogo",
+ "change #jwkSelector input:radio":"toggleJWKSetType"
},
cancel:function(e) {
@@ -708,6 +712,25 @@ var ClientFormView = Backbone.View.extend({
}
},
+ /**
+ * Set up the form based on the JWK Set selector
+ */
+ toggleJWKSetType:function() {
+ var jwkSelector = $('#jwkSelector input:radio', this.el).filter(':checked').val();
+
+ if (jwkSelector == 'URI') {
+ $('#jwksUri', this.el).show();
+ $('#jwks', this.el).hide();
+ } else if (jwkSelector == 'VAL') {
+ $('#jwksUri', this.el).hide();
+ $('#jwks', this.el).show();
+ } else {
+ $('#jwksUri', this.el).hide();
+ $('#jwks', this.el).hide();
+ }
+
+ },
+
/**
* Set up the form based on the "Generate" checkbox
* @param event
@@ -880,6 +903,40 @@ var ClientFormView = Backbone.View.extend({
refreshTokenValiditySeconds = this.getFormTokenNumberValue($('#refreshTokenValidityTime input[type=text]').val(), $('#refreshTokenValidityTime select').val());
}
}
+
+ // process the JWKS
+ var jwksUri = null;
+ var jwks = null;
+ var jwkSelector = $('#jwkSelector input:radio', this.el).filter(':checked').val();
+
+ if (jwkSelector == 'URI') {
+ jwksUri = $('#jwksUri input').val();
+ jwks = null;
+ } else if (jwkSelector == 'VAL') {
+ jwksUri = null;
+ try {
+ jwks = JSON.parse($('#jwks textarea').val());
+ } catch (e) {
+ console.log("An error occurred when parsing the JWK Set");
+
+ //Display an alert with an error message
+ $('#modalAlert div.modal-header').html("JWK Set Error");
+ $('#modalAlert div.modal-body').html("There was an error parsing the public key from the JSON Web Key set. Check the value and try again.");
+
+ $("#modalAlert").modal({ // wire up the actual modal functionality and show the dialog
+ "backdrop" : "static",
+ "keyboard" : true,
+ "show" : true // ensure the modal is shown immediately
+ });
+
+ return false;
+ }
+ } else {
+ jwksUri = null;
+ jwks = null;
+ }
+
+
var attrs = {
clientName:$('#clientName input').val(),
@@ -900,7 +957,8 @@ var ClientFormView = Backbone.View.extend({
policyUri: $('#policyUri input').val(),
clientUri: $('#clientUri input').val(),
applicationType: $('#applicationType input').filter(':checked').val(),
- jwksUri: $('#jwksUri input').val(),
+ jwksUri: jwksUri,
+ jwks: jwks,
subjectType: $('#subjectType input').filter(':checked').val(),
tokenEndpointAuthMethod: tokenEndpointAuthMethod,
responseTypes: responseTypes,
@@ -976,7 +1034,7 @@ var ClientFormView = Backbone.View.extend({
app.navigate('admin/clients', {trigger:true});
},
error:function (error, response) {
- console.log("An error occurred when deleting from a list widget");
+ console.log("An error occurred when saving a client");
//Pull out the response text.
var responseJson = JSON.parse(response.responseText);
@@ -1103,6 +1161,7 @@ var ClientFormView = Backbone.View.extend({
// toggle other dynamic fields
this.toggleClientCredentials();
this.previewLogo();
+ this.toggleJWKSetType();
// disable unsupported JOSE algorithms
this.disableUnsupportedJOSEItems(app.serverConfiguration.request_object_signing_alg_values_supported, '#requestObjectSigningAlg option');
diff --git a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
index 10f1de08e..c04f356fe 100644
--- a/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
+++ b/openid-connect-server-webapp/src/main/webapp/resources/template/client.html
@@ -276,10 +276,10 @@
- >
-
- >
-
+ >
+
+ >
+
@@ -495,11 +495,23 @@
-
-
-
+
+
+
+
+ >
+
+ >
+
+
+
+
-
URL for the client's JSON Web Key set
+
URL for the client's JSON Web Key set (must be reachable by the server)
+
+
+
+
JSON Web Key set
diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
index 149da9826..225350d0f 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/web/ClientAPI.java
@@ -215,7 +215,7 @@ public class ClientAPI {
if (Strings.isNullOrEmpty(client.getJwksUri()) && client.getJwks() == null) {
logger.error("tried to create client with private key auth but no private key");
m.addAttribute(HttpCodeView.CODE, HttpStatus.BAD_REQUEST);
- m.addAttribute(JsonErrorView.ERROR_MESSAGE, "Can not create a client with private key authentication without registering a key via the JWS Set URI.");
+ m.addAttribute(JsonErrorView.ERROR_MESSAGE, "Can not create a client with private key authentication without registering a key via the JWK Set URI or JWK Set Value.");
return JsonErrorView.VIEWNAME;
}
@@ -315,10 +315,10 @@ public class ClientAPI {
} else if (client.getTokenEndpointAuthMethod().equals(AuthMethod.PRIVATE_KEY)) {
- if (Strings.isNullOrEmpty(client.getJwksUri()) && client.getJwks() != null) {
+ if (Strings.isNullOrEmpty(client.getJwksUri()) && client.getJwks() == null) {
logger.error("tried to create client with private key auth but no private key");
m.addAttribute(HttpCodeView.CODE, HttpStatus.BAD_REQUEST);
- m.addAttribute(JsonErrorView.ERROR_MESSAGE, "Can not create a client with private key authentication without registering a key via the JWS Set URI.");
+ m.addAttribute(JsonErrorView.ERROR_MESSAGE, "Can not create a client with private key authentication without registering a key via the JWK Set URI or JWK Set Value.");
return JsonErrorView.VIEWNAME;
}