Project

General

Profile

« Previous | Next » 

Revision 59655

form containing only one private key

View differences:

RegisterServiceServlet.java
65 65
        String name = request.getParameter("first_name").trim();
66 66
        String description = request.getParameter("description").trim();
67 67
        String keyType = request.getParameter("key_radio").trim();
68

  
69 68
        String jwksUri = null;
70 69
        String jwksString = null;
71 70
        Jwks jwks = null;
72 71

  
72

  
73 73
        if (keyType.equals("uri")) {
74 74
            jwksUri = request.getParameter("uri");
75 75
            String[] schemes = {"https"};
76 76
            UrlValidator urlValidator = new UrlValidator(schemes);
77 77
            if (!urlValidator.isValid(jwksUri)){
78
                System.out.println("Not valid? " + jwksUri);
79 78
                request.getSession().setAttribute("msg_key_uri_error_display", "display:block");
80 79
                canProceed = false;
81 80
            }
......
83 82
            jwksString = request.getParameter("value");
84 83
            try {
85 84
                Gson gson = new GsonBuilder().registerTypeAdapter(Jwks.class, new JwksDeserializer()).create();
86
                jwks = gson.fromJson(jwksString, Jwks.class);
85
                String jwksSet = String.format("{\"keys\":[%s]}", jwksString);
86
                jwks = gson.fromJson(jwksSet, Jwks.class);
87 87
                if (jwks.getKeys() == null || jwks.getKeys().length == 0) {
88 88
                    System.out.println("Something wrong with the keys.");
89 89
                    request.getSession().setAttribute("msg_key_value_error_display", "display:block");

Also available in: Unified diff