Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 27037 invoked from network); 28 May 2010 02:03:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 28 May 2010 02:03:33 -0000 Received: (qmail 26388 invoked by uid 500); 28 May 2010 02:03:33 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 26339 invoked by uid 500); 28 May 2010 02:03:33 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 26332 invoked by uid 99); 28 May 2010 02:03:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 May 2010 02:03:33 +0000 X-ASF-Spam-Status: No, hits=-1930.3 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 May 2010 02:03:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3240A2388903; Fri, 28 May 2010 02:03:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r949067 - in /geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main: java/org/apache/geronimo/console/filter/NoXssShowTreeSettingFilter.java resources/pluto-portal-driver-config.xml webapp/WEB-INF/web.xml Date: Fri, 28 May 2010 02:03:12 -0000 To: scm@geronimo.apache.org From: delos@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100528020312.3240A2388903@eris.apache.org> Author: delos Date: Fri May 28 02:03:11 2010 New Revision: 949067 URL: http://svn.apache.org/viewvc?rev=949067&view=rev Log: GERONIMO-5351 make admin console main page visible when user is redirected to it Added: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/filter/NoXssShowTreeSettingFilter.java Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml Added: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/filter/NoXssShowTreeSettingFilter.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/filter/NoXssShowTreeSettingFilter.java?rev=949067&view=auto ============================================================================== --- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/filter/NoXssShowTreeSettingFilter.java (added) +++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/java/org/apache/geronimo/console/filter/NoXssShowTreeSettingFilter.java Fri May 28 02:03:11 2010 @@ -0,0 +1,105 @@ +/** + * 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.geronimo.console.filter; + +import java.io.IOException; +import java.util.Collections; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +public class NoXssShowTreeSettingFilter implements Filter { + + private static final String NOXSS_SHOW_TREE = "noxssShowTree"; + + public void destroy() { + } + + public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, + ServletException { + + if (request instanceof HttpServletRequest && request.getParameterMap()!=null && !request.getParameterMap().containsKey(NOXSS_SHOW_TREE)) { + + NoXssShowTreeSettingRequest wrapper = new NoXssShowTreeSettingRequest((HttpServletRequest)request); + + filterChain.doFilter(wrapper, response); + }else{ + filterChain.doFilter(request, response); + } + } + + + public void init(FilterConfig arg0) throws ServletException { + + } + + protected static class NoXssShowTreeSettingRequest extends HttpServletRequestWrapper { + + private Map newParamMap = new HashMap(); + + public NoXssShowTreeSettingRequest(HttpServletRequest request) { + super(request); + + + newParamMap.putAll(request.getParameterMap()); + + /* + * To show navigator tree in admin console, we need to set NOXSS_SHOW_TREE to true. + * + */ + String[] noxssShowTree = new String[1]; + noxssShowTree[0]="true"; + newParamMap.put(NOXSS_SHOW_TREE,noxssShowTree); + } + + @Override + public String getParameter(final String name) + { + String[] strArray = newParamMap.get(name); + if (strArray != null && strArray.length>0) + return strArray[0]; + else return null; + } + + @Override + public Map getParameterMap() + { + return Collections.unmodifiableMap(newParamMap); + } + + @Override + public Enumeration getParameterNames() + { + return Collections.enumeration(newParamMap.keySet()); + } + + @Override + public String[] getParameterValues(final String key) + { + return newParamMap.get(key); + } + } +} Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml?rev=949067&r1=949066&r2=949067&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml (original) +++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml Fri May 28 02:03:11 2010 @@ -37,7 +37,7 @@ limitations under the License. - + Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=949067&r1=949066&r2=949067&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml (original) +++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml Fri May 28 02:03:11 2010 @@ -52,6 +52,16 @@ limitations under the License. org.apache.pluto.driver.PortalStartupListener + + NoXssShowTreeSettingFilter + org.apache.geronimo.console.filter.NoXssShowTreeSettingFilter + + + + NoXssShowTreeSettingFilter + /secure/* + + PlutoURLRebuildFilter org.apache.geronimo.console.filter.PlutoURLRebuildFilter @@ -287,7 +297,7 @@ limitations under the License. - + console monitor /portal