inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

MNT-22136: WebDAV PROPFIND returns 302 instead of 404 (for docker image only) (#818)

Browse Source 
* MNT-22136: WebDAV PROPFIND returns 302 instead of 404 (for docker image only)

- appears to be regression from REPO-3275 (due to apparent copy & paste from index.jsp)

- added new -ve test added to TAS WebDAV to repeat this specific issue (without fix - fails with 302 instead of 404)
  - see also [WebDavUtil.isLocked()](https://github.com/Alfresco/alfresco-tas-webdav/blob/master/src/main/java/org/alfresco/webdav/dsl/WebDavUtil.java#L359-L376)
This commit is contained in:
montgolfiere
2021-11-24 16:57:55 +00:00
committed by GitHub
parent 5b7029b130
commit 4fb119c3fb
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packaging/tests/tas-webdav/src/test/java/org/alfresco/webdav/UnlockFileTests.java
View File

@@ -198,4 +198,15 @@ public class UnlockFileTests extends WebDavTest
.then().unlock() .then().unlock()
.and().assertThat().hasStatus(HttpStatus.NO_CONTENT.value()).and().assertThat().isUnlocked(); .and().assertThat().hasStatus(HttpStatus.NO_CONTENT.value()).and().assertThat().isUnlocked();
} }
@TestRail(section={TestGroup.PROTOCOLS, TestGroup.WEBDAV}, executionType= ExecutionType.SANITY,
description ="Checks no existent file is not locked (and status 404)")
@Test(groups = {TestGroup.PROTOCOLS, TestGroup.WEBDAV, TestGroup.SANITY})
public void checkLockStatusForNonExistentFile() throws Exception
{
testFile = FileModel.getRandomFileModel(FileType.TEXT_PLAIN, content);
webDavProtocol.authenticateUser(dataUser.getAdminUser()).
usingResource(testFile).
assertThat().isUnlocked().assertThat().hasStatus(HttpStatus.NOT_FOUND.value());
}
} }

11
packaging/war/src/main/webapp/error.jsp
View File

@@ -2,7 +2,7 @@
#%L #%L
Alfresco Repository WAR Community Alfresco Repository WAR Community
%% %%
Copyright (C) 2005 - 2016 Alfresco Software Limited Copyright (C) 2005 - 2021 Alfresco Software Limited
%% %%
This file is part of the Alfresco software. This file is part of the Alfresco software.
If the software was purchased under a paid Alfresco license, the terms of If the software was purchased under a paid Alfresco license, the terms of
@@ -35,15 +35,6 @@
<%@ page import="org.alfresco.service.cmr.module.ModuleInstallState" %> <%@ page import="org.alfresco.service.cmr.module.ModuleInstallState" %>
<%@ page import="java.util.Calendar" %> <%@ page import="java.util.Calendar" %>
<!-- Enterprise index-jsp placeholder -->
<%
// route WebDAV requests
if (request.getMethod().equalsIgnoreCase("PROPFIND") || request.getMethod().equalsIgnoreCase("OPTIONS"))
{
response.sendRedirect(request.getContextPath() + "/webdav/");
}
%>
<% <%
WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(session.getServletContext()); WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(session.getServletContext());
SysAdminParams sysAdminParams = (SysAdminParams)context.getBean("sysAdminParams"); SysAdminParams sysAdminParams = (SysAdminParams)context.getBean("sysAdminParams");