From af7eee14819294ea056f1abc683ca0d8f70dae7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Garc=C3=ADa?= <60674455+jgarciacloudbees@users.noreply.github.com> Date: Thu, 24 Oct 2024 08:57:13 +0200 Subject: [PATCH] JENKINS-73941 - Apply suggestions from code review Co-authored-by: michael cirioli --- README.md | 2 +- .../plugins/scriptsecurity/scripts/Messages.properties | 4 ++-- .../scriptsecurity/scripts/ScriptApproval/config.jelly | 2 +- .../scripts/ScriptApproval/help-forceSandbox.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7f5bbe10..8f7b29e9 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ operations to whitelist. Operations which change state of persisted objects (suc Jenkins jobs) should generally be denied. Most `getSomething` methods are harmless. In case of highly secured environments, where only sandbox scripts are allowed, the -option "Force to use the Sandbox globally in the system" allows forcing the use of the +option "Force the use of the sandbox globally in the system" allows forcing the use of the sandbox globally in the system and will block the creation of new items in the "In-process Script Approval" screen. diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/Messages.properties b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/Messages.properties index 4e7a1b5c..dc0dcce1 100644 --- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/Messages.properties +++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/Messages.properties @@ -8,6 +8,6 @@ ScriptApprovalLink.outstandingSignature={0} signatures pending approval ScriptApprovalLink.outstandingClasspath={0} classpath entries pending approval ScriptApprovalLink.dangerous={0} approved dangerous signatures ScriptApproval.PipelineMessage=A Jenkins administrator will need to approve this script before it can be used -ScriptApproval.ForceSandBoxMessage=Running Scripts out of the Sandbox is not allowed in the system +ScriptApproval.ForceSandBoxMessage=Running scripts out of the sandbox is not allowed in the system UnapprovedUsage.NonApproved=script not yet approved for use -UnapprovedUsage.ForceSandBox=Running Scripts out of the Sandbox is not allowed in the system +UnapprovedUsage.ForceSandBox=Running scripts out of the sandbox is not allowed in the system diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/config.jelly b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/config.jelly index 278e5c6b..a44129b0 100644 --- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/config.jelly +++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/config.jelly @@ -2,7 +2,7 @@ - + diff --git a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/help-forceSandbox.html b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/help-forceSandbox.html index 614b0e07..24cd9285 100644 --- a/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/help-forceSandbox.html +++ b/src/main/resources/org/jenkinsci/plugins/scriptsecurity/scripts/ScriptApproval/help-forceSandbox.html @@ -1,5 +1,5 @@

Controls whether the "Use Groovy Sandbox" is shown in the system to users without Overall/Administer permission.

-

This can be used to get a better UX in highly secured environments where all pipelines and other logics are +

This can be used to simplify the UX in highly secured environments where all pipelines and other logics are required to run in the sandbox (ie. running arbitrary code is never approved)

\ No newline at end of file