From 7affbb1dacf709424b33f30a5305c44ea201acd4 Mon Sep 17 00:00:00 2001 From: dahn Date: Fri, 19 Apr 2024 12:23:31 +0200 Subject: [PATCH] protect against null-path (#8915) Co-authored-by: Vladimir Dombrovski Co-authored-by: Vishesh Co-authored-by: Suresh Kumar Anaparti --- .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 5 ++++- systemvm/debian/etc/logrotate.d/haproxy | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index b65a7847675..0612ed70510 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3066,7 +3066,10 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes } private String appendFileType(String path, String fileType) { - if (path.toLowerCase().endsWith(fileType.toLowerCase())) { + if (StringUtils.isBlank(path)) { + throw new CloudRuntimeException("No path given, cannot append filetype " + fileType); + } + if (fileType == null || path.toLowerCase().endsWith(fileType.toLowerCase())) { return path; } diff --git a/systemvm/debian/etc/logrotate.d/haproxy b/systemvm/debian/etc/logrotate.d/haproxy index 464209791a3..a6b72b6f77a 100644 --- a/systemvm/debian/etc/logrotate.d/haproxy +++ b/systemvm/debian/etc/logrotate.d/haproxy @@ -4,6 +4,6 @@ notifempty maxsize 10M postrotate - /bin/kill -HUP `cat /var/run/rsyslog.pid 2> /dev/null` 2> /dev/null || true + /usr/lib/rsyslog/rsyslog-rotate endscript }