Skip to content

Commit ce8e046

Browse files
authored
Merge pull request #574 from daniel-beck/javadoc-system-properties
Add Javadoc for system property escape hatches
2 parents 82a9de4 + 78e8829 commit ce8e046

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

src/main/java/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,28 @@
9393
@Extension
9494
public final class ScriptApproval extends GlobalConfiguration implements RootAction {
9595

96+
/**
97+
* SECURITY-2450: Since 1172.v35f6a_0b_8207e, unmodified, unsandboxed scripts are no longer automatically approved
98+
* when administrators submit job configuration forms.
99+
* <p>
100+
* This flag restores the previous behavior when set to {@code true}.
101+
* </p>
102+
*
103+
* @see <a href="https://github.com/jenkinsci/script-security-plugin/releases/tag/1172.v35f6a_0b_8207e">1172.v35f6a_0b_8207e changelog</a>
104+
*/
96105
@SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
97106
public static /* non-final */ boolean ADMIN_AUTO_APPROVAL_ENABLED =
98107
SystemProperties.getBoolean(ScriptApproval.class.getName() + ".ADMIN_AUTO_APPROVAL_ENABLED");
99108

109+
/**
110+
* SECURITY-3103: Since 1265.va_fb_290b_4b_d34, administrators saving jobs (e.g., when copying existing jobs with
111+
* unapproved scripts) will no longer result in unapproved scripts in those configurations being approved.
112+
* <p>
113+
* This flag restores the previous behavior when set to {@code true}.
114+
* </p>
115+
*
116+
* @see <a href="https://github.com/jenkinsci/script-security-plugin/releases/tag/1265.va_fb_290b_4b_d34">1265.va_fb_290b_4b_d34 changelog</a>
117+
*/
100118
@SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "for script console")
101119
public static /* non-final */ boolean ALLOW_ADMIN_APPROVAL_ENABLED =
102120
SystemProperties.getBoolean(ScriptApproval.class.getName() + ".ALLOW_ADMIN_APPROVAL_ENABLED");

0 commit comments

Comments
 (0)