Skip to content

RANGER-5320:Handle unsupported cipher key creation #672

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

RANGER-5320:Handle unsupported cipher key creation #672

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
12 changes: 12 additions & 0 deletions kms/src/main/java/org/apache/hadoop/crypto/key/RangerKeyStoreProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.crypto.CipherSuite;
import org.apache.hadoop.fs.Path;
import org.apache.ranger.credentialapi.CredentialReader;
import org.apache.ranger.kms.dao.DaoManager;
Expand Down Expand Up @@ -442,6 +443,7 @@ public KeyVersion createKey(String name, byte[] material, Options options) throw
logger.debug("==> createKey({})", name);

KeyVersion ret;
validateKeyCiphers(options.getCipher());

try (AutoClosableWriteLock ignored = new AutoClosableWriteLock(lock)) {
reloadKeys();
Expand Down Expand Up @@ -597,6 +599,16 @@ private static Configuration getConfiguration(boolean loadHadoopDefaults, String
return conf;
}

private void validateKeyCiphers(String ciphers) throws IOException {
if (StringUtils.isNotEmpty(ciphers)) {
try {
CipherSuite.convert(ciphers);
} catch (Exception e) {
throw new IOException("Invalid ciphers: " + ciphers, e);
}
}
}

private static void getFromJceks(Configuration conf, String path, String alias, String key) {
logger.debug("==> getFromJceks()");

Expand Down