diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 13:18:10 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2015-08-27 13:18:10 +0200 |
| commit | bd8401b7cec32546edb6f93d0468d60dbe9dfcd0 (patch) | |
| tree | 25ecd9e074528ea5e9a9771a9bc1659033652d86 /id | |
| parent | 1051a42329a603821f415383343d253724d4cd65 (diff) | |
| download | moa-id-spss-bd8401b7cec32546edb6f93d0468d60dbe9dfcd0.tar.gz moa-id-spss-bd8401b7cec32546edb6f93d0468d60dbe9dfcd0.tar.bz2 moa-id-spss-bd8401b7cec32546edb6f93d0468d60dbe9dfcd0.zip | |
fix merge problem with OpenID connect
Diffstat (limited to 'id')
2 files changed, 6 insertions, 1 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java index 3bef7844c..06509b333 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java @@ -171,14 +171,17 @@ public class OAuth20AuthRequest extends OAuth20BaseRequest { try { // OAOAUTH20 cannot be null at this point. check was done in base request OAAuthParameter oAuthConfig = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(this.getOAURL()); - + + if (!this.getClientID().equals(oAuthConfig.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_PROTOCOLS_OPENID_CLIENTID)) || !this.getRedirectUri().equals(oAuthConfig.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_PROTOCOLS_OPENID_REDIRECTURL))) { throw new OAuth20AccessDeniedException(); } + this.setOnlineApplicationConfiguration(oAuthConfig); Logger.info("Dispatch OpenIDConnect AuthRequest: ClientID=" + this.clientID); + } catch (ConfigurationException e) { throw new OAuth20WrongParameterException(OAuth20Constants.PARAM_CLIENT_ID); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java index 9d611b2f1..6bebe5a6a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java @@ -133,6 +133,8 @@ class OAuth20TokenRequest extends OAuth20BaseRequest { throw new OAuth20AccessDeniedException(); } + this.setOnlineApplicationConfiguration(oaParam); + } catch (ConfigurationException e) { throw new OAuth20WrongParameterException(OAuth20Constants.PARAM_CLIENT_ID); |