X-Git-Url: https://git.pterodactylus.net/?p=WoTNS.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fwotns%2Fui%2Fweb%2FResolverPage.java;h=d26d1aa86915bc26b0cafc5e137ede4dc62027cb;hp=1a4f687b94eee6d507f1a89be72abcac67e1da5d;hb=9288c73f25d0ce121b574812d71b9d4c41d529ba;hpb=622c4a4d3ebed447d5708a41cf3e1e82e18fa29b diff --git a/src/main/java/net/pterodactylus/wotns/ui/web/ResolverPage.java b/src/main/java/net/pterodactylus/wotns/ui/web/ResolverPage.java index 1a4f687..d26d1aa 100644 --- a/src/main/java/net/pterodactylus/wotns/ui/web/ResolverPage.java +++ b/src/main/java/net/pterodactylus/wotns/ui/web/ResolverPage.java @@ -35,7 +35,7 @@ public class ResolverPage extends BasicPage { private final Resolver resolver; public ResolverPage(Template unknownNameTemplate, WebInterface webInterface, Resolver resolver) { - super(webInterface, "", unknownNameTemplate); + super(webInterface, "", "Error - Web of Trust Name Service", unknownNameTemplate); this.resolver = resolver; } @@ -62,11 +62,19 @@ public class ResolverPage extends BasicPage { protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { String uri = request.getUri().getPath(); String path = uri.substring(uri.indexOf('/', 1) + 1); - FreenetURI targetUri; + + /* look for path after target. */ + int firstSlash = path.indexOf('/'); + int secondSlash = path.indexOf('/', firstSlash + 1); + String filePath = ""; + if (secondSlash != -1) { + filePath = path.substring(secondSlash); + path = path.substring(0, secondSlash); + } try { - targetUri = resolver.resolveURI(path); + FreenetURI targetUri = resolver.resolveURI(path); if (targetUri != null) { - throw new RedirectException("/" + targetUri.toString()); + throw new RedirectException("/" + targetUri.toString() + filePath); } } catch (MalformedURLException mue1) { /* TODO - do something. */