MaDgIK
/
dnet-openaire-users
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

form containing only one private key

This commit is contained in:
Katerina Iatropoulou 2020-10-21 10:34:08 +00:00
parent a153f36a66
commit 5d2cc9c427
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/eu/dnetlib/openaire/usermanagement/RegisterServiceServlet.java
View File

@ -65,17 +65,16 @@ public class RegisterServiceServlet extends HttpServlet {
String name = request.getParameter("first_name").trim();
String description = request.getParameter("description").trim();
String keyType = request.getParameter("key_radio").trim();
String jwksUri = null;
String jwksString = null;
Jwks jwks = null;
if (keyType.equals("uri")) {
jwksUri = request.getParameter("uri");
String[] schemes = {"https"};
UrlValidator urlValidator = new UrlValidator(schemes);
if (!urlValidator.isValid(jwksUri)){
System.out.println("Not valid? " + jwksUri);
request.getSession().setAttribute("msg_key_uri_error_display", "display:block");
canProceed = false;
}
@ -83,7 +82,8 @@ public class RegisterServiceServlet extends HttpServlet {
jwksString = request.getParameter("value");
try {
Gson gson = new GsonBuilder().registerTypeAdapter(Jwks.class, new JwksDeserializer()).create();
jwks = gson.fromJson(jwksString, Jwks.class);
String jwksSet = String.format("{\"keys\":[%s]}", jwksString);
jwks = gson.fromJson(jwksSet, Jwks.class);
if (jwks.getKeys() == null || jwks.getKeys().length == 0) {
System.out.println("Something wrong with the keys.");
request.getSession().setAttribute("msg_key_value_error_display", "display:block");

8
src/main/webapp/registerService.jsp
View File

@ -97,17 +97,17 @@
<label class="uk-form-label uk-text-bold">Public Key Set</label>
<span class="uk-float-right">
<span class="uk-margin-small-right">
<input id="by_value" class="uk-radio uk-margin-small-right" type="radio" name="key_radio" value="value" checked>
<input id="by_value" class="uk-radio uk-margin-small-right" type="radio" name="key_radio" value="value" ${(key_radio == 'value' || key_radio == '' || key_radio == null) ? 'checked' : ''}>
<label class="clickable" for="by_value">By Value</label>
</span>
<span>
<input id="by_uri" class="uk-radio uk-margin-small-right" type="radio" name="key_radio" value="uri">
<input id="by_uri" class="uk-radio uk-margin-small-right" type="radio" name="key_radio" value="uri" ${key_radio == 'uri' ? 'checked' : ''}>
<label class="clickable" for="by_uri">By URI</label>
</span>
</span>
<div id="value_input">
<textarea id="value" name="value" type="textarea" placeholder='{"keys":[]}'
class="form-control uk-textarea" rows="10">{"keys":[]}</textarea>
<textarea id="value" name="value" type="textarea" placeholder='{"kty": ..., "e": ... , "use": ... , "kid": ..., "alg": ... , "n": ...}'
class="form-control uk-textarea" rows="10">${value}</textarea>
<span class="uk-text-danger uk-text-small">Please provide a valid JSON.</span>
</div>
<div id="uri_input" style="display:none;">