You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by sm...@apache.org on 2026/04/23 18:47:08 UTC

(knox) branch master updated: KNOX-3303: Support configurable 'sub' claim reconciliation and client_id claim in Client Credentials flow (#1208)

This is an automated email from the ASF dual-hosted git repository.

smolnar82 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new 4988a16a0 KNOX-3303: Support configurable 'sub' claim reconciliation and client_id claim in Client Credentials flow (#1208)
4988a16a0 is described below

commit 4988a16a022b5cc030864906ce1ade7e1c213620
Author: Sandor Molnar <sm...@apache.org>
AuthorDate: Thu Apr 23 20:47:03 2026 +0200

    KNOX-3303: Support configurable 'sub' claim reconciliation and client_id claim in Client Credentials flow (#1208)
    
    Implement thirdPartyApp topology config to toggle 'sub' claim between client_id and userName.
    Add client_id claim to access tokens issued during client credentials token exchange.
---
 .../federation/jwt/filter/AbstractJWTFilter.java   | 19 ++++++--
 .../federation/JWTFederationFilterTest.java        | 38 ++++++++++++++-
 .../knoxtoken/ClientCredentialsResource.java       | 20 +++++++-
 .../gateway/service/knoxtoken/TokenResource.java   |  9 ++++
 .../knoxtoken/TokenServiceResourceTest.java        | 31 ++++++++++++
 .../knox/gateway/security/TokenIdPrincipal.java    | 55 ++++++++++++++++++++++
 .../services/security/token/JWTokenAttributes.java | 11 +++++
 .../security/token/JWTokenAttributesBuilder.java   |  8 +++-
 .../services/security/token/TokenMetadata.java     |  8 +++-
 .../services/security/token/impl/JWTToken.java     |  4 ++
 .../services/security/token/TokenMetadataTest.java | 46 ++++++++++++++++++
 .../services/security/token/impl/JWTTokenTest.java | 12 +++++
 12 files changed, 253 insertions(+), 8 deletions(-)

diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
index cc420bfb0..f3963c523 100644
--- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
+++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java
@@ -69,6 +69,7 @@ import org.apache.knox.gateway.i18n.messages.MessagesFactory;
 import org.apache.knox.gateway.provider.federation.jwt.JWTMessages;
 import org.apache.knox.gateway.security.PrimaryPrincipal;
 import org.apache.knox.gateway.security.SubjectUtils;
+import org.apache.knox.gateway.security.TokenIdPrincipal;
 import org.apache.knox.gateway.services.GatewayServices;
 import org.apache.knox.gateway.services.ServiceLifecycleException;
 import org.apache.knox.gateway.services.ServiceType;
@@ -405,15 +406,24 @@ public abstract class AbstractJWTFilter implements Filter {
       // token id until it is created, the username is always the same
       // in the record. Using the token id makes it a unique username for
       // audit and the like.
-      final String username = metadata.isClientId() ? tokenId : metadata.getUserName();
-
-      return createSubjectFromTokenData(username, null);
+      // However, in case of service-to-service communications, it might
+      // be useful to return the actual userName during the token exchange
+      // step in the client credentials flow (this is controlled by the thirdPartyApp)
+      // flag that was (or wasn't) submitted while the client credentials were created
+      final String userName = (metadata.isClientId() && metadata.isThirdPartyApp()) ? tokenId : metadata.getUserName();
+      final String clientId = (metadata.isClientId() && !metadata.isThirdPartyApp()) ? tokenId : null;
+      return createSubjectFromTokenData(userName, null, clientId);
     }
     return null;
   }
 
   @SuppressWarnings("rawtypes")
   protected Subject createSubjectFromTokenData(final String principal, final String expectedPrincipalClaimValue) {
+    return createSubjectFromTokenData(principal, expectedPrincipalClaimValue, null);
+  }
+
+  @SuppressWarnings("rawtypes")
+  protected Subject createSubjectFromTokenData(final String principal, final String expectedPrincipalClaimValue, final String tokenId) {
     String claimValue =
               (expectedPrincipalClaimValue != null) ? expectedPrincipalClaimValue.toLowerCase(Locale.ROOT) : null;
 
@@ -421,6 +431,9 @@ public abstract class AbstractJWTFilter implements Filter {
     Set<Principal> principals = new HashSet<>();
     Principal p = new PrimaryPrincipal(claimValue != null ? claimValue : principal);
     principals.add(p);
+    if (tokenId != null) {
+      principals.add(new TokenIdPrincipal(tokenId));
+    }
 
     // The newly constructed Sets check whether this Subject has been set read-only
     // before permitting subsequent modifications. The newly created Sets also prevent
diff --git a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java
index 6f5ae4903..2ea5524b9 100644
--- a/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java
+++ b/gateway-provider-security-jwt/src/test/java/org/apache/knox/gateway/provider/federation/JWTFederationFilterTest.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 import java.util.Properties;
-
+import javax.security.auth.Subject;
 import javax.servlet.FilterConfig;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
@@ -32,6 +32,7 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.knox.gateway.provider.federation.jwt.filter.AbstractJWTFilter;
 import org.apache.knox.gateway.provider.federation.jwt.filter.JWTFederationFilter;
 import org.apache.knox.gateway.provider.federation.jwt.filter.SignatureVerificationCache;
+import org.apache.knox.gateway.security.TokenIdPrincipal;
 import org.apache.knox.gateway.services.security.token.TokenMetadata;
 import org.apache.knox.gateway.services.security.token.TokenStateService;
 import org.easymock.EasyMock;
@@ -89,6 +90,41 @@ public class JWTFederationFilterTest extends AbstractJWTFilterTest {
     EasyMock.verify(response);
   }
 
+  @Test
+  public void testSubjectCreationWithThirdPartyAppReconciliation() throws Exception {
+    // Scenario 1: thirdPartyApp = true (default) -> principal should be tokenId
+    testSubjectCreation(true);
+
+    // Scenario 2: thirdPartyApp = false -> principal should be userName
+    testSubjectCreation(false);
+  }
+
+  private void testSubjectCreation(boolean thirdPartyApp) throws Exception {
+    final String tokenId = "test-token-id";
+    final String userName = "test-user";
+
+    final TokenMetadata metadataTrue = EasyMock.createNiceMock(TokenMetadata.class);
+    EasyMock.expect(metadataTrue.isClientId()).andReturn(true).anyTimes();
+    EasyMock.expect(metadataTrue.isThirdPartyApp()).andReturn(thirdPartyApp).anyTimes();
+    EasyMock.expect(metadataTrue.getUserName()).andReturn(userName).anyTimes();
+
+    final TokenStateService tss = EasyMock.createNiceMock(TokenStateService.class);
+    EasyMock.expect(tss.getTokenMetadata(tokenId)).andReturn(metadataTrue).anyTimes();
+    EasyMock.replay(metadataTrue, tss);
+
+    final TestJWTFederationFilter filter = new TestJWTFederationFilter();
+    Properties props = getProperties();
+    props.put(TokenStateService.CONFIG_SERVER_MANAGED, "true");
+    filter.init(new TestFilterConfig(props, tss));
+
+    final Subject subject = filter.createSubjectFromTokenIdentifier(tokenId);
+    assertEquals(thirdPartyApp ? tokenId : userName, subject.getPrincipals().iterator().next().getName());
+    if (!thirdPartyApp) {
+      assertEquals(1, subject.getPrincipals(TokenIdPrincipal.class).size());
+      assertEquals(tokenId, subject.getPrincipals(TokenIdPrincipal.class).iterator().next().getName());
+    }
+  }
+
   @Test
   public void testCookieAuthSupportValidCookie() throws Exception {
     testCookieAuthSupport(true);
diff --git a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ClientCredentialsResource.java b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ClientCredentialsResource.java
index 04de2ed36..d23c693ee 100644
--- a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ClientCredentialsResource.java
+++ b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/ClientCredentialsResource.java
@@ -17,11 +17,16 @@
  */
 package org.apache.knox.gateway.service.knoxtoken;
 
+import com.nimbusds.jose.KeyLengthException;
+import org.apache.knox.gateway.services.ServiceLifecycleException;
+import org.apache.knox.gateway.services.security.AliasServiceException;
 import org.apache.knox.gateway.services.security.token.TokenMetadata;
 import org.apache.knox.gateway.services.security.token.TokenMetadataType;
 import org.apache.knox.gateway.util.JsonUtils;
 
+import javax.annotation.PostConstruct;
 import javax.inject.Singleton;
+import javax.servlet.ServletException;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -35,11 +40,21 @@ import static javax.ws.rs.core.MediaType.APPLICATION_XML;
 @Path(ClientCredentialsResource.RESOURCE_PATH)
 @Singleton
 public class ClientCredentialsResource extends PasscodeTokenResourceBase {
-    private static final String TYPE = "type";
     public static final String RESOURCE_PATH = "clientid/api/v1/oauth/credentials";
     public static final String CLIENT_ID = "client_id";
     public static final String CLIENT_SECRET = "client_secret";
     private static final String PREFIX = "clientid.";
+    private static final String THIRD_PARTY_APP = "thirdPartyApp";
+
+    private boolean thirdPartyApp;
+
+    @Override
+    @PostConstruct
+    public void init() throws AliasServiceException, ServiceLifecycleException, KeyLengthException, ServletException {
+        super.init();
+        final String configuredThirdPartyApp = context.getInitParameter(THIRD_PARTY_APP);
+        thirdPartyApp = configuredThirdPartyApp == null ? true : Boolean.parseBoolean(configuredThirdPartyApp);
+    }
 
     @Override
     @GET
@@ -57,7 +72,8 @@ public class ClientCredentialsResource extends PasscodeTokenResourceBase {
 
     @Override
     protected void addArbitraryTokenMetadata(TokenMetadata tokenMetadata) {
-        tokenMetadata.add(TYPE, TokenMetadataType.CLIENT_ID.name());
+        tokenMetadata.add(TokenMetadata.TYPE, TokenMetadataType.CLIENT_ID.name());
+        tokenMetadata.add(TokenMetadata.THIRD_PARTY_APP, String.valueOf(thirdPartyApp));
         super.addArbitraryTokenMetadata(tokenMetadata);
     }
 
diff --git a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
index 8e6119b9c..6fec10e0f 100644
--- a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
+++ b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java
@@ -72,6 +72,7 @@ import org.apache.knox.gateway.context.ContextAttributes;
 import org.apache.knox.gateway.i18n.messages.MessagesFactory;
 import org.apache.knox.gateway.security.GroupPrincipal;
 import org.apache.knox.gateway.security.SubjectUtils;
+import org.apache.knox.gateway.security.TokenIdPrincipal;
 import org.apache.knox.gateway.services.ServiceType;
 import org.apache.knox.gateway.services.GatewayServices;
 import org.apache.knox.gateway.services.ServiceLifecycleException;
@@ -1093,6 +1094,14 @@ public class TokenResource {
       jwtAttributesBuilder.setGroups(groups());
     }
 
+    final Subject subject = SubjectUtils.getCurrentSubject();
+    if (subject != null) {
+      Set<TokenIdPrincipal> tokenIdPrincipals = subject.getPrincipals(TokenIdPrincipal.class);
+      if (!tokenIdPrincipals.isEmpty()) {
+        jwtAttributesBuilder.setClientId(tokenIdPrincipals.iterator().next().getName());
+      }
+    }
+
     jwtAttributes = jwtAttributesBuilder.build();
     token = ts.issueToken(jwtAttributes);
     return token;
diff --git a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java
index 92f3a1323..8d64377b6 100644
--- a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java
+++ b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java
@@ -1487,6 +1487,37 @@ public class TokenServiceResourceTest {
     testPasscodeToken(false, false, false);
   }
 
+  @Test
+  public void testClientCredentialsThirdPartyAppConfig() throws Exception {
+    tryClientCredentialsThirdPartyAppConfig(null, true);
+    tryClientCredentialsThirdPartyAppConfig("true", true);
+    tryClientCredentialsThirdPartyAppConfig("false", false);
+  }
+
+  private void tryClientCredentialsThirdPartyAppConfig(String configValue, boolean expectedValue) throws Exception {
+    try {
+      tss = new PersistentTestTokenStateService();
+      final Map<String, String> contextExpectations = new HashMap<>();
+      if (configValue != null) {
+        contextExpectations.put("clientid.thirdPartyApp", configValue);
+      }
+      configureCommonExpectations(contextExpectations, Boolean.TRUE);
+      final ClientCredentialsResource ccr = new ClientCredentialsResource();
+      ccr.request = request;
+      ccr.context = context;
+      ccr.init();
+
+      final Response response = ccr.doPost();
+      assertEquals(200, response.getStatus());
+
+      final String clientId = getTagValue(response.getEntity().toString(), ClientCredentialsResource.CLIENT_ID);
+      final TokenMetadata metadata = tss.getTokenMetadata(clientId);
+      assertEquals(expectedValue, metadata.isThirdPartyApp());
+    } finally {
+      tss = new TestTokenStateService();
+    }
+  }
+
   @Test
   public void testClientCredentialsResponse() throws Exception {
     tryClientCredentialsResource(null);
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/security/TokenIdPrincipal.java b/gateway-spi/src/main/java/org/apache/knox/gateway/security/TokenIdPrincipal.java
new file mode 100644
index 000000000..94c0e07cd
--- /dev/null
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/security/TokenIdPrincipal.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.knox.gateway.security;
+
+import java.security.Principal;
+
+public class TokenIdPrincipal implements Principal {
+  private final String name;
+
+  public TokenIdPrincipal(String name) {
+    this.name = name;
+  }
+
+  @Override
+  public String getName() {
+    return name;
+  }
+
+  @Override
+  public String toString() {
+    return name;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TokenIdPrincipal that = (TokenIdPrincipal) o;
+    return name.equals(that.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return name.hashCode();
+  }
+}
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributes.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributes.java
index 25c61f9a9..2df7cf53b 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributes.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributes.java
@@ -39,9 +39,15 @@ public class JWTokenAttributes {
   private final Set<String> groups;
   private final String issuer;
   private String kid;
+  private final String clientId;
 
   JWTokenAttributes(String userName, List<String> audiences, String algorithm, long expires, String signingKeystoreName, String signingKeystoreAlias,
       char[] signingKeystorePassphrase, boolean managed, String jku, String type, Set<String> groups, String kid, String issuer) {
+    this(userName, audiences, algorithm, expires, signingKeystoreName, signingKeystoreAlias, signingKeystorePassphrase, managed, jku, type, groups, kid, issuer, null);
+  }
+
+  JWTokenAttributes(String userName, List<String> audiences, String algorithm, long expires, String signingKeystoreName, String signingKeystoreAlias,
+      char[] signingKeystorePassphrase, boolean managed, String jku, String type, Set<String> groups, String kid, String issuer, String clientId) {
     this.userName = userName;
     this.audiences = audiences;
     this.algorithm = algorithm;
@@ -55,6 +61,7 @@ public class JWTokenAttributes {
     this.groups = groups;
     this.kid = kid;
     this.issuer = issuer;
+    this.clientId = clientId;
   }
 
   public String getUserName() {
@@ -124,4 +131,8 @@ public class JWTokenAttributes {
   public String getIssuer() {
     return issuer;
   }
+
+  public String getClientId() {
+    return clientId;
+  }
 }
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributesBuilder.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributesBuilder.java
index 6a63f34e8..91f4acddf 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributesBuilder.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/JWTokenAttributesBuilder.java
@@ -37,6 +37,7 @@ public class JWTokenAttributesBuilder {
   private Set<String> groups;
   private String kid;
   private String issuer = JWTokenAttributes.DEFAULT_ISSUER;
+  private String clientId;
 
   public JWTokenAttributesBuilder setUserName(String userName) {
     this.userName = userName;
@@ -107,8 +108,13 @@ public class JWTokenAttributesBuilder {
     return this;
   }
 
+  public JWTokenAttributesBuilder setClientId(String clientId) {
+    this.clientId = clientId;
+    return this;
+  }
+
   public JWTokenAttributes build() {
     return new JWTokenAttributes(userName, (audiences == null ? new ArrayList<>() : audiences), algorithm, expires, signingKeystoreName, signingKeystoreAlias,
-        signingKeystorePassphrase, managed, jku, type, groups, kid, issuer);
+        signingKeystorePassphrase, managed, jku, type, groups, kid, issuer, clientId);
   }
 }
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/TokenMetadata.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/TokenMetadata.java
index cb4ee25ac..3bc7fe2cd 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/TokenMetadata.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/TokenMetadata.java
@@ -39,7 +39,8 @@ public class TokenMetadata {
   public static final String CREATED_BY = "createdBy";
   public static final String LAST_USED_AT = "lastUsedAt";
   public static final String TYPE = "type";
-  private static final List<String> KNOWN_MD_NAMES = Arrays.asList(USER_NAME, COMMENT, ENABLED, PASSCODE, CREATED_BY, LAST_USED_AT, TYPE);
+  public static final String THIRD_PARTY_APP = "thirdPartyApp";
+  private static final List<String> KNOWN_MD_NAMES = Arrays.asList(USER_NAME, COMMENT, ENABLED, PASSCODE, CREATED_BY, LAST_USED_AT, TYPE, THIRD_PARTY_APP);
 
   private final Map<String, String> metadataMap = new HashMap<>();
 
@@ -139,6 +140,11 @@ public class TokenMetadata {
     saveMetadata(TYPE, type.name());
   }
 
+  public boolean isThirdPartyApp() {
+    final String thirdPartyApp = getMetadata(THIRD_PARTY_APP);
+    return thirdPartyApp == null || Boolean.parseBoolean(thirdPartyApp);
+  }
+
   public void markKnoxSsoCookie() {
     setType(TokenMetadataType.KNOXSSO_COOKIE);
   }
diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java
index cd9ccc5b2..22d8dc16f 100644
--- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java
+++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/token/impl/JWTToken.java
@@ -42,6 +42,7 @@ public class JWTToken implements JWT {
   public static final String KNOX_KID_CLAIM = "kid";
   public static final String KNOX_JKU_CLAIM = "jku";
   public static final String KNOX_GROUPS_CLAIM = "knox.groups";
+  public static final String CLIENT_ID_CLAIM = "client_id";
 
   SignedJWT jwt;
 
@@ -95,6 +96,9 @@ public class JWTToken implements JWT {
     if (jwtAttributes.getGroups() != null) {
       builder.claim(KNOX_GROUPS_CLAIM, jwtAttributes.getGroups());
     }
+    if (jwtAttributes.getClientId() != null) {
+      builder.claim(CLIENT_ID_CLAIM, jwtAttributes.getClientId());
+    }
 
     // Add a private UUID claim for uniqueness
     builder.claim(KNOX_ID_CLAIM, String.valueOf(UUID.randomUUID()));
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/TokenMetadataTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/TokenMetadataTest.java
new file mode 100644
index 000000000..7539c3f53
--- /dev/null
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/TokenMetadataTest.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.knox.gateway.services.security.token;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TokenMetadataTest {
+
+  @Test
+  public void testIsThirdPartyAppDefault() {
+    assertTrue("Should default to true for backward compatibility", new TokenMetadata().isThirdPartyApp());
+  }
+
+  @Test
+  public void testIsThirdPartyAppExplicit() {
+    final TokenMetadata metadata = new TokenMetadata();
+    metadata.add(TokenMetadata.THIRD_PARTY_APP, "true");
+    assertTrue(metadata.isThirdPartyApp());
+    metadata.add(TokenMetadata.THIRD_PARTY_APP, "false");
+    assertFalse(metadata.isThirdPartyApp());
+  }
+
+  @Test
+  public void testIsThirdPartyAppInvalidValue() {
+    final TokenMetadata metadata = new TokenMetadata();
+    metadata.add(TokenMetadata.THIRD_PARTY_APP, "not-a-boolean");
+    assertFalse("Boolean.parseBoolean should return false for invalid strings", metadata.isThirdPartyApp());
+  }
+}
diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java
index c3099a898..c4ab7d7ba 100644
--- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java
+++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java
@@ -224,4 +224,16 @@ public class JWTTokenTest {
     token = new JWTToken(new JWTokenAttributesBuilder().setAlgorithm("RS256").setType(tokenType).build());
     assertEquals(token.getType(), new JOSEObjectType(tokenType));
   }
+
+  @Test
+  public void testClientIdClaim() throws Exception {
+    final String clientId = "test-client-id";
+    JWT token = new JWTToken(new JWTokenAttributesBuilder()
+            .setAlgorithm("RS256")
+            .setUserName("test-user")
+            .setClientId(clientId)
+            .build());
+
+    assertEquals(clientId, token.getClaim(JWTToken.CLIENT_ID_CLAIM));
+  }
 }