Merge pull request #1136 from scireum/feature/jvo/SIRI-597-Aggro-Base64

Error Check in Base64 Macro (SIRI-597)

pom.xml

@@ -69,12 +69,12 @@
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
-            <version>3.5.0</version>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
-            <version>3.5.0</version>
+            <version>3.5.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.github.jai-imageio</groupId>
@@ -153,7 +153,7 @@
         <dependency>
             <groupId>io.swagger.core.v3</groupId>
             <artifactId>swagger-annotations</artifactId>
-            <version>2.2.4</version>
+            <version>2.2.6</version>
         </dependency>
     </dependencies>
 

src/main/java/sirius/pasta/noodle/macros/Base64ResourceMacro.java

@@ -78,14 +78,12 @@ public Object invoke(Environment environment, Object[] args) {
 
     @Nonnull
     private String encodeResource(String path) {
-        if (!path.startsWith("/assets")) {
+        if (!path.startsWith("/assets/")) {
             throw new IllegalArgumentException("Only assets can be inlined for security reasons.");
         }
 
-        Resource resource = resources.resolve(path).orElse(null);
-        if (resource == null) {
-            return "";
-        }
+        Resource resource =
+                resources.resolve(path).orElseThrow(() -> new IllegalArgumentException("Unknown resource: " + path));
 
         String base64Data = Base64.getEncoder().encodeToString(resource.getContent());
 

src/main/java/sirius/web/dispatch/SiriusSassGenerator.java

@@ -22,8 +22,8 @@
 import java.io.InputStream;
 import java.util.Optional;
 
-/*
- * Subclass of generator which takes care of proper logging
+/**
+ * Subclass of {@link Generator} which takes care of proper logging.
  */
 class SiriusSassGenerator extends Generator {