Skip to content
This repository has been archived by the owner on Apr 25, 2024. It is now read-only.

Commit

Permalink
validate path
Browse files Browse the repository at this point in the history 
Signed-off-by: Olivier Lamy <olamy@apache.org>
  • Loading branch information
@olamy
olamy committed Sep 5, 2022
1 parent a49b01f commit 9304604
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 113 deletions.
113 changes: 0 additions & 113 deletions archiva-modules/archiva-web/archiva-webapp/pom.xml
View file
Expand Up @@ -591,46 +591,6 @@
</exclusion>
</exclusions>
</dependency>


<!-- sirona -->
<!--
FIXME for some reasons doesn't work with the jetty app see MRM-1792
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-web</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-reporting</artifactId>
<classifier>classes</classifier>
</dependency>
-->
<!--
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-ehcache-agent</artifactId>
</dependency>
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-cassandra</artifactId>
</dependency>
-->

<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
Expand Down Expand Up @@ -865,79 +825,6 @@

<plugins>

<!-- commented as not needed now
<plugin>
<groupId>com.samaxes.maven</groupId>
<artifactId>maven-minify-plugin</artifactId>
<version>1.3.5</version>
<executions>
<execution>
<id>startup-minify</id>
<phase>generate-resources</phase>
<configuration>
<webappSourceDir>${basedir}/src/main/webapp</webappSourceDir>
<cssSourceDir>css</cssSourceDir>
<cssSourceFiles>
<cssSourceFile>jquery-ui-1.8.16.custom.css</cssSourceFile>
<cssSourceFile>jquery.ui.1.8.16.ie.css</cssSourceFile>
<cssSourceFile>bootstrap.2.0.2.css</cssSourceFile>
<cssSourceFile>archiva.css</cssSourceFile>
</cssSourceFiles>
<cssFinalFile>apache-archiva-${project.version}.css</cssFinalFile>
<jsSourceDir>js</jsSourceDir>
<jsSourceFiles>
<jsSourceFile>jquery-1.7.2.js</jsSourceFile>
<jsSourceFile>lab.js</jsSourceFile>
<jsSourceFile>require.1.0.1.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>apache-archiva-startup-${project.version}.js</jsFinalFile>
</configuration>
<goals>
<goal>minify</goal>
</goals>
</execution>
<execution>
<id>main-minify</id>
<phase>generate-resources</phase>
<configuration>
<webappSourceDir>${basedir}/src/main/webapp</webappSourceDir>
<jsSourceDir>js</jsSourceDir>
<jsSourceFiles>
<jsSourceFile>jquery.tmpl.js</jsSourceFile>
<jsSourceFile>archiva/utils.js</jsSourceFile>
<jsSourceFile>jquery.i18n.properties-1.0.9.js</jsSourceFile>
<jsSourceFile>archiva/i18nload.js</jsSourceFile>
<jsSourceFile>jquery.cookie.1.0.0.js</jsSourceFile>
<jsSourceFile>knockout-debug.js</jsSourceFile>
<jsSourceFile>jquery-ui-1.8.16.custom.min.js</jsSourceFile>
<jsSourceFile>jquery.validate.js</jsSourceFile>
<jsSourceFile>jquery.json-2.3.min.js</jsSourceFile>
<jsSourceFile>archiva/main-tmpl.js</jsSourceFile>
<jsSourceFile>archiva/repositories.js</jsSourceFile>
<jsSourceFile>archiva/network-proxies.js</jsSourceFile>
<jsSourceFile>archiva/proxy-connectors.js</jsSourceFile>
<jsSourceFile>redback/operation.js</jsSourceFile>
<jsSourceFile>redback/redback-tmpl.js</jsSourceFile>
<jsSourceFile>bootstrap.2.0.2.js</jsSourceFile>
<jsSourceFile>knockout.simpleGrid.js</jsSourceFile>
<jsSourceFile>redback/user.js</jsSourceFile>
<jsSourceFile>redback/users.js</jsSourceFile>
<jsSourceFile>redback/redback.js</jsSourceFile>
<jsSourceFile>redback/register.js</jsSourceFile>
<jsSourceFile>redback/permission.js</jsSourceFile>
<jsSourceFile>redback/resource.js</jsSourceFile>
<jsSourceFile>redback/roles.js</jsSourceFile>
<jsSourceFile>archiva/main.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>apache-archiva-main-${project.version}.js</jsFinalFile>
</configuration>
<goals>
<goal>minify</goal>
</goals>
</execution>
</executions>
</plugin>
-->
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
Expand Down
7 changes: 7 additions & 0 deletions ...in/java/org/apache/archiva/repository/content/maven2/ManagedDefaultRepositoryContent.java
View file
Expand Up @@ -91,6 +91,13 @@ public void deleteProject( String namespace, String projectId )
{
throw new ContentNotFoundException( "cannot found project " + namespace + ":" + projectId );
}
try {
if (!directory.getCanonicalPath().equals(directory.getAbsolutePath())) {
throw new ContentNotFoundException( "Invalid directory for project " + namespace + ":" + projectId );
}
} catch (IOException e) {
throw new RepositoryException(e.getMessage(), e);
}
if ( directory.isDirectory() )
{
try
Expand Down

0 comments on commit 9304604

Please sign in to comment.