X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Ftext%2FSoneTextParser.java;h=39d26dbc6bcde786ea48a0d702cb595005033e10;hp=74dcb87172e2b23cebe3252e9b2f5e748f8b9b94;hb=a21cf1224cebf99f3210883efbf4afb9bd8da87c;hpb=8d06eafb25514dc1371de140acdfd1ae899e0146 diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java index 74dcb87..39d26db 100644 --- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java +++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java @@ -17,6 +17,8 @@ package net.pterodactylus.sone.text; +import static com.google.common.base.Optional.absent; +import static com.google.common.base.Optional.of; import static java.util.logging.Logger.getLogger; import java.io.BufferedReader; @@ -24,6 +26,8 @@ import java.io.IOException; import java.io.Reader; import java.io.StringReader; import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; @@ -39,8 +43,10 @@ import net.pterodactylus.sone.database.PostProvider; import net.pterodactylus.sone.database.SoneProvider; import com.google.common.base.Optional; +import org.bitpedia.util.Base32; import freenet.keys.FreenetURI; +import freenet.support.Base64; /** * {@link Parser} implementation that can recognize Freenet URIs. @@ -55,6 +61,38 @@ public class SoneTextParser implements Parser { /** Pattern to detect whitespace. */ 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]"); + private static class NextLink { + + private final int position; + private final String link; + private final String remainder; + private final LinkType linkType; + + private NextLink(int position, String link, String remainder, LinkType linkType) { + this.position = position; + this.link = link; + this.remainder = remainder; + this.linkType = linkType; + } + + public int getPosition() { + return position; + } + + public String getLink() { + return link; + } + + public String getRemainder() { + return remainder; + } + + public LinkType getLinkType() { + return linkType; + } + + } + /** * Enumeration for all recognized link types. * @@ -69,7 +107,39 @@ public class SoneTextParser implements Parser { HTTP("http://", false), HTTPS("https://", false), SONE("sone://", false), - POST("post://", false); + POST("post://", false), + + FREEMAIL("", true) { + @Override + public Optional findNext(String line) { + int nextFreemailSuffix = line.indexOf(".freemail"); + if (nextFreemailSuffix < 54) { + /* 52 chars for the id, 1 on @, at least 1 for the local part. */ + return absent(); + } + if (line.charAt(nextFreemailSuffix - 53) != '@') { + return absent(); + } + if (!line.substring(nextFreemailSuffix - 52, nextFreemailSuffix).matches("^[a-z2-7]*$")) { + return absent(); + } + int startOfLocalPart = nextFreemailSuffix - 54; + if (!isAllowedInLocalPart(line.charAt(startOfLocalPart))) { + return absent(); + } + while ((startOfLocalPart > 0) && isAllowedInLocalPart(line.charAt(startOfLocalPart - 1))) { + startOfLocalPart--; + } + return of(new NextLink(startOfLocalPart, line.substring(startOfLocalPart, nextFreemailSuffix + 9), line.substring(nextFreemailSuffix + 9), this)); + } + + private boolean isAllowedInLocalPart(char character) { + return ((character >= 'A') && (character <= 'Z')) + || ((character >= 'a') && (character <= 'z')) + || ((character >= '0') && (character <= '9')) + || (character == '.') || (character == '-') || (character == '_'); + } + }; private final String scheme; private final boolean freenetLink; @@ -92,6 +162,38 @@ public class SoneTextParser implements Parser { return freenetLink; } + public Optional findNext(String line) { + int nextLinkPosition = line.indexOf(getScheme()); + if (nextLinkPosition == -1) { + return absent(); + } + int endOfLink = findEndOfLink(line.substring(nextLinkPosition)); + return of(new NextLink(nextLinkPosition, line.substring(nextLinkPosition, nextLinkPosition + endOfLink), line.substring(nextLinkPosition + endOfLink), this)); + } + + private static int findEndOfLink(String line) { + Matcher matcher = whitespacePattern.matcher(line); + int endOfLink = matcher.find() ? matcher.start() : line.length(); + while (isPunctuation(line.charAt(endOfLink - 1))) { + endOfLink--; + } + int openParens = 0; + for (int i = 0; i < endOfLink; i++) { + switch (line.charAt(i)) { + case '(': + openParens++; + break; + case ')': + openParens--; + if (openParens < 0) { + return i; + } + default: + } + } + return endOfLink; + } + } /** The Sone provider. */ @@ -123,7 +225,7 @@ public class SoneTextParser implements Parser { @Nonnull @Override public Iterable parse(@Nonnull String source, @Nullable SoneTextParserContext context) { - PartContainer parts = new PartContainer(); + List parts = new ArrayList<>(); try (Reader sourceReader = new StringReader(source); BufferedReader bufferedReader = new BufferedReader(sourceReader)) { String line; @@ -147,7 +249,7 @@ public class SoneTextParser implements Parser { */ boolean lineComplete = true; while (line.length() > 0) { - Optional nextLink = NextLink.findNextLink(line); + Optional nextLink = findNextLink(line); if (!nextLink.isPresent()) { if (lineComplete && !lastLineEmpty) { parts.add(new PlainTextPart("\n" + line)); @@ -175,8 +277,7 @@ public class SoneTextParser implements Parser { } lineComplete = false; - int endOfLink = findEndOfLink(line); - String link = line.substring(0, endOfLink); + String link = nextLink.get().getLink(); logger.log(Level.FINER, String.format("Found link: %s", link)); /* if there is no text after the scheme, it’s not a link! */ @@ -203,9 +304,11 @@ public class SoneTextParser implements Parser { case HTTPS: renderHttpLink(parts, link, linkType); break; + case FREEMAIL: + renderFreemailLink(parts, link); } - line = line.substring(endOfLink); + line = nextLink.get().getRemainder(); } lastLineEmpty = false; } @@ -214,16 +317,31 @@ public class SoneTextParser implements Parser { throw new RuntimeException(ioe1); } for (int partIndex = parts.size() - 1; partIndex >= 0; --partIndex) { - Part part = parts.getPart(partIndex); + Part part = parts.get(partIndex); if (!(part instanceof PlainTextPart) || !"\n".equals(part.getText())) { break; } - parts.removePart(partIndex); + parts.remove(partIndex); } return parts; } - private void renderSoneLink(PartContainer parts, String line) { + public static Optional findNextLink(String line) { + int earliestLinkPosition = Integer.MAX_VALUE; + NextLink earliestNextLink = null; + for (LinkType possibleLinkType : LinkType.values()) { + Optional nextLink = possibleLinkType.findNext(line); + if (nextLink.isPresent()) { + if (nextLink.get().getPosition() < earliestLinkPosition) { + earliestNextLink = nextLink.get(); + earliestLinkPosition = earliestNextLink.getPosition(); + } + } + } + return Optional.fromNullable(earliestNextLink); + } + + private void renderSoneLink(List parts, String line) { if (line.length() >= (7 + 43)) { String soneId = line.substring(7, 50); Optional sone = soneProvider.getSone(soneId); @@ -233,7 +351,7 @@ public class SoneTextParser implements Parser { } } - private void renderPostLink(PartContainer parts, String line) { + private void renderPostLink(List parts, String line) { if (line.length() >= (7 + 36)) { String postId = line.substring(7, 43); Optional post = postProvider.getPost(postId); @@ -247,10 +365,11 @@ public class SoneTextParser implements Parser { } } - private void renderFreenetLink(PartContainer parts, String link, LinkType linkType, @Nullable SoneTextParserContext context) { + private void renderFreenetLink(List parts, String link, LinkType linkType, @Nullable SoneTextParserContext context) { String name = link; + String linkWithoutParameters = link; if (name.indexOf('?') > -1) { - name = name.substring(0, name.indexOf('?')); + linkWithoutParameters = name = name.substring(0, name.indexOf('?')); } if (name.endsWith("/")) { name = name.substring(0, name.length() - 1); @@ -265,7 +384,7 @@ public class SoneTextParser implements Parser { name = link.substring(0, Math.min(9, link.length())); } boolean fromPostingSone = ((linkType == LinkType.SSK) || (linkType == LinkType.USK)) && (context != null) && (context.getPostingSone() != null) && link.substring(4, Math.min(link.length(), 47)).equals(context.getPostingSone().getId()); - parts.add(new FreenetLinkPart(link, name, fromPostingSone)); + parts.add(new FreenetLinkPart(link, name, linkWithoutParameters, fromPostingSone)); } catch (MalformedURLException mue1) { /* not a valid link, insert as plain text. */ parts.add(new PlainTextPart(link)); @@ -278,9 +397,8 @@ public class SoneTextParser implements Parser { } } - private void renderHttpLink(PartContainer parts, String link, LinkType linkType) { - String name; - name = link.substring(linkType == LinkType.HTTP ? 7 : 8); + private void renderHttpLink(List parts, String link, LinkType linkType) { + String name = link.substring(linkType == LinkType.HTTP ? 7 : 8); int firstSlash = name.indexOf('/'); int lastSlash = name.lastIndexOf('/'); if ((lastSlash - firstSlash) > 3) { @@ -298,74 +416,16 @@ public class SoneTextParser implements Parser { parts.add(new LinkPart(link, name)); } - private int findEndOfLink(String line) { - Matcher matcher = whitespacePattern.matcher(line); - if (!matcher.find(0)) { - return line.length(); - } - int nextWhitespace = matcher.start(); - int lastPunctuation = nextWhitespace; - while (isPunctuation(line.charAt(lastPunctuation - 1))) { - lastPunctuation -= 1; - } - if (lastPunctuation < nextWhitespace) { - return lastPunctuation; - } - int openParens = 0; - for (int i = 0; i < nextWhitespace; i++) { - switch (line.charAt(i)) { - case '(': - openParens++; - break; - case ')': - openParens--; - if (openParens < 0) { - return i; - } - default: - } - } - return nextWhitespace; + private void renderFreemailLink(List parts, String line) { + int separator = line.indexOf('@'); + String freemailId = line.substring(separator + 1, separator + 53); + String identityId = Base64.encode(Base32.decode(freemailId)); + String emailLocalPart = line.substring(0, separator); + parts.add(new FreemailPart(emailLocalPart, freemailId, identityId)); } - private boolean isPunctuation(char character) { - return (character == '.') || (character == ','); - } - - private static class NextLink { - - private final int position; - private final LinkType linkType; - - private NextLink(int position, LinkType linkType) { - this.position = position; - this.linkType = linkType; - } - - public int getPosition() { - return position; - } - - public LinkType getLinkType() { - return linkType; - } - - public static Optional findNextLink(String line) { - int earliestLinkPosition = Integer.MAX_VALUE; - LinkType linkType = null; - for (LinkType possibleLinkType : LinkType.values()) { - int nextLinkPosition = line.indexOf(possibleLinkType.getScheme()); - if (nextLinkPosition > -1) { - if (nextLinkPosition < earliestLinkPosition) { - earliestLinkPosition = nextLinkPosition; - linkType = possibleLinkType; - } - } - } - return earliestLinkPosition < Integer.MAX_VALUE ? - Optional.of(new NextLink(earliestLinkPosition, linkType)) : Optional.absent(); - } - + private static boolean isPunctuation(char character) { + return (character == '.') || (character == ',') || (character == '!') || (character == '?'); } }