HADOOP-13461. NPE in KeyProvider.rollNewVersion. Contributed by Colm O hEigeartaigh.
This commit is contained in:
parent
ec289bbece
commit
e83be44af5
@ -557,6 +557,10 @@ public void close() throws IOException {
|
||||
public KeyVersion rollNewVersion(String name) throws NoSuchAlgorithmException,
|
||||
IOException {
|
||||
Metadata meta = getMetadata(name);
|
||||
if (meta == null) {
|
||||
throw new IOException("Can't find Metadata for key " + name);
|
||||
}
|
||||
|
||||
byte[] material = generateKey(meta.getBitLength(), meta.getCipher());
|
||||
return rollNewVersion(name, material);
|
||||
}
|
||||
|
@ -22,6 +22,7 @@
|
||||
|
||||
import org.apache.hadoop.fs.Path;
|
||||
import org.apache.hadoop.security.ProviderUtils;
|
||||
import org.apache.hadoop.test.GenericTestUtils;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
@ -38,6 +39,7 @@
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
import static org.junit.Assert.assertArrayEquals;
|
||||
import static org.junit.Assert.fail;
|
||||
|
||||
public class TestKeyProvider {
|
||||
|
||||
@ -182,8 +184,11 @@ public List<KeyVersion> getKeyVersions(String name)
|
||||
|
||||
@Override
|
||||
public Metadata getMetadata(String name) throws IOException {
|
||||
if (!"unknown".equals(name)) {
|
||||
return new Metadata(CIPHER, 128, "description", null, new Date(), 0);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public KeyVersion createKey(String name, byte[] material,
|
||||
@ -236,6 +241,27 @@ public void testMaterialGeneration() throws Exception {
|
||||
Assert.assertNotNull(kp.material);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRolloverUnknownKey() throws Exception {
|
||||
MyKeyProvider kp = new MyKeyProvider(new Configuration());
|
||||
KeyProvider.Options options = new KeyProvider.Options(new Configuration());
|
||||
options.setCipher(CIPHER);
|
||||
options.setBitLength(128);
|
||||
kp.createKey("hello", options);
|
||||
Assert.assertEquals(128, kp.size);
|
||||
Assert.assertEquals(CIPHER, kp.algorithm);
|
||||
Assert.assertNotNull(kp.material);
|
||||
|
||||
kp = new MyKeyProvider(new Configuration());
|
||||
try {
|
||||
kp.rollNewVersion("unknown");
|
||||
fail("should have thrown");
|
||||
} catch (IOException e) {
|
||||
String expectedError = "Can't find Metadata for key";
|
||||
GenericTestUtils.assertExceptionContains(expectedError, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testConfiguration() throws Exception {
|
||||
Configuration conf = new Configuration(false);
|
||||
|
Loading…
Reference in New Issue
Block a user