[
https://issues.apache.org/jira/browse/KNOX-2527?focusedWorklogId=539103&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-539103
]
ASF GitHub Bot logged work on KNOX-2527:
----------------------------------------
Author: ASF GitHub Bot
Created on: 21/Jan/21 14:46
Start Date: 21/Jan/21 14:46
Worklog Time Spent: 10m
Work Description: smolnar82 commented on a change in pull request #397:
URL: https://github.com/apache/knox/pull/397#discussion_r561936179
##########
File path:
gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java
##########
@@ -167,23 +152,71 @@ public JWT issueToken(Principal p, List<String>
audiences, String algorithm, lon
claimArray[3] = String.valueOf(expires);
}
- JWT token;
- if (SUPPORTED_SIG_ALGS.contains(algorithm)) {
- token = new JWTToken(algorithm, claimArray, audiences);
- try {
- RSAPrivateKey key = getSigningKey(signingKeystoreName,
signingKeystoreAlias, signingKeystorePassphrase);
- // allowWeakKey to not break existing 1024 bit certificates
- JWSSigner signer = new RSASSASigner(key, true);
- token.sign(signer);
- } catch (KeystoreServiceException e) {
- throw new TokenServiceException(e);
+ final JWT token = SUPPORTED_PKI_SIG_ALGS.contains(algorithm) ||
SUPPORTED_HMAC_SIG_ALGS.contains(algorithm) ? new JWTToken(algorithm,
claimArray, audiences) : null;
+ if (token != null) {
+ signToken(algorithm, signingKeystoreName, signingKeystoreAlias,
signingKeystorePassphrase, token);
+ return token;
+ } else {
+ throw new TokenServiceException("Cannot issue token - Unsupported
algorithm: " + algorithm);
+ }
+ }
+
+ private void signToken(String algorithm, String signingKeystoreName, String
signingKeystoreAlias, char[] signingKeystorePassphrase, JWT token) throws
TokenServiceException {
+ if (TokenUtils.useHMAC(getHmacSecret(), signingKeystoreName)) {
Review comment:
This makes sense; I fixed the code.
##########
File path:
gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java
##########
@@ -205,31 +238,37 @@ private String getSigningKeyAlias(String
signingKeystoreAlias) {
}
@Override
- public boolean verifyToken(JWT token)
- throws TokenServiceException {
+ public boolean verifyToken(JWT token) throws TokenServiceException {
return verifyToken(token, null);
}
@Override
- public boolean verifyToken(JWT token, RSAPublicKey publicKey)
- throws TokenServiceException {
- boolean rc;
- PublicKey key;
+ public boolean verifyToken(JWT token, RSAPublicKey publicKey) throws
TokenServiceException {
+ return TokenUtils.useHMAC(getHmacSecret(),
config.getSigningKeystoreName()) ? verifyTokenUsingHMAC(token) :
verifyTokenUsingRSA(token, publicKey);
Review comment:
This makes sense; I fixed the code.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
Issue Time Tracking
-------------------
Worklog Id: (was: 539103)
Time Spent: 1h 20m (was: 1h 10m)
> Support HMAC signature/verification in JWT token authority
> ----------------------------------------------------------
>
> Key: KNOX-2527
> URL: https://issues.apache.org/jira/browse/KNOX-2527
> Project: Apache Knox
> Issue Type: New Feature
> Components: KnoxSSO, Server
> Affects Versions: 1.5.0
> Reporter: Sandor Molnar
> Assignee: Sandor Molnar
> Priority: Major
> Fix For: 1.6.0
>
> Time Spent: 1h 20m
> Remaining Estimate: 0h
>
> As of now, in {{DefaultTokenAuthorityService}}, the generated JWT token is
> signed by RSA (PKI). It would be beneficial to add support for HMAC as well
> so that token signature/verification would not require a keystore being set
> but using a secret stored via Knox's alias service. The recommended alias
> name is {{gateway.signing.hmac.secret}}
> To support backward compatibility, the implementation should use HMAC
> signature/verification only if:
> - the HMAC secret is configured via the alias service for the gateway, and
> - there is no previously pre-configured {{gateway.signing.keystore.name}}
> which is a clear indication of end-user preference of using PKI signatures.
> The default HMAC signing algorithm should be {{HS256}} (HMAC using SHA-256
> hash algorithm) and clients should be able to change it by already existing
> request parameters called {{knoxsso.token.sigalg}} or {{knox.token.sigalg}}.
> Other valid values are:
> - {{HS384}} (HMAC using SHA-384 hash algorithm)
> - {{HS512}} (HMAC using SHA-512 hash algorithm)
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
