Progress

Author: MadeByIToncek

example-plugin/src/main/java/space/itoncek/trailcompass/ExamplePackage.java

@@ -22,7 +22,7 @@ public void onLoad(Config cfg) {
 	@Override
 	public void onEnable() {
 		c.logger().info("Loading Geodesk database");
-		flib = new FeatureLibrary(new File(c.dataFolder() + "/praha.gol").getPath());
+		flib = c.featureLibrary();
 	}
 
 	@Override

example-plugin/src/test/java/space/itoncek/trailcompass/measuring/PoiMeasurementRequestTest.java

@@ -24,10 +24,10 @@ class PoiMeasurementRequestTest {
 
 	@BeforeEach
 	void setUp() {
+		new File("./praha.gol").deleteOnExit();
 		flib = new FeatureLibrary(new File("./praha.gol").getPath(),"https://cdn.itoncek.space/praha");
 		ls = new LocationSupplier(() -> new Location(50.0544700, 14.2905664, 0),
 				() -> new Location(50.1089592, 14.5773658, 0));
-		new File("./praha.gol").deleteOnExit();
 	}
 
 	@Test

server/src/main/java/space/itoncek/trailcompass/TrailServer.java

@@ -2,9 +2,16 @@
 
 import io.javalin.Javalin;
 import static io.javalin.apibuilder.ApiBuilder.*;
+import io.javalin.http.Context;
+import io.javalin.http.HttpStatus;
+import io.javalin.openapi.HttpMethod;
+import io.javalin.openapi.OpenApi;
+import io.javalin.openapi.OpenApiContent;
+import io.javalin.openapi.OpenApiResponse;
 import io.javalin.openapi.plugin.OpenApiPlugin;
 import io.javalin.openapi.plugin.OpenApiPluginConfiguration;
 import io.javalin.openapi.plugin.swagger.SwaggerPlugin;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import space.itoncek.trailcompass.database.DatabaseInterface;
@@ -91,9 +98,38 @@ public TrailServer() {
 					post("addRequest", setup::addRequest);
 				});
 				get("health", healthMonitor::check);
+				get("/", this::getVersion);
+				get("time", this::getTime);
 			});
 		});
 	}
+	@OpenApi(
+			summary = "Get server time, useful for determining ping and synchronising clocks",
+			operationId = "time",
+			path = "/time",
+			methods = HttpMethod.GET,
+			tags = {"SYSTEM"},
+			responses = {
+					@OpenApiResponse(status = "200", content = {@OpenApiContent(mimeType = "text/plain", example = "1739379173617")})
+			}
+	)
+	private void getTime(@NotNull Context context) {
+		context.status(HttpStatus.OK).result(System.currentTimeMillis() + "");
+	}
+
+	@OpenApi(
+			summary = "Get server version",
+			operationId = "ver",
+			path = "/",
+			methods = HttpMethod.GET,
+			tags = {"SYSTEM"},
+			responses = {
+					@OpenApiResponse(status = "200", content = {@OpenApiContent(mimeType = "text/plain", example = "vDEVELOPMENT")})
+			}
+	)
+	private void getVersion(@NotNull Context context) {
+		context.status(HttpStatus.OK).result(TrailServer.class.getPackage().getImplementationVersion() == null? "vDEVELOPMENT":TrailServer.class.getPackage().getImplementationVersion());
+	}
 
 	public static void main(String[] args) {
 		TrailServer ts = new TrailServer();
@@ -116,9 +152,6 @@ public static void main(String[] args) {
 
 	private static void setupOpenApi(OpenApiPluginConfiguration pluginConfig) {
 		pluginConfig.withDefinitionConfiguration((version, definition) -> definition.withInfo(info -> info.setTitle("Trailserver Backend API Specification"))
-				.withServer(server -> server.description("Backend server for TrailCompass")
-						.url("{url}")
-						.variable("url", "URL of the server", "http://localhost:8080/"))
 				.withSecurity(security -> security.withBearerAuth("JWT")));
 	}
 

server/src/main/java/space/itoncek/trailcompass/modules/LoginSystem.java

@@ -78,6 +78,7 @@ public void login(Context ctx) {
 		try {
 			JSONObject body = new JSONObject(ctx.body());
 
+			log.info("{}, {}",body.getString("username"), body.getString("passwordhash"));
 			UserMeta user = server.db.getUserMeta(body.getString("username"), body.getString("passwordhash"));
 
 			if (user == null) {
@@ -176,23 +177,27 @@ public void verifyLogin(Context ctx) {
 	}
 
 	public void checkTokenValidity(Context h) {
-		if ((h.method() == HandlerType.POST) && !(h.path().startsWith("/uac/login") || h.path().equals("/uac/verifyLogin"))) {
-			try {
-				String header = h.header(Header.AUTHORIZATION);
-				if (header == null) {
-					throw new MissingClaimException(h.ip());
-				}
-
-				DecodedJWT verify = verifier.verify(header.substring(7));
-
-				log.info(verify.getClaim("validuntil").asLong() + " x " + System.currentTimeMillis());
-				if (verify.getClaim("validuntil").asLong() < System.currentTimeMillis()) {
-					h.status(HttpStatus.IM_A_TEAPOT).result("expired");
-				}
-			} catch (JSONException | AlgorithmMismatchException | SignatureVerificationException |
-					 TokenExpiredException | MissingClaimException | IncorrectClaimException e) {
-				h.status(HttpStatus.UNAUTHORIZED).result("Neplatný token!");
+		if (h.path().startsWith("/uac/login")) return;
+		else if (h.path().equals("/uac/verifyLogin")) return;
+		else if (h.path().equals("/")) return;
+		else if (h.method().equals(HandlerType.GET)) return;
+
+
+		try {
+			String header = h.header(Header.AUTHORIZATION);
+			if (header == null) {
+				throw new MissingClaimException(h.ip());
+			}
+
+			DecodedJWT verify = verifier.verify(header.substring(7));
+
+			log.info(verify.getClaim("validuntil").asLong() + " x " + System.currentTimeMillis());
+			if (verify.getClaim("validuntil").asLong() < System.currentTimeMillis()) {
+				h.status(HttpStatus.IM_A_TEAPOT).result("expired");
 			}
+		} catch (JSONException | AlgorithmMismatchException | SignatureVerificationException |
+				 TokenExpiredException | MissingClaimException | IncorrectClaimException e) {
+			h.status(HttpStatus.UNAUTHORIZED).result("Neplatný token!");
 		}
 	}
 

server/src/main/java/space/itoncek/trailcompass/packages/PackageLoader.java

@@ -31,6 +31,7 @@ public void loadPlugins(File dir) throws Exception {
 		if (jars == null) return;
 
 		for (File jar : jars) {
+			if(jar.isDirectory()) continue;
 			URLClassLoader classLoader = new URLClassLoader(
 					new URL[]{jar.toURI().toURL()},
 					this.getClass().getClassLoader()