Add validation to snooze() and memory cleanup to isSnoozed()

Author: LakshyaBagani

core/src/main/java/hudson/model/AdministrativeMonitor.java

@@ -33,6 +33,8 @@
 import java.io.IOException;
 import java.util.Map;
 import java.util.Set;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import jenkins.model.Jenkins;
 import org.kohsuke.accmod.Restricted;
 import org.kohsuke.accmod.restrictions.NoExternalUse;
@@ -89,6 +91,8 @@
  * @see Jenkins#administrativeMonitors
  */
 public abstract class AdministrativeMonitor extends AbstractModelObject implements ExtensionPoint, StaplerProxy {
+    private static final Logger LOGGER = Logger.getLogger(AdministrativeMonitor.class.getName());
+
     /**
      * Human-readable ID of this monitor, which needs to be unique within the system.
      *
@@ -161,13 +165,34 @@ public boolean isSnoozed() {
         if (expiry == null) {
             return false;
         }
-        return System.currentTimeMillis() < expiry;
+        long now = System.currentTimeMillis();
+        if (now >= expiry) {
+            // Cleanup expired entry to prevent memory leak
+            try {
+                AbstractCIBase jenkins = Jenkins.get();
+                Map<String, Long> map = jenkins.getSnoozedAdministrativeMonitors();
+                if (map.remove(id) != null) {
+                    jenkins.setSnoozedAdministrativeMonitors(map);
+                    jenkins.save();
+                }
+            } catch (IOException e) {
+                LOGGER.log(Level.WARNING, "Failed to cleanup expired snooze for " + id, e);
+            }
+            return false;
+        }
+        return true;
     }
 
     /**
      * @since 2.549
      */
     public void snooze(long durationMs) throws IOException {
+        if (durationMs <= 0) {
+            throw new IllegalArgumentException("Duration must be positive");
+        }
+        if (durationMs > 365L * 24 * 60 * 60 * 1000) {
+            throw new IllegalArgumentException("Duration exceeds maximum (1 year)");
+        }
         long expiryTime = System.currentTimeMillis() + durationMs;
         AbstractCIBase jenkins = Jenkins.get();
         Map<String, Long> map = jenkins.getSnoozedAdministrativeMonitors();