Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 14:22:05 +01:00
Code Issues Releases Wiki Activity

Merge pull request #413 from adiaholic/xep-0156

Browse source 
HttpLookupMethod: Position parser at START_ELEMENT before parsing
This commit is contained in:
Florian Schmaus 2020-08-07 12:37:04 +02:00 committed by GitHub
commit 36d61d9e52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
smack-core/src/main/java/org/jivesoftware/smack/altconnections/HttpLookupMethod.java
View file

@ -27,6 +27,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.jivesoftware.smack.util.PacketParserUtils; import org.jivesoftware.smack.util.PacketParserUtils;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException; import org.jivesoftware.smack.xml.XmlPullParserException;
@ -132,6 +133,7 @@ public final class HttpLookupMethod {
* @throws URISyntaxException exception to indicate that a string could not be parsed as a URI reference * @throws URISyntaxException exception to indicate that a string could not be parsed as a URI reference
*/ */
public static List<URI> parseXrdLinkReferencesFor(XmlPullParser parser, String relation) throws IOException, XmlPullParserException, URISyntaxException { public static List<URI> parseXrdLinkReferencesFor(XmlPullParser parser, String relation) throws IOException, XmlPullParserException, URISyntaxException {
ParserUtils.forwardToStartElement(parser);
List<URI> uriList = new ArrayList<>(); List<URI> uriList = new ArrayList<>();
int initialDepth = parser.getDepth(); int initialDepth = parser.getDepth();

9
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
View file

@ -82,14 +82,7 @@ public class PacketParserUtils {
public static XmlPullParser getParserFor(Reader reader) throws XmlPullParserException, IOException { public static XmlPullParser getParserFor(Reader reader) throws XmlPullParserException, IOException {
XmlPullParser parser = SmackXmlParser.newXmlParser(reader); XmlPullParser parser = SmackXmlParser.newXmlParser(reader);
// Wind the parser forward to the first start tag ParserUtils.forwardToStartElement(parser);
XmlPullParser.Event event = parser.getEventType();
while (event != XmlPullParser.Event.START_ELEMENT) {
if (event == XmlPullParser.Event.END_DOCUMENT) {
throw new IllegalArgumentException("Document contains no start tag");
}
event = parser.next();
}
return parser; return parser;
} }

11
smack-core/src/main/java/org/jivesoftware/smack/util/ParserUtils.java
View file

@ -63,6 +63,17 @@ public class ParserUtils {
assert parser.getEventType() == XmlPullParser.Event.END_ELEMENT; assert parser.getEventType() == XmlPullParser.Event.END_ELEMENT;
} }
public static void forwardToStartElement(XmlPullParser parser) throws XmlPullParserException, IOException {
// Wind the parser forward to the first start tag
XmlPullParser.Event event = parser.getEventType();
while (event != XmlPullParser.Event.START_ELEMENT) {
if (event == XmlPullParser.Event.END_DOCUMENT) {
throw new IllegalArgumentException("Document contains no start tag");
}
event = parser.next();
}
}
public static void forwardToEndTagOfDepth(XmlPullParser parser, int depth) public static void forwardToEndTagOfDepth(XmlPullParser parser, int depth)
throws XmlPullParserException, IOException { throws XmlPullParserException, IOException {
XmlPullParser.Event event = parser.getEventType(); XmlPullParser.Event event = parser.getEventType();