accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Date Fri, 01 Aug 2014 17:31:47 GMT
Merge branch '1.6.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/db72ba35
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/db72ba35
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/db72ba35

Branch: refs/heads/master
Commit: db72ba3588d022138447de457fd719c17f6cca96
Parents: 8abe4df6 fb450ff
Author: Josh Elser <elserj@apache.org>
Authored: Fri Aug 1 13:16:31 2014 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Aug 1 13:16:31 2014 -0400

----------------------------------------------------------------------
 .../conf/CredentialProviderFactoryShim.java     | 320 +++++++++++++++++++
 .../org/apache/accumulo/core/conf/Property.java |   1 +
 .../accumulo/core/conf/SiteConfiguration.java   |  53 ++-
 .../conf/CredentialProviderFactoryShimTest.java | 149 +++++++++
 core/src/test/resources/accumulo.jceks          | Bin 0 -> 946 bytes
 core/src/test/resources/empty.jceks             | Bin 0 -> 32 bytes
 6 files changed, 522 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/db72ba35/core/src/main/java/org/apache/accumulo/core/conf/Property.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/db72ba35/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
index 3696c0d,a5e14af..8114ea8
--- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
@@@ -103,9 -120,23 +139,24 @@@ public class SiteConfiguration extends 
          props.put(entry.getKey(), entry.getValue());
    }
  
+   protected Configuration getHadoopConfiguration() {
+     String credProviderPathsKey = Property.GENERAL_SECURITY_CREDENTIAL_PROVIDER_PATHS.getKey();
+     String credProviderPathsValue = getXmlConfig().get(credProviderPathsKey);
+ 
+     if (null != credProviderPathsValue) {
+       // We have configuration for a CredentialProvider
+       // Try to pull the sensitive password from there
+       Configuration conf = new Configuration();
+       conf.set(CredentialProviderFactoryShim.CREDENTIAL_PROVIDER_PATH, credProviderPathsValue);
+       return conf;
+     }
+ 
+     return null;
+   }
+ 
    /**
 -   * method here to support testing, do not call
 +   * Clears the configuration properties in this configuration (but not the
 +   * parent). This method supports testing and should not be called.
     */
    synchronized public static void clearInstance() {
      instance = null;


Mime
View raw message