forked from knowm/XChange
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request knowm#1392 from jheusser/fixes/quoine-nonce
xchange-quoine: Clean up digest, pass through nonce factory
- Loading branch information
Showing
2 changed files
with
6 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 5 additions & 41 deletions
46
xchange-quoine/src/main/java/org/knowm/xchange/quoine/service/QuoineSignatureDigest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,38 @@ | ||
| package org.knowm.xchange.quoine.service; | ||
|
|
||
| import java.io.UnsupportedEncodingException; | ||
| import java.security.MessageDigest; | ||
| import java.security.NoSuchAlgorithmException; | ||
|
|
||
| import javax.crypto.Mac; | ||
| import javax.ws.rs.HeaderParam; | ||
|
|
||
| import com.auth0.jwt.JWT; | ||
| import com.auth0.jwt.JWTCreator; | ||
| import com.auth0.jwt.algorithms.Algorithm; | ||
| import org.knowm.xchange.service.BaseParamsDigest; | ||
|
|
||
| import net.iharder.Base64; | ||
| import si.mazi.rescu.Params; | ||
| import si.mazi.rescu.ParamsDigest; | ||
| import si.mazi.rescu.RestInvocation; | ||
| import si.mazi.rescu.SynchronizedValueFactory; | ||
|
|
||
| public class QuoineSignatureDigest implements ParamsDigest { | ||
|
|
||
| private final JWTCreator.Builder builder; | ||
| private final String tokenID; | ||
| private final byte[] userSecret; | ||
| private final SynchronizedValueFactory<Long> nonceFactory; | ||
|
|
||
| public QuoineSignatureDigest(String tokenID, String userSecret) { | ||
| public QuoineSignatureDigest(String tokenID, String userSecret, SynchronizedValueFactory<Long> nonceFactory) { | ||
| this.tokenID = tokenID; | ||
| this.userSecret = userSecret.getBytes(); | ||
| this.nonceFactory = nonceFactory; | ||
|
|
||
| this.builder = JWT.create(); | ||
| } | ||
|
|
||
| public ParamsDigest getContentMD5Digester() { | ||
| return new QuoineContentMD5Digest(); | ||
| } | ||
|
|
||
| @Override | ||
| public String digestParams(RestInvocation restInvocation) { | ||
|
|
||
| String path = "/" + restInvocation.getMethodPath(); | ||
|
|
||
| final String sign = builder | ||
| .withClaim("path", path) | ||
| .withClaim("nonce", String.valueOf(System.nanoTime())) | ||
| .withClaim("nonce", String.valueOf(nonceFactory.createValue())) | ||
| .withClaim("token_id", tokenID) | ||
| .sign(Algorithm.HMAC256(userSecret)); | ||
|
|
||
| return sign; | ||
| } | ||
|
|
||
| private String getContentMD5(String content) { | ||
| if(content == null || "".equals(content)) { | ||
| return ""; | ||
| } | ||
| String digest = null; | ||
| try { | ||
| byte[] bytesOfMessage = content.getBytes("UTF-8"); | ||
| MessageDigest md = MessageDigest.getInstance("MD5"); | ||
| digest = Base64.encodeBytes(md.digest(bytesOfMessage)); | ||
| } catch(NoSuchAlgorithmException | UnsupportedEncodingException e) { | ||
| e.printStackTrace(); | ||
| } | ||
| return digest; | ||
| } | ||
|
|
||
| private class QuoineContentMD5Digest implements ParamsDigest { | ||
|
|
||
| @Override | ||
| public String digestParams(RestInvocation restInvocation) { | ||
|
|
||
| return getContentMD5(restInvocation.getRequestBody()); | ||
| } | ||
| } | ||
| } |