Author: olamy
Date: Wed Aug 10 15:51:26 2011
New Revision: 1156241
URL: http://svn.apache.org/viewvc?rev=1156241&view=rev
Log:
[MRM-1487] Unable to add a proxy connector
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1156241&r1=1156240&r2=1156241&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Aug 10
15:51:26 2011
@@ -162,6 +162,11 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>ognl</groupId>
+ <artifactId>ognl</artifactId>
+ <version>3.0.2</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.struts</groupId>
<artifactId>struts2-core</artifactId>
</dependency>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java?rev=1156241&r1=1156240&r2=1156241&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/AbstractActionSupport.java
Wed Aug 10 15:51:26 2011
@@ -22,6 +22,7 @@ package org.apache.maven.archiva.web.act
import com.google.common.collect.Lists;
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.ActionSupport;
+import com.opensymphony.xwork2.interceptor.ParameterNameAware;
import org.apache.archiva.audit.AuditEvent;
import org.apache.archiva.audit.AuditListener;
import org.apache.archiva.audit.Auditable;
@@ -179,4 +180,5 @@ public abstract class AbstractActionSupp
}
return beans;
}
+
}
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java?rev=1156241&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java
Wed Aug 10 15:51:26 2011
@@ -0,0 +1,31 @@
+package org.apache.maven.archiva.web.interceptor;
+
+import com.opensymphony.xwork2.interceptor.ParametersInterceptor;
+
+import java.util.regex.Pattern;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: olamy
+ * Date: 10/08/11
+ * Time: 16:55
+ * To change this template use File | Settings | File Templates.
+ */
+public class ArchivaParametersInterceptor extends ParametersInterceptor
+{
+
+ private String acceptedParamNames = "[a-zA-Z0-9\\-\\.\\]\\[\\(\\)_'\\s]+";
+ private Pattern acceptedPattern = Pattern.compile(acceptedParamNames);
+
+ @Override
+ protected boolean acceptableName( String name )
+ {
+ boolean accept = super.acceptableName( name );
+ if (!accept)
+ {
+ // [MRM-1487] second try adding '-' in pattern
+ accept = acceptedPattern.matcher( name ).matches();
+ }
+ return accept;
+ }
+}
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/interceptor/ArchivaParametersInterceptor.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml?rev=1156241&r1=1156240&r2=1156241&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/struts.xml
Wed Aug 10 15:51:26 2011
@@ -36,11 +36,40 @@
<interceptor name="redbackAutoLogin"
class="redbackAutoLoginInterceptor"/>
<interceptor name="redbackPolicyEnforcement"
class="redbackPolicyEnforcementInterceptor"/>
<interceptor name="paramFilter"
class="com.opensymphony.xwork2.interceptor.ParameterFilterInterceptor"/>
+ <interceptor name="archivaParams"
class="org.apache.maven.archiva.web.interceptor.ArchivaParametersInterceptor"/>
+
+
+ <interceptor-stack name="defaultArchivaStack">
+ <interceptor-ref name="exception"/>
+ <interceptor-ref name="alias"/>
+ <interceptor-ref name="servletConfig"/>
+ <interceptor-ref name="i18n"/>
+ <interceptor-ref name="prepare"/>
+ <interceptor-ref name="chain"/>
+ <interceptor-ref name="debugging"/>
+ <interceptor-ref name="scopedModelDriven"/>
+ <interceptor-ref name="modelDriven"/>
+ <interceptor-ref name="fileUpload"/>
+ <interceptor-ref name="checkbox"/>
+ <interceptor-ref name="multiselect"/>
+ <interceptor-ref name="staticParams"/>
+ <interceptor-ref name="actionMappingParams"/>
+ <interceptor-ref name="archivaParams">
+ <param name="excludeParams">dojo\..*,^struts\..*</param>
+ </interceptor-ref>
+ <interceptor-ref name="conversionError"/>
+ <interceptor-ref name="validation">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ <interceptor-ref name="workflow">
+ <param name="excludeMethods">input,back,cancel,browse</param>
+ </interceptor-ref>
+ </interceptor-stack>
<interceptor-stack name="configuredArchivaStack">
<interceptor-ref name="redbackForceAdminUser"/>
<interceptor-ref name="redbackAutoLogin"/>
- <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="defaultArchivaStack"/>
<interceptor-ref name="paramFilter">
<param name="blocked">externalResult</param>
</interceptor-ref>
@@ -63,7 +92,7 @@
<interceptor-stack name="unconfiguredArchivaStack">
<interceptor-ref name="redbackForceAdminUser"/>
<interceptor-ref name="redbackAutoLogin"/>
- <interceptor-ref name="defaultStack"/>
+ <interceptor-ref name="defaultArchivaStack"/>
<interceptor-ref name="redbackPolicyEnforcement"/>
<interceptor-ref name="redbackSecureActions">
<param name="enableReferrerCheck">false</param>
@@ -81,7 +110,7 @@
<interceptor-stack name="configuredPrepareParamsStack">
<!-- <interceptor-ref name="prepare" /> -->
- <interceptor-ref name="params"/>
+ <interceptor-ref name="archivaParams"/>
<interceptor-ref name="configuredArchivaStack"/>
</interceptor-stack>
</interceptors>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml?rev=1156241&r1=1156240&r2=1156241&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/resources/log4j.xml
Wed Aug 10 15:51:26 2011
@@ -27,6 +27,9 @@
<param name="ConversionPattern" value="%d [%t] %-5p %c %x - %m%n"/>
</layout>
</appender>
+ <logger name="com.opensymphony.xwork2.interceptor.ParametersInterceptor">
+ <level value="debug"/>
+ </logger>
<logger name="org.apache.commons.configuration.DefaultConfigurationBuilder">
<level value="error"/>
</logger>
