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

Digester2 removal fix #245

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Digester2 removal fix #245

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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@
.classpath
/.idea
**/*.iml
/tfs - Shortcut.lnk
/buildlog.log
/.vs
10 changes: 9 additions & 1 deletion tfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<artifactId>tfs</artifactId>
<packaging>hpi</packaging>
<name>Team Foundation Server Plug-in</name>
<version>5.157.1-SNAPSHOT</version>
<version>5.666.1-SNAPSHOT</version>
<url>http://wiki.jenkins-ci.org/display/JENKINS/Team+Foundation+Server+Plugin</url>

<properties>
Expand Down Expand Up @@ -279,5 +279,13 @@
<artifactId>json</artifactId>
<version>20090211</version>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-digester3</artifactId>
<version>3.2</version>
<classifier>with-deps</classifier>
</dependency>

</dependencies>
</project>
27 changes: 23 additions & 4 deletions tfs/src/main/java/hudson/plugins/tfs/ChangeSetReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,17 @@
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.List;
import javax.xml.parsers.ParserConfigurationException;

import hudson.model.Run;
import hudson.scm.RepositoryBrowser;
import org.apache.commons.digester.Digester;
import org.xml.sax.SAXException;

import org.xml.sax.SAXException;
import org.apache.commons.digester3.Digester;
import hudson.plugins.tfs.model.ChangeLogSet;
import hudson.plugins.tfs.model.ChangeSet;
import hudson.scm.ChangeLogParser;
import hudson.util.Digester2;


/**
* TeamFoundation change log reader.
Expand All @@ -36,7 +37,8 @@ public ChangeLogSet parse(final Run build, final RepositoryBrowser<?> browser, f
/** Performs the actual parsing. */
public ChangeLogSet parse(final Run build, final RepositoryBrowser<?> browser, final Reader reader) throws IOException, SAXException {
List<ChangeSet> changesetList = new ArrayList<ChangeSet>();
Digester digester = new Digester2();
// Digester digester = new Digester2();
Digester digester = createDigester(true);
digester.push(changesetList);

digester.addObjectCreate("*/changeset", ChangeSet.class);
Expand All @@ -56,4 +58,21 @@ public ChangeLogSet parse(final Run build, final RepositoryBrowser<?> browser, f

return new ChangeLogSet(build, browser, changesetList);
}
/** Creates a Digester. */
public static Digester createDigester(final boolean secure) throws SAXException {
Digester digester = new Digester();
if (secure) {
digester.setXIncludeAware(false);
try {
digester.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
digester.setFeature("http://xml.org/sax/features/external-general-entities", false);
digester.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
digester.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
} catch (ParserConfigurationException ex) {
throw new SAXException("Failed to securely configure xml digester parser", ex);
}
}
return digester;
}

}