Skip to content
Permalink
Browse files

[JENKINS-36748] Do not process null specs in triggers (#2482)

* [JENKINS-36748] Add a test case and not process null specs

* [JENKINS-36748] Correct license and add a minor comment

* [JENKINS-36748] Add a Waning logger when spec is null

(cherry picked from commit 4278804)
  • Loading branch information
fbelzunc authored and olivergondza committed Aug 24, 2016
1 parent 6098ac0 commit a59dd9d45f544b6464bf0574ab5a0bb12b7d7008
@@ -90,7 +90,11 @@ public void start(J project, boolean newInstance) {
this.job = project;

try {// reparse the tabs with the job as the hash
this.tabs = CronTabList.create(spec, Hash.from(project.getFullName()));
if (spec != null) {
this.tabs = CronTabList.create(spec, Hash.from(project.getFullName()));
} else {
LOGGER.log(Level.WARNING, "The job {0} has a null crontab spec which is incorrect", job.getFullName());
}
} catch (ANTLRException e) {
// this shouldn't fail because we've already parsed stuff in the constructor,
// so if it fails, use whatever 'tabs' that we already have.
@@ -281,7 +285,7 @@ public void run(AbstractProject p) {
LOGGER.log(Level.FINER, "did not trigger {0}", p);
}
} else {
LOGGER.log(Level.WARNING, "The job {0} has a syntactically incorrect config and is missing the cron spec for a trigger", p.getFullName());
LOGGER.log(Level.WARNING, "The job {0} has a syntactically incorrect config and is missing the cron spec for a trigger", p.getFullName());
}
}
}
@@ -0,0 +1,91 @@
/*
* The MIT License
*
* Copyright (c) 2016 CloudBees, Inc
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

package hudson.triggers;

import antlr.ANTLRException;
import hudson.Extension;
import hudson.model.Item;
import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.Issue;
import org.jvnet.hudson.test.JenkinsRule;
import org.kohsuke.stapler.DataBoundConstructor;

import java.io.ByteArrayInputStream;
import java.util.Calendar;
import java.util.GregorianCalendar;

public class TriggerTest {

@Rule
public JenkinsRule jenkinsRule = new JenkinsRule();

@Issue("JENKINS-36748")
@Test
public void testNoNPE() throws Exception {
jenkinsRule.getInstance().createProjectFromXML("whatever", new ByteArrayInputStream(("<project>\n <builders/>\n <publishers/>\n <buildWrappers/>\n" + triggersSection() + "</project>").getBytes()));
final Calendar cal = new GregorianCalendar();
Trigger.checkTriggers(cal);
}

private String triggersSection() {
String tagname = MockTrigger.class.getName().replace("$", "_-");
return "<triggers> \n <" + tagname + ">\n </" + tagname + ">\n </triggers>\n";
}

public static class MockTrigger extends Trigger<Item> {
@Extension
public static final DescriptorImpl DESCRIPTOR = new DescriptorImpl();

@DataBoundConstructor
public MockTrigger(String cron) throws ANTLRException {
super(cron);
}

@Override
public DescriptorImpl getDescriptor() {
return DESCRIPTOR;
}

// Override Trigger#readResolve so this one is not called
@Override
public Object readResolve() {
return this;
}

public static class DescriptorImpl extends TriggerDescriptor {
@Override public boolean isApplicable(Item item) {
return true;
}

public DescriptorImpl() {
load();
save();
}
}
}
}


0 comments on commit a59dd9d

Please sign in to comment.
You can’t perform that action at this time.