Colbster937/originblacklist
1
0
Fork 0
mirror of https://github.com/colbster937/originblacklist.git synced 2026-02-04 11:07:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

eagler

Browse Source
This commit is contained in:
Colbster937
2026-01-12 16:20:41 -06:00
parent 91adbd5526
commit 58123dddd7
10 changed files with 174 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/main/java/xyz/webmc/originblacklist/base/OriginBlacklist.java
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.events.OriginBlacklistLoginEvent;
import xyz.webmc.originblacklist.base.events.OriginBlacklistMOTDEvent;
import xyz.webmc.originblacklist.base.util.BuildInfo;
import xyz.webmc.originblacklist.base.util.IOriginBlacklistPlugin;
import xyz.webmc.originblacklist.base.util.OPlayer;
import xyz.webmc.originblacklist.base.util.UpdateChecker;
@@ -14,8 +15,11 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.Base64;
@@ -54,6 +58,11 @@ public final class OriginBlacklist {
}, 60, TimeUnit.MINUTES);
}
public final void init() {
this.plugin.log(EnumLogLevel.INFO, "Initialized Plugin");
this.plugin.log(EnumLogLevel.DEBUG, "Commit " + BuildInfo.get("git_cm_hash"));
}
public final void handleLogin(final OriginBlacklistLoginEvent event) {
final OPlayer player = event.getPlayer();
final EnumBlacklistType blacklisted = this.testBlacklist(player);
@@ -165,7 +174,7 @@ public final class OriginBlacklist {
return EnumBlacklistType.ADDR;
}
} catch (final AddressStringException exception) {
exception.printStackTrace();
// exception.printStackTrace();
}
}
}
@@ -275,7 +284,7 @@ public final class OriginBlacklist {
}
conn.disconnect();
} catch (Throwable t) {
} catch (final Throwable t) {
t.printStackTrace();
}
});
@@ -293,42 +302,49 @@ public final class OriginBlacklist {
if (!this.config.get("update_checker.auto_update").getAsBoolean()) {
this.plugin.log(EnumLogLevel.INFO, "An update is available! Download it at " + this.updateURL);
} else {
final Path jar = this.plugin.getPluginJarPath();
final Path bak = jar.resolveSibling(jar.getFileName().toString() + ".bak");
final Path tmp = jar.resolveSibling(jar.getFileName().toString() + ".tmp");
try {
Files.copy(jar, bak, StandardCopyOption.REPLACE_EXISTING);
} catch (final Throwable t) {
t.printStackTrace();
}
try {
final URL url = new URL(this.updateURL);
final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
conn.setConnectTimeout(15000);
conn.setReadTimeout(15000);
conn.connect();
try (final InputStream in = conn.getInputStream()) {
Files.copy(in, tmp, StandardCopyOption.REPLACE_EXISTING);
} finally {
conn.disconnect();
}
Files.move(tmp, jar, StandardCopyOption.REPLACE_EXISTING);
Files.delete(bak);
} catch (final Throwable t) {
t.printStackTrace();
try {
Files.move(bak, jar, StandardCopyOption.REPLACE_EXISTING);
} catch (final Throwable _t) {
_t.printStackTrace();
}
}
this.updatePlugin();
}
}
});
}
}
private final void updatePlugin() {
try {
final URL url = new URL(this.updateURL);
final Path jar = this.plugin.getPluginJarPath();
final Path bak = jar.resolveSibling(jar.getFileName().toString() + ".bak");
final Path upd = jar.resolveSibling(Paths.get(URLDecoder.decode(url.getPath(), StandardCharsets.UTF_8)).getFileName());
try {
Files.copy(jar, bak, StandardCopyOption.REPLACE_EXISTING);
} catch (final Throwable t) {
t.printStackTrace();
}
try {
final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
conn.setConnectTimeout(15000);
conn.setReadTimeout(15000);
conn.setRequestProperty("User-Agent", OriginBlacklist.getUserAgent());
conn.connect();
try (final InputStream in = conn.getInputStream()) {
Files.copy(in, upd, StandardCopyOption.REPLACE_EXISTING);
} finally {
conn.disconnect();
}
Files.delete(jar);
Files.delete(bak);
} catch (final Throwable t) {
t.printStackTrace();
Files.move(bak, jar, StandardCopyOption.REPLACE_EXISTING);
}
} catch (final Throwable t) {
t.printStackTrace();
}
}
public static final String getComponentString(final Component comp) {
return LegacyComponentSerializer.legacySection().serialize(comp);
}
@@ -341,6 +357,10 @@ public final class OriginBlacklist {
return "data:image/png;base64," + Base64.getEncoder().encodeToString(bytes);
}
public static final String getUserAgent() {
return BuildInfo.get("plugin_name") + "/" + BuildInfo.get("plugin_vers") + "+" + BuildInfo.get("git_cm_hash");
}
public static final boolean isNonNull(final String str) {
return str != null && !str.isEmpty() && !str.isBlank() && !str.equals("null");
}

19
src/main/java/xyz/webmc/originblacklist/base/util/BuildInfo.java Normal file
View File

@@ -0,0 +1,19 @@
package xyz.webmc.originblacklist.base.util;
import java.io.InputStream;
import java.util.Properties;
public class BuildInfo {
private static final Properties properties;
public static final String get(final String key) {
return properties.getProperty(key).trim();
}
static {
properties = new Properties();
try (final InputStream in = BuildInfo.class.getClassLoader().getResourceAsStream("build.properties")) {
properties.load(in);
} catch (final Throwable t) {}
}
}

65
src/main/java/xyz/webmc/originblacklist/base/util/UpdateChecker.java
View File

@@ -17,54 +17,57 @@ import org.semver4j.Semver.VersionDiff;
public class UpdateChecker {
private static final Json5 json5 = Json5.builder(builder -> builder.build());
public static final String checkForUpdate(final String repo, final Semver currentVersion, final boolean allowPreRelease) {
public static final String checkForUpdate(final String repo, final Semver currentVersion, final boolean allowSnapshots) {
try {
URL url = new URL("https://api.github.com/repos/" + repo + "/releases");
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
final URL url = new URL("https://api.github.com/repos/" + repo + "/releases");
final HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
conn.setConnectTimeout(5000);
conn.setReadTimeout(5000);
conn.setRequestProperty("User-Agent", OriginBlacklist.getUserAgent());
conn.setRequestProperty("Accept", "application/vnd.github+json");
conn.connect();
BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
String ret = null;
Json5Element element = json5.parse(reader);
reader.close();
if (element instanceof Json5Array) {
final Json5Array arr = element.getAsJson5Array();
if (arr.size() > 0) {
element = arr.get(0);
if (element instanceof Json5Object) {
final Json5Object obj = element.getAsJson5Object();
final String tag = obj.get("tag_name").getAsString();
final Semver ver = new Semver(tag.substring(1));
if (ver.isGreaterThan(currentVersion) && (allowPreRelease || currentVersion.diff(ver) != VersionDiff.BUILD)) {
element = obj.get("assets");
if (element instanceof Json5Array) {
final Json5Array aArr = element.getAsJson5Array();
element = aArr.get(0);
if (element instanceof Json5Object) {
final Json5Object vObj = element.getAsJson5Object();
ret = vObj.get("url").getAsString();
for (int i = 0; i < Math.min(2, arr.size()); i++) {
element = arr.get(i);
if (element instanceof Json5Object) {
final Json5Object obj = element.getAsJson5Object();
if (allowSnapshots || !obj.get("prerelease").getAsBoolean()) {
final String tag = obj.get("tag_name").getAsString();
final Semver ver = new Semver(tag.startsWith("v") ? tag.substring(1) : tag);
String comm;
try {
comm = ver.getBuild().get(0).trim();
} catch (Throwable t) {
comm = "";
}
if (ver.isGreaterThan(currentVersion) || (allowSnapshots && currentVersion.diff(ver) == VersionDiff.BUILD && OriginBlacklist.isNonNull(comm) && !BuildInfo.get("git_cm_hash").startsWith(comm))) {
element = obj.get("assets");
if (element instanceof Json5Array) {
final Json5Array aArr = element.getAsJson5Array();
if (aArr.size() > 0) {
element = aArr.get(0);
if (element instanceof Json5Object) {
final Json5Object vObj = element.getAsJson5Object();
ret = vObj.get("browser_download_url").getAsString();
break;
}
}
}
}
}
}
continue;
}
}
}
conn.disconnect();
if (OriginBlacklist.isNonNull(ret)) {
url = new URL(ret);
conn = (HttpURLConnection) url.openConnection();
conn.setRequestMethod("GET");
conn.setConnectTimeout(5000);
conn.setReadTimeout(5000);
conn.connect();
reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
element = json5.parse(reader);
if (element instanceof Json5Object) {
final Json5Object obj = element.getAsJson5Object();
ret = obj.get("browser_download_url").getAsString();
}
}
return ret;
} catch (final Throwable t) {
t.printStackTrace();

2
src/main/java/xyz/webmc/originblacklist/bukkit/OriginBlacklistBukkit.java
View File

@@ -76,7 +76,7 @@ public final class OriginBlacklistBukkit extends JavaPlugin implements Listener,
this.eaglerAPI = EaglerXServerAPI.instance();
this.getCommand("originblacklist").setExecutor(new OriginBlacklistCommandBukkit(this.blacklist));
this.getServer().getPluginManager().registerEvents(this, this);
this.log(EnumLogLevel.INFO, "Initialized Plugin");
this.blacklist.init();
if (this.blacklist.isMetricsEnabled()) {
this.metrics = new Metrics(this, OriginBlacklist.BSTATS_ID);
this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {

2
src/main/java/xyz/webmc/originblacklist/bungee/OriginBlacklistBungee.java
View File

@@ -72,7 +72,7 @@ public final class OriginBlacklistBungee extends Plugin implements Listener, IOr
this.eaglerAPI = EaglerXServerAPI.instance();
this.getProxy().getPluginManager().registerCommand(this, new OriginBlacklistCommandBungee(this, this.blacklist, "originblacklist"));
this.getProxy().getPluginManager().registerListener(this, this);
this.log(EnumLogLevel.INFO, "Initialized Plugin");
this.blacklist.init();
if (this.blacklist.isMetricsEnabled()) {
this.metrics = new Metrics(this, OriginBlacklist.BSTATS_ID);
this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {

6
src/main/java/xyz/webmc/originblacklist/velocity/OriginBlacklistVelocity.java
View File

@@ -88,7 +88,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
this.blacklist = new OriginBlacklist(this);
this.eaglerAPI = EaglerXServerAPI.instance();
this.proxy.getCommandManager().register("originblacklist", new OriginBlacklistCommandVelocity(this.blacklist));
this.log(EnumLogLevel.INFO, "Initialized Plugin");
this.blacklist.init();
if (this.blacklist.isMetricsEnabled()) {
this.metrics = this.metricsFactory.make(this, OriginBlacklist.BSTATS_ID);
this.metrics.addCustomChart(new AdvancedPie("player_types", () -> {
@@ -153,7 +153,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
public final Path getPluginJarPath() {
try {
return Paths.get(this.getClass().getProtectionDomain().getCodeSource().getLocation().toURI()).toAbsolutePath();
} catch (Throwable t) {
} catch (final Throwable t) {
throw new RuntimeException("Unable to determine plugin JAR path");
}
}
@@ -166,7 +166,7 @@ public final class OriginBlacklistVelocity implements IOriginBlacklistPlugin {
this.logger.error(txt);
} else if (level == EnumLogLevel.DEBUG) {
if (this.blacklist.isDebugEnabled()) {
this.logger.debug(txt);
this.logger.info(txt);
}
} else {
this.logger.info(txt);

10
src/main/resources/bungee.yml
View File

@@ -3,8 +3,8 @@ version: ${plugin_vers}
main: xyz.webmc.${plugin_iden}.bungee.${plugin_name}Bungee
description: ${plugin_desc}
website: ${plugin_site}
author: [${plugin_athr}]
contributors: [${plugin_ctbr}]
depends: [${plugin_depb}]
provides: [${plugin_prov}]
softdepend: [${plugin_sdpb}]
author: ${plugin_athr}
contributors: ${plugin_ctbr}
depends: ${plugin_depb}
provides: ${plugin_prov}
softdepend: ${plugin_sdpb}

12
src/main/resources/plugin.yml
View File

@@ -3,10 +3,10 @@ version: ${plugin_vers}
main: xyz.webmc.${plugin_iden}.bukkit.${plugin_name}Bukkit
description: ${plugin_desc}
website: ${plugin_site}
authors: [${plugin_athr}]
contributors: [${plugin_ctbr}]
depend: [${plugin_depa}]
provides: [${plugin_prov}]
softdepend: [${plugin_sdpa}]
authors: ${plugin_athr}
contributors: ${plugin_ctbr}
depend: ${plugin_depa}
provides: ${plugin_prov}
softdepend: ${plugin_sdpa}
commands:
originblacklist:
${plugin_iden}:

4
src/main/resources/velocity-plugin.json
View File

@@ -5,6 +5,6 @@
"description": "${plugin_desc}",
"website": "${plugin_site}",
"main": "xyz.webmc.${plugin_iden}.velocity.${plugin_name}Velocity",
"authors": [${plugin_athr}],
"dependencies": [${plugin_depc}]
"authors": ${plugin_athr},
"dependencies": ${plugin_depc}
}