Skip to content

uggest change for security concern #7

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
YYTVicky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

uggest change for security concern #7

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
10 changes: 7 additions & 3 deletions exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CryptoFunctions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@ public void setup() {
keyByteArray = sha.digest(keyByteArray);
keyByteArray = java.util.Arrays.copyOf(keyByteArray, 16);
javax.crypto.spec.SecretKeySpec secretKey = new javax.crypto.spec.SecretKeySpec(keyByteArray, "AES");


/** AES/ECB/PKCS5Padding is not secure, recommend AES/CFB/PKCS5Padding */
cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, secretKey);
} catch (Exception e) {
Expand Down Expand Up @@ -350,15 +351,18 @@ public static class AESDecryptFunction implements DrillSimpleFunc {

@Override
public void setup() {
/**For secure concern, key should be randomly generated*/
String key = org.apache.drill.exec.expr.fn.impl.StringFunctionHelpers.toStringFromUTF8(rawKey.start, rawKey.end, rawKey.buffer);

try {
byte[] keyByteArray = key.getBytes("UTF-8");

/**SHA-1 is not secure, recommend SHA-512*/
java.security.MessageDigest sha = java.security.MessageDigest.getInstance("SHA-1");
keyByteArray = sha.digest(keyByteArray);
keyByteArray = java.util.Arrays.copyOf(keyByteArray, 16);
javax.crypto.spec.SecretKeySpec secretKey = new javax.crypto.spec.SecretKeySpec(keyByteArray, "AES");

/** AES/ECB/PKCS5Padding is not secure, recommend AES/CFB/PKCS5Padding */
cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
cipher.init(Cipher.DECRYPT_MODE, secretKey);
} catch (Exception e) {
Expand All @@ -385,4 +389,4 @@ public void eval() {

}

}
}