Skip to content

Add safe checks and make sure log4j configuration has log4j2 format #12061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: 4.20
Choose a base branch
from
Draft

Add safe checks and make sure log4j configuration has log4j2 format #12061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions debian/cloudstack-management.postinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,33 @@ if [ "$1" = configure ]; then
chown -R cloud:cloud /usr/share/cloudstack-management/templates
find /usr/share/cloudstack-management/templates -type d -exec chmod 0770 {} \;

LOGFILE="${CONFDIR}/log4j-cloud.xml"

# Detect if current file is old Log4j1 format
if grep -q "<log4j:configuration" "$LOGFILE" 2>/dev/null; then
echo "Old Log4j1 format detected in $LOGFILE"

BACKUP_SUFFIXES=".rpmnew .dpkg-new .dpkg-dist"
for sfx in $BACKUP_SUFFIXES; do
NEWFILE="${LOGFILE}${sfx}"
if [ -f "$NEWFILE" ]; then
echo "Found new version candidate: $NEWFILE"

# Verify that the candidate actually has Log4j2 syntax
if grep -q "<Configuration" "$NEWFILE" 2>/dev/null; then
echo "Verified Log4j2 format in $NEWFILE — applying update."
cp -f "$NEWFILE" "$LOGFILE"
mv "$NEWFILE" "${NEWFILE}.bak.$(date +%F_%H-%M-%S)"
echo "Replaced old Log4j1 config with Log4j2 version."
break
else
echo "WARNING: $NEWFILE does not appear to be Log4j2 format — skipping."
fi
fi
done
else
echo "Log4j2 format already present — no action needed."
fi
ln -sf ${CONFDIR}/log4j-cloud.xml ${CONFDIR}/log4j2.xml

# Add jdbc MySQL driver settings to db.properties if not present
Expand Down
10 changes: 10 additions & 0 deletions debian/cloudstack-management.preinst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,14 @@ if [ "$1" = upgrade ]; then
rm -f /usr/share/cloudstack-management/work
rm -f /etc/default/cloudstack-management
fi

if [ -L "/etc/cloudstack/management/log4j.xml" ]; then
echo "Removing existing /etc/cloudstack/management/log4j.xml, symlink will again be created during post install"
rm -f /etc/cloudstack/management/log4j.xml
fi

if [ -L "/etc/cloudstack/management/log4j2.xml" ]; then
echo "Removing existing /etc/cloudstack/management/log4j2.xml, symlink will again be created during post install"
rm -f /etc/cloudstack/management/log4j2.xml
fi
fi
Loading