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

Remediate CVE-2022-27204 by removing capability to use arbitrary URL #61

Merged
merged 1 commit into from
Dec 4, 2022
Merged

Remediate CVE-2022-27204 by removing capability to use arbitrary URL #61

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
53 changes: 11 additions & 42 deletions ...cwctravel/hudson/plugins/extended_choice_parameter/ExtendedChoiceParameterDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import org.acegisecurity.Authentication;
import org.acegisecurity.context.SecurityContextHolder;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
Expand Down Expand Up @@ -137,12 +136,11 @@ public FormValidation doCheckPropertyFile(@QueryParameter final String propertyF
property.setFile(prop);
}
else {
URL propertyFileUrl = new URL(propertyFile);
property.setUrl(propertyFileUrl);
return FormValidation.warning(Messages.ExtendedChoiceParameterDefinition_PropertyFileDoesntExist(), propertyFile);
}
property.execute();
}
catch(MalformedURLException | BuildException e) {
catch(BuildException e) {
return FormValidation.warning(Messages.ExtendedChoiceParameterDefinition_PropertyFileDoesntExist(), propertyFile);
}

Expand Down Expand Up @@ -657,23 +655,12 @@ private String computeValue(String value, String propertyFilePath, String proper
try {
String resolvedPropertyFilePath = expandVariables(propertyFilePath);
File propertyFile = new File(resolvedPropertyFilePath);
if(propertyFile.exists()) {
Project project = new Project();
Property property = new Property();
property.setProject(project);
property.setFile(propertyFile);
property.execute();
return project.getProperty(propertyKey);
}
else {
Project project = new Project();
Property property = new Property();
property.setProject(project);
URL propertyFileUrl = new URL(resolvedPropertyFilePath);
property.setUrl(propertyFileUrl);
property.execute();
return project.getProperty(propertyKey);
}
Project project = new Project();
Property property = new Property();
property.setProject(project);
property.setFile(propertyFile);
property.execute();
return project.getProperty(propertyKey);
}
catch(Exception e) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
Expand Down Expand Up @@ -938,28 +925,10 @@ private ArrayList<Integer> columnIndicesForDropDowns(String[] headerColumns) {
Map<String, Set<String>> calculateChoicesByDropdownId() throws Exception {
String resolvedPropertyFile = expandVariables(propertyFile);
File file = new File(resolvedPropertyFile);
List<String[]> fileLines = Collections.emptyList();
List<String[]> fileLines;
CSVParser csvParser = new CSVParserBuilder().withSeparator('\t').build();
if(file.isFile()) {
CSVReader csvReader = null;
try {
csvReader = new CSVReaderBuilder(new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8)).withCSVParser(csvParser).build();
fileLines = csvReader.readAll();
}
finally {
IOUtils.closeQuietly(csvReader);
}
}
else {
URL propertyFileUrl = new URL(resolvedPropertyFile);
CSVReader csvReader = null;
try {
csvReader = new CSVReaderBuilder(new InputStreamReader(propertyFileUrl.openStream(), StandardCharsets.UTF_8)).withCSVParser(csvParser).build();
fileLines = csvReader.readAll();
}
finally {
IOUtils.closeQuietly(csvReader);
}
try(CSVReader csvReader = new CSVReaderBuilder(new InputStreamReader(Files.newInputStream(file.toPath()), StandardCharsets.UTF_8)).withCSVParser(csvParser).build();) {
fileLines = csvReader.readAll();
}

if(fileLines.size() < 2) {
Expand Down