Qortal/qortal
Qortal/qortal
3
0
Fork 3
mirror of https://github.com/Qortal/qortal.git synced 2025-02-15 03:35:49 +00:00
Code Issues Projects Releases Wiki Activity

More work on HTML parsing.

Browse Source 
The style tag parsing ideally needs rewriting using an actual CSS parser, but we can get away with this hacky approach in the short term.
This commit is contained in:
CalDescent 2021-06-25 08:34:44 +01:00
parent b286c15c51
commit b34066f579
1 changed files with 58 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/main/java/org/qortal/api/resource/WebsiteResource.java
View File

@ -298,7 +298,7 @@ public class WebsiteResource {
Elements href = document.select("[href]"); Elements href = document.select("[href]");
for (Element element : href) { for (Element element : href) {
String elementHtml = element.attr("href"); String elementHtml = element.attr("href");
if (!elementHtml.startsWith("http") && !elementHtml.startsWith("//")) { if (this.isRelativeLink(elementHtml)) {
String slash = (elementHtml.startsWith("/") ? "" : File.separator); String slash = (elementHtml.startsWith("/") ? "" : File.separator);
element.attr("href", "/site/" +resourceId + slash + element.attr("href")); element.attr("href", "/site/" +resourceId + slash + element.attr("href"));
} }
@ -306,16 +306,72 @@ public class WebsiteResource {
Elements src = document.select("[src]"); Elements src = document.select("[src]");
for (Element element : src) { for (Element element : src) {
String elementHtml = element.attr("src"); String elementHtml = element.attr("src");
if (!elementHtml.startsWith("http") && !elementHtml.startsWith("//")) { if (this.isRelativeLink(elementHtml)) {
String slash = (elementHtml.startsWith("/") ? "" : File.separator); String slash = (elementHtml.startsWith("/") ? "" : File.separator);
element.attr("src", "/site/" +resourceId + slash + element.attr("src")); element.attr("src", "/site/" +resourceId + slash + element.attr("src"));
} }
} }
Elements srcset = document.select("[srcset]");
for (Element element : srcset) {
String elementHtml = element.attr("srcset").trim();
if (this.isRelativeLink(elementHtml)) {
String[] parts = element.attr("srcset").split(",");
ArrayList<String> newParts = new ArrayList<>();
for (String part : parts) {
part = part.trim();
String slash = (elementHtml.startsWith("/") ? "" : File.separator);
String newPart = "/site/" +resourceId + slash + part;
newParts.add(newPart);
}
String newString = String.join(",", newParts);
element.attr("srcset", newString);
}
}
Elements style = document.select("[style]");
for (Element element : style) {
String elementHtml = element.attr("style");
if (elementHtml.contains("url(")) {
String[] parts = elementHtml.split("url\\(");
String[] parts2 = parts[1].split("\\)");
String link = parts2[0];
if (link != null) {
link = this.removeQuotes(link);
if (this.isRelativeLink(link)) {
String slash = (link.startsWith("/") ? "" : File.separator);
String modifiedLink = "url('" + "/site/" + resourceId + slash + link + "')";
element.attr("style", parts[0] + modifiedLink + parts2[1]);
}
}
}
}
return document.html().getBytes(); return document.html().getBytes();
} }
return data; return data;
} }
private boolean isRelativeLink(String elementHtml) {
List<String> prefixes = new ArrayList<>();
prefixes.add("http");
prefixes.add("//");
prefixes.add("javascript:");
for (String prefix : prefixes) {
if (elementHtml.startsWith(prefix)) {
return false;
}
}
return true;
}
private String removeQuotes(String elementHtml) {
if (elementHtml.startsWith("\"") || elementHtml.startsWith("\'")) {
elementHtml = elementHtml.substring(1);
}
if (elementHtml.endsWith("\"") || elementHtml.endsWith("\'")) {
elementHtml = elementHtml.substring(0, elementHtml.length() - 1);
}
return elementHtml;
}
private List<String> indexFiles() { private List<String> indexFiles() {
List<String> indexFiles = new ArrayList<>(); List<String> indexFiles = new ArrayList<>();
indexFiles.add("index.html"); indexFiles.add("index.html");