Merge pull request syslog-ng#4830 from therandomstring/security-fixes

Random fixes

Author: bazsi

contrib/syslog-ng-helm-chart/templates/compress-job.yaml

@@ -32,6 +32,10 @@ spec:
           containers:
           - name: compress
             image: "ubuntu:20.10"
+            resources:
+              limits:
+                cpu: 500m
+                memory: 2048Mi
             command:
             - /bin/entrypoint.sh
             volumeMounts:

contrib/syslog-ng-helm-chart/templates/tests/test-connection.yaml

@@ -7,9 +7,14 @@ metadata:
   annotations:
     "helm.sh/hook": test-success
 spec:
+  automountServiceAccountToken: false
   containers:
     - name: wget
       image: busybox
       command: ['wget']
       args: ['{{ include "syslog-ng.fullname" . }}:{{ .Values.service.port }}']
+      resources:
+        limits:
+          cpu: 100m
+          memory: 256Mi
   restartPolicy: Never

modules/java/src/main/java/org/syslog_ng/SyslogNgClassLoader.java

@@ -90,8 +90,16 @@ private static List<String> resolveWildCardFileName(String path) {
     List<String> result = new ArrayList<String>();
     File f = new File(path);
     final String basename = f.getName();
-    String dirname = f.getParent();
-    File dir = new File(dirname);
+    File dir;
+    try {
+      String dirname = f.getParent();
+      dir = new File(dirname);
+    }
+    catch (NullPointerException e) {
+      InternalMessageSender.error("Error. Null pointer dereference. Path or pattern might not exist:" + path + ". Error:" + e.getMessage());
+      e.printStackTrace(System.err);
+      return result;
+    }
     File[] files = dir.listFiles(new FilenameFilter() {
 
       public boolean accept(File dir, String name) {