SRSoftware/OpenCloudCal
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

implemented "Forward" path handler to catch lookups of former index.php

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-01-03 23:40:21 +01:00
parent fa8b5f2c57
commit 4bd4cf2f27
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
de.srsoftware.cal.app/build.gradle.kts
View File

@@ -14,7 +14,7 @@ dependencies {
implementation("de.srsoftware:configuration.api:1.0.0") implementation("de.srsoftware:configuration.api:1.0.0")
implementation("de.srsoftware:configuration.json:1.0.1") implementation("de.srsoftware:configuration.json:1.0.1")
implementation("de.srsoftware:tools.http:1.2.2") implementation("de.srsoftware:tools.http:1.2.3")
implementation("de.srsoftware:tools.logging:1.2.0") implementation("de.srsoftware:tools.logging:1.2.0")
implementation("de.srsoftware:tools.plugin:1.0.1") implementation("de.srsoftware:tools.plugin:1.0.1")
implementation("de.srsoftware:tools.util:1.3.0") implementation("de.srsoftware:tools.util:1.3.0")

8
de.srsoftware.cal.app/src/main/java/de/srsoftware/cal/app/Application.java
View File

@@ -4,10 +4,7 @@ package de.srsoftware.cal.app;
import static java.lang.System.Logger.Level.*; import static java.lang.System.Logger.Level.*;
import com.sun.net.httpserver.HttpServer; import com.sun.net.httpserver.HttpServer;
import de.srsoftware.cal.ApiEndpoint; import de.srsoftware.cal.*;
import de.srsoftware.cal.BaseImporter;
import de.srsoftware.cal.IndexHandler;
import de.srsoftware.cal.StaticHandler;
import de.srsoftware.cal.db.Database; import de.srsoftware.cal.db.Database;
import de.srsoftware.cal.db.MariaDB; import de.srsoftware.cal.db.MariaDB;
import de.srsoftware.configuration.Configuration; import de.srsoftware.configuration.Configuration;
@@ -64,7 +61,8 @@ public class Application {
HttpServer server = HttpServer.create(new InetSocketAddress(port), 0); HttpServer server = HttpServer.create(new InetSocketAddress(port), 0);
var staticPages = new StaticHandler(staticPath).bindPath("/static").on(server); var staticPages = new StaticHandler(staticPath).bindPath("/static").on(server);
new IndexHandler(staticPages).bindPath("/").on(server); new IndexHandler(staticPages).bindPath("/").on(server);
new ApiEndpoint(db).bindPath(("/api")).on(server); new ApiEndpoint(db).bindPath("/api").on(server);
new Forward().bindPath("/index.php").on(server);
server.start(); server.start();
LOG.log(INFO,"Started webserver on port {0,number,#} …",port); LOG.log(INFO,"Started webserver on port {0,number,#} …",port);

2
de.srsoftware.cal.web/build.gradle.kts
View File

@@ -5,7 +5,7 @@ dependencies {
implementation(project(":de.srsoftware.cal.base")) implementation(project(":de.srsoftware.cal.base"))
implementation(project(":de.srsoftware.cal.db")) implementation(project(":de.srsoftware.cal.db"))
implementation("de.srsoftware:tools.http:1.2.2") implementation("de.srsoftware:tools.http:1.2.3")
implementation("de.srsoftware:tools.optionals:1.0.0") implementation("de.srsoftware:tools.optionals:1.0.0")
implementation("de.srsoftware:tools.util:1.3.0") implementation("de.srsoftware:tools.util:1.3.0")
implementation("org.json:json:20240303") implementation("org.json:json:20240303")

21
de.srsoftware.cal.web/src/main/java/de/srsoftware/cal/Forward.java Normal file
View File

@@ -0,0 +1,21 @@
/* © SRSoftware 2024 */
package de.srsoftware.cal;
import static de.srsoftware.tools.Optionals.nullable;
import com.sun.net.httpserver.HttpExchange;
import de.srsoftware.tools.HttpError;
import de.srsoftware.tools.PathHandler;
import java.io.IOException;
public class Forward extends PathHandler {
@Override
public boolean doGet(String path, HttpExchange ex) throws IOException {
var params = queryParam(ex);
var show = nullable(params.get("show"));
if (show.isPresent()) return sendRedirect(ex,"/static/event?id="+show.get());
LOG.log(System.Logger.Level.WARNING,"Call to {0} with query: {1} – no handler defined",path,params);
return sendContent(ex, HttpError.of(400,"Unknwon request"));
}
}