You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2013/09/17 05:34:09 UTC
git commit: Disable encrypted query strings temporarily.
Updated Branches:
refs/heads/master 5467a33da -> 36034a692
Disable encrypted query strings temporarily.
Project: http://git-wip-us.apache.org/repos/asf/incubator-knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-knox/commit/36034a69
Tree: http://git-wip-us.apache.org/repos/asf/incubator-knox/tree/36034a69
Diff: http://git-wip-us.apache.org/repos/asf/incubator-knox/diff/36034a69
Branch: refs/heads/master
Commit: 36034a692436e2b832ac233ce05fe0a72881543e
Parents: 5467a33
Author: Kevin Minder <ke...@hortonworks.com>
Authored: Mon Sep 16 23:33:57 2013 -0400
Committer: Kevin Minder <ke...@hortonworks.com>
Committed: Mon Sep 16 23:33:57 2013 -0400
----------------------------------------------------------------------
.../security/impl/DefaultKeystoreService.java | 22 ++++++++++++--------
.../WebHdfsDeploymentContributor/rewrite.xml | 4 ++--
.../src/main/resources/log4j.properties | 3 ++-
3 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/36034a69/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
index 4be49ec..135407e 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/security/impl/DefaultKeystoreService.java
@@ -17,6 +17,14 @@
*/
package org.apache.hadoop.gateway.services.security.impl;
+import org.apache.hadoop.gateway.GatewayMessages;
+import org.apache.hadoop.gateway.config.GatewayConfig;
+import org.apache.hadoop.gateway.i18n.messages.MessagesFactory;
+import org.apache.hadoop.gateway.services.Service;
+import org.apache.hadoop.gateway.services.ServiceLifecycleException;
+import org.apache.hadoop.gateway.services.security.KeystoreService;
+import org.apache.hadoop.gateway.services.security.KeystoreServiceException;
+
import java.io.File;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -31,14 +39,6 @@ import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
import java.util.Map;
-import org.apache.hadoop.gateway.config.GatewayConfig;
-import org.apache.hadoop.gateway.i18n.messages.MessagesFactory;
-import org.apache.hadoop.gateway.services.ServiceLifecycleException;
-import org.apache.hadoop.gateway.services.security.KeystoreService;
-import org.apache.hadoop.gateway.services.security.KeystoreServiceException;
-import org.apache.hadoop.gateway.services.Service;
-import org.apache.hadoop.gateway.GatewayMessages;
-
public class DefaultKeystoreService extends BaseKeystoreService implements KeystoreService, Service {
@@ -181,7 +181,11 @@ public class DefaultKeystoreService extends BaseKeystoreService implements Keyst
KeyStore ks = getCredentialStoreForCluster(clusterName);
if (ks != null) {
try {
- credential = new String(ks.getKey(alias, masterService.getMasterSecret()).getEncoded()).toCharArray();
+ char[] masterSecret = masterService.getMasterSecret();
+ Key credentialKey = ks.getKey( alias, masterSecret );
+ byte[] credentialBytes = credentialKey.getEncoded();
+ String credentialString = new String( credentialBytes );
+ credential = credentialString.toCharArray();
} catch (UnrecoverableKeyException e) {
LOG.failedToGetCredentialForCluster( clusterName, e );
} catch (KeyStoreException e) {
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/36034a69/gateway-service-hdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
----------------------------------------------------------------------
diff --git a/gateway-service-hdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml b/gateway-service-hdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
index db6069b..0aa62e9 100644
--- a/gateway-service-hdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
+++ b/gateway-service-hdfs/src/main/resources/org/apache/hadoop/gateway/hdfs/WebHdfsDeploymentContributor/rewrite.xml
@@ -28,7 +28,7 @@
<rule dir="OUT" name="WEBHDFS/webhdfs/outbound/namenode/headers/location">
<match pattern="{scheme}://{host}:{port}/{path=**}?{**}"/>
<rewrite template="{gateway.url}/datanode/api/v1/{path=**}?{scheme}?host={$hostmap(host)}?{port}?{**}"/>
- <encrypt-query/>
+ <encode-query/>
</rule>
<rule dir="IN" name="WEBHDFS/webhdfs/inbound/hdfs" pattern="hdfs:/{path=**}?{**}">
@@ -48,7 +48,7 @@
</rule>
<rule dir="IN" name="WEBHDFS/webhdfs/inbound/datanode">
- <decrypt-query/>
+ <decode-query/>
<match pattern="*://*:*/**/datanode/api/*/{path=**}?{scheme}?{host}?{port}?{**}"/>
<rewrite template="{scheme}://{host}:{port}/{path=**}?{**}"/>
</rule>
http://git-wip-us.apache.org/repos/asf/incubator-knox/blob/36034a69/gateway-test-ldap/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/gateway-test-ldap/src/main/resources/log4j.properties b/gateway-test-ldap/src/main/resources/log4j.properties
index 02bf744..0ac181c 100644
--- a/gateway-test-ldap/src/main/resources/log4j.properties
+++ b/gateway-test-ldap/src/main/resources/log4j.properties
@@ -20,4 +20,5 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %m%n
-log4j.logger.org.apache.hadoop.gateway=INFO
\ No newline at end of file
+log4j.logger.org.apache.hadoop.gateway=INFO
+#log4j.logger.org.apache.hadoop.gateway=DEBUG
\ No newline at end of file