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

fix(oxauth): duplicate iss and aud on introspection as jwt #1748 #1766

Merged
merged 1 commit into from
Dec 21, 2022
Merged

fix(oxauth): duplicate iss and aud on introspection as jwt #1748 #1766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 33 additions & 31 deletions Model/src/main/java/org/gluu/oxauth/model/jwt/JwtClaimSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
import org.gluu.oxauth.model.exception.InvalidJwtException;
import org.gluu.oxauth.model.json.JsonApplier;
import org.gluu.oxauth.model.util.Base64Util;
import org.gluu.oxauth.model.util.Util;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;

import java.io.UnsupportedEncodingException;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.*;

/**
Expand All @@ -27,16 +26,16 @@ public abstract class JwtClaimSet {

private Map<String, Object> claims;

public JwtClaimSet() {
claims = new LinkedHashMap<String, Object>();
protected JwtClaimSet() {
claims = new LinkedHashMap<>();
}

public JwtClaimSet(JSONObject jsonObject) {
protected JwtClaimSet(JSONObject jsonObject) {
this();
load(jsonObject);
}

public JwtClaimSet(String base64JsonObject) throws InvalidJwtException {
protected JwtClaimSet(String base64JsonObject) throws InvalidJwtException {
this();
load(base64JsonObject);
}
Expand Down Expand Up @@ -80,12 +79,12 @@ public JSONObject getClaimAsJSON(String key) {
}

public List<String> getClaimAsStringList(String key) {
List<String> list = new ArrayList<String>();
Object claims = getClaim(key);
List<String> list = new ArrayList<>();
Object value = getClaim(key);

try {
if (claims != null && claims instanceof JSONArray) {
JSONArray jsonArray = (JSONArray) claims;
if (value instanceof JSONArray) {
JSONArray jsonArray = (JSONArray) value;
for (int i = 0; i < jsonArray.length(); i++) {
list.add(jsonArray.getString(i));
}
Expand All @@ -96,6 +95,7 @@ public List<String> getClaimAsStringList(String key) {
}
}
} catch (JSONException e) {
// ignore
}

return list;
Expand All @@ -115,7 +115,7 @@ public Date getClaimAsDate(String key) {
return new Date((Long) claim * 1000);
} else if (claim instanceof Double) {
final double c = (Double) claim;
final BigDecimal bigDecimal = new BigDecimal(c);
final BigDecimal bigDecimal = BigDecimal.valueOf(c);

long claimLong = bigDecimal.longValue();
claimLong = claimLong * 1000;
Expand Down Expand Up @@ -171,6 +171,7 @@ public Character getClaimAsCharacter(String key) {
}
}

@SuppressWarnings("java:S3776")
public void setClaimObject(String key, Object value, boolean overrideValue) {
if (value == null) {
setNullClaim(key);
Expand All @@ -179,10 +180,19 @@ public void setClaimObject(String key, Object value, boolean overrideValue) {
setClaim(key, (String) value);
} else {
Object currentValue = getClaim(key);
if (currentValue != null) {
setClaim(key, Lists.newArrayList(currentValue.toString(), (String) value));
} else {
setClaim(key, (String) value);
String valueAsString = (String) value;

if (currentValue instanceof String) {
if (!currentValue.equals(value)) {
setClaim(key, Lists.newArrayList(currentValue.toString(), valueAsString));
} else {
setClaim(key, (String) value);
}
} else if (currentValue instanceof List) {
List<String> currentValueAsList = (List) currentValue;
if (!currentValueAsList.contains(valueAsString)) {
currentValueAsList.add(valueAsString);
}
}
}
} else if (value instanceof Date) {
Expand Down Expand Up @@ -236,6 +246,7 @@ public void setClaim(String key, Character value) {
claims.put(key, value);
}

@SuppressWarnings("java:S3740")
public void setClaim(String key, List values) {
claims.put(key, values);
}
Expand Down Expand Up @@ -269,6 +280,7 @@ public void removeClaim(String key) {
claims.remove(key);
}

@SuppressWarnings("java:S3740")
public JSONObject toJsonObject() throws InvalidJwtException {
JSONObject jsonObject = new JSONObject();

Expand All @@ -291,8 +303,6 @@ public JSONObject toJsonObject() throws InvalidJwtException {
jsonObject.put(claim.getKey(), claim.getValue());
}
}
} catch (JSONException e) {
throw new InvalidJwtException(e);
} catch (Exception e) {
throw new InvalidJwtException(e);
}
Expand All @@ -301,13 +311,9 @@ public JSONObject toJsonObject() throws InvalidJwtException {
}

public String toBase64JsonObject() throws InvalidJwtException {
try {
String jsonObjectString = toJsonString();
byte[] jsonObjectBytes = jsonObjectString.getBytes(Util.UTF8_STRING_ENCODING);
return Base64Util.base64urlencode(jsonObjectBytes);
} catch (UnsupportedEncodingException e) {
return null;
}
String jsonObjectString = toJsonString();
byte[] jsonObjectBytes = jsonObjectString.getBytes(StandardCharsets.UTF_8);
return Base64Util.base64urlencode(jsonObjectBytes);
}

public String toJsonString() throws InvalidJwtException {
Expand All @@ -319,14 +325,14 @@ public String toJsonString() throws InvalidJwtException {
}

public Map<String, List<String>> toMap() throws InvalidJwtException {
Map<String, List<String>> map = new HashMap<String, java.util.List<String>>();
Map<String, List<String>> map = new HashMap<>();

try {
for (Map.Entry<String, Object> claim : claims.entrySet()) {
String key = claim.getKey();
Object value = claim.getValue();

List<String> values = new ArrayList<String>();
List<String> values = new ArrayList<>();
if (value instanceof JSONArray) {
JSONArray jsonArray = (JSONArray) value;
for (int i = 0; i < jsonArray.length(); i++) {
Expand Down Expand Up @@ -358,12 +364,8 @@ public void load(JSONObject jsonObject) {

public void load(String base64JsonObject) throws InvalidJwtException {
try {
String jsonObjectString = new String(Base64Util.base64urldecode(base64JsonObject), Util.UTF8_STRING_ENCODING);
String jsonObjectString = new String(Base64Util.base64urldecode(base64JsonObject), StandardCharsets.UTF_8);
load(new JSONObject(jsonObjectString));
} catch (UnsupportedEncodingException e) {
throw new InvalidJwtException(e);
} catch (JSONException e) {
throw new InvalidJwtException(e);
} catch (Exception e) {
throw new InvalidJwtException(e);
}
Expand Down
50 changes: 50 additions & 0 deletions Model/src/test/java/org/gluu/oxauth/model/jwt/JwtClaimsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package org.gluu.oxauth.model.jwt;

import com.google.common.collect.Lists;
import org.testng.annotations.Test;

import static org.testng.Assert.assertEquals;

/**
* @author Yuriy Z
*/
public class JwtClaimsTest {

@Test
public void setClaimObject_whenSetSameValue_shouldNotCreateDuplicate() {
JwtClaims claims = new JwtClaims();
claims.addAudience("client1");

claims.setClaimObject("aud", "client1", false);
assertEquals(claims.getClaim("aud"), "client1");
}

@Test
public void setClaimObject_whenSetDifferentValues_shouldCreateCorrectArray() {
JwtClaims claims = new JwtClaims();
claims.addAudience("client1");

claims.setClaimObject("aud", "client2", false);
assertEquals(claims.getClaim("aud"), Lists.newArrayList("client1", "client2"));
}

@Test
public void setClaimObject_whenSetDifferentValue_shouldCreateCorrectArray() {
JwtClaims claims = new JwtClaims();
claims.addAudience("client1");

claims.setClaimObject("aud", "client2", false);
claims.setClaimObject("aud", "client3", false);
assertEquals(claims.getClaim("aud"), Lists.newArrayList("client1", "client2", "client3"));
}

@Test
public void setClaimObject_whenSetDifferentValueWithOverride_shouldOverrideValue() {
JwtClaims claims = new JwtClaims();
claims.addAudience("client1");

claims.setClaimObject("aud", "client2", false);
claims.setClaimObject("aud", "client3", true);
assertEquals(claims.getClaim("aud"), "client3");
}
}
3 changes: 3 additions & 0 deletions Server/src/main/java/org/gluu/oxauth/introspection/ws/rs/IntrospectionWebService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ private String createResponseAsJwt(JSONObject response, AuthorizationGrant grant
}
}

if (log.isTraceEnabled()) {
log.trace("Response before signing: {}", jwt.getClaims().toJsonString());
}
return jwtSigner.sign().toString();
}

Expand Down