github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

unit test correction, slight refactor of tested classes

pull/59/head
nemonik 2012-03-29 14:02:51 -04:00
parent 1209e9a83f
commit 0a29eba617
6 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/EcdsaSigner.java
View File

@ -199,7 +199,7 @@ public class EcdsaSigner extends AbstractJwtSigner implements InitializingBean {
* @see org.mitre.jwt.signer.AbstractJwtSigner#generateSignature(java.lang.String)
*/
@Override
protected String generateSignature(String signatureBase) {
public String generateSignature(String signatureBase) {
String sig = null;

2
openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/HmacSigner.java
View File

@ -168,7 +168,7 @@ public class HmacSigner extends AbstractJwtSigner implements InitializingBean {
* )
*/
@Override
protected String generateSignature(String signatureBase) {
public String generateSignature(String signatureBase) {
if (passphrase == null) {
throw new IllegalArgumentException("Passphrase cannot be null");
}

5
openid-connect-server/src/main/java/org/mitre/jwt/signer/impl/RsaSigner.java
View File

@ -148,9 +148,10 @@ public class RsaSigner extends AbstractJwtSigner implements InitializingBean {
KeyPair keyPair = keystore.getKeyPairForAlias(alias, password);
Assert.notNull(keyPair, "Either alias and/or password is not correct for keystore");
publicKey = keyPair.getPublic();
privateKey = keyPair.getPrivate();
}
/**
@ -202,7 +203,7 @@ public class RsaSigner extends AbstractJwtSigner implements InitializingBean {
* )
*/
@Override
protected String generateSignature(String signatureBase) {
public String generateSignature(String signatureBase) {
String sig = null;

6
openid-connect-server/src/main/java/org/mitre/jwt/signer/service/impl/KeyStore.java
View File

@ -32,6 +32,12 @@ public class KeyStore implements InitializingBean {
private java.security.KeyStore keystore;
/**
* Default Constructor
*/
public KeyStore() {
}
/**
* KeyStore constructor
*

55
openid-connect-server/src/test/java/org/mitre/jwt/JwtTest.java
View File

@ -3,8 +3,10 @@ package org.mitre.jwt;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.Assert.assertThat;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.security.GeneralSecurityException;
import java.security.KeyFactory;
import java.security.NoSuchAlgorithmException;
import java.security.PrivateKey;
@ -54,7 +56,10 @@ public class JwtTest {
try {
key = "secret".getBytes("UTF-8");
signer = new HmacSigner(key);
signer = new HmacSigner();
((HmacSigner) signer).setPassphrase(key);
((HmacSigner) signer).afterPropertiesSet();
signer.sign(jwt);
/*
@ -77,9 +82,10 @@ public class JwtTest {
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
}
/**
@ -225,10 +231,12 @@ public class JwtTest {
try {
key = "secret".getBytes("UTF-8");
signer = new HmacSigner(key);
signer = new HmacSigner();
((HmacSigner) signer).setPassphrase(key);
((HmacSigner) signer).afterPropertiesSet();
/*
* Token string based on the following strucutres, serialized exactly as
* Token string based on the following structures, serialized exactly as
* follows and base64 encoded:
*
* header: {"typ":"JWT","alg":"HS256"} claims:
@ -245,44 +253,9 @@ public class JwtTest {
} catch (UnsupportedEncodingException e) {
// TODO Auto-generated catch block
e.printStackTrace();
} catch (NoSuchAlgorithmException e) {
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
}
@Test
public void testValidateRsaSignature() throws Exception {
/*
* Expected string based on the following structures, serialized exactly
* as follows and base64 encoded:
*
* header: {"typ":"JWT","alg":"HS256"} claims:
* {"exp":1300819380,"iss":"joe","http://example.com/is_root":true}
*
* Expected signature: dSRvtD-ExzGN-
* fRXd1wRZOPo1JFPuqgwvaIKp8jgcyMXJegy6IUjssfUfUcICN5yvh0ggOMWMeWkwQ7
* -PlXMJWymdhXVI3BOpNt7ZOB2vMFYSOOHNBJUunQoe1lmNxuHQdhxqoHahn3u1cLDXz
* -xx-
* JELduuMmaDWqnTFPodVPl45WBKHaQhlOiFWj3ZClUV2k5p2yBT8TmxekL8gWwgVbQk5yPnYOs
* -PcMjzODc9MZX4yI10ZSCSDciwf-
* rgkQLT7wW4uZCoqTZ7187sCodHd6nw3nghqbtqN05fQ3Yq7ykwaR8pdQBFb2L9l7DhLLuXIREDKIFUHBSUs8OnvXFMg
*/
// uses the "testGenerateRsaSignature" alias added just previously in
// the testGenerateRsaSignature unit test
JwtSigner signer = new RsaSigner(RsaSigner.Algorithm.RS256.toString(),
keystore, "testGenerateRsaSignature",
RsaSigner.DEFAULT_PASSWORD);
((RsaSigner) signer).afterPropertiesSet();
String jwtString = "eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJleHAiOjEzMDA4MTkzODAsImlzcyI6ImpvZSIsImh0dHA6Ly9leGFtcGxlLmNvbS9pc19yb290Ijp0cnVlfQ.dSRvtD-ExzGN-fRXd1wRZOPo1JFPuqgwvaIKp8jgcyMXJegy6IUjssfUfUcICN5yvh0ggOMWMeWkwQ7-PlXMJWymdhXVI3BOpNt7ZOB2vMFYSOOHNBJUunQoe1lmNxuHQdhxqoHahn3u1cLDXz-xx-JELduuMmaDWqnTFPodVPl45WBKHaQhlOiFWj3ZClUV2k5p2yBT8TmxekL8gWwgVbQk5yPnYOs-PcMjzODc9MZX4yI10ZSCSDciwf-rgkQLT7wW4uZCoqTZ7187sCodHd6nw3nghqbtqN05fQ3Yq7ykwaR8pdQBFb2L9l7DhLLuXIREDKIFUHBSUs8OnvXFMg";
boolean valid = signer.verify(jwtString);
assertThat(valid, equalTo(Boolean.TRUE));
}
}

13
openid-connect-server/src/test/java/org/mitre/jwt/signer/service/impl/KeyStoreTest.java
View File

@ -91,7 +91,14 @@ public class KeyStoreTest {
int daysNotValidBefore, int daysNotValidAfter)
throws GeneralSecurityException, IOException {
java.security.KeyStore ks = keystore.getKeystore();
java.security.KeyStore ks;
if (keystore != null ) {
ks = keystore.getKeystore();
} else {
ks = java.security.KeyStore.getInstance(java.security.KeyStore.getDefaultType());
ks.load(null, null);
}
KeyPairGenerator rsaKeyPairGenerator = null;
@ -118,7 +125,9 @@ public class KeyStoreTest {
ks.setKeyEntry(alias, privateKey, aliasPassword.toCharArray(),
new java.security.cert.Certificate[] { certificate });
keystore.setKeystore(ks);
if (keystore != null) {
keystore.setKeystore(ks);
}
return ks;
}