Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Java Security Ultimate Scan 2023 #147

Merged
merged 1 commit into from
Oct 18, 2023
Merged

refactor: Java Security Ultimate Scan 2023 #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/test/java/org/biouno/unochoice/TestPersistingParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void setUp() throws Exception {
// scriptler setup
scriptler = j.getInstance().getExtensionList(ScriptlerManagement.class).get(0);
ScriptlerHelper scriptlerHelper = new ScriptlerHelper(scriptler);
scriptFile = File.createTempFile("uno-choice", "dummy.groovy");
scriptFile = Files.createTempFile("uno-choice", "dummy.groovy").toFile();
FileUtils.writeStringToFile(scriptFile, SCRIPT_PARAM001, Charset.defaultCharset(), false);
FileItem fi = new FileItemImpl(scriptFile);
scriptlerHelper.saveScript(fi, true, "dummy.groovy");
Expand Down
9 changes: 5 additions & 4 deletions src/test/java/org/biouno/unochoice/issue63983/TestSandboxAndApproval.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

import java.io.File;
import java.nio.charset.Charset;
import java.nio.file.Files;
import java.util.Collections;

@Issue("63983")
Expand All @@ -61,7 +62,7 @@ public void testGroovyScriptApprovedNoSandboxOK() throws Exception {
final String scriptText = "import hudson.model.Hudson;\n" +
"Hudson.getInstance();\n" +
"return \"Got instance!\";";
final File scriptFile = File.createTempFile("uno-choice", "63983");
final File scriptFile = Files.createTempFile("uno-choice", "63983").toFile();
FileUtils.writeStringToFile(scriptFile, scriptText, Charset.defaultCharset(), false);
final FileItem fi = new FileParameterValue.FileItemImpl(scriptFile);
scriptlerHelper.saveScript(fi, true, "63983");
Expand All @@ -85,7 +86,7 @@ public void testGroovyScriptPendingSandboxRejected() throws Exception {
final String scriptText = "import hudson.model.Hudson;\n" +
"Hudson.getInstance();\n" +
"return \"Got instance!\";";
final File scriptFile = File.createTempFile("uno-choice", "63983");
final File scriptFile = Files.createTempFile("uno-choice", "63983").toFile();
FileUtils.writeStringToFile(scriptFile, scriptText, Charset.defaultCharset(), false);
final FileItem fi = new FileParameterValue.FileItemImpl(scriptFile);
scriptlerHelper.saveScript(fi, true, "63983");
Expand All @@ -111,7 +112,7 @@ public void testGroovyScriptPendingNoSandboxRejected() throws Exception {
final String scriptText = "import hudson.model.Hudson;\n" +
"Hudson.getInstance();\n" +
"return \"Got instance!\";";
final File scriptFile = File.createTempFile("uno-choice", "63983");
final File scriptFile = Files.createTempFile("uno-choice", "63983").toFile();
FileUtils.writeStringToFile(scriptFile, scriptText, Charset.defaultCharset(), false);
final FileItem fi = new FileParameterValue.FileItemImpl(scriptFile);
scriptlerHelper.saveScript(fi, true, "63983");
Expand All @@ -137,7 +138,7 @@ public void testGroovyScriptApprovedSandboxRejected() throws Exception {
final String scriptText = "import hudson.model.Hudson;\n" +
"Hudson.getInstance();\n" +
"return \"Got instance!\";";
final File scriptFile = File.createTempFile("uno-choice", "63983");
final File scriptFile = Files.createTempFile("uno-choice", "63983").toFile();
FileUtils.writeStringToFile(scriptFile, scriptText, Charset.defaultCharset(), false);
final FileItem fi = new FileParameterValue.FileItemImpl(scriptFile);
scriptlerHelper.saveScript(fi, true, "63983");
Expand Down