Compare commits

..

2 Commits

Author SHA1 Message Date
Colbster937
14ffd4eb08 relocate deps 2026-01-16 16:09:04 -06:00
Colbster937
50fdbb0c28 add http blacklist sharing 2026-01-14 16:44:44 -06:00
12 changed files with 340 additions and 142 deletions

4
.gitignore vendored
View File

@@ -1,8 +1,10 @@
/.gradle/ /.gradle/
/.vscode/ /.vscode/
/gradle/ /gradle/**
/build/ /build/
/bin/ /bin/
/run/ /run/
/gradlew /gradlew
/gradlew.bat /gradlew.bat
!/gradle/wrapper/
!/gradle/wrapper/*.properties

View File

@@ -1,4 +1,5 @@
import groovy.lang.Closure import groovy.lang.Closure
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.palantir.gradle.gitversion.VersionDetails import com.palantir.gradle.gitversion.VersionDetails
import org.gradle.api.tasks.compile.JavaCompile import org.gradle.api.tasks.compile.JavaCompile
import org.gradle.language.jvm.tasks.ProcessResources import org.gradle.language.jvm.tasks.ProcessResources
@@ -37,9 +38,11 @@ val PLUGIN_PROV_J = getBukkitBungeeDeps(PLUGIN_PROV)
val PLUGIN_ATHR_J = getBukkitBungeeDeps(PLUGIN_ATHR) val PLUGIN_ATHR_J = getBukkitBungeeDeps(PLUGIN_ATHR)
val PLUGIN_CTBR_J = getBukkitBungeeDeps(PLUGIN_CTBR) val PLUGIN_CTBR_J = getBukkitBungeeDeps(PLUGIN_CTBR)
val EAGXS_VER = "1.0.8"
plugins { plugins {
id("java") id("java")
id("com.gradleup.shadow") version "9.3.0" id("com.gradleup.shadow") version "9.3.1"
id("com.palantir.git-version") version "4.2.0" id("com.palantir.git-version") version "4.2.0"
id("xyz.jpenilla.run-paper") version "3.0.2" id("xyz.jpenilla.run-paper") version "3.0.2"
id("xyz.jpenilla.run-waterfall") version "3.0.2" id("xyz.jpenilla.run-waterfall") version "3.0.2"
@@ -113,7 +116,7 @@ tasks.withType<JavaCompile>().configureEach {
options.release.set(17) options.release.set(17)
} }
tasks.withType<ProcessResources>() { tasks.withType<ProcessResources>().configureEach {
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
outputs.upToDateWhen { false } outputs.upToDateWhen { false }
@@ -126,7 +129,6 @@ tasks.withType<ProcessResources>() {
doLast { doLast {
val file = destinationDir.resolve("build.properties") val file = destinationDir.resolve("build.properties")
file.parentFile.mkdirs() file.parentFile.mkdirs()
file.writeText( file.writeText(
BUILD_PROPS.entries.joinToString("\n") { (k, v) -> BUILD_PROPS.entries.joinToString("\n") { (k, v) ->
"$k = $v" "$k = $v"
@@ -137,44 +139,27 @@ tasks.withType<ProcessResources>() {
inputs.files(tasks.named<JavaCompile>("compileJava").map { it.outputs.files }) inputs.files(tasks.named<JavaCompile>("compileJava").map { it.outputs.files })
} }
tasks.withType<RunServer>() { tasks.withType<Jar>().configureEach {
minecraftVersion("1.12.2") if (this !is ShadowJar) enabled = false
runDirectory.set(layout.projectDirectory.dir("run/paper"))
downloadPlugins {
github("lax1dude", "eaglerxserver", "v1.0.8", "EaglerXServer.jar")
modrinth("placeholderapi", "2.11.7")
}
} }
tasks.withType<RunWaterfall>() { tasks.withType<ShadowJar>().configureEach {
waterfallVersion("1.21") doFirst {
runDirectory.set(layout.projectDirectory.dir("run/waterfall")) delete(layout.buildDirectory.dir("libs"))
downloadPlugins { mkdir(layout.buildDirectory.dir("libs"))
github("lax1dude", "eaglerxserver", "v1.0.8", "EaglerXServer.jar")
} }
} relocate("inet.ipaddr", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.ipaddress")
tasks.withType<RunVelocity>() {
velocityVersion("3.4.0-SNAPSHOT")
runDirectory.set(layout.projectDirectory.dir("run/velocity"))
downloadPlugins {
github("lax1dude", "eaglerxserver", "v1.0.8", "EaglerXServer.jar")
modrinth("miniplaceholders", "3.1.0")
}
}
tasks.jar {
archiveFileName.set("$PLUGIN_NAME-$PLUGIN_VERS.jar")
}
tasks.shadowJar {
relocate("org.bstats", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.bstats")
relocate("de.marhali.json5", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.json5") relocate("de.marhali.json5", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.json5")
relocate("org.bstats", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.bstats")
relocate("org.semver4j.semver4j", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.semver4j") relocate("org.semver4j.semver4j", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.semver4j")
// relocate("net.kyori.adventure", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.adventure") // relocate("net.kyori.adventure", "$PLUGIN_DOMN.$PLUGIN_IDEN.shaded.adventure")
archiveFileName.set("$PLUGIN_NAME-$PLUGIN_VERS.jar") archiveFileName.set("$PLUGIN_NAME-$PLUGIN_VERS.jar")
} }
tasks.named("build") {
dependsOn(tasks.named("shadowJar"))
}
tasks.register("printVars") { tasks.register("printVars") {
group = "help" group = "help"
doLast { doLast {
@@ -183,6 +168,32 @@ tasks.register("printVars") {
} }
} }
tasks.withType<RunServer>().configureEach {
minecraftVersion("1.12.2")
runDirectory.set(layout.projectDirectory.dir("run/paper"))
downloadPlugins {
github("lax1dude", "eaglerxserver", "v" + EAGXS_VER, "EaglerXServer.jar")
modrinth("placeholderapi", "2.11.7")
}
}
tasks.withType<RunWaterfall>().configureEach {
waterfallVersion("1.21")
runDirectory.set(layout.projectDirectory.dir("run/waterfall"))
downloadPlugins {
github("lax1dude", "eaglerxserver", "v" + EAGXS_VER, "EaglerXServer.jar")
}
}
tasks.withType<RunVelocity>().configureEach {
velocityVersion("3.4.0-SNAPSHOT")
runDirectory.set(layout.projectDirectory.dir("run/velocity"))
downloadPlugins {
github("lax1dude", "eaglerxserver", "v" + EAGXS_VER, "EaglerXServer.jar")
modrinth("miniplaceholders", "3.1.0")
}
}
fun getBukkitBungeeDeps(list: List<String>): String { fun getBukkitBungeeDeps(list: List<String>): String {
return list.joinToString( return list.joinToString(
prefix = "[", prefix = "[",

View File

@@ -0,0 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

View File

@@ -6,6 +6,7 @@ import xyz.webmc.originblacklist.base.enums.EnumConnectionType;
import xyz.webmc.originblacklist.base.enums.EnumLogLevel; import xyz.webmc.originblacklist.base.enums.EnumLogLevel;
import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent; import xyz.webmc.originblacklist.base.events.OriginBlacklistLoginEvent;
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent; import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
import xyz.webmc.originblacklist.base.http.OriginBlacklistHTTPServer;
import xyz.webmc.originblacklist.base.util.BuildInfo; import xyz.webmc.originblacklist.base.util.BuildInfo;
import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin; import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
import xyz.webmc.originblacklist.base.util.OPlayer; import xyz.webmc.originblacklist.base.util.OPlayer;
@@ -26,8 +27,10 @@ import java.util.Base64;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import de.marhali.json5.Json5;
import de.marhali.json5.Json5Array; import de.marhali.json5.Json5Array;
import de.marhali.json5.Json5Element; import de.marhali.json5.Json5Element;
import de.marhali.json5.Json5Object;
import inet.ipaddr.AddressStringException; import inet.ipaddr.AddressStringException;
import inet.ipaddr.IPAddressString; import inet.ipaddr.IPAddressString;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@@ -47,11 +50,15 @@ public final class OriginBlacklist {
private final IOriginBlacklistPlugin plugin; private final IOriginBlacklistPlugin plugin;
private final OriginBlacklistConfig config; private final OriginBlacklistConfig config;
private final OriginBlacklistHTTPServer http;
private final Json5 json5;
private String updateURL; private String updateURL;
public OriginBlacklist(final IOriginBlacklistPlugin plugin) { public OriginBlacklist(final IOriginBlacklistPlugin plugin) {
this.plugin = plugin; this.plugin = plugin;
this.config = new OriginBlacklistConfig(plugin); this.config = new OriginBlacklistConfig(plugin);
this.http = new OriginBlacklistHTTPServer(this);
this.json5 = Json5.builder(builder -> builder.prettyPrinting().indentFactor(0).build());
plugin.scheduleRepeat(() -> { plugin.scheduleRepeat(() -> {
this.checkForUpdates(); this.checkForUpdates();
}, this.config.getInteger("update_checker.check_timer"), TimeUnit.SECONDS); }, this.config.getInteger("update_checker.check_timer"), TimeUnit.SECONDS);
@@ -60,6 +67,22 @@ public final class OriginBlacklist {
public final void init() { public final void init() {
this.plugin.log(EnumLogLevel.INFO, "Initialized Plugin"); this.plugin.log(EnumLogLevel.INFO, "Initialized Plugin");
this.plugin.log(EnumLogLevel.DEBUG, "Commit " + BuildInfo.get("git_cm_hash")); this.plugin.log(EnumLogLevel.DEBUG, "Commit " + BuildInfo.get("git_cm_hash"));
if (this.isHTTPServerEnabled()) {
this.http.start();
}
}
public final void shutdown() {
this.plugin.log(EnumLogLevel.INFO, "Shutting down...");
this.http.stop();
}
public final void handleReload() {
if (this.isHTTPServerEnabled()) {
this.http.start();
} else {
this.http.stop();
}
} }
public final void handleLogin(final OriginBlacklistLoginEvent event) { public final void handleLogin(final OriginBlacklistLoginEvent event) {
@@ -115,6 +138,10 @@ public final class OriginBlacklist {
return this.config.getBoolean("bStats"); return this.config.getBoolean("bStats");
} }
public final boolean isHTTPServerEnabled() {
return this.config.getBoolean("blacklist_http_share.enabled");
}
public final OriginBlacklistConfig getConfig() { public final OriginBlacklistConfig getConfig() {
return this.config; return this.config;
} }
@@ -134,7 +161,7 @@ public final class OriginBlacklist {
conn.disconnect(); conn.disconnect();
} }
public final void checkForUpdates(Runnable action1, Runnable action2) { public final void checkForUpdates(final Runnable action1, final Runnable action2) {
if (this.config.getBoolean("update_checker.enabled")) { if (this.config.getBoolean("update_checker.enabled")) {
this.plugin.runAsync(() -> { this.plugin.runAsync(() -> {
this.updateURL = UpdateChecker.checkForUpdates(PLUGIN_REPO, this.plugin.getPluginVersion(), this.updateURL = UpdateChecker.checkForUpdates(PLUGIN_REPO, this.plugin.getPluginVersion(),
@@ -150,12 +177,13 @@ public final class OriginBlacklist {
} }
} }
public final void updatePlugin(Runnable action1, Runnable action2) { public final void updatePlugin(final Runnable action1, final Runnable action2) {
try { try {
final URL url = new URL(this.updateURL); final URL url = new URL(this.updateURL);
final Path jar = this.plugin.getPluginJarPath(); final Path jar = this.plugin.getPluginJarPath();
final Path bak = jar.resolveSibling(jar.getFileName().toString() + ".bak"); final Path bak = jar.resolveSibling(jar.getFileName().toString() + ".bak");
final Path upd = jar.resolveSibling(Paths.get(URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8)).getFileName()); final Path upd = jar
.resolveSibling(Paths.get(URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8)).getFileName());
try { try {
Files.copy(jar, bak, StandardCopyOption.REPLACE_EXISTING); Files.copy(jar, bak, StandardCopyOption.REPLACE_EXISTING);
@@ -190,7 +218,9 @@ public final class OriginBlacklist {
} }
public final void updatePlugin() { public final void updatePlugin() {
this.updatePlugin(() -> {}, () -> {}); this.updatePlugin(() -> {
}, () -> {
});
} }
public final EnumBlacklistType testBlacklist(final OPlayer player) { public final EnumBlacklistType testBlacklist(final OPlayer player) {
@@ -203,11 +233,14 @@ public final class OriginBlacklist {
EnumBlacklistType type = EnumBlacklistType.NONE; EnumBlacklistType type = EnumBlacklistType.NONE;
if (isNonNull(origin)) { if (isNonNull(origin)) {
if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.ORIGIN; if (whitelist && !type.isBlacklisted())
type = EnumBlacklistType.ORIGIN;
for (final Json5Element element : this.config.getArray("blacklist.origins").getAsJson5Array()) { for (final Json5Element element : this.config.getArray("blacklist.origins").getAsJson5Array()) {
if (origin.matches(element.getAsString())) { if (origin.matches(element.getAsString())) {
if (whitelist) type = EnumBlacklistType.NONE; if (whitelist)
else if (!type.isBlacklisted()) type = EnumBlacklistType.ORIGIN; type = EnumBlacklistType.NONE;
else if (!type.isBlacklisted())
type = EnumBlacklistType.ORIGIN;
break; break;
} }
} }
@@ -216,39 +249,49 @@ public final class OriginBlacklist {
} }
if (isNonNull(brand)) { if (isNonNull(brand)) {
if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.BRAND; if (whitelist && !type.isBlacklisted())
type = EnumBlacklistType.BRAND;
for (final Json5Element element : this.config.getArray("blacklist.brands")) { for (final Json5Element element : this.config.getArray("blacklist.brands")) {
if (brand.matches(element.getAsString())) { if (brand.matches(element.getAsString())) {
if (whitelist) type = EnumBlacklistType.NONE; if (whitelist)
else if (!type.isBlacklisted()) type = EnumBlacklistType.BRAND; type = EnumBlacklistType.NONE;
else if (!type.isBlacklisted())
type = EnumBlacklistType.BRAND;
break; break;
} }
} }
} }
if (isNonNull(name)) { if (isNonNull(name)) {
if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.NAME; if (whitelist && !type.isBlacklisted())
type = EnumBlacklistType.NAME;
for (final Json5Element element : this.config.getArray("blacklist.player_names")) { for (final Json5Element element : this.config.getArray("blacklist.player_names")) {
if (name.matches(element.getAsString())) { if (name.matches(element.getAsString())) {
if (whitelist) type = EnumBlacklistType.NONE; if (whitelist)
else if (!type.isBlacklisted()) type = EnumBlacklistType.NAME; type = EnumBlacklistType.NONE;
else if (!type.isBlacklisted())
type = EnumBlacklistType.NAME;
break; break;
} }
} }
} }
if (isNonNull(addr)) { if (isNonNull(addr)) {
if (whitelist && !type.isBlacklisted()) type = EnumBlacklistType.ADDR; if (whitelist && !type.isBlacklisted())
type = EnumBlacklistType.ADDR;
for (final Json5Element element : this.config.getArray("blacklist.ip_addresses")) { for (final Json5Element element : this.config.getArray("blacklist.ip_addresses")) {
try { try {
if ((new IPAddressString(element.getAsString()).toAddress()) if ((new IPAddressString(element.getAsString()).toAddress())
.contains((new IPAddressString(addr)).toAddress())) { .contains((new IPAddressString(addr)).toAddress())) {
if (whitelist) type = EnumBlacklistType.NONE; if (whitelist)
else if (!type.isBlacklisted()) type = EnumBlacklistType.ADDR; type = EnumBlacklistType.NONE;
else if (!type.isBlacklisted())
type = EnumBlacklistType.ADDR;
break; break;
} }
} catch (final AddressStringException exception) { } catch (final AddressStringException exception) {
if (this.isDebugEnabled()) exception.printStackTrace(); if (this.isDebugEnabled())
exception.printStackTrace();
} }
} }
} }
@@ -256,6 +299,24 @@ public final class OriginBlacklist {
return type; return type;
} }
public final String getBlacklistShare() {
try {
final Json5Object obj = new Json5Object();
obj.addProperty("plugin_version", this.plugin.getPluginVersion().getVersion());
obj.addProperty("blacklist_to_whitelist", this.config.getBoolean("blacklist_to_whitelist"));
obj.addProperty("block_undefined_origin", this.config.getBoolean("block_undefined_origin"));
final Json5Object bObj = new Json5Object();
final String[] types = new String[] { "origins", "brands", "player_names", "ip_addresses" };
for (final String type : types) {
bObj.add(type, this.config.getArray("blacklist." + type));
}
obj.add("blacklist", bObj);
return this.json5.serialize(obj);
} catch (final Throwable t) {
return null;
}
}
private final Component getBlacklistedComponent(final String type, final String id, final String blockType, private final Component getBlacklistedComponent(final String type, final String id, final String blockType,
final String blockTypeAlt, final String notAllowed, final String notAllowedAlt, final String blockValue, final String blockTypeAlt, final String notAllowed, final String notAllowedAlt, final String blockValue,
final String action) { final String action) {
@@ -332,8 +393,7 @@ public final class OriginBlacklist {
connType.toString(), connType.toString(),
this.plugin.getPluginVersion(), this.plugin.getPluginVersion(),
PLUGIN_REPO, PLUGIN_REPO,
PLUGIN_REPO PLUGIN_REPO).getBytes();
).getBytes();
final Json5Array arr = this.config.get("discord.webhook_urls").getAsJson5Array(); final Json5Array arr = this.config.get("discord.webhook_urls").getAsJson5Array();
for (final Json5Element element : arr) { for (final Json5Element element : arr) {
this.plugin.runAsync(() -> { this.plugin.runAsync(() -> {
@@ -371,7 +431,8 @@ public final class OriginBlacklist {
} else { } else {
this.updatePlugin(); this.updatePlugin();
} }
}, () -> {}); }, () -> {
});
} }
public static final String getComponentString(final Component comp) { public static final String getComponentString(final Component comp) {

View File

@@ -24,20 +24,21 @@ public class OriginBlacklistCommand implements ICommand {
if (ctx.hasPermission("originblacklist.command")) { if (ctx.hasPermission("originblacklist.command")) {
if (args.length > 0) { if (args.length > 0) {
final OriginBlacklistConfig config = this.plugin.getConfig(); final OriginBlacklistConfig config = this.plugin.getConfig();
final String command = args[0].toLowerCase(); final String command = args[0];
final String argA = args.length > 1 ? args[1].toLowerCase() : null; final String argA = args.length > 1 ? args[1] : null;
; ;
final String argB = args.length > 2 ? args[2] : null; final String argB = args.length > 2 ? args[2] : null;
final boolean add = "add".equals(command); final boolean add = "add".equalsIgnoreCase(command);
final boolean remove = "remove".equals(command); final boolean remove = "remove".equalsIgnoreCase(command);
if ("reload".equals(command)) { if ("reload".equalsIgnoreCase(command)) {
if (ctx.hasPermission("originblacklist.command.reload")) { if (ctx.hasPermission("originblacklist.command.reload")) {
config.reloadConfig(); config.reloadConfig();
this.plugin.handleReload();
ctx.reply("<green>Configuration Reloaded</green>"); ctx.reply("<green>Configuration Reloaded</green>");
} else { } else {
ctx.reply(NO_PERMISSION); ctx.reply(NO_PERMISSION);
} }
} else if ("update".equals(command)) { } else if ("update".equalsIgnoreCase(command)) {
if (ctx.hasPermission("originblacklist.command.update")) { if (ctx.hasPermission("originblacklist.command.update")) {
ctx.reply("<aqua>Checking for updates...</aqua>"); ctx.reply("<aqua>Checking for updates...</aqua>");
this.plugin.checkForUpdates(() -> { this.plugin.checkForUpdates(() -> {
@@ -57,13 +58,13 @@ public class OriginBlacklistCommand implements ICommand {
if ((add && ctx.hasPermission("originblacklist.command.add")) if ((add && ctx.hasPermission("originblacklist.command.add"))
|| (remove && ctx.hasPermission("originblacklist.command.add"))) { || (remove && ctx.hasPermission("originblacklist.command.add"))) {
final String arrName; final String arrName;
if ("origin".equals(argA)) { if ("origin".equalsIgnoreCase(argA)) {
arrName = "origins"; arrName = "origins";
} else if ("brand".equals(argA)) { } else if ("brand".equalsIgnoreCase(argA)) {
arrName = "brands"; arrName = "brands";
} else if ("name".equals(argA)) { } else if ("name".equalsIgnoreCase(argA)) {
arrName = "player_names"; arrName = "player_names";
} else if ("ip".equals(argA)) { } else if ("ip".equalsIgnoreCase(argA)) {
arrName = "ip_addresses"; arrName = "ip_addresses";
} else { } else {
arrName = null; arrName = null;
@@ -94,7 +95,7 @@ public class OriginBlacklistCommand implements ICommand {
} else { } else {
ctx.reply(NO_PERMISSION); ctx.reply(NO_PERMISSION);
} }
} else if ("test".equals(command) && OriginBlacklist.isNonNull(argA)) { } else if ("test".equalsIgnoreCase(command) && OriginBlacklist.isNonNull(argA)) {
if (ctx.hasPermission("originblacklist.command.test")) { if (ctx.hasPermission("originblacklist.command.test")) {
if (this.isBlacklisted(argA)) { if (this.isBlacklisted(argA)) {
ctx.reply("<green>" + argA + " is on the blacklist.</green>"); ctx.reply("<green>" + argA + " is on the blacklist.</green>");
@@ -104,7 +105,7 @@ public class OriginBlacklistCommand implements ICommand {
} else { } else {
ctx.reply(NO_PERMISSION); ctx.reply(NO_PERMISSION);
} }
} else if ("list".equals(command)) { } else if ("list".equalsIgnoreCase(command)) {
if (ctx.hasPermission("originblacklist.command.list")) { if (ctx.hasPermission("originblacklist.command.list")) {
ctx.reply("<aqua>Blacklist:</aqua>"); ctx.reply("<aqua>Blacklist:</aqua>");
ctx.reply("<gold> - Origins:</gold>"); ctx.reply("<gold> - Origins:</gold>");
@@ -148,9 +149,9 @@ public class OriginBlacklistCommand implements ICommand {
ctx.reply("<aqua>Commands:</aqua>"); ctx.reply("<aqua>Commands:</aqua>");
ctx.reply("<gray> - /originblacklist reload</gray>"); ctx.reply("<gray> - /originblacklist reload</gray>");
ctx.reply("<gray> - /originblacklist update</gray>"); ctx.reply("<gray> - /originblacklist update</gray>");
ctx.reply("<gray> - /originblacklist add <origin/brand/name/ip> <argB></gray>"); ctx.reply("<gray> - /originblacklist add <origin/brand/name/ip> <arg></gray>");
ctx.reply("<gray> - /originblacklist remove <origin/brand/name/ip> <argB></gray>"); ctx.reply("<gray> - /originblacklist remove <origin/brand/name/ip> <arg></gray>");
ctx.reply("<gray> - /originblacklist test <argB></gray>"); ctx.reply("<gray> - /originblacklist test <arg></gray>");
ctx.reply("<gray> - /originblacklist list</gray>"); ctx.reply("<gray> - /originblacklist list</gray>");
} }

View File

@@ -50,19 +50,19 @@ public final class OriginBlacklistConfig {
private final void loadConfig() { private final void loadConfig() {
try { try {
this.reloadConfigUnsafe(); this.reloadConfigUnsafe();
this.reloadIconImage();
} catch (final IOException exception) { } catch (final IOException exception) {
throw new RuntimeException("Failed to load config.", exception); throw new RuntimeException("Failed to load config.", exception);
} }
this.reloadIconImage();
} }
public final void reloadConfig() { public final void reloadConfig() {
try { try {
this.reloadConfigUnsafe(); this.reloadConfigUnsafe();
this.reloadIconImage();
} catch (final IOException exception) { } catch (final IOException exception) {
exception.printStackTrace(); exception.printStackTrace();
} }
this.reloadIconImage();
} }
private final void reloadConfigUnsafe() throws IOException { private final void reloadConfigUnsafe() throws IOException {
@@ -95,10 +95,10 @@ public final class OriginBlacklistConfig {
final BufferedImage img = ImageIO.read(iconFile); final BufferedImage img = ImageIO.read(iconFile);
if (img.getWidth() == 64 && img.getHeight() == 64) { if (img.getWidth() == 64 && img.getHeight() == 64) {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); final ByteArrayOutputStream baos = new ByteArrayOutputStream();
ImageIO.write(img, "png", baos); ImageIO.write(img, "png", baos);
this.icon64 = OriginBlacklist.getPNGBase64FromBytes(baos.toByteArray()); this.icon64 = OriginBlacklist.getPNGBase64FromBytes(baos.toByteArray());
byte[] bytes = new byte[64 * 64 * 4]; final byte[] bytes = new byte[64 * 64 * 4];
for (int y = 0; y < 64; y++) { for (int y = 0; y < 64; y++) {
for (int x = 0; x < 64; x++) { for (int x = 0; x < 64; x++) {
int pixel = img.getRGB(x, y); int pixel = img.getRGB(x, y);
@@ -255,7 +255,7 @@ public final class OriginBlacklistConfig {
private static final Json5Object getDefaultConfig() { private static final Json5Object getDefaultConfig() {
final Json5Object obj = new Json5Object(); final Json5Object obj = new Json5Object();
addJSONObj(obj, "debug", Json5Primitive.fromBoolean(false), null); addJSONObj(obj, "debug", Json5Primitive.fromBoolean(false), null);
final Json5Object mobj = new Json5Object(); final Json5Object mObj = new Json5Object();
final Json5Array kick = new Json5Array(); final Json5Array kick = new Json5Array();
kick.add("<red>This %block_type% is %not_allowed_alt%!</red>"); kick.add("<red>This %block_type% is %not_allowed_alt%!</red>");
kick.add("<dark_gray>»</dark_gray> <gray>%blocked_value%</gray> <dark_gray>«</dark_gray>"); kick.add("<dark_gray>»</dark_gray> <gray>%blocked_value%</gray> <dark_gray>«</dark_gray>");
@@ -264,18 +264,18 @@ public final class OriginBlacklistConfig {
kick.add(""); kick.add("");
kick.add("<aqua>Think this is a mistake? Join our discord:</aqua>"); kick.add("<aqua>Think this is a mistake? Join our discord:</aqua>");
kick.add("<blue>discord.gg/changethisintheconfig</blue>"); kick.add("<blue>discord.gg/changethisintheconfig</blue>");
addJSONObj(mobj, "kick", kick, null); addJSONObj(mObj, "kick", kick, null);
final Json5Array motd = new Json5Array(); final Json5Array motd = new Json5Array();
motd.add("<red>This %block_type% is %not_allowed%!</red>"); motd.add("<red>This %block_type% is %not_allowed%!</red>");
motd.add("<dark_gray>»</dark_gray> <gray>%blocked_value%</gray>"); motd.add("<dark_gray>»</dark_gray> <gray>%blocked_value%</gray>");
addJSONObj(mobj, "motd", motd, null); addJSONObj(mObj, "motd", motd, null);
final Json5Object actions = new Json5Object(); final Json5Object actions = new Json5Object();
actions.add("generic", Json5Primitive.fromString("<gold>Please switch to a different %block_type%.</gold>")); actions.add("generic", Json5Primitive.fromString("<gold>Please switch to a different %block_type%.</gold>"));
actions.add("player_name", Json5Primitive.fromString("<gold>Please change your %block_type%.</gold>")); actions.add("player_name", Json5Primitive.fromString("<gold>Please change your %block_type%.</gold>"));
actions.add("ip_address", Json5Primitive.fromString("<gold>Please contact staff for assistance.</gold>")); actions.add("ip_address", Json5Primitive.fromString("<gold>Please contact staff for assistance.</gold>"));
addJSONObj(mobj, "actions", actions, null); addJSONObj(mObj, "actions", actions, null);
addJSONObj(obj, "messages", mobj, null); addJSONObj(obj, "messages", mObj, null);
final Json5Object bobj = new Json5Object(); final Json5Object bObj = new Json5Object();
final Json5Array origins = new Json5Array(); final Json5Array origins = new Json5Array();
origins.add(".*eaglerhackedclients\\.vercel\\.app.*"); origins.add(".*eaglerhackedclients\\.vercel\\.app.*");
origins.add(".*eaglerhacks\\.github\\.io.*"); origins.add(".*eaglerhacks\\.github\\.io.*");
@@ -287,32 +287,37 @@ public final class OriginBlacklistConfig {
origins.add(".*uec\\.vercel\\.app.*"); origins.add(".*uec\\.vercel\\.app.*");
origins.add(".*valux-game\\.github\\.io.*"); origins.add(".*valux-game\\.github\\.io.*");
origins.add(".*project516\\.dev.*"); origins.add(".*project516\\.dev.*");
addJSONObj(bobj, "origins", origins, null); addJSONObj(bObj, "origins", origins, null);
final Json5Array brands = new Json5Array(); final Json5Array brands = new Json5Array();
brands.add(".*dragonx.*"); brands.add(".*dragonx.*");
brands.add(".*piclient.*"); brands.add(".*piclient.*");
brands.add(".*justin.*"); brands.add(".*justin.*");
brands.add(".*wurstx.*"); brands.add(".*wurstx.*");
brands.add(".*moonlight.*"); brands.add(".*moonlight.*");
addJSONObj(bobj, "brands", brands, null); addJSONObj(bObj, "brands", brands, null);
final Json5Array players = new Json5Array(); final Json5Array players = new Json5Array();
players.add("Admin"); players.add("Admin");
addJSONObj(bobj, "player_names", players, null); addJSONObj(bObj, "player_names", players, null);
final Json5Array ips = new Json5Array(); final Json5Array ips = new Json5Array();
ips.add("192.0.2.0/24"); ips.add("192.0.2.0/24");
addJSONObj(bobj, "ip_addresses", ips, null); addJSONObj(bObj, "ip_addresses", ips, null);
addJSONObj(obj, "blacklist", bobj, null); addJSONObj(obj, "blacklist", bObj, null);
final Json5Object dobj = new Json5Object(); final Json5Object dObj = new Json5Object();
addJSONObj(dobj, "enabled", Json5Primitive.fromBoolean(false), null); addJSONObj(dObj, "enabled", Json5Primitive.fromBoolean(false), null);
addJSONObj(dobj, "webhook_urls", new Json5Array(), null); addJSONObj(dObj, "webhook_urls", new Json5Array(), null);
addJSONObj(dobj, "send_ips", Json5Primitive.fromBoolean(true), null); addJSONObj(dObj, "send_ips", Json5Primitive.fromBoolean(true), null);
addJSONObj(obj, "discord", dobj, null); addJSONObj(obj, "discord", dObj, null);
final Json5Object uobj = new Json5Object(); final Json5Object uObj = new Json5Object();
addJSONObj(uobj, "enabled", Json5Primitive.fromBoolean(true), null); addJSONObj(uObj, "enabled", Json5Primitive.fromBoolean(true), null);
addJSONObj(uobj, "allow_snapshots", Json5Primitive.fromBoolean(false), null); addJSONObj(uObj, "allow_snapshots", Json5Primitive.fromBoolean(false), null);
addJSONObj(uobj, "check_timer", Json5Primitive.fromNumber(3600), null); addJSONObj(uObj, "check_timer", Json5Primitive.fromNumber(3600), null);
addJSONObj(uobj, "auto_update", Json5Primitive.fromBoolean(true), null); addJSONObj(uObj, "auto_update", Json5Primitive.fromBoolean(true), null);
addJSONObj(obj, "update_checker", uobj, null); addJSONObj(obj, "update_checker", uObj, null);
final Json5Object hObj = new Json5Object();
addJSONObj(hObj, "enabled", Json5Primitive.fromBoolean(false), null);
addJSONObj(hObj, "http_port", Json5Primitive.fromNumber(8080), null);
addJSONObj(hObj, "listen_addr", Json5Primitive.fromString("0.0.0.0"), null);
addJSONObj(obj, "blacklist_http_share", hObj, null);
addJSONObj(obj, "blacklist_to_whitelist", Json5Primitive.fromBoolean(false), null); addJSONObj(obj, "blacklist_to_whitelist", Json5Primitive.fromBoolean(false), null);
addJSONObj(obj, "block_undefined_origin", Json5Primitive.fromBoolean(false), null); addJSONObj(obj, "block_undefined_origin", Json5Primitive.fromBoolean(false), null);
addJSONObj(obj, "bStats", Json5Primitive.fromBoolean(true), null); addJSONObj(obj, "bStats", Json5Primitive.fromBoolean(true), null);

View File

@@ -0,0 +1,39 @@
package xyz.webmc.originblacklist.base.http;
import xyz.webmc.originblacklist.base.OriginBlacklist;
import java.io.IOException;
import java.io.OutputStream;
import java.nio.charset.StandardCharsets;
import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
public class OriginBlacklistHTTPHandler implements HttpHandler {
private final OriginBlacklist plugin;
public OriginBlacklistHTTPHandler(final OriginBlacklist plugin) {
this.plugin = plugin;
}
@Override
public final void handle(final HttpExchange exchange) throws IOException {
try {
final String path = exchange.getRequestURI().getPath();
if ("/".equals(path)) {
final byte[] bytes = this.plugin.getBlacklistShare().getBytes(StandardCharsets.UTF_8);
exchange.getResponseHeaders().set("Content-Type", "application/json; charset=utf-8");
exchange.sendResponseHeaders(200, bytes.length);
try (final OutputStream os = exchange.getResponseBody()) {
os.write(bytes);
}
} else {
exchange.sendResponseHeaders(404, -1);
}
} finally {
exchange.close();
}
}
}

View File

@@ -0,0 +1,56 @@
package xyz.webmc.originblacklist.base.http;
import xyz.webmc.originblacklist.base.OriginBlacklist;
import xyz.webmc.originblacklist.base.config.OriginBlacklistConfig;
import java.net.InetSocketAddress;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import com.sun.net.httpserver.HttpServer;
public class OriginBlacklistHTTPServer {
private final OriginBlacklist plugin;
private final ExecutorService executor;
private HttpServer server;
private boolean running;
public OriginBlacklistHTTPServer(final OriginBlacklist plugin) {
this.plugin = plugin;
this.executor = Executors.newFixedThreadPool(4);
this.running = false;
}
public final void start() {
if (!this.running) {
try {
this.server = this.createServer();
this.server.start();
this.running = true;
} catch (final Throwable t) {
}
}
}
public final void stop() {
if (this.running && this.server != null) {
this.server.stop(0);
this.running = false;
}
}
public final void shutdown() {
this.stop();
this.executor.shutdownNow();
}
private final HttpServer createServer() throws Throwable {
final OriginBlacklistConfig config = this.plugin.getConfig();
final HttpServer server = HttpServer
.create(new InetSocketAddress(config.getString("blacklist_http_share.listen_addr"),
config.getInteger("blacklist_http_share.http_port")), 0);
server.createContext("/", new OriginBlacklistHTTPHandler(this.plugin));
server.setExecutor(executor);
return server;
}
}

View File

@@ -71,7 +71,7 @@ public final class UpdateChecker {
String comm; String comm;
try { try {
comm = ver.getBuild().get(0).trim(); comm = ver.getBuild().get(0).trim();
} catch (Throwable t) { } catch (final Throwable t) {
comm = ""; comm = "";
} }
if (ver.isGreaterThan(currentVersion) || (allowSnapshots && currentVersion.diff(ver) == VersionDiff.BUILD if (ver.isGreaterThan(currentVersion) || (allowSnapshots && currentVersion.diff(ver) == VersionDiff.BUILD

View File

@@ -93,6 +93,11 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
} }
} }
@Override
public void onDisable() {
this.blacklist.shutdown();
}
@EventHandler(priority = EventPriority.NORMAL) @EventHandler(priority = EventPriority.NORMAL)
public final void onEaglerLogin(final EaglercraftLoginEvent event) { public final void onEaglerLogin(final EaglercraftLoginEvent event) {
final OPlayer player = new OPlayer(event.getLoginConnection(), event.getProfileUsername(), event.getProfileUUID()); final OPlayer player = new OPlayer(event.getLoginConnection(), event.getProfileUsername(), event.getProfileUUID());

View File

@@ -89,6 +89,11 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
} }
} }
@Override
public void onDisable() {
this.blacklist.shutdown();
}
@EventHandler(priority = EventPriority.HIGHEST) @EventHandler(priority = EventPriority.HIGHEST)
public final void onEaglerLogin(final EaglercraftLoginEvent event) { public final void onEaglerLogin(final EaglercraftLoginEvent event) {
final OPlayer player = new OPlayer(event.getLoginConnection(), event.getProfileUsername(), event.getProfileUUID()); final OPlayer player = new OPlayer(event.getLoginConnection(), event.getProfileUsername(), event.getProfileUUID());

View File

@@ -24,6 +24,7 @@ import com.velocitypowered.api.event.connection.PreLoginEvent;
import com.velocitypowered.api.event.player.PlayerClientBrandEvent; import com.velocitypowered.api.event.player.PlayerClientBrandEvent;
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent; import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
import com.velocitypowered.api.event.proxy.ProxyPingEvent; import com.velocitypowered.api.event.proxy.ProxyPingEvent;
import com.velocitypowered.api.event.proxy.ProxyShutdownEvent;
import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.plugin.PluginContainer;
import com.velocitypowered.api.proxy.Player; import com.velocitypowered.api.proxy.Player;
import com.velocitypowered.api.proxy.ProxyServer; import com.velocitypowered.api.proxy.ProxyServer;
@@ -105,6 +106,11 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
} }
} }
@Subscribe
public final void onProxyShutdown(final ProxyShutdownEvent e) {
this.blacklist.shutdown();
}
@Subscribe(order = PostOrder.FIRST) @Subscribe(order = PostOrder.FIRST)
public final void onEaglerLogin(final EaglercraftLoginEvent event) { public final void onEaglerLogin(final EaglercraftLoginEvent event) {
final OPlayer player = new OPlayer(event.getLoginConnection(), event.getProfileUsername(), event.getProfileUUID()); final OPlayer player = new OPlayer(event.getLoginConnection(), event.getProfileUsername(), event.getProfileUUID());