Merge branch 'release/1.0.1'

HISTORY

@@ -1,3 +1,8 @@
+2020-09-28 1.0.1
+  - Mail service configuration optional
+  - Enhanced history
+
+
 2020-08-21 1.0.0
   - Enhanced history
 

README.md

@@ -83,6 +83,7 @@ You can see an example for each configuration in [example package](/examples/src
 ## AVS Post Filter
 
 This filter can scan e.g. asset uploads for viruses.
+You will also need to configure "Day CQ Mail Service" (com.day.cq.mailer.DefaultMailService) for this.
 
 * includePatterns: List of regular expressions to match the URLs to check. If empty, all non-excluded URLs are scanned.
 * excludePatterns: List of regular expressions to match the URLs to ignore. Has higher priority than include patterns.

api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.valtech.avs</groupId>
 		<artifactId>avs</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>avs.api</artifactId>

core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>de.valtech.avs</groupId>
 		<artifactId>avs</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>avs.core</artifactId>

core/src/main/java/de/valtech/avs/core/filter/AvsPostFilter.java

@@ -138,7 +138,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                 continue;
             }
             if (StringUtils.isNotEmpty(part.getSubmittedFileName())) {
-                fileNames.add(part.getSubmittedFileName());
+                fileNames.add(getFilePath(slingRequest, part));
             }
             InputStream partStream = part.getInputStream();
             File file = File.createTempFile("valtech-avs", ".tmp");
@@ -178,6 +178,20 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
         chain.doFilter(request, response);
     }
 
+    /**
+     * Returns path and name of uploaded file.
+     * 
+     * @param slingRequest request
+     * @param part         file part
+     * @return path
+     */
+    private String getFilePath(SlingHttpServletRequest slingRequest, Part part) {
+        String fileName = part.getSubmittedFileName();
+        String path = (StringUtils.isNotBlank(slingRequest.getRequestURI())) ? slingRequest.getRequestURI() + "/" : "";
+        path = path.replace(".createasset.html", "");
+        return path + fileName;
+    }
+
     /**
      * Checks if the request is multipart form-data.
      * 

core/src/main/java/de/valtech/avs/core/mail/AvsNotificationMailer.java

@@ -34,6 +34,8 @@
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.osgi.service.component.annotations.ReferencePolicyOption;
 import org.osgi.service.metatype.annotations.Designate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +55,7 @@ public class AvsNotificationMailer {
 
     private static final Logger LOG = LoggerFactory.getLogger(AvsNotificationMailer.class);
 
-    @Reference
+    @Reference(cardinality = ReferenceCardinality.OPTIONAL, policyOption = ReferencePolicyOption.GREEDY)
     private MailService mailService;
 
     private AvsNotificationMailerConfig config;
@@ -76,6 +78,10 @@ public void activate(AvsNotificationMailerConfig config) {
      * @param result   scan result
      */
     public void sendEmail(List<String> emails, String fileName, ScanResult result) {
+        if (mailService == null) {
+            LOG.info("Skipping email sending as mail service is not configured.");
+            return;
+        }
         VelocityEngine ve = new VelocityEngine();
         ve.init();
         VelocityContext context = new VelocityContext();

core/src/main/java/de/valtech/avs/core/model/scan/ScanModel.java

@@ -68,7 +68,7 @@ protected void init() {
                 if (inputStream != null) {
                     scanDone = true;
                     String userId = request.getResourceResolver().adaptTo(Session.class).getUserID();
-                    ScanResult result = avsService.scan(inputStream, userId);
+                    ScanResult result = avsService.scan(inputStream, userId, filePart.getSubmittedFileName());
                     clean = result.isClean();
                     resultOutput = result.getOutput();
                 }

examples/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.valtech.avs</groupId>
 		<artifactId>avs</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>avs.examples</artifactId>

pom.xml

@@ -4,7 +4,7 @@
 	<groupId>de.valtech.avs</groupId>
 	<artifactId>avs</artifactId>
 	<packaging>pom</packaging>
-	<version>1.0.0</version>
+	<version>1.0.1</version>
 	<name>AVS</name>
 	<description>AEM Virus Scan</description>
 	<url>https://github.com/valtech/aem-virus-scan</url>
@@ -341,7 +341,7 @@
 				<plugin>
 					<groupId>org.owasp</groupId>
 					<artifactId>dependency-check-maven</artifactId>
-					<version>5.2.1</version>
+					<version>5.2.4</version>
 					<configuration>
 						<failBuildOnCVSS>0</failBuildOnCVSS>
 						<failBuildOnAnyVulnerability>true</failBuildOnAnyVulnerability>

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.projectKey=avs
 sonar.projectName=AEM Virus Scan
-sonar.projectVersion=1.0.0-SNAPSHOT
+sonar.projectVersion=1.0.1-SNAPSHOT
 
 # Encoding of the source code. Default is default system encoding
 sonar.sourceEncoding=UTF-8

ui.apps.structure/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.valtech.avs</groupId>
 		<artifactId>avs</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>ui.apps.structure</artifactId>

ui.apps/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>de.valtech.avs</groupId>
 		<artifactId>avs</artifactId>
-		<version>1.0.0</version>
+		<version>1.0.1</version>
 	</parent>
 
 	<artifactId>avs.ui.apps</artifactId>