You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by lm...@apache.org on 2016/04/04 20:43:30 UTC
[1/3] knox git commit: KNOX-706, KNOX-707 - Update CHANGES
Repository: knox
Updated Branches:
refs/heads/v0.9.0 268546206 -> 11320d53e
KNOX-706, KNOX-707 - Update CHANGES
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/53e51630
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/53e51630
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/53e51630
Branch: refs/heads/v0.9.0
Commit: 53e5163073b8231b9657c99ac83a963ff6f4ee06
Parents: 2685462
Author: Larry McCay <lm...@hortonworks.com>
Authored: Mon Apr 4 14:41:12 2016 -0400
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Mon Apr 4 14:42:32 2016 -0400
----------------------------------------------------------------------
CHANGES | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/53e51630/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5bc061f..94754cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -60,6 +60,8 @@ Release Notes - Apache Knox - Version 0.9.0
* [KNOX-689] - Applications Deployment Contributor can't find service.xml
* [KNOX-689] - Revert - Applications Deployment Contributor can't find service.xml
* [KNOX-704] - Remove bogus sleep() from knoxauth redirecting.html
+ * [KNOX-706] - KnoxSSO Default IDP must not require specific URL
+ * [KNOX-707] - Enter Key within KnoxSSO Default IDP Form does not Submit
------------------------------------------------------------------------------
Release Notes - Apache Knox - Version 0.8.0
[3/3] knox git commit: KNOX-706 - KnoxSSO Default IDP must not
require specific URL
Posted by lm...@apache.org.
KNOX-706 - KnoxSSO Default IDP must not require specific URL
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/11320d53
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/11320d53
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/11320d53
Branch: refs/heads/v0.9.0
Commit: 11320d53efad3f732e3fe4af94b3fd4490621d8e
Parents: 69fac2b
Author: Larry McCay <lm...@hortonworks.com>
Authored: Mon Apr 4 14:32:34 2016 -0400
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Mon Apr 4 14:43:10 2016 -0400
----------------------------------------------------------------------
.../deploy/impl/ShiroDeploymentContributor.java | 12 +++++
.../gateway/filter/RedirectToUrlFilter.java | 52 ++++++++++++++++++++
.../home/conf/topologies/knoxsso.xml | 4 ++
3 files changed, 68 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/11320d53/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/deploy/impl/ShiroDeploymentContributor.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/deploy/impl/ShiroDeploymentContributor.java b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/deploy/impl/ShiroDeploymentContributor.java
index b050197..8cabf6e 100644
--- a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/deploy/impl/ShiroDeploymentContributor.java
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/deploy/impl/ShiroDeploymentContributor.java
@@ -21,6 +21,7 @@ import org.apache.hadoop.gateway.deploy.DeploymentContext;
import org.apache.hadoop.gateway.deploy.ProviderDeploymentContributorBase;
import org.apache.hadoop.gateway.descriptor.FilterParamDescriptor;
import org.apache.hadoop.gateway.descriptor.ResourceDescriptor;
+import org.apache.hadoop.gateway.filter.RedirectToUrlFilter;
import org.apache.hadoop.gateway.filter.ResponseCookieFilter;
import org.apache.hadoop.gateway.topology.Provider;
import org.apache.hadoop.gateway.topology.Service;
@@ -38,6 +39,7 @@ public class ShiroDeploymentContributor extends ProviderDeploymentContributorBas
private static final String SHIRO_FILTER_CLASSNAME = "org.apache.shiro.web.servlet.ShiroFilter";
private static final String POST_FILTER_CLASSNAME = "org.apache.hadoop.gateway.filter.ShiroSubjectIdentityAdapter";
private static final String COOKIE_FILTER_CLASSNAME = "org.apache.hadoop.gateway.filter.ResponseCookieFilter";
+ private static final String REDIRECT_FILTER_CLASSNAME = "org.apache.hadoop.gateway.filter.RedirectToUrlFilter";
private static final String SESSION_TIMEOUT = "sessionTimeout";
private static final String REMEMBER_ME = "rememberme";
private static final String SHRIO_CONFIG_FILE_NAME = "shiro.ini";
@@ -105,6 +107,16 @@ public class ShiroDeploymentContributor extends ProviderDeploymentContributorBas
params = new ArrayList<FilterParamDescriptor>();
}
Map<String, String> providerParams = provider.getParams();
+ String redirectToUrl = providerParams.get(RedirectToUrlFilter.REDIRECT_TO_URL);
+ if (redirectToUrl != null) {
+ params.add( resource.createFilterParam()
+ .name(RedirectToUrlFilter.REDIRECT_TO_URL)
+ .value(redirectToUrl));
+ resource.addFilter().name( "Redirect" + getName() ).role(
+ getRole() ).impl( REDIRECT_FILTER_CLASSNAME ).params( params );
+ params.clear();
+ }
+
String cookies = providerParams.get( ResponseCookieFilter.RESTRICTED_COOKIES );
if (cookies == null) {
params.add( resource.createFilterParam()
http://git-wip-us.apache.org/repos/asf/knox/blob/11320d53/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/filter/RedirectToUrlFilter.java
----------------------------------------------------------------------
diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/filter/RedirectToUrlFilter.java b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/filter/RedirectToUrlFilter.java
new file mode 100644
index 0000000..40775e9
--- /dev/null
+++ b/gateway-provider-security-shiro/src/main/java/org/apache/hadoop/gateway/filter/RedirectToUrlFilter.java
@@ -0,0 +1,52 @@
+/**
+ * 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.gateway.filter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class RedirectToUrlFilter extends AbstractGatewayFilter {
+ public static final String REDIRECT_TO_URL = "redirectToUrl";
+
+ protected static String redirectUrl = null;
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ super.init(filterConfig);
+ redirectUrl = filterConfig.getInitParameter(REDIRECT_TO_URL);
+ }
+
+ @Override
+ protected void doFilter( HttpServletRequest request,
+ HttpServletResponse response, FilterChain chain ) throws IOException, ServletException {
+ if (redirectUrl != null && request.getHeader("Authorization") == null) {
+ response.sendRedirect(redirectUrl + getOriginalQueryString(request));
+ }
+ chain.doFilter( request, response );
+ }
+
+ private String getOriginalQueryString(HttpServletRequest request) {
+ String originalQueryString = request.getQueryString();
+ return (originalQueryString == null) ? "" : "?" + originalQueryString;
+ }
+}
http://git-wip-us.apache.org/repos/asf/knox/blob/11320d53/gateway-release/home/conf/topologies/knoxsso.xml
----------------------------------------------------------------------
diff --git a/gateway-release/home/conf/topologies/knoxsso.xml b/gateway-release/home/conf/topologies/knoxsso.xml
index 7e962cf..c0b48ce 100644
--- a/gateway-release/home/conf/topologies/knoxsso.xml
+++ b/gateway-release/home/conf/topologies/knoxsso.xml
@@ -38,6 +38,10 @@
<value>30</value>
</param>
<param>
+ <name>redirectToUrl</name>
+ <value>/gateway/knoxsso/knoxauth/login.html</value>
+ </param>
+ <param>
<name>restrictedCookies</name>
<value>rememberme,WWW-Authenticate</value>
</param>
[2/3] knox git commit: KNOX-707 - Enter Key within KnoxSSO Default
IDP Form does not Submit
Posted by lm...@apache.org.
KNOX-707 - Enter Key within KnoxSSO Default IDP Form does not Submit
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/69fac2b6
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/69fac2b6
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/69fac2b6
Branch: refs/heads/v0.9.0
Commit: 69fac2b6d41193678fb33f611f2ed96ca86db050
Parents: 53e5163
Author: Larry McCay <lm...@hortonworks.com>
Authored: Mon Apr 4 14:32:57 2016 -0400
Committer: Larry McCay <lm...@hortonworks.com>
Committed: Mon Apr 4 14:42:45 2016 -0400
----------------------------------------------------------------------
.../resources/applications/knoxauth/app/js/knoxauth.js | 6 ++++++
.../main/resources/applications/knoxauth/app/login.html | 12 +++---------
2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/69fac2b6/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js b/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js
index 7197894..6f91420 100644
--- a/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js
+++ b/gateway-applications/src/main/resources/applications/knoxauth/app/js/knoxauth.js
@@ -38,6 +38,12 @@ function redirect(redirectUrl) {
catch(e) { window.location = redirectUrl; }
}
+var keypressed = function(event) {
+ if (event.keyCode == 13) {
+ login();
+ }
+}
+
var login = function() {
var form = document.forms[0];
var username = form.username.value;
http://git-wip-us.apache.org/repos/asf/knox/blob/69fac2b6/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
----------------------------------------------------------------------
diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/login.html b/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
index 08e4d67..dd486e1 100644
--- a/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
+++ b/gateway-applications/src/main/resources/applications/knoxauth/app/login.html
@@ -47,9 +47,6 @@
</head>
<body class="login" style="">
- <!--%
- response.setHeader("X-Frame-Options", "DENY");
- %-->
<!-- Page content
================================================== -->
<section id="signin-container" style="margin-top: 4.5px;">
@@ -60,17 +57,14 @@
<fieldset>
<div class="fields">
<label><i class="icon-user"></i> Username:</label>
- <input type="text" name="username" id="username" tabindex="1" autofocus>
+ <input type="text" name="username" id="username" tabindex="1" onkeypress=keypressed(event) autofocus>
<label><i class="icon-lock"></i> Password:</label>
- <input type="password" name="password" id="password" tabindex="2" autocomplete="off">
+ <input type="password" name="password" id="password" tabindex="2" autocomplete="off" onkeypress=keypressed(event)>
</div>
<span id="errorBox" class="help-inline" style="color:white;display:none;"><span class="errorMsg"></span>
<i class="icon-warning-sign" style="color:#ae2817;"></i>
</span>
- <span id="errorBoxUnsynced" class="help-inline" style="color:white;display:none;">User is not available in HDP Admin Tool. Please contact your Administrator.
- <i class="icon-warning-sign" style="color:#ae2817;"></i>
- </span>
- <button type="button" class="btn btn-primary btn-block" id="signIn" tabindex="4" onkeypress="return login()" onclick="login();">
+ <button type="button" class="btn btn-primary btn-block" id="signIn" tabindex="4" onkeypress="keypressed(event)" onclick="login();">
Sign In
<i id="signInLoading" class="icon-spinner icon-spin pull-right icon-sign-in"></i>
</button>