Code corrections

Author: car031

logicaldoc-webdav/src/main/java/com/logicaldoc/webdav/web/AbstractWebdavServlet.java

@@ -165,13 +165,14 @@ private Session getSession(HttpServletRequest request, WebdavResponse webdavResp
 		Session session = SessionManager.get().getSession(request);
 		if (session == null) {
 			// Try to invalidates previous session cookie
-			if (request.getCookies().length > 0) {
+			if (request.getCookies() != null) {
 				Cookie[] cooks = request.getCookies();
 				for (Cookie cookie : cooks) {
 					if (cookie.getName().equals("ldoc-sid")) {
 						// A zero value causes the cookie to be deleted.
 						cookie.setMaxAge(0);
 						webdavResponse.addCookie(cookie);
+						break;
 					}
 				}
 			}
@@ -197,7 +198,7 @@ private void handleException(HttpServletRequest request, WebdavResponse davRespo
 			log.warn("{}: {} {}", e.getClass().getName(), request.getMethod(), methodCode);
 		} else if (e.getClass().getName().contains("ClientAbortException")) {
 			log.warn("{}: {} {} {}", e.getClass().getName(), e.getMessage(), request.getMethod(), methodCode);
-		} else if(e instanceof DavException de){
+		} else if (e instanceof DavException de) {
 			log.error(de.getMessage(), de);
 			try {
 				davResponse.sendError(de);
@@ -362,33 +363,20 @@ private void spoolResource(WebdavRequest request, WebdavResponse response, DavRe
 			}
 		}
 
-		OutputStream outX = (sendContent) ? response.getOutputStream() : null;
+		OutputStream outX = sendContent ? response.getOutputStream() : null;
 		OutputContext oc = getOutputContext(response, outX);
 
-		if (!resource.isCollection() && resource instanceof DavResourceImpl dri) {
+		if (!resource.isCollection() && resource instanceof DavResourceImpl davRsource) {
 			log.debug("resource instanceof DavResourceImpl");
 
-			// Enforce download permission
-			ExportContext exportCtx = dri.getExportContext(oc);
-			if (!exportCtx.getResource().isDownloadEnabled()) {
-				throw new DavException(HttpServletResponse.SC_FORBIDDEN,
-						"Download permission not granted to this user");
-			}
+			ExportContext exportCtx = enforceDownloadPermission(oc, davRsource);
 
 			// Deals with ranges
 			String rangeHeader = request.getHeader(HttpHeaders.RANGE);
 			if (rangeHeader != null) {
-				Pair<String, String> parsedRange = null;
-				try {
-					parsedRange = parseRangeRequestHeader(rangeHeader);
-					if (log.isDebugEnabled())
-						log.debug("parsedRange {}", parsedRange);
-				} catch (DavException e) {
-					log.error(e.getMessage());
-				}
-
 				WebdavSession session = (com.logicaldoc.webdav.session.WebdavSession) request.getDavSession();
-				resource = getResourceFactory().createRangeResource(dri.getLocator(), session, parsedRange);
+				resource = getResourceFactory().createRangeResource(davRsource.getLocator(), session,
+						parseRangeRequestHeader(rangeHeader));
 
 				log.debug("Create RangeResourceImpl {}", resource);
 
@@ -402,6 +390,15 @@ private void spoolResource(WebdavRequest request, WebdavResponse response, DavRe
 		resource.spool(oc);
 	}
 
+	private ExportContext enforceDownloadPermission(OutputContext oc, DavResourceImpl davRsource)
+			throws IOException, DavException {
+		ExportContext exportCtx = davRsource.getExportContext(oc);
+		if (!exportCtx.getResource().isDownloadEnabled()) {
+			throw new DavException(HttpServletResponse.SC_FORBIDDEN, "Download permission not granted to this user");
+		}
+		return exportCtx;
+	}
+
 	private void setETagHeader(WebdavRequest request, WebdavResponse response, ExportContext exportCtx) {
 		String userAgent = request.getHeader("User-Agent");
 		if (userAgent != null && userAgent.contains("LogicalDOCApp")) {

logicaldoc-webdav/src/test/java/com/logicaldoc/webdav/resource/service/ResourceServiceImplTest.java

@@ -218,30 +218,29 @@ public void testMoveFolder() throws DavException {
 
 		source = testSubject.getResource("/Default/folder6", davSession);
 		assertNull(source);
-		
+
 		// rename a folder
 		Resource source02 = testSubject.getResource("/Default/folder7", davSession);
 		Resource destination02 = testSubject.getResource("/Default", davSession);
-		
+
 		// Bad example, the rename must be done in a different way
 		Resource badBlood = testSubject.move(source02, destination02, "reputation", davSession);
 		assertNotNull(badBlood);
-		assertFalse("reputation".equals(badBlood.getName()));
 		assertEquals("folder7", badBlood.getName());
 		assertTrue(badBlood.isFolder());
-		
+
 		// good example (folder rename)
 		source02.setName("delicate");
 		Resource delicate = testSubject.move(source02, destination02, null, davSession);
 		assertNotNull(delicate);
 		assertEquals("delicate", delicate.getName());
 		assertTrue(delicate.isFolder());
-		
+
 	}
 
 	@Test
 	public void testDeleteResource() throws DavException {
-		
+
 		// delete document
 		Resource resource = testSubject.getResource("/Default/one.pdf", davSession);
 		assertNotNull(resource);
@@ -280,13 +279,15 @@ public void testCopy() throws DavException {
 
 		source = testSubject.getResource("/Default/one.pdf", davSession);
 		assertNotNull(source);
-		
-		// Test copy Folder (it should produce an exception, as right now copy of folder is not supported)
+
+		// Test copy Folder (it should produce an exception, as right now copy
+		// of folder is not supported)
 		Resource dest02 = testSubject.getResource("/Default/folder7", davSession);
 		try {
 			testSubject.copy(destinationFolder, dest02, null, davSession);
 			Assert.fail();
-		} catch (DavException e) {			
+		} catch (DavException e) {
+			// All as expected
 		}
 	}
 
@@ -307,7 +308,7 @@ public void testStreamOut() throws DavException, IOException {
 	}
 
 	@Test
-	public void testCheckout() throws DavException, PersistenceException  {
+	public void testCheckout() throws DavException, PersistenceException {
 		Document doc = docDao.findById(1L);
 		assertEquals(AbstractDocument.DOC_UNLOCKED, doc.getStatus());
 

logicaldoc-webdav/src/test/java/com/logicaldoc/webdav/web/WebdavServletTest.java

@@ -276,7 +276,6 @@ private String callPROPFIND() throws IOException {
 			MockServletResponse response = new MockServletResponse(tempFile);
 
 			MockServletRequest request = prepareRequest(DavMethods.METHOD_PROPFIND, "");
-			//request.setHeader("Depth", "1");
 			request.setHeader("Accept-Encoding", "identity");
 			request.setHeader("Content-Type", "application/xml; charset=utf-8");
 			request.setBody(PROPFIND_SPEC);
@@ -399,5 +398,4 @@ protected MockServletRequest prepareRequest(String method, String path) {
 		request.setRequestURI(PREFIX + path);
 		return request;
 	}
-  
 }

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/client/AbstractRestClient.java

@@ -8,8 +8,6 @@
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.transport.http.HTTPConduit;
 import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
 
@@ -21,8 +19,6 @@
  */
 public abstract class AbstractRestClient<T> {
 
-	private static final Logger log = LoggerFactory.getLogger(AbstractRestClient.class);
-
 	protected String endpoint;
 
 	protected String apiKey;
@@ -65,12 +61,12 @@ protected AbstractRestClient(Class<T> stub, String endpoint, String apiKey, int
 
 	protected void prepareProxy(Class<T> stub) {
 		JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
-		
+
 		if (StringUtils.isNotEmpty(apiKey)) {
 			bean.setHeaders(Map.of("X-API-KEY", apiKey));
 			bean.setInheritHeaders(true);
 		}
-		
+
 		bean.setResourceClass(stub);
 		bean.setAddress(endpoint);
 		bean.setProviders(List.of(new JacksonJsonProvider()));

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/client/RestAuthClient.java

@@ -1,8 +1,5 @@
 package com.logicaldoc.webservice.rest.client;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.logicaldoc.core.security.authentication.AuthenticationException;
 import com.logicaldoc.webservice.model.WSCredentials;
 import com.logicaldoc.webservice.rest.AuthService;
@@ -16,8 +13,6 @@
  */
 public class RestAuthClient extends AbstractRestClient<AuthService> implements AuthService {
 
-	private static final Logger log = LoggerFactory.getLogger(RestAuthClient.class);
-
 	public RestAuthClient(String endpoint) throws AuthenticationException {
 		super(AuthService.class, endpoint, null);
 	}

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/client/RestBookmarkClient.java

@@ -9,8 +9,6 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.core.PersistenceException;
 import com.logicaldoc.core.security.authentication.AuthenticationException;
@@ -22,8 +20,6 @@
 
 public class RestBookmarkClient extends AbstractRestClient<BookmarkService> {
 
-	private static final Logger log = LoggerFactory.getLogger(RestBookmarkClient.class);
-
 	public RestBookmarkClient(String endpoint, String apiKey) {
 		this(endpoint, apiKey, -1);
 	}

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/client/RestDocumentClient.java

@@ -13,8 +13,6 @@
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
 import org.apache.cxf.jaxrs.ext.multipart.AttachmentBuilder;
 import org.apache.cxf.jaxrs.ext.multipart.ContentDisposition;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.core.PersistenceException;
 import com.logicaldoc.core.security.authentication.AuthenticationException;
@@ -28,8 +26,6 @@
 
 public class RestDocumentClient extends AbstractRestClient<DocumentService> {
 
-	private static final Logger log = LoggerFactory.getLogger(RestDocumentClient.class);
-
 	public RestDocumentClient(String endpoint, String apiKey) {
 		this(endpoint, apiKey, -1);
 	}

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/client/RestDocumentMetadataClient.java

@@ -2,9 +2,6 @@
 
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.logicaldoc.core.PersistenceException;
 import com.logicaldoc.core.security.authentication.AuthenticationException;
 import com.logicaldoc.core.security.authorization.PermissionException;
@@ -16,8 +13,6 @@
 
 public class RestDocumentMetadataClient extends AbstractRestClient<DocumentMetadataService> {
 
-	private static final Logger log = LoggerFactory.getLogger(RestDocumentMetadataClient.class);
-
 	public RestDocumentMetadataClient(String endpoint, String apiKey) {
 		this(endpoint, apiKey, -1);
 	}

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/client/RestFolderClient.java

@@ -5,8 +5,6 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.core.PersistenceException;
 import com.logicaldoc.core.security.authentication.AuthenticationException;
@@ -17,8 +15,6 @@
 
 public class RestFolderClient extends AbstractRestClient<FolderService> {
 
-	private static final Logger log = LoggerFactory.getLogger(RestFolderClient.class);
-
 	public RestFolderClient(String endpoint, String apiKey) {
 		this(endpoint, apiKey, -1);
 	}

logicaldoc-webservice/src/main/java/com/logicaldoc/webservice/rest/client/RestSearchClient.java

@@ -3,8 +3,6 @@
 import javax.ws.rs.core.MediaType;
 
 import org.apache.cxf.jaxrs.client.WebClient;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.logicaldoc.core.PersistenceException;
 import com.logicaldoc.core.searchengine.SearchException;
@@ -16,8 +14,6 @@
 
 public class RestSearchClient extends AbstractRestClient<SearchService> {
 
-	private static final Logger log = LoggerFactory.getLogger(RestSearchClient.class);
-
 	public RestSearchClient(String endpoint, String apiKey) {
 		this(endpoint, apiKey, -1);
 	}