Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/rework #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Feature/rework #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c783452
Migrate to gradle
rainbowdashlabs Dec 31, 2021
a83f5d5
Start of config migration to database
rainbowdashlabs Dec 31, 2021
6847c48
Dump current progress
rainbowdashlabs Jan 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 16 additions & 15 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,57 @@ plugins {
}

repositories {
mavenCentral()
maven("https://m2.dv8tion.net/releases")
maven("https://jcenter.bintray.com")
maven("https://eldonexus.de/repository/maven-public/")
maven("https://eldonexus.de/repository/maven-proxies/")
mavenCentral()
}

dependencies {
implementation("commons-io:commons-io:2.7")
implementation("com.google.api-client:google-api-client:1.23.0")
implementation("commons-io:commons-io:2.11.0")
//implementation("com.google.api-client:google-api-client:1.32.2")
implementation("com.google.guava:guava:31.0.1-jre")
implementation("com.google.code.gson:gson:2.8.9")
implementation("com.sparkjava:spark-core:2.9.3")
implementation("org.apache.commons:commons-lang3:3.9")
implementation("net.dv8tion", "JDA", "4.3.0_339") {
implementation("com.fasterxml.jackson.core", "jackson-databind", "2.12.3")
implementation("io.javalin", "javalin", "3.13.9")
implementation("org.apache.commons","commons-lang3","3.12.0")
implementation("net.dv8tion", "JDA", "5.0.0-alpha.3") {
exclude(module = "opus-java")
}
implementation("com.zaxxer:HikariCP:5.0.0")
implementation("org.mariadb.jdbc:mariadb-java-client:2.7.4")
implementation("de.chojo", "sql-util", "1.1.5")
implementation("org.postgresql", "postgresql", "42.3.1")

implementation("org.slf4j:slf4j-api:1.7.32")
implementation("org.apache.logging.log4j:log4j-core:2.17.0")
implementation("org.apache.logging.log4j:log4j-slf4j-impl:2.17.0")
compileOnly("org.projectlombok", "lombok", "1.18.22")
annotationProcessor("org.projectlombok", "lombok", "1.18.22")

}

group = "de.eldoria"
version = "1.0"
description = "UpdateButler"
java.sourceCompatibility = JavaVersion.VERSION_11
java.sourceCompatibility = JavaVersion.VERSION_15

publishing {
publications.create<MavenPublication>("maven") {
from(components["java"])
}
}

tasks.withType<JavaCompile>() {
options.encoding = "UTF-8"
}


tasks {
shadowJar {
mergeServiceFiles()
manifest {
attributes(mapOf("Main-Class" to "de.eldoria.updatebutler.UpdateButler"))
}
}

build {
dependsOn(shadowJar)
}

compileJava {
options.encoding = "UTF-8"
}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/de/eldoria/updatebutler/UpdateButler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,15 @@ private void initializeDatabase() throws IllegalStateException {
DBSettings settings = configuration.getDbSettings();
Properties props = new Properties();
props.setProperty("dataSourceClassName", "org.mariadb.jdbc.MariaDbDataSource");
props.setProperty("dataSource.serverName", settings.getAddress());
props.setProperty("dataSource.portNumber", settings.getPort());
props.setProperty("dataSource.user", settings.getUser());
props.setProperty("dataSource.password", settings.getPassword());
props.setProperty("dataSource.databaseName", settings.getDatabase());
props.setProperty("dataSource.serverName", settings.address());
props.setProperty("dataSource.portNumber", settings.port());
props.setProperty("dataSource.user", settings.user());
props.setProperty("dataSource.password", settings.password());
props.setProperty("dataSource.databaseName", settings.database());

HikariConfig config = new HikariConfig(props);

config.setMaximumPoolSize(settings.getMaxConnections());
config.setMaximumPoolSize(settings.maxConnections());

source = new HikariDataSource(config);

Expand Down
23 changes: 15 additions & 8 deletions src/main/java/de/eldoria/updatebutler/api/RateLimiter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package de.eldoria.updatebutler.api;

import com.google.api.client.http.HttpStatusCodes;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import lombok.extern.slf4j.Slf4j;
import spark.Request;
import io.javalin.http.Context;
import org.eclipse.jetty.http.HttpStatus;
import org.slf4j.Logger;

import java.time.Instant;
import java.time.temporal.TemporalUnit;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;

import static spark.Spark.halt;
import static org.slf4j.LoggerFactory.getLogger;

@Slf4j
public class RateLimiter {

private static final Logger log = getLogger(RateLimiter.class);
private final Cache<String, Instant> rateLimit = CacheBuilder.newBuilder()
.expireAfterAccess(10, TimeUnit.MINUTES)
.build();
Expand All @@ -28,13 +28,20 @@ public RateLimiter(long time, TemporalUnit timeUnit) {
this.timeUnit = timeUnit;
}

public void assertRateLimit(Request request) throws ExecutionException {
String ip = request.headers("X-Real-IP");
public void assertRateLimit(Context ctx) throws ExecutionException {
String ip = ctx.header("X-Real-IP");
Instant lastAccess = rateLimit.get(ip, () -> Instant.now().minus(time + 1, timeUnit));
if (lastAccess.isAfter(Instant.now().minus(time, timeUnit))) {
log.trace("Rate limited. Request denied.");
halt(HttpStatusCodes.STATUS_CODE_BAD_REQUEST, "You are rate limited. Please wait.");
ctx.status(HttpStatus.SERVICE_UNAVAILABLE_503);
throw new RateLimitException();
}
rateLimit.put(ip, Instant.now());
}

private static class RateLimitException extends RuntimeException {
public RateLimitException() {
super("You are rate limited. Please wait.");
}
}
}
92 changes: 45 additions & 47 deletions src/main/java/de/eldoria/updatebutler/api/WebAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package de.eldoria.updatebutler.api;

import com.google.api.client.http.HttpStatusCodes;
import de.eldoria.updatebutler.api.debug.DebugAPI;
import de.eldoria.updatebutler.api.updates.UpdatesAPI;
import de.eldoria.updatebutler.api.verify.Verify;
import de.eldoria.updatebutler.config.Configuration;
import lombok.extern.slf4j.Slf4j;
import io.javalin.Javalin;
import org.eclipse.jetty.http.HttpStatus;
import org.slf4j.Logger;

import javax.sql.DataSource;
import java.io.BufferedReader;
Expand All @@ -13,84 +15,80 @@
import java.time.temporal.ChronoUnit;
import java.util.stream.Collectors;

import static spark.Spark.afterAfter;
import static spark.Spark.before;
import static spark.Spark.get;
import static spark.Spark.halt;
import static spark.Spark.ipAddress;
import static spark.Spark.options;
import static spark.Spark.port;
import static org.slf4j.LoggerFactory.getLogger;

@Slf4j
public class WebAPI {
private static final Logger log = getLogger(WebAPI.class);

private final Javalin javalin;
private final DebugAPI debugAPI;
private final UpdatesAPI updatesAPI;
private final RateLimiter rateLimiter = new RateLimiter(1, ChronoUnit.SECONDS);

public WebAPI(Configuration configuration, DataSource source) {
initAPI(configuration);
debugAPI = new DebugAPI(source, configuration);
updatesAPI = new UpdatesAPI(configuration);
javalin = Javalin.create()
.start(configuration.getHost(), configuration.getPort());

debugAPI = new DebugAPI(source, javalin, configuration);
updatesAPI = new UpdatesAPI(javalin, configuration);
new Verify(javalin);
}

private void initAPI(Configuration configuration) {
port(configuration.getPort());
ipAddress(configuration.getHost());

options("/*", (request, response) -> {
String accessControlRequestHeaders = request
.headers("Access-Control-Request-Headers");
javalin.options("/*", ctx -> {
String accessControlRequestHeaders = ctx
.header("Access-Control-Request-Headers");
if (accessControlRequestHeaders != null) {
response.header("Access-Control-Allow-Headers",
ctx.header("Access-Control-Allow-Headers",
"Authorization");
}

String accessControlRequestMethod = request
.headers("Access-Control-Request-Method");
String accessControlRequestMethod = ctx
.header("Access-Control-Request-Method");
if (accessControlRequestMethod != null) {
response.header("Access-Control-Allow-Methods",
ctx.header("Access-Control-Allow-Methods",
"HEAD, GET, POST, OPTIONS");
}

return "OK";
ctx.status(HttpStatus.OK_200);
});

get("/assets/:file", ((request, response) -> {
String params = request.params(":file");
javalin.get("/assets/<file>", ctx -> {
String params = ctx.pathParam("file");
if ("tailwind.css".equals(params)) {
try (BufferedReader inputStream = new BufferedReader(
new InputStreamReader(getClass().getClassLoader().getResourceAsStream("tailwind.css")))) {
response.status(HttpStatusCodes.STATUS_CODE_OK);
response.header("content-type", "text/css");
response.body(inputStream.lines().collect(Collectors.joining(System.lineSeparator())));
ctx.status(HttpStatus.OK_200)
.header("content-type", "text/css")
.result(inputStream.lines().collect(Collectors.joining(System.lineSeparator())));
} catch (IOException e) {
log.error("Could not load css stylesheet", e);
halt(HttpStatusCodes.STATUS_CODE_NOT_FOUND);
ctx.status(HttpStatus.NOT_FOUND_404);
return;
}
}
return response.body();
}));
});

before((request, response) -> {
javalin.before(ctx -> {
log.trace("Received request on route: {} {}\nHeaders:\n{}\nBody:\n{}",
request.requestMethod() + " " + request.uri(),
request.queryString(),
request.headers().stream().map(h -> " " + h + ": " + request.headers(h))
ctx.method() + " " + ctx.url(),
ctx.queryString(),
ctx.headerMap().entrySet().stream().map(h -> " " + h.getKey() + ": " + h.getValue())
.collect(Collectors.joining("\n")),
request.body().substring(0, Math.min(request.body().length(), 180)));
response.header("Access-Control-Allow-Origin", "*");
response.header("Access-Control-Allow-Headers", "*");
response.header("Content-Security-Policy", "default-src 'self'; script-src 'none'; frame-src 'none'; style-src 'self'; img-src eldoria.de discordapp.com; media-src 'none'");
ctx.body().substring(0, Math.min(ctx.body().length(), 180)));
ctx.header("Access-Control-Allow-Origin", "*")
.header("Access-Control-Allow-Headers", "*")
.header("Content-Security-Policy", "default-src 'self'; script-src 'none'; frame-src 'none'; style-src 'self'; img-src eldoria.de discordapp.com; media-src 'none'");
});

afterAfter(((request, response) -> {
javalin.after(ctx -> {
log.trace("Answered request on route: {} {}\nStatus: {}\nHeaders:\n{}\nBody:\n{}",
request.requestMethod() + " " + request.uri(),
request.queryString(),
response.raw().getStatus(),
response.raw().getHeaderNames().stream().map(h -> " " + h + ": " + response.raw().getHeader(h))
ctx.method() + " " + ctx.url(),
ctx.queryString(),
ctx.status(),
ctx.res.getHeaderNames().stream().map(h -> " " + h + ": " + ctx.res.getHeader(h))
.collect(Collectors.joining("\n")),
response.body().substring(0, Math.min(response.body().length(), 180)));
}));
ctx.resultString().substring(0, Math.min(ctx.resultString().length(), 180)));
});
}
}
Loading