Thanks to visit codestin.com
Credit goes to github.com

Skip to content

DE25851: Made Encryptor#encrypt thread safe and improved performance … #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FrankGasparovic merged 1 commit into from
Mar 28, 2017
Merged

DE25851: Made Encryptor#encrypt thread safe and improved performance … #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions service/src/main/java/com/ge/predix/acs/encryption/DecryptionFailureException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@SuppressWarnings("serial")
public class DecryptionFailureException extends RuntimeException {

public DecryptionFailureException(final Throwable cause) {
super(cause);
public DecryptionFailureException(final String message, final Throwable cause) {
super(message, cause);
}
}
4 changes: 2 additions & 2 deletions service/src/main/java/com/ge/predix/acs/encryption/EncryptionFailureException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@SuppressWarnings("serial")
public class EncryptionFailureException extends RuntimeException {

public EncryptionFailureException(final Throwable cause) {
super(cause);
public EncryptionFailureException(final String message, final Throwable cause) {
super(message, cause);
}
}
70 changes: 38 additions & 32 deletions service/src/main/java/com/ge/predix/acs/encryption/Encryptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,65 @@
package com.ge.predix.acs.encryption;

import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays;

import javax.crypto.Cipher;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;

import org.apache.commons.codec.binary.Base64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.google.common.primitives.Bytes;

public final class Encryptor {

private static final Logger LOGGER = LoggerFactory.getLogger(Encryptor.class);
private static final String ALGO_WITH_PADDING = "AES/CBC/PKCS5PADDING";
private static final String ALGO = "AES";
private static final String ENCODING = "UTF-8";
private static final int IV_LENGTH_IN_BYTES = 16;
private static final int KEY_LENGTH_IN_BYTES = 16;

private Cipher cipher;
private String encryptionKey;
private static final ThreadLocal<Cipher> CIPHER_THREAD_LOCAL = ThreadLocal.withInitial(() -> {
try {
return Cipher.getInstance(ALGO_WITH_PADDING);
} catch (Throwable e) {
throw new CipherInitializationFailureException(
"Could not create instance of cipher with algorithm: " + ALGO_WITH_PADDING, e);
}
});

private SecretKeySpec secretKeySpec;

private static final class CipherInitializationFailureException extends RuntimeException {

CipherInitializationFailureException(final String message, final Throwable cause) {
super(message, cause);
}
}

public Encryptor() {
// Modified version of Cassandra's CipherFactory#buildCipher
// (https://github.com/apache/cassandra/blob/trunk/src/java/org/apache/cassandra/security/CipherFactory.java)
private Cipher buildCipher(final byte[] iv, final int cipherMode) {
try {
this.cipher = Cipher.getInstance(ALGO_WITH_PADDING);
} catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
LOGGER.error("Can not created instance of cipher with algorithm" + ALGO_WITH_PADDING);
Cipher cipher = CIPHER_THREAD_LOCAL.get();
cipher.init(cipherMode, this.secretKeySpec, new IvParameterSpec(iv));
return cipher;
} catch (Throwable e) {
throw new CipherInitializationFailureException(
"Could not initialize instance of cipher with algorithm: " + ALGO_WITH_PADDING, e);
}
}

public String encrypt(final String value) {
try {
byte[] ivBytes = new byte[IV_LENGTH_IN_BYTES];
SecureRandom.getInstanceStrong().nextBytes(ivBytes);
IvParameterSpec iv = new IvParameterSpec(ivBytes);
SecretKeySpec skeySpec = new SecretKeySpec(this.encryptionKey.getBytes(ENCODING), ALGO);

this.cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv);
new SecureRandom().nextBytes(ivBytes);

byte[] encrypted = this.cipher.doFinal(value.getBytes());
byte[] encrypted = this.buildCipher(ivBytes, Cipher.ENCRYPT_MODE).doFinal(value.getBytes());
byte[] result = Bytes.concat(ivBytes, encrypted);

return Base64.encodeBase64String(result);
} catch (Throwable ex) {
LOGGER.error("Unable to encrypt");
throw new EncryptionFailureException(ex);
} catch (Throwable e) {
throw new EncryptionFailureException("Unable to encrypt", e);
}
}

Expand All @@ -60,23 +69,20 @@ public String decrypt(final String encrypted) {
byte[] ivBytes = Arrays.copyOfRange(encryptedBytes, 0, IV_LENGTH_IN_BYTES);
byte[] encryptedSecretBytes = Arrays.copyOfRange(encryptedBytes, IV_LENGTH_IN_BYTES, encryptedBytes.length);

IvParameterSpec iv = new IvParameterSpec(ivBytes);
SecretKeySpec skeySpec = new SecretKeySpec(this.encryptionKey.getBytes(ENCODING), ALGO);

this.cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
byte[] original = this.cipher.doFinal(encryptedSecretBytes);
byte[] original = this.buildCipher(ivBytes, Cipher.DECRYPT_MODE).doFinal(encryptedSecretBytes);

return new String(original);
} catch (Throwable ex) {
LOGGER.error("Unable to decrypt");
throw new DecryptionFailureException(ex);
} catch (Throwable e) {
throw new DecryptionFailureException("Unable to decrypt", e);
}
}

public void setEncryptionKey(final String encryptionKey) {
if (null == encryptionKey || encryptionKey.length() != KEY_LENGTH_IN_BYTES) {
throw new SymmetricKeyValidationException("Encryption key must be string of length " + KEY_LENGTH_IN_BYTES);
try {
this.secretKeySpec = new SecretKeySpec(encryptionKey.getBytes(), 0, KEY_LENGTH_IN_BYTES, ALGO);
} catch (Throwable e) {
throw new SymmetricKeyValidationException(
"Encryption key must be string of length: " + KEY_LENGTH_IN_BYTES, e);
}
this.encryptionKey = encryptionKey;
}
}
4 changes: 2 additions & 2 deletions service/src/main/java/com/ge/predix/acs/encryption/SymmetricKeyValidationException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
@SuppressWarnings("serial")
public class SymmetricKeyValidationException extends RuntimeException {

public SymmetricKeyValidationException(final String message) {
super(message);
public SymmetricKeyValidationException(final String message, final Throwable cause) {
super(message, cause);
}
}
14 changes: 12 additions & 2 deletions service/src/test/java/com/ge/predix/acs/encryption/EncryptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,19 @@ public void testEncryptCompleteFlow() {
}

@Test(expectedExceptions = { SymmetricKeyValidationException.class })
public void testCreateEncryptionWithWrongKeySize() {
public void testCreateEncryptionWithTooShortOfAKey() {
Encryptor encryption = new Encryptor();
encryption.setEncryptionKey("Key_With_Wrong_Size");
encryption.setEncryptionKey("Too_short");
}

@Test
public void testCreateEncryptionWithTooLongOfAKey() {
try {
Encryptor encryption = new Encryptor();
encryption.setEncryptionKey("Toooooooooo_loooooooooong");
} catch (Throwable e) {
Assert.fail();
}
}

}