From 1dd2aaf8a1576c5c192bd0c25885790ff6bf1a47 Mon Sep 17 00:00:00 2001 From: Samuel Sayer Date: Mon, 30 Jul 2012 09:27:03 -0400 Subject: [PATCH 1/3] add JsonObject export for JWK keys --- .../main/java/org/mitre/jwk/model/AbstractJwk.java | 8 ++++++++ .../src/main/java/org/mitre/jwk/model/EC.java | 11 +++++++++++ .../src/main/java/org/mitre/jwk/model/Rsa.java | 11 +++++++++++ .../org/mitre/oauth2/model/ClientDetailsEntity.java | 4 ++-- 4 files changed, 32 insertions(+), 2 deletions(-) diff --git a/openid-connect-common/src/main/java/org/mitre/jwk/model/AbstractJwk.java b/openid-connect-common/src/main/java/org/mitre/jwk/model/AbstractJwk.java index 483dbe170..851b6a08e 100644 --- a/openid-connect-common/src/main/java/org/mitre/jwk/model/AbstractJwk.java +++ b/openid-connect-common/src/main/java/org/mitre/jwk/model/AbstractJwk.java @@ -51,6 +51,14 @@ public abstract class AbstractJwk implements Jwk{ public void setUse(String use) { this.use = use; } + + public JsonObject toJsonObject() { + JsonObject export = new JsonObject(); + export.addProperty(ALGORITHM, getAlg()); + export.addProperty(USE, getUse()); + export.addProperty(KEY_ID, getKid()); + return export; + } protected void init(JsonObject object){ if(object.get(ALGORITHM) != null){ diff --git a/openid-connect-common/src/main/java/org/mitre/jwk/model/EC.java b/openid-connect-common/src/main/java/org/mitre/jwk/model/EC.java index 254b39767..1e73acfd2 100644 --- a/openid-connect-common/src/main/java/org/mitre/jwk/model/EC.java +++ b/openid-connect-common/src/main/java/org/mitre/jwk/model/EC.java @@ -55,6 +55,17 @@ public class EC extends AbstractJwk{ super(object); } + + + @Override + public JsonObject toJsonObject() { + JsonObject obj = super.toJsonObject(); + obj.addProperty(CURVE, getCrv()); + obj.addProperty(X, getX()); + obj.addProperty(Y, getY()); + return obj; + } + public void init(JsonObject object){ super.init(object); setCrv(object.get(CURVE).getAsString()); diff --git a/openid-connect-common/src/main/java/org/mitre/jwk/model/Rsa.java b/openid-connect-common/src/main/java/org/mitre/jwk/model/Rsa.java index 882ffd677..6194c46be 100644 --- a/openid-connect-common/src/main/java/org/mitre/jwk/model/Rsa.java +++ b/openid-connect-common/src/main/java/org/mitre/jwk/model/Rsa.java @@ -46,6 +46,17 @@ public class Rsa extends AbstractJwk{ setMod(object.get(MODULUS).getAsString()); setExp(object.get(EXPONENT).getAsString()); } + + + + @Override + public JsonObject toJsonObject() { + JsonObject export = super.toJsonObject(); + export.addProperty(MODULUS, getMod()); + export.addProperty(EXPONENT, getExp()); + return export; + + } @Override public PublicKey getKey() throws NoSuchAlgorithmException, InvalidKeySpecException { diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java index 37b00ed53..463c6adc6 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java @@ -274,7 +274,7 @@ public class ClientDetailsEntity implements ClientDetails { @Override @Basic - public Integer getAccessTokenValiditySeconds() { + public int getAccessTokenValiditySeconds() { return accessTokenValiditySeconds; } @@ -288,7 +288,7 @@ public class ClientDetailsEntity implements ClientDetails { @Override @Basic - public Integer getRefreshTokenValiditySeconds() { + public int getRefreshTokenValiditySeconds() { return refreshTokenValiditySeconds; } From 1b5f99efec90edcd5642e8c7b9116011bcb00e22 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Tue, 31 Jul 2012 10:42:42 -0400 Subject: [PATCH 2/3] added .json mapping to SWD --- .../main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java b/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java index eb9599d68..8405a9dab 100644 --- a/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java +++ b/openid-connect-server/src/main/java/org/mitre/swd/web/SimpleWebDiscoveryEndpoint.java @@ -56,7 +56,7 @@ public class SimpleWebDiscoveryEndpoint { return modelAndView; } - @RequestMapping(value="/.well-known/host-meta", + @RequestMapping(value={"/.well-known/host-meta", "/.well-known/host-meta.json"}, params={"resource", "rel=http://openid.net/specs/connect/1.0/issuer"}) public ModelAndView xrdDiscovery(@RequestParam("resource") String resource, ModelAndView modelAndView) { From 789f41bdbefe7b9d6918ac922c4fab16527a7644 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Tue, 31 Jul 2012 10:44:25 -0400 Subject: [PATCH 3/3] fixed client details regression --- .../main/java/org/mitre/oauth2/model/ClientDetailsEntity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java index 463c6adc6..37b00ed53 100644 --- a/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java +++ b/openid-connect-common/src/main/java/org/mitre/oauth2/model/ClientDetailsEntity.java @@ -274,7 +274,7 @@ public class ClientDetailsEntity implements ClientDetails { @Override @Basic - public int getAccessTokenValiditySeconds() { + public Integer getAccessTokenValiditySeconds() { return accessTokenValiditySeconds; } @@ -288,7 +288,7 @@ public class ClientDetailsEntity implements ClientDetails { @Override @Basic - public int getRefreshTokenValiditySeconds() { + public Integer getRefreshTokenValiditySeconds() { return refreshTokenValiditySeconds; }