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

Fix detection of invalid spaces in prolog #20

Merged
merged 1 commit into from
Jun 23, 2023
Merged

Fix detection of invalid spaces in prolog #20

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
6 changes: 6 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ limitations under the License.
<version>5.9.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/codehaus/plexus/util/xml/pull/MXParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2528,9 +2528,11 @@ private void parsePI() throws XmlPullParserException, IOException {
if ((buf[piTargetStart] == 'x' || buf[piTargetStart] == 'X')
&& (buf[piTargetStart + 1] == 'm' || buf[piTargetStart + 1] == 'M')
&& (buf[piTargetStart + 2] == 'l' || buf[piTargetStart + 2] == 'L')) {
if (piTargetStart > 3) { // <?xml is allowed as first characters in input ...
if (piTargetStart > 2) { // <?xml is allowed as first characters in input ...
throw new XmlPullParserException(
"processing instruction can not have PITarget with reserved xml name",
eventType == 0
? "XMLDecl is only allowed as first characters in input"
: "processing instruction can not have PITarget with reserved xml name",
this,
null);
} else {
Expand Down
22 changes: 22 additions & 0 deletions src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.xml.XmlStreamReader;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
import static org.junit.jupiter.api.Assertions.*;

/**
Expand Down Expand Up @@ -1473,4 +1477,22 @@ public void testProcessingInstructionTokenizeAfterXMLDeclAndBeforeFirstTag() thr
assertEquals(XmlPullParser.END_TAG, parser.nextToken());
assertEquals(XmlPullParser.END_DOCUMENT, parser.nextToken());
}

@ParameterizedTest
@ValueSource(strings = {" ", "\n", "\r", "\r\n", " ", "\n "})
void testBlankAtBeginning(String ws) throws XmlPullParserException, IOException {
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><test>nnn</test>";

MXParser parser = new MXParser();
parser.setInput(new StringReader(ws + xml));
assertThat(
assertThrows(XmlPullParserException.class, parser::next).getMessage(),
containsString("XMLDecl is only allowed as first characters in input"));

parser.setInput(new StringReader(ws + xml));
assertEquals(XmlPullParser.IGNORABLE_WHITESPACE, parser.nextToken());
assertThat(
assertThrows(XmlPullParserException.class, parser::nextToken).getMessage(),
containsString("processing instruction can not have PITarget with reserved xml name"));
}
}