commit cb912f3a48d44459a6b5b961904d3a27fcc6ea7e
author Michael Ochmann <michael.ochmann@sap.com> Tue Jun 20 14:30:53 2017 +0200
committer Michael Ochmann <michael.ochmann@sap.com> Tue Jun 20 14:30:53 2017 +0200
tree edc21afa56f6c8d2025b84b1cd56e5f4dbcd6908
parent a8e61e928234ebdaa088a4364cc1de708f6b7a94

Support RS256 and HS256 algorithm aliases

Older versions of CF/XSA UAA used the identifiers
SHA256withRSA or HMACSHA256 to specify the algorithm
 used to sign OAuth 2 access tokens they issued.

Newer CF/XSA UAA versions, however, prefer the following
identifiers:

RS256 (common alias for SHA256withRSA)
HS256 (common alias for HMACSHA256)

Most other implementations of JSON web tokens (e.g. OpenId)
also prefer these aliases over the more specific identifiers.
Consequently, the cfoauth plugin should support them, too.

Change-Id: Ib1786552e08be8583c5360243acd215e7193abdd
Signed-off-by: Michael Ochmann <michael.ochmann@sap.com>

src/main/java/com/googlesource/gerrit/plugins/cfoauth/UAAClient.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/cfoauth/UAAClient.java b/src/main/java/com/googlesource/gerrit/plugins/cfoauth/UAAClient.java
index b800265..fb67075 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/cfoauth/UAAClient.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/cfoauth/UAAClient.java
@@ -378,10 +378,10 @@
       throw new UAAClientException(
           "GET /uaa/token_key failed: missing \"alg\" attribute");
     }
-    if ("HMACSHA256".equals(alg)) {
+    if ("HS256".equals(alg) || "HMACSHA256".equals(alg)) {
       return new HMACSHA256SignatureVerifier(
           getAttribute(content, VALUE_ATTRIBUTE));
-    } else if ("SHA256withRSA".equals(alg)) {
+    } else if ("RS256".equals(alg) || "SHA256withRSA".equals(alg)) {
       return new SHA265WithRSASignatureVerifier(
           getAttribute(content, MODULUS_ATTRIBUTE),
           getAttribute(content, PUBLIC_EXPONENT_ATTRIBUTE));