From d9f8ec770711288e78f915c49ff6a3879d417212 Mon Sep 17 00:00:00 2001 From: strangelookingnerd <49242855+strangelookingnerd@users.noreply.github.com> Date: Tue, 19 Nov 2024 10:23:45 +0100 Subject: [PATCH] Properly handle empty values --- .../plugins/badge/action/AbstractBadgeAction.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jenkinsci/plugins/badge/action/AbstractBadgeAction.java b/src/main/java/com/jenkinsci/plugins/badge/action/AbstractBadgeAction.java index 43e4536..5fd9959 100644 --- a/src/main/java/com/jenkinsci/plugins/badge/action/AbstractBadgeAction.java +++ b/src/main/java/com/jenkinsci/plugins/badge/action/AbstractBadgeAction.java @@ -87,7 +87,7 @@ public void setIcon(String icon) { @Whitelisted public String getIcon() { - if (StringUtils.isEmpty(icon) + if (StringUtils.isBlank(icon) || icon.startsWith("/") || icon.startsWith("symbol-") || icon.startsWith("icon-") @@ -122,7 +122,7 @@ public void setText(String text) { @Whitelisted public String getText() { - if (StringUtils.isEmpty(text)) { + if (StringUtils.isBlank(text)) { return text; } @@ -161,14 +161,14 @@ public void setLink(String link) { @Whitelisted public String getLink() { - if (StringUtils.isEmpty(link) + if (StringUtils.isBlank(link) || link.startsWith("/") || link.matches("^https?://.*") || link.matches("^mailto:.*")) { return link; } - LOGGER.log(Level.WARNING, "Invalid link value: '{}' - ignoring it", link); + LOGGER.log(Level.WARNING, () -> "Invalid link value: '" + link + "' - ignoring it"); return null; }