Skip to content

Fix #12771: remove KeystoreEncryptionSpi Cipher ThreadLocal on stop and after use #13582

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

Open
arimu1 wants to merge 1 commit into
base: master
Choose a base branch
from
+96 −7
Open

Fix #12771: remove KeystoreEncryptionSpi Cipher ThreadLocal on stop and after use #13582

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
46 changes: 39 additions & 7 deletions ...s/core/src/main/java/org/apache/ignite/spi/encryption/keystore/KeystoreEncryptionSpi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ public class KeystoreEncryptionSpi extends IgniteSpiAdapter implements Encryptio
@Override public void spiStop() throws IgniteSpiException {
ensureStarted();

//empty.
aesWithPadding.remove();
aesWithoutPadding.remove();
}

/** {@inheritDoc} */
Expand Down Expand Up @@ -188,12 +189,26 @@ public class KeystoreEncryptionSpi extends IgniteSpiAdapter implements Encryptio

/** {@inheritDoc} */
@Override public void encrypt(ByteBuffer data, Serializable key, ByteBuffer res) {
doEncryption(data, aesWithPadding.get(), key, res);
Cipher cipher = aesWithPadding.get();

try {
doEncryption(data, cipher, key, res);
}
finally {
aesWithPadding.remove();
}
}

/** {@inheritDoc} */
@Override public void encryptNoPadding(ByteBuffer data, Serializable key, ByteBuffer res) {
doEncryption(data, aesWithoutPadding.get(), key, res);
Cipher cipher = aesWithoutPadding.get();

try {
doEncryption(data, cipher, key, res);
}
finally {
aesWithoutPadding.remove();
}
}

/** {@inheritDoc} */
Expand All @@ -202,11 +217,11 @@ public class KeystoreEncryptionSpi extends IgniteSpiAdapter implements Encryptio

ensureStarted();

Cipher cipher = aesWithPadding.get();

try {
SecretKeySpec keySpec = new SecretKeySpec(((KeystoreEncryptionKey)key).key().getEncoded(), CIPHER_ALGO);

Cipher cipher = aesWithPadding.get();

cipher.init(DECRYPT_MODE, keySpec, new IvParameterSpec(data, 0, cipher.getBlockSize()));

return cipher.doFinal(data, cipher.getBlockSize(), data.length - cipher.getBlockSize());
Expand All @@ -215,16 +230,33 @@ public class KeystoreEncryptionSpi extends IgniteSpiAdapter implements Encryptio
BadPaddingException e) {
throw new IgniteSpiException(e);
}
finally {
aesWithPadding.remove();
}
}

/** {@inheritDoc} */
@Override public void decrypt(ByteBuffer data, Serializable key, ByteBuffer res) {
doDecryption(data, aesWithPadding.get(), key, res);
Cipher cipher = aesWithPadding.get();

try {
doDecryption(data, cipher, key, res);
}
finally {
aesWithPadding.remove();
}
}

/** {@inheritDoc} */
@Override public void decryptNoPadding(ByteBuffer data, Serializable key, ByteBuffer res) {
doDecryption(data, aesWithoutPadding.get(), key, res);
Cipher cipher = aesWithoutPadding.get();

try {
doDecryption(data, cipher, key, res);
}
finally {
aesWithoutPadding.remove();
}
}

/**
Expand Down
57 changes: 57 additions & 0 deletions ...es/core/src/test/java/org/apache/ignite/spi/encryption/KeystoreEncryptionSpiSelfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@

package org.apache.ignite.spi.encryption;

import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.nio.ByteBuffer;
import javax.crypto.Cipher;
import java.util.Arrays;
import org.apache.ignite.IgniteException;
import org.apache.ignite.spi.encryption.keystore.KeystoreEncryptionKey;
Expand All @@ -33,10 +36,64 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertTrue;

/** */
public class KeystoreEncryptionSpiSelfTest {

/** */
@Test
public void testCipherThreadLocalsRemovedAfterUse() throws Exception {
KeystoreEncryptionSpi encSpi = new KeystoreEncryptionSpi();

encSpi.setKeyStorePath(KEYSTORE_PATH);
encSpi.setKeyStorePassword(KEYSTORE_PASSWORD.toCharArray());

GridTestUtils.invoke(encSpi, "onBeforeStart");

encSpi.spiStart("default");

KeystoreEncryptionKey k = (KeystoreEncryptionKey)encSpi.create();

byte[] plainText = "ThreadLocal cleanup test".getBytes(UTF_8);
byte[] cipherText = new byte[encSpi.encryptedSize(plainText.length)];

ThreadLocal<Cipher> aesWithPadding = cipherThreadLocal("aesWithPadding");

Cipher paddingCipherBeforeEncrypt = aesWithPadding.get();

encSpi.encrypt(ByteBuffer.wrap(plainText), k, ByteBuffer.wrap(cipherText));

assertNotSame(paddingCipherBeforeEncrypt, aesWithPadding.get());

Cipher paddingCipherBeforeDecrypt = aesWithPadding.get();

encSpi.decrypt(cipherText, k);

assertNotSame(paddingCipherBeforeDecrypt, aesWithPadding.get());

ThreadLocal<Cipher> aesWithoutPadding = cipherThreadLocal("aesWithoutPadding");

Cipher noPaddingCipherBeforeStop = aesWithoutPadding.get();

encSpi.spiStop();

assertNotSame(noPaddingCipherBeforeStop, aesWithoutPadding.get());
}

/** */
@SuppressWarnings("unchecked")
private static ThreadLocal<Cipher> cipherThreadLocal(String fldName) throws Exception {
Field fld = KeystoreEncryptionSpi.class.getDeclaredField(fldName);

assertTrue(Modifier.isStatic(fld.getModifiers()));

fld.setAccessible(true);

return (ThreadLocal<Cipher>)fld.get(null);
}

/** @throws Exception If failed. */
@Test
public void testCantStartWithEmptyParam() throws Exception {
Expand Down