From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Thu, 15 Sep 2011 17:41:03 +0000 (+0200)
Subject: Merge branch 'release-0.0.2'
X-Git-Tag: 0.0.2^0
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=2083a1061f5ecb9d8573cfcd98c5f416e8dffb6c;hp=231a7fce4ed6828b3731fa93b8adc1cdda813092;p=WoTNS.git

Merge branch 'release-0.0.2'
---

diff --git a/pom.xml b/pom.xml
index 629c11a..24d87ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>net.pterodactylus</groupId>
 	<artifactId>WoTNS</artifactId>
-	<version>0.0.1</version>
+	<version>0.0.2</version>
 	<dependencies>
 		<dependency>
 			<groupId>net.pterodactylus</groupId>
diff --git a/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java b/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java
index ef81166..f08239e 100644
--- a/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java
+++ b/src/main/java/net/pterodactylus/wotns/main/WoTNSPlugin.java
@@ -46,7 +46,7 @@ public class WoTNSPlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL1
 		Logging.setupConsoleLogging();
 	}
 
-	private static final Version VERSION = new Version(0, 0, 1);
+	private static final Version VERSION = new Version(0, 0, 2);
 
 	private PluginRespirator pluginRespirator;
 
diff --git a/src/main/java/net/pterodactylus/wotns/template/HttpRequestAccessor.java b/src/main/java/net/pterodactylus/wotns/template/HttpRequestAccessor.java
new file mode 100644
index 0000000..d8b44ee
--- /dev/null
+++ b/src/main/java/net/pterodactylus/wotns/template/HttpRequestAccessor.java
@@ -0,0 +1,47 @@
+/*
+ * Sone - HttpRequestAccessor.java - Copyright © 2011 David Roden
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package net.pterodactylus.wotns.template;
+
+import net.pterodactylus.util.template.Accessor;
+import net.pterodactylus.util.template.ReflectionAccessor;
+import net.pterodactylus.util.template.TemplateContext;
+import freenet.support.api.HTTPRequest;
+
+/**
+ * {@link Accessor} implementation that can parse headers from
+ * {@link HTTPRequest}s.
+ *
+ * @see HTTPRequest#getHeader(String)
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class HttpRequestAccessor extends ReflectionAccessor {
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public Object get(TemplateContext templateContext, Object object, String member) {
+		Object parentValue = super.get(templateContext, object, member);
+		if (parentValue != null) {
+			return parentValue;
+		}
+		HTTPRequest httpRequest = (HTTPRequest) object;
+		return httpRequest.getHeader(member);
+	}
+
+}
diff --git a/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java b/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
index ba2537e..85ad8b1 100644
--- a/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
+++ b/src/main/java/net/pterodactylus/wotns/ui/web/BasicPage.java
@@ -89,6 +89,7 @@ public class BasicPage extends FreenetTemplatePage {
 	@Override
 	protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
 		super.processTemplate(request, templateContext);
+		templateContext.set("request", request.getHttpRequest());
 		templateContext.set("ownIdentities", identityManager.getAllOwnIdentities());
 		templateContext.set("formPassword", webInterface.getWoTNSPlugin().getToadletContainer().getFormPassword());
 	}
diff --git a/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java b/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java
index 18daf46..4d63640 100644
--- a/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/wotns/ui/web/WebInterface.java
@@ -35,11 +35,13 @@ import net.pterodactylus.util.web.StaticPage;
 import net.pterodactylus.wotns.freenet.wot.Identity;
 import net.pterodactylus.wotns.main.IdentityComparator;
 import net.pterodactylus.wotns.main.WoTNSPlugin;
+import net.pterodactylus.wotns.template.HttpRequestAccessor;
 import net.pterodactylus.wotns.template.IdentityAccessor;
 import net.pterodactylus.wotns.web.FreenetRequest;
 import net.pterodactylus.wotns.web.PageToadlet;
 import net.pterodactylus.wotns.web.PageToadletFactory;
 import freenet.clients.http.ToadletContainer;
+import freenet.support.api.HTTPRequest;
 
 /**
  * TODO
@@ -60,6 +62,7 @@ public class WebInterface {
 
 		templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
 		templateContextFactory.addAccessor(Identity.class, new IdentityAccessor());
+		templateContextFactory.addAccessor(HTTPRequest.class, new HttpRequestAccessor());
 		templateContextFactory.addFilter("html", new HtmlFilter());
 		CollectionSortFilter sortFilter = new CollectionSortFilter();
 		sortFilter.addComparator(Identity.class, IdentityComparator.NAME);
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 2144e2f..6ed3fee 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -1,6 +1,13 @@
 <%include include/head.html>
 <h1>WoTNS</h1>
-<p>Yay, Index!</p>
+<p>The Web of Trust Service uses properties of Web of Trust identities to implement a DNS-like scheme on top of Freenet.</p>
+<p>The general syntax is: <code>http://<%request.host>/tns/<i>identity</i>/<i>target</i></code>.</p>
+<p><i>identity</i> is the nickname of a Web of Trust identity, such as “WoTNS”. It is also possible to include the beginning of the identity’s
+key into <i>identity</i>, in the form of <i>nickname@start-of-key</i>, such as “WoTNS@DAx”.</p>
+<p>The <i>target</i> consists of a name chosen by the remote identity. It can consist of latin latters, digits, and periods (and the final name
+has to fulfill the Web of Trust’s requirement for a valid property name.</p>
+<p>To be able to add targets for one of your identities, you first have to create an identity using the <a href="/WebOfTrust/">Web of Trust</a>,
+and you have to enable the identity here.</p>
 
 <%foreach enabledIdentities identity>
 	<%first>