diff --git a/src/main/java/org/openautonomousconnection/oac2web/api.java b/src/main/java/org/openautonomousconnection/oac2web/api.java index d349635..60baa00 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/api.java +++ b/src/main/java/org/openautonomousconnection/oac2web/api.java @@ -19,7 +19,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -@Route(path = "api") +@Route(path = "/api") public class api implements WebPage { @Override public WebResponsePacket handle(WebPageContext webPageContext) throws Exception { diff --git a/src/main/java/org/openautonomousconnection/oac2web/docs.java b/src/main/java/org/openautonomousconnection/oac2web/docs.java index 5ce8d31..cc968fd 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/docs.java +++ b/src/main/java/org/openautonomousconnection/oac2web/docs.java @@ -16,7 +16,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -@Route(path = "docs.html") +@Route(path = "/docs.html") public class docs implements WebPage { @Override public WebResponsePacket handle(WebPageContext webPageContext) throws Exception { diff --git a/src/main/java/org/openautonomousconnection/oac2web/download.java b/src/main/java/org/openautonomousconnection/oac2web/download.java index 35ed0eb..d536b7b 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/download.java +++ b/src/main/java/org/openautonomousconnection/oac2web/download.java @@ -9,7 +9,7 @@ import org.openautonomousconnection.webserver.utils.HttpsProxy; /** * Proxies the HTTPS download page through OAC. */ -@Route(path = "download.html") +@Route(path = "/download.html") public class download implements WebPage { @Override diff --git a/src/main/java/org/openautonomousconnection/oac2web/frontend/dashboard.java b/src/main/java/org/openautonomousconnection/oac2web/frontend/dashboard.java index 2842c2c..75faf96 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/frontend/dashboard.java +++ b/src/main/java/org/openautonomousconnection/oac2web/frontend/dashboard.java @@ -25,7 +25,7 @@ import java.util.Map; * - action=delete_infoname, id * - action=add_record, id (infoname_id), sub, type, value, ttl, priority, port, weight */ -@Route(path = "ins/dashboard") +@Route(path = "/ins/dashboard") public final class dashboard implements WebPage { @Override diff --git a/src/main/java/org/openautonomousconnection/oac2web/frontend/index.java b/src/main/java/org/openautonomousconnection/oac2web/frontend/index.java index 5cbe9be..2213eb2 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/frontend/index.java +++ b/src/main/java/org/openautonomousconnection/oac2web/frontend/index.java @@ -11,7 +11,7 @@ import java.util.HashMap; /** * Landing page for the registrar frontend. */ -@Route(path = "ins/index.html") +@Route(path = "/ins/index.html") public final class index implements WebPage { @Override diff --git a/src/main/java/org/openautonomousconnection/oac2web/frontend/login.java b/src/main/java/org/openautonomousconnection/oac2web/frontend/login.java index a293066..37143bb 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/frontend/login.java +++ b/src/main/java/org/openautonomousconnection/oac2web/frontend/login.java @@ -25,7 +25,7 @@ import java.util.Map; * * Creates a session with SessionManager. */ -@Route(path = "ins/login") +@Route(path = "/ins/login") public final class login implements WebPage { @Override @@ -51,8 +51,8 @@ public final class login implements WebPage { boolean ok = app.passwordHasher().verify(password, u.passwordEncoded()); if (!ok) return renderForm("Invalid credentials."); - String ip = (ctx.client.getConnection().getSocket() != null && ctx.client.getConnection().getSocket().getInetAddress() != null) - ? ctx.client.getConnection().getSocket().getInetAddress().getHostAddress() + String ip = (ctx.client.getConnection().getTcpSocket() != null && ctx.client.getConnection().getTcpSocket().getInetAddress() != null) + ? ctx.client.getConnection().getTcpSocket().getInetAddress().getHostAddress() : ""; String ua = ctx.request.getHeaders() != null ? ctx.request.getHeaders().getOrDefault("user-agent", "") : ""; diff --git a/src/main/java/org/openautonomousconnection/oac2web/frontend/register.java b/src/main/java/org/openautonomousconnection/oac2web/frontend/register.java index e4c9463..87f61b8 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/frontend/register.java +++ b/src/main/java/org/openautonomousconnection/oac2web/frontend/register.java @@ -26,7 +26,7 @@ import java.util.Map; * - users.username = sha256(username) as HEX (64 chars) * - users.password = PBKDF2$sha256$... */ -@Route(path = "ins/register") +@Route(path = "/ins/register") public final class register implements WebPage { @Override @@ -52,8 +52,8 @@ public final class register implements WebPage { try { int userId = app.dao().createUser(usernameHashHex, passwordEnc); - String ip = (ctx.client.getConnection().getSocket() != null && ctx.client.getConnection().getSocket().getInetAddress() != null) - ? ctx.client.getConnection().getSocket().getInetAddress().getHostAddress() + String ip = (ctx.client.getConnection().getTcpSocket() != null && ctx.client.getConnection().getTcpSocket().getInetAddress() != null) + ? ctx.client.getConnection().getTcpSocket().getInetAddress().getHostAddress() : ""; String ua = ctx.request.getHeaders() != null ? ctx.request.getHeaders().getOrDefault("user-agent", "") : ""; diff --git a/src/main/java/org/openautonomousconnection/oac2web/index.java b/src/main/java/org/openautonomousconnection/oac2web/index.java index 4061d15..873f83d 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/index.java +++ b/src/main/java/org/openautonomousconnection/oac2web/index.java @@ -9,7 +9,7 @@ import org.openautonomousconnection.webserver.utils.HttpsProxy; /** * Proxies the HTTPS wiki page through OAC. */ -@Route(path = "index.html") +@Route(path = "/index.html") public class index implements WebPage { @Override diff --git a/src/main/java/org/openautonomousconnection/oac2web/ins.java b/src/main/java/org/openautonomousconnection/oac2web/ins.java index e9a7bce..ae68e78 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/ins.java +++ b/src/main/java/org/openautonomousconnection/oac2web/ins.java @@ -9,7 +9,7 @@ import org.openautonomousconnection.webserver.utils.HttpsProxy; /** * Proxies the HTTPS INS page through OAC. */ -@Route(path = "ins.php") +@Route(path = "/ins.php") public class ins implements WebPage { @Override diff --git a/src/main/java/org/openautonomousconnection/oac2web/license.java b/src/main/java/org/openautonomousconnection/oac2web/license.java index dd35b58..9f3c9d2 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/license.java +++ b/src/main/java/org/openautonomousconnection/oac2web/license.java @@ -9,7 +9,7 @@ import org.openautonomousconnection.webserver.utils.HttpsProxy; /** * Proxies the HTTPS license page through OAC. */ -@Route(path = "license.html") +@Route(path = "/license.html") public class license implements WebPage { @Override diff --git a/src/main/java/org/openautonomousconnection/oac2web/wiki.java b/src/main/java/org/openautonomousconnection/oac2web/wiki.java index 8a3593d..2053094 100644 --- a/src/main/java/org/openautonomousconnection/oac2web/wiki.java +++ b/src/main/java/org/openautonomousconnection/oac2web/wiki.java @@ -9,7 +9,7 @@ import org.openautonomousconnection.webserver.utils.HttpsProxy; /** * Proxies the HTTPS wiki page through OAC. */ -@Route(path = "wiki.html") +@Route(path = "/wiki.html") public class wiki implements WebPage { @Override