提交 108f2c4b 编写于 作者: S Stephen Connolly 提交者: Oliver Gondža

[JENKINS-30139] Add @Restricted to prevent external use of internal data

(cherry picked from commit 9a57858a)
上级 d68bbfcf
...@@ -55,6 +55,8 @@ import javax.annotation.CheckForNull; ...@@ -55,6 +55,8 @@ import javax.annotation.CheckForNull;
import jenkins.model.Jenkins; import jenkins.model.Jenkins;
import org.acegisecurity.context.SecurityContext; import org.acegisecurity.context.SecurityContext;
import org.acegisecurity.context.SecurityContextHolder; import org.acegisecurity.context.SecurityContextHolder;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.HttpRedirect; import org.kohsuke.stapler.HttpRedirect;
import org.kohsuke.stapler.HttpResponse; import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.HttpResponses; import org.kohsuke.stapler.HttpResponses;
...@@ -229,8 +231,13 @@ public class OldDataMonitor extends AdministrativeMonitor { ...@@ -229,8 +231,13 @@ public class OldDataMonitor extends AdministrativeMonitor {
public static class VersionRange { public static class VersionRange {
private static VersionNumber currentVersion = Jenkins.getVersion(); private static VersionNumber currentVersion = Jenkins.getVersion();
VersionNumber min, max; @Restricted(NoExternalUse.class)
VersionNumber min;
@Restricted(NoExternalUse.class)
VersionNumber max;
@Restricted(NoExternalUse.class)
boolean single = true; boolean single = true;
@Restricted(NoExternalUse.class)
public String extra; public String extra;
public VersionRange(String version, String extra) { public VersionRange(String version, String extra) {
...@@ -263,10 +270,12 @@ public class OldDataMonitor extends AdministrativeMonitor { ...@@ -263,10 +270,12 @@ public class OldDataMonitor extends AdministrativeMonitor {
&& currentVersion.digit(1) - min.digit(1) >= threshold)); && currentVersion.digit(1) - min.digit(1) >= threshold));
} }
@Restricted(NoExternalUse.class)
synchronized VersionNumber getMax() { synchronized VersionNumber getMax() {
return max; return max;
} }
@Restricted(NoExternalUse.class)
synchronized VersionNumber getMin() { synchronized VersionNumber getMin() {
return min; return min;
} }
...@@ -275,11 +284,13 @@ public class OldDataMonitor extends AdministrativeMonitor { ...@@ -275,11 +284,13 @@ public class OldDataMonitor extends AdministrativeMonitor {
/** /**
* Sorted list of unique max-versions in the data set. For select list in jelly. * Sorted list of unique max-versions in the data set. For select list in jelly.
*/ */
@Restricted(NoExternalUse.class)
public Iterator<VersionNumber> getVersionList() { public Iterator<VersionNumber> getVersionList() {
TreeSet<VersionNumber> set = new TreeSet<VersionNumber>(); TreeSet<VersionNumber> set = new TreeSet<VersionNumber>();
for (VersionRange vr : data.values()) { for (VersionRange vr : data.values()) {
if (vr.getMax() != null) { VersionNumber max = vr.getMax();
set.add(vr.getMax()); if (max != null) {
set.add(max);
} }
} }
return set.iterator(); return set.iterator();
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册