diff options
| author | Olivier Lamy <olamy@apache.org> | 2022-09-05 16:34:41 +1000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2022-09-05 16:34:41 +1000 |
| commit | 4a2d43be63634331668d71590034963e96a8886a (patch) | |
| tree | 3b53c6290848bc727f9a73b93a00cdfbc7e76f51 /archiva-modules/archiva-web | |
| parent | 930460424c715f52a7cb5eef5b084a7a8ef31fb5 (diff) | |
| download | archiva-4a2d43be63634331668d71590034963e96a8886a.tar.gz archiva-4a2d43be63634331668d71590034963e96a8886a.zip | |
simplify exception management
Signed-off-by: Olivier Lamy <olamy@apache.org>
Diffstat (limited to 'archiva-modules/archiva-web')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java index d4958b113..58f78fc70 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/main/java/org/apache/archiva/webdav/ArchivaDavResourceFactory.java @@ -330,7 +330,7 @@ public class ArchivaDavResourceFactory new File( managedRepositoryContent.getRepoRoot(), logicalResource ).getAbsolutePath() ); } - catch ( RepositoryAdminException e ) + catch ( RepositoryAdminException | IOException e ) { throw new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e ); } @@ -478,10 +478,6 @@ public class ArchivaDavResourceFactory { managedRepositoryContent = repositoryFactory.getManagedRepositoryContent( repositoryId ); } - catch ( RepositoryNotFoundException e ) - { - throw new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e ); - } catch ( RepositoryException e ) { throw new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e ); @@ -510,7 +506,7 @@ public class ArchivaDavResourceFactory { storedExceptions.add( e ); } - catch ( RepositoryAdminException e ) + catch ( IOException | RepositoryAdminException e ) { storedExceptions.add( new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e ) ); } @@ -588,7 +584,7 @@ public class ArchivaDavResourceFactory private DavResource processRepository( final DavServletRequest request, ArchivaDavResourceLocator archivaLocator, String activePrincipal, ManagedRepositoryContent managedRepositoryContent, ManagedRepository managedRepository ) - throws DavException + throws DavException, IOException { DavResource resource = null; if ( isAuthorized( request, managedRepositoryContent.getId() ) ) @@ -606,6 +602,10 @@ public class ArchivaDavResourceFactory } LogicalResource logicalResource = new LogicalResource( path ); File resourceFile = new File( managedRepositoryContent.getRepoRoot(), path ); + if(!resourceFile.getCanonicalPath().equals(resourceFile.getAbsolutePath())) + { + throw new DavException( HttpServletResponse.SC_BAD_REQUEST ); + } resource = new ArchivaDavResource( resourceFile.getAbsolutePath(), path, managedRepositoryContent.getRepository(), request.getRemoteAddr(), activePrincipal, request.getDavSession(), @@ -1342,7 +1342,7 @@ public class ArchivaDavResourceFactory } } - Set<String> authzRepos = new HashSet<String>(); + Set<String> authzRepos = new HashSet<>(); String permission = WebdavMethodUtil.getMethodPermission( request.getMethod() ); @@ -1393,15 +1393,7 @@ public class ArchivaDavResourceFactory temporaryGroupIndexMap ); return mergedRepoDir; } - catch ( RepositoryAdminException e ) - { - throw new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e ); - } - catch ( IndexMergerException e ) - { - throw new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e ); - } - catch ( IOException e ) + catch ( RepositoryAdminException | IndexMergerException | IOException e ) { throw new DavException( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e ); } |