Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not create refresh token for client credentials clients #22

Open
wants to merge 4 commits into
base: v1.3.6
Choose a base branch
from
Open

Do not create refresh token for client credentials clients #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
645e027
Do not create refresh token
rmiccoli Sep 26, 2024
7b58563
Bump version to 1.3.6.cnaf-20240927
rmiccoli Sep 27, 2024
aaa4258
Merge branch 'v1.3.6' into issue-847
rmiccoli Sep 27, 2024
cd84ea4
Fix tests
rmiccoli Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openid-connect-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>openid-connect-parent</artifactId>
<groupId>org.mitre</groupId>
<version>1.3.6.cnaf-20240725</version>
<version>1.3.6.cnaf-20240927</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openid-connect-client</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openid-connect-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<artifactId>openid-connect-parent</artifactId>
<groupId>org.mitre</groupId>
<version>1.3.6.cnaf-20240725</version>
<version>1.3.6.cnaf-20240927</version>
<relativePath>..</relativePath>
</parent>
<artifactId>openid-connect-common</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion openid-connect-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-parent</artifactId>
<version>1.3.6.cnaf-20240725</version>
<version>1.3.6.cnaf-20240927</version>
<relativePath>..</relativePath>
</parent>
<build>
Expand Down
7 changes: 4 additions & 3 deletions ...server/src/main/java/org/mitre/oauth2/service/impl/DefaultOAuth2ProviderTokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,10 @@ public OAuth2AccessTokenEntity createAccessToken(OAuth2Authentication authentica

token.setAuthenticationHolder(authHolder);

// attach a refresh token, if this client is allowed to request them and the user gets the
// offline scope
if (client.isAllowRefresh() && token.getScope().contains(SystemScopeService.OFFLINE_ACCESS)) {
// attach a refresh token, if this client is allowed to request them, the user gets the
// offline scope and grant type differs from client credentials
if (client.isAllowRefresh() && token.getScope().contains(SystemScopeService.OFFLINE_ACCESS)
&& !request.getGrantType().equals("client_credentials")) {
OAuth2RefreshTokenEntity savedRefreshToken = createRefreshToken(client, authHolder);

token.setRefreshToken(savedRefreshToken);
Expand Down
26 changes: 25 additions & 1 deletion ...er/src/test/java/org/mitre/oauth2/service/impl/TestDefaultOAuth2ProviderTokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
import static org.mockito.Mockito.when;

import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;

import org.junit.Before;
Expand Down Expand Up @@ -310,7 +312,9 @@ public void createAccessToken_noRefresh() {
*/
@Test
public void createAccessToken_yesRefresh() {
OAuth2Request clientAuth = new OAuth2Request(null, clientId, null, true,
Map<String, String> requestParameters = new HashMap<String, String>();
requestParameters.put("grant_type", "authorization_code");
OAuth2Request clientAuth = new OAuth2Request(requestParameters, clientId, null, true,
newHashSet(SystemScopeService.OFFLINE_ACCESS), null, null, null, null);
when(authentication.getOAuth2Request()).thenReturn(clientAuth);
when(client.isAllowRefresh()).thenReturn(true);
Expand Down Expand Up @@ -338,6 +342,11 @@ public void createAccessToken_expiration() {
when(client.getRefreshTokenValiditySeconds()).thenReturn(refreshTokenValiditySeconds);

long start = System.currentTimeMillis();
Map<String, String> requestParameters = new HashMap<String, String>();
requestParameters.put("grant_type", "authorization_code");
OAuth2Request clientAuth =
new OAuth2Request(requestParameters, clientId, null, true, scope, null, null, null, null);
when(authentication.getOAuth2Request()).thenReturn(clientAuth);
OAuth2AccessTokenEntity token = service.createAccessToken(authentication);
long end = System.currentTimeMillis();

Expand All @@ -357,6 +366,11 @@ public void createAccessToken_expiration() {

@Test
public void createAccessToken_checkClient() {
Map<String, String> requestParameters = new HashMap<String, String>();
requestParameters.put("grant_type", "authorization_code");
OAuth2Request clientAuth =
new OAuth2Request(requestParameters, clientId, null, true, scope, null, null, null, null);
when(authentication.getOAuth2Request()).thenReturn(clientAuth);
OAuth2AccessTokenEntity token = service.createAccessToken(authentication);

verify(scopeService, atLeastOnce()).removeReservedScopes(anySetOf(SystemScope.class));
Expand All @@ -366,6 +380,11 @@ public void createAccessToken_checkClient() {

@Test
public void createAccessToken_checkScopes() {
Map<String, String> requestParameters = new HashMap<String, String>();
requestParameters.put("grant_type", "authorization_code");
OAuth2Request clientAuth =
new OAuth2Request(requestParameters, clientId, null, true, scope, null, null, null, null);
when(authentication.getOAuth2Request()).thenReturn(clientAuth);
OAuth2AccessTokenEntity token = service.createAccessToken(authentication);

verify(scopeService, atLeastOnce()).removeReservedScopes(anySetOf(SystemScope.class));
Expand All @@ -381,6 +400,11 @@ public void createAccessToken_checkAttachedAuthentication() {
when(authenticationHolderRepository.save(any(AuthenticationHolderEntity.class)))
.thenReturn(authHolder);

Map<String, String> requestParameters = new HashMap<String, String>();
requestParameters.put("grant_type", "authorization_code");
OAuth2Request clientAuth =
new OAuth2Request(requestParameters, clientId, null, true, scope, null, null, null, null);
when(authentication.getOAuth2Request()).thenReturn(clientAuth);
OAuth2AccessTokenEntity token = service.createAccessToken(authentication);

assertThat(token.getAuthenticationHolder().getAuthentication(), equalTo(authentication));
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.mitre</groupId>
<artifactId>openid-connect-parent</artifactId>
<version>1.3.6.cnaf-20240725</version>
<version>1.3.6.cnaf-20240927</version>
<name>MITREid Connect</name>
<packaging>pom</packaging>
<parent>
Expand Down