HDDS-1430. NPE if secure ozone if KMS uri is not defined. Contributed by Ajay Kumar. (#752)
This commit is contained in:
parent
59816dff94
commit
95790bb7e5
|
@ -128,6 +128,9 @@ public final class OzoneKMSUtil {
|
|||
|
||||
public static KeyProvider getKeyProvider(final Configuration conf,
|
||||
final URI serverProviderUri) throws IOException{
|
||||
if (serverProviderUri == null) {
|
||||
throw new IOException("KMS serverProviderUri is not configured.");
|
||||
}
|
||||
return KMSUtil.createKeyProviderFromUri(conf, serverProviderUri);
|
||||
}
|
||||
|
||||
|
|
|
@ -0,0 +1,51 @@
|
|||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
package org.apache.hadoop.ozone.client.rpc;
|
||||
|
||||
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
|
||||
import org.apache.hadoop.ozone.OzoneConfigKeys;
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
import static org.junit.Assert.*;
|
||||
|
||||
/**
|
||||
* Test class for {@link OzoneKMSUtil}.
|
||||
* */
|
||||
public class TestOzoneKMSUtil {
|
||||
private OzoneConfiguration config;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
config = new OzoneConfiguration();
|
||||
config.setBoolean(OzoneConfigKeys.OZONE_SECURITY_ENABLED_KEY, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getKeyProvider() {
|
||||
try {
|
||||
OzoneKMSUtil.getKeyProvider(config, null);
|
||||
fail("Expected IOException.");
|
||||
} catch (IOException ioe) {
|
||||
assertEquals(ioe.getMessage(), "KMS serverProviderUri is " +
|
||||
"not configured.");
|
||||
}
|
||||
}
|
||||
}
|
|
@ -59,7 +59,13 @@ public class OzoneFileSystem extends BasicOzoneFileSystem
|
|||
@Override
|
||||
public DelegationTokenIssuer[] getAdditionalTokenIssuers()
|
||||
throws IOException {
|
||||
KeyProvider keyProvider = getKeyProvider();
|
||||
KeyProvider keyProvider;
|
||||
try {
|
||||
keyProvider = getKeyProvider();
|
||||
} catch (IOException ioe) {
|
||||
LOG.error("Error retrieving KeyProvider.", ioe);
|
||||
return null;
|
||||
}
|
||||
if (keyProvider instanceof DelegationTokenIssuer) {
|
||||
return new DelegationTokenIssuer[]{(DelegationTokenIssuer)keyProvider};
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue