X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FFreenetLinkParser.java;h=704792caa11a5b9cbc0278b241d9ac465c2ff6ef;hb=9e4db46b86d084eba9029906e779ec1d96f78ac4;hp=85bda1a588fd9f28b37b576524e3e9e84babc0b6;hpb=6db033602e7c17efc40a4a19efe705d67832fc1a;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
index 85bda1a..704792c 100644
--- a/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
+++ b/src/main/java/net/pterodactylus/sone/text/FreenetLinkParser.java
@@ -21,26 +21,29 @@ import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
+import java.net.MalformedURLException;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.pterodactylus.util.logging.Logging;
-import net.pterodactylus.util.template.TemplateFactory;
+import net.pterodactylus.util.template.TemplateContextFactory;
+import net.pterodactylus.util.template.TemplateParser;
+import freenet.keys.FreenetURI;
/**
* {@link Parser} implementation that can recognize Freenet URIs.
*
* @author David âBombeâ Roden
*/
-public class FreenetLinkParser implements Parser {
+public class FreenetLinkParser implements Parser {
/** The logger. */
private static final Logger logger = Logging.getLogger(FreenetLinkParser.class);
/** Pattern to detect whitespace. */
- private static final Pattern whitespacePattern = Pattern.compile("[\\p{javaWhitespace}]");
+ private static final Pattern whitespacePattern = Pattern.compile("[\\u000a\u0020\u00a0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u200c\u200d\u202f\u205f\u2060\u2800\u3000]");
/**
* Enumeration for all recognized link types.
@@ -59,21 +62,27 @@ public class FreenetLinkParser implements Parser {
SSK,
/** Link is a USK. */
- USK
+ USK,
+
+ /** Link is HTTP. */
+ HTTP,
+
+ /** Link is HTTPS. */
+ HTTPS;
}
/** The template factory. */
- private final TemplateFactory templateFactory;
+ private final TemplateContextFactory templateContextFactory;
/**
* Creates a new freenet link parser.
*
- * @param templateFactory
- * The template factory
+ * @param templateContextFactory
+ * The template context factory
*/
- public FreenetLinkParser(TemplateFactory templateFactory) {
- this.templateFactory = templateFactory;
+ public FreenetLinkParser(TemplateContextFactory templateContextFactory) {
+ this.templateContextFactory = templateContextFactory;
}
//
@@ -84,7 +93,7 @@ public class FreenetLinkParser implements Parser {
* {@inheritDoc}
*/
@Override
- public Part parse(Reader source) throws IOException {
+ public Part parse(FreenetLinkParserContext context, Reader source) throws IOException {
PartContainer parts = new PartContainer();
BufferedReader bufferedReader = (source instanceof BufferedReader) ? (BufferedReader) source : new BufferedReader(source);
String line;
@@ -95,7 +104,9 @@ public class FreenetLinkParser implements Parser {
int nextChk = line.indexOf("CHK@");
int nextSsk = line.indexOf("SSK@");
int nextUsk = line.indexOf("USK@");
- if ((nextKsk == -1) && (nextChk == -1) && (nextSsk == -1) && (nextUsk == -1)) {
+ int nextHttp = line.indexOf("http://");
+ int nextHttps = line.indexOf("https://");
+ if ((nextKsk == -1) && (nextChk == -1) && (nextSsk == -1) && (nextUsk == -1) && (nextHttp == -1) && (nextHttps == -1)) {
parts.add(createPlainTextPart(line));
break;
}
@@ -117,6 +128,14 @@ public class FreenetLinkParser implements Parser {
next = nextUsk;
linkType = LinkType.USK;
}
+ if ((nextHttp > -1) && (nextHttp < next)) {
+ next = nextHttp;
+ linkType = LinkType.HTTP;
+ }
+ if ((nextHttps > -1) && (nextHttps < next)) {
+ next = nextHttps;
+ linkType = LinkType.HTTPS;
+ }
if ((next >= 8) && (line.substring(next - 8, next).equals("freenet:"))) {
next -= 8;
line = line.substring(0, next) + line.substring(next + 8);
@@ -127,12 +146,57 @@ public class FreenetLinkParser implements Parser {
parts.add(createPlainTextPart(line.substring(0, next)));
String link = line.substring(next, nextSpace);
String name = link;
- logger.log(Level.FINER, "Found link: " + link);
+ logger.log(Level.FINER, "Found link: %s", link);
logger.log(Level.FINEST, "Next: %d, CHK: %d, SSK: %d, USK: %d", new Object[] { next, nextChk, nextSsk, nextUsk });
- if (((linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) && (link.length() > 98) && (link.charAt(47) == ',') && (link.charAt(91) == ',') && (link.charAt(99) == '/')) {
- name = link.substring(0, 47) + "â¦" + link.substring(99);
+
+ if ((linkType == LinkType.KSK) || (linkType == LinkType.CHK) || (linkType == LinkType.SSK) || (linkType == LinkType.USK)) {
+ FreenetURI uri;
+ if (name.indexOf('?') > -1) {
+ name = name.substring(0, name.indexOf('?'));
+ }
+ if (name.endsWith("/")) {
+ name = name.substring(0, name.length() - 1);
+ }
+ try {
+ uri = new FreenetURI(name);
+ name = uri.lastMetaString();
+ if (name == null) {
+ name = uri.getDocName();
+ }
+ if (name == null) {
+ name = link.substring(0, Math.min(9, link.length()));
+ }
+ boolean fromPostingSone = ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) && link.substring(4, Math.min(link.length(), 47)).equals(context.getPostingSone().getId());
+ parts.add(fromPostingSone ? createTrustedFreenetLinkPart(link, name) : createFreenetLinkPart(link, name));
+ } catch (MalformedURLException mue1) {
+ /* not a valid link, insert as plain text. */
+ parts.add(createPlainTextPart(link));
+ } catch (NullPointerException npe1) {
+ /* FreenetURI sometimes throws these, too. */
+ parts.add(createPlainTextPart(link));
+ } catch (ArrayIndexOutOfBoundsException aioobe1) {
+ /* oh, and these, too. */
+ parts.add(createPlainTextPart(link));
+ }
+ } else if ((linkType == LinkType.HTTP) || (linkType == LinkType.HTTPS)) {
+ name = link.substring(linkType == LinkType.HTTP ? 7 : 8);
+ int firstSlash = name.indexOf('/');
+ int lastSlash = name.lastIndexOf('/');
+ if ((lastSlash - firstSlash) > 3) {
+ name = name.substring(0, firstSlash + 1) + "â¦" + name.substring(lastSlash);
+ }
+ if (name.endsWith("/")) {
+ name = name.substring(0, name.length() - 1);
+ }
+ if (((name.indexOf('/') > -1) && (name.indexOf('.') < name.lastIndexOf('.', name.indexOf('/'))) || ((name.indexOf('/') == -1) && (name.indexOf('.') < name.lastIndexOf('.')))) && name.startsWith("www.")) {
+ name = name.substring(4);
+ }
+ if (name.indexOf('?') > -1) {
+ name = name.substring(0, name.indexOf('?'));
+ }
+ link = "?_CHECKED_HTTP_=" + link;
+ parts.add(createInternetLinkPart(link, name));
}
- parts.add(createLinkPart(link, name));
line = line.substring(nextSpace);
} else {
parts.add(createPlainTextPart(line.substring(0, next + 4)));
@@ -155,11 +219,40 @@ public class FreenetLinkParser implements Parser {
* @return The part that displays the given text
*/
private Part createPlainTextPart(String text) {
- return new TemplatePart(templateFactory.createTemplate(new StringReader("<% text|html>"))).set("text", text);
+ return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("<% text|html>"))).set("text", text);
+ }
+
+ /**
+ * Creates a new part based on a template that links to a site within the
+ * normal internet.
+ *
+ * @param link
+ * The target of the link
+ * @param name
+ * The name of the link
+ * @return The part that displays the link
+ */
+ private Part createInternetLinkPart(String link, String name) {
+ return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name);
+ }
+
+ /**
+ * Creates a new part based on a template that links to a site within
+ * freenet.
+ *
+ * @param link
+ * The target of the link
+ * @param name
+ * The name of the link
+ * @return The part that displays the link
+ */
+ private Part createFreenetLinkPart(String link, String name) {
+ return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name);
}
/**
- * Creates a new link part based on a template.
+ * Creates a new part based on a template that links to a page in the
+ * posterâs keyspace.
*
* @param link
* The target of the link
@@ -167,8 +260,8 @@ public class FreenetLinkParser implements Parser {
* The name of the link
* @return The part that displays the link
*/
- private Part createLinkPart(String link, String name) {
- return new TemplatePart(templateFactory.createTemplate(new StringReader("\"><% name|html>"))).set("link", link).set("name", name);
+ private Part createTrustedFreenetLinkPart(String link, String name) {
+ return new TemplatePart(templateContextFactory, TemplateParser.parse(new StringReader("\" title=\"<% link|html>\"><% name|html>"))).set("link", link).set("name", name);
}
}