snvijaya commented on a change in pull request #1842: HADOOP-16730 : ABFS: Add
Authorizer Interface
URL: https://github.com/apache/hadoop/pull/1842#discussion_r383185199
##########
File path:
hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AbfsConfiguration.java
##########
@@ -578,35 +585,37 @@ public AccessTokenProvider getTokenProvider() throws
TokenAccessProviderExceptio
}
}
- public String getAbfsExternalAuthorizationClass() {
- return this.abfsExternalAuthorizationClass;
- }
-
- public AbfsAuthorizer getAbfsAuthorizer() throws IOException {
- String authClassName = getAbfsExternalAuthorizationClass();
- AbfsAuthorizer authorizer = null;
+ public SASTokenProvider getSASTokenProvider() throws
AzureBlobFileSystemException {
+ AuthType authType = getEnum(FS_AZURE_ACCOUNT_AUTH_TYPE_PROPERTY_NAME,
AuthType.SharedKey);
+ if (authType != AuthType.SAS) {
+ throw new SASTokenProviderException(String.format(
+ "Invalid auth type: %s is being used, expecting SAS", authType));
+ }
try {
- if (authClassName != null && !authClassName.isEmpty()) {
- @SuppressWarnings("unchecked")
- Class<AbfsAuthorizer> authClass = (Class<AbfsAuthorizer>)
rawConfig.getClassByName(authClassName);
- authorizer = authClass.getConstructor(new Class[]
{Configuration.class}).newInstance(rawConfig);
- LOG.trace("Initializing {}", authClassName);
- authorizer.init();
- LOG.trace("{} init complete", authClassName);
+ String configKey = FS_AZURE_SAS_TOKEN_PROVIDER_TYPE;
+ Class<? extends SASTokenProvider> sasTokenProviderClass =
+ getClass(configKey, null, SASTokenProvider.class);
+ if (sasTokenProviderClass == null) {
+ throw new IllegalArgumentException(
+ String.format("The configuration value for \"%s\" is invalid.",
configKey));
}
- } catch (
- IllegalAccessException
- | InstantiationException
- | ClassNotFoundException
- | IllegalArgumentException
- | InvocationTargetException
- | NoSuchMethodException
- | SecurityException
- | AbfsAuthorizationException e) {
- throw new IOException(e);
+
+ SASTokenProvider sasTokenProvider = ReflectionUtils
+ .newInstance(sasTokenProviderClass, rawConfig);
+ if (sasTokenProvider == null) {
+ throw new IllegalArgumentException("Failed to initialize " +
sasTokenProviderClass);
+ }
+
+ LOG.trace("Initializing {}", sasTokenProviderClass.getName());
+ sasTokenProvider.initialize(rawConfig, accountName);
+ LOG.trace("{} init complete", sasTokenProviderClass.getName());
+ return sasTokenProvider;
+ } catch(IllegalArgumentException e) {
+ throw e;
+ } catch (Exception e) {
Review comment:
Done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
