Commit 32950bfe authored by Stephane Nicoll's avatar Stephane Nicoll

Merge pull request #7299 from vpavic:resource-server-config

* pr/7299:
  Fix JWT token URI derivation
parents 4311cf33 5783cd55
/* /*
* Copyright 2012-2015 the original author or authors. * Copyright 2012-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -246,7 +246,7 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware { ...@@ -246,7 +246,7 @@ public class ResourceServerProperties implements Validator, BeanFactoryAware {
if (ResourceServerProperties.this.tokenInfoUri != null if (ResourceServerProperties.this.tokenInfoUri != null
&& ResourceServerProperties.this.tokenInfoUri && ResourceServerProperties.this.tokenInfoUri
.endsWith("/check_token")) { .endsWith("/check_token")) {
return ResourceServerProperties.this.userInfoUri.replace("/check_token", return ResourceServerProperties.this.tokenInfoUri.replace("/check_token",
"/token_key"); "/token_key");
} }
return null; return null;
......
...@@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; ...@@ -27,6 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link ResourceServerProperties}. * Tests for {@link ResourceServerProperties}.
* *
* @author Dave Syer * @author Dave Syer
* @author Vedran Pavic
*/ */
public class ResourceServerPropertiesTests { public class ResourceServerPropertiesTests {
...@@ -45,9 +46,17 @@ public class ResourceServerPropertiesTests { ...@@ -45,9 +46,17 @@ public class ResourceServerPropertiesTests {
} }
@Test @Test
public void tokenKeyDerived() throws Exception { public void tokenKeyDerivedFromUserInfoUri() throws Exception {
this.properties.setUserInfoUri("http://example.com/userinfo"); this.properties.setUserInfoUri("http://example.com/userinfo");
assertThat(this.properties.getJwt().getKeyUri()).isNotNull(); assertThat(this.properties.getJwt().getKeyUri())
.isEqualTo("http://example.com/token_key");
}
@Test
public void tokenKeyDerivedFromTokenInfoUri() throws Exception {
this.properties.setTokenInfoUri("http://example.com/check_token");
assertThat(this.properties.getJwt().getKeyUri())
.isEqualTo("http://example.com/token_key");
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment