From d427cbbacd4a52a9d7d474db066c591b2d910a73 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Tue, 7 Dec 2021 16:03:29 -0600 Subject: [PATCH] Update Gradle and reimplement changes --- gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 269 +++++++++++------- .../admin/module/CommandSpy.java | 2 +- .../FionnCMD.java} | 14 +- .../command/impl/PanelCMD.java | 61 ++-- .../RestartCMD.java} | 14 +- .../services/impl/Pterodactyl.java | 183 ++++-------- 7 files changed, 264 insertions(+), 281 deletions(-) rename src/main/java/me/totalfreedom/totalfreedommod/command/{Command_fionn.java => impl/FionnCMD.java} (61%) rename src/main/java/me/totalfreedom/totalfreedommod/command/{Command_restart.java => impl/RestartCMD.java} (78%) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a25..84d1f85f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 744e882e..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -106,80 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/src/main/java/me/totalfreedom/totalfreedommod/admin/module/CommandSpy.java b/src/main/java/me/totalfreedom/totalfreedommod/admin/module/CommandSpy.java index 9fcc9ae2..b266b5a8 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/admin/module/CommandSpy.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/admin/module/CommandSpy.java @@ -26,7 +26,7 @@ public class CommandSpy extends AbstractService { if (plugin.adminList.isAdmin(player) && plugin.adminList.getAdmin(player).getCommandSpy()) { - if (plugin.al.isAdmin(event.getPlayer()) && !plugin.al.isSeniorAdmin(player)) + if (plugin.adminList.isAdmin(event.getPlayer()) && !plugin.adminList.isSeniorAdmin(player)) { continue; } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fionn.java b/src/main/java/me/totalfreedom/totalfreedommod/command/impl/FionnCMD.java similarity index 61% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_fionn.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/impl/FionnCMD.java index d7deceb1..a792696f 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_fionn.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/impl/FionnCMD.java @@ -1,5 +1,9 @@ -package me.totalfreedom.totalfreedommod.command; +package me.totalfreedom.totalfreedommod.command.impl; +import me.totalfreedom.totalfreedommod.command.FreedomCommand; +import me.totalfreedom.totalfreedommod.command.input.CommandParameters; +import me.totalfreedom.totalfreedommod.command.input.CommandPermissions; +import me.totalfreedom.totalfreedommod.command.input.SourceType; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.bukkit.ChatColor; @@ -8,13 +12,13 @@ import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Fionn the server", usage = "/") -public class Command_fionn extends FreedomCommand +@CommandParameters(name = "fionn", description = "Fionn the server", usage = "/") +public class FionnCMD extends FreedomCommand { @Override public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) { - if (!plugin.ptero.isEnabled()) + if (!plugin.pterodactyl.isEnabled()) { msg("Pterodactyl integration is currently disabled.", ChatColor.RED); return true; @@ -25,7 +29,7 @@ public class Command_fionn extends FreedomCommand return true; } FUtil.bcastMsg(ChatColor.LIGHT_PURPLE + "Fionn is about to corrupt the worlds again!"); - plugin.ptero.fionnTheServer(); + plugin.pterodactyl.fionnTheServer(); return true; } } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/impl/PanelCMD.java b/src/main/java/me/totalfreedom/totalfreedommod/command/impl/PanelCMD.java index 1c87c24e..99bf72a1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/impl/PanelCMD.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/impl/PanelCMD.java @@ -1,10 +1,13 @@ package me.totalfreedom.totalfreedommod.command.impl; import com.google.common.base.Strings; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import me.totalfreedom.totalfreedommod.admin.Admin; +import me.totalfreedom.totalfreedommod.command.FreedomCommand; import me.totalfreedom.totalfreedommod.command.input.CommandParameters; import me.totalfreedom.totalfreedommod.command.input.CommandPermissions; -import me.totalfreedom.totalfreedommod.command.FreedomCommand; import me.totalfreedom.totalfreedommod.command.input.SourceType; import me.totalfreedom.totalfreedommod.player.PlayerData; import me.totalfreedom.totalfreedommod.rank.Rank; @@ -14,38 +17,39 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - @CommandPermissions(level = Rank.SENIOR_ADMIN, source = SourceType.ONLY_IN_GAME) @CommandParameters(name = "panel", description = "Manage your Pterodactyl panel account", usage = "/ ") -public class PanelCMD extends FreedomCommand { - +public class PanelCMD extends FreedomCommand +{ @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - - if (!plugin.pterodactyl.isEnabled()) { + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (!plugin.pterodactyl.isEnabled()) + { msg("Pterodactyl integration is currently disabled.", ChatColor.RED); return true; } PlayerData playerData = getData(playerSender); - if (playerData.getDiscordID() == null) { - msg("You must have a linked discord account.", ChatColor.RED); + if (playerData.getDiscordID() == null) + { + msg("You must have a linked Discord account.", ChatColor.RED); return true; } - if (args.length == 0) { + if (args.length == 0) + { return false; } - if (args[0].equalsIgnoreCase("create")) { + if (args[0].equalsIgnoreCase("create")) + { msg("Creating your Pterodactyl account...", ChatColor.GREEN); Admin admin = getAdmin(playerSender); - if (admin.getPteroID() != null) { + if (admin.getPteroID() != null) + { msg("You already have a Pterodactyl account.", ChatColor.RED); return true; } @@ -54,36 +58,33 @@ public class PanelCMD extends FreedomCommand { String password = FUtil.randomString(30); String id = plugin.pterodactyl.createAccount(username, password); - if (Strings.isNullOrEmpty(id)) { + if (Strings.isNullOrEmpty(id)) + { msg("Failed to create your Pterodactyl account.", ChatColor.RED); return true; } plugin.pterodactyl.addAccountToServer(id); - admin.setPteroID(id); plugin.adminList.save(admin); plugin.adminList.updateTables(); plugin.discord.sendPteroInfo(playerData, username, password); - msg("Successfully created your Pterodactyl account. Check your DMs from " + plugin.discord.formatBotTag() + " on discord to get your credentials.", ChatColor.GREEN); + msg("Successfully created your Pterodactyl account. Check your DMs from " + plugin.discord.formatBotTag() + " on Discord to get your credentials.", ChatColor.GREEN); return true; - } else if (args[0].equalsIgnoreCase("delete")) { + } + else if (args[0].equalsIgnoreCase("delete")) + { msg("Deleting your Pterodactyl account...", ChatColor.GREEN); Admin admin = getAdmin(playerSender); - if (admin.getPteroID() == null) { + if (admin.getPteroID() == null) + { msg("You do not have a Pterodactyl account.", ChatColor.RED); return true; } - boolean deleted = plugin.pterodactyl.deleteAccount(admin.getPteroID()); - - if (!deleted) { - msg("Failed to delete your Pterodactyl account.", ChatColor.RED); - return true; - } - + plugin.pterodactyl.deleteAccount(admin.getPteroID()); admin.setPteroID(null); plugin.adminList.save(admin); plugin.adminList.updateTables(); @@ -95,8 +96,10 @@ public class PanelCMD extends FreedomCommand { } @Override - public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) { - if (args.length == 1 && plugin.adminList.isSeniorAdmin(sender)) { + public List getTabCompleteOptions(CommandSender sender, Command command, String alias, String[] args) + { + if (args.length == 1 && plugin.adminList.isSeniorAdmin(sender)) + { return Arrays.asList("create", "delete"); } diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_restart.java b/src/main/java/me/totalfreedom/totalfreedommod/command/impl/RestartCMD.java similarity index 78% rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_restart.java rename to src/main/java/me/totalfreedom/totalfreedommod/command/impl/RestartCMD.java index e75d3299..d53040b5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_restart.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/impl/RestartCMD.java @@ -1,7 +1,11 @@ -package me.totalfreedom.totalfreedommod.command; +package me.totalfreedom.totalfreedommod.command.impl; import java.util.HashMap; import java.util.Map; +import me.totalfreedom.totalfreedommod.command.FreedomCommand; +import me.totalfreedom.totalfreedommod.command.input.CommandParameters; +import me.totalfreedom.totalfreedommod.command.input.CommandPermissions; +import me.totalfreedom.totalfreedommod.command.input.SourceType; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang.StringUtils; @@ -12,15 +16,15 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @CommandPermissions(level = Rank.ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Restart the server", usage = "/ [reason]", aliases="tfmrestart") -public class Command_restart extends FreedomCommand +@CommandParameters(name = "restart", description = "Restart the server", usage = "/ [reason]", aliases = "tfmrestart") +public class RestartCMD extends FreedomCommand { private static final Map RESTART_CONFIRM = new HashMap<>(); @Override public boolean run(final CommandSender sender, final Player playerSender, final Command cmd, final String commandLabel, final String[] args, final boolean senderIsConsole) { - if (!plugin.ptero.isEnabled()) + if (!plugin.pterodactyl.isEnabled()) { msg("Pterodactyl integration is currently disabled.", ChatColor.RED); return true; @@ -72,6 +76,6 @@ public class Command_restart extends FreedomCommand } RESTART_CONFIRM.remove(sender); - plugin.ptero.restartServer(); + plugin.pterodactyl.restartServer(); } } \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/services/impl/Pterodactyl.java b/src/main/java/me/totalfreedom/totalfreedommod/services/impl/Pterodactyl.java index 6d64dff1..e770dc68 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/services/impl/Pterodactyl.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/services/impl/Pterodactyl.java @@ -1,28 +1,31 @@ package me.totalfreedom.totalfreedommod.services.impl; -import java.io.IOException; -import java.util.Arrays; -import java.util.List; +import com.mattmalec.pterodactyl4j.Permission; +import com.mattmalec.pterodactyl4j.PteroAction; +import com.mattmalec.pterodactyl4j.PteroBuilder; +import com.mattmalec.pterodactyl4j.application.entities.ApplicationUser; +import com.mattmalec.pterodactyl4j.application.entities.PteroApplication; +import com.mattmalec.pterodactyl4j.application.managers.UserAction; +import com.mattmalec.pterodactyl4j.client.entities.ClientServer; +import com.mattmalec.pterodactyl4j.client.entities.ClientSubuser; +import com.mattmalec.pterodactyl4j.client.entities.PteroClient; +import joptsimple.internal.Strings; import me.totalfreedom.totalfreedommod.admin.Admin; import me.totalfreedom.totalfreedommod.config.ConfigEntry; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.services.AbstractService; import me.totalfreedom.totalfreedommod.util.FLog; -import me.totalfreedom.totalfreedommod.util.FUtil; -import me.totalfreedom.totalfreedommod.util.Response; -import org.json.simple.JSONObject; -import org.json.simple.parser.ParseException; public class Pterodactyl extends AbstractService { - public final String URL = ConfigEntry.PTERO_URL.getString(); - private final String SERVER_KEY = ConfigEntry.PTERO_SERVER_KEY.getString(); private final String ADMIN_KEY = ConfigEntry.PTERO_ADMIN_KEY.getString(); - private final List SERVER_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + SERVER_KEY); - private final List ADMIN_HEADERS = Arrays.asList("Accept:Application/vnd.pterodactyl.v1+json", "Content-Type:application/json", "Authorization:Bearer " + ADMIN_KEY); + private final String CLIENT_KEY = ConfigEntry.PTERO_SERVER_KEY.getString(); + private final String IDENTIFIER = ConfigEntry.PTERO_SERVER_UUID.getString(); + PteroApplication adminAPI = PteroBuilder.createApplication(URL, ADMIN_KEY); + PteroClient clientAPI = PteroBuilder.createClient(URL, CLIENT_KEY); - private boolean enabled = URL != null && !URL.isEmpty(); + private boolean enabled = !Strings.isNullOrEmpty(URL); public void onStart() { @@ -36,145 +39,75 @@ public class Pterodactyl extends AbstractService { String id = admin.getPteroID(); - if ((id == null || id.isEmpty()) || !enabled) + if (Strings.isNullOrEmpty(id) || !enabled) { return; } if (!admin.isActive() || admin.getRank() != Rank.SENIOR_ADMIN) { - FLog.debug("Disabling ptero acc"); + FLog.debug("Disabling Pterodactyl account"); removeAccountFromServer(id); return; } - FLog.debug("Enabling ptero acc"); + FLog.debug("Enabling Pterodactyl account"); addAccountToServer(id); } - @SuppressWarnings("unchecked") public String createAccount(String username, String password) { - JSONObject json = new JSONObject(); - json.put("username", username); - json.put("password", password); - json.put("email", username.toLowerCase() + "@" + ConfigEntry.PTERO_DEFAULT_EMAIL_DOMAIN.getString()); - json.put("first_name", username); - json.put("last_name", "\u200E"); // required, so I made it appear empty - - Response response; - JSONObject jsonResponse; - try - { - response = FUtil.sendRequest(URL + "/api/application/users", "POST", ADMIN_HEADERS, json.toJSONString()); - jsonResponse = response.getJSONMessage(); - } - catch (IOException | ParseException e) - { - FLog.severe(e); - return null; - } - - return ((JSONObject)jsonResponse.get("attributes")).get("id").toString(); + UserAction action = adminAPI.getUserManager().createUser() + .setUserName(username) + .setEmail(username.toLowerCase() + "@" + ConfigEntry.PTERO_DEFAULT_EMAIL_DOMAIN.getString()) + .setFirstName(username) + .setLastName("\u200E") // Required - make it appear empty + .setPassword(password); + return action.execute().getId(); } - public boolean deleteAccount(String id) + public void deleteAccount(String id) { - JSONObject json = new JSONObject(); - try - { - return FUtil.sendRequest(URL + "/api/application/users/" + id, "DELETE", ADMIN_HEADERS, json.toJSONString()).getCode() == 204; - } - catch (IOException e) - { - FLog.severe(e); - return false; - } + ApplicationUser username = adminAPI.retrieveUserById(id).execute(); + PteroAction action = adminAPI.getUserManager().deleteUser(username); + action.execute(); } - @SuppressWarnings("unchecked") public void addAccountToServer(String id) { - String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users"; - - JSONObject userData = getUserData(id); - if (userData == null) - { - FLog.severe("The Pterodactyl user with the ID of " + id + " was not found"); - return; - } - - JSONObject json = new JSONObject(); - json.put("email", userData.get("email").toString()); - json.put("permissions", Arrays.asList("control.console", "control.start", "control.restart", "control.stop", "control.kill")); - - try - { - FUtil.sendRequest(url, "POST", SERVER_HEADERS, json.toJSONString()); - } - catch (IOException e) - { - FLog.severe(e); - } + ApplicationUser username = adminAPI.retrieveUserById(id).execute(); + String email = username.getEmail(); + PteroAction server = clientAPI.retrieveServerByIdentifier(IDENTIFIER); + server.execute().getSubuserManager().createUser() + .setEmail(email) + .setPermissions(Permission.CONTROL_PERMISSIONS).execute(); } public void removeAccountFromServer(String id) { - JSONObject userData = getUserData(id); - if (userData == null) - { - FLog.severe("The Pterodactyl user with the ID of " + id + " was not found"); - return; - } - - String url = URL + "/api/client/servers/" + ConfigEntry.PTERO_SERVER_UUID.getString() + "/users/" + userData.get("uuid"); - - try - { - FUtil.sendRequest(url, "DELETE", SERVER_HEADERS, null); - } - catch (IOException e) - { - FLog.severe(e); - } + ApplicationUser username = adminAPI.retrieveUserById(id).execute(); + PteroAction server = clientAPI.retrieveServerByIdentifier(IDENTIFIER); + ClientSubuser clientSubuser = server.execute().getSubuser(username.getUUID()).retrieve().execute(); + server.execute().getSubuserManager().deleteUser(clientSubuser).execute(); } - public JSONObject getUserData(String id) - { - Response response; - JSONObject jsonResponse; - try - { - response = FUtil.sendRequest(URL + "/api/application/users/" + id, "GET", ADMIN_HEADERS, null); - jsonResponse = response.getJSONMessage(); - - } - catch (IOException | ParseException e) - { - FLog.severe(e); - return null; - } - - return (JSONObject)jsonResponse.get("attributes"); - - } - - // API patch function on users doesnt work rn, it throws 500 errors, so it's probably not written yet - @SuppressWarnings("unchecked") public void setPassword(String id, String password) { - JSONObject json = new JSONObject(); - json.put("password", password); + ApplicationUser username = adminAPI.retrieveUserById(id).execute(); + UserAction action = adminAPI.getUserManager().editUser(username).setPassword(password); + action.execute(); + } - try - { - FUtil.sendRequest(URL + "/api/application/users/" + id, "PATCH", ADMIN_HEADERS, json.toJSONString()); - } - catch (IOException e) - { - FLog.severe(e); - } + public void restartServer() + { + clientAPI.retrieveServerByIdentifier(IDENTIFIER).flatMap(ClientServer::restart).execute(); + } + + public void fionnTheServer() + { + clientAPI.retrieveServerByIdentifier(IDENTIFIER).flatMap(ClientServer::stop).execute(); + plugin.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, () -> clientAPI.retrieveServerByIdentifier(IDENTIFIER).flatMap(ClientServer::kill).execute(), 0, 60); } public String getURL() @@ -184,7 +117,7 @@ public class Pterodactyl extends AbstractService public String getServerKey() { - return SERVER_KEY; + return CLIENT_KEY; } public String getAdminKey() @@ -192,16 +125,6 @@ public class Pterodactyl extends AbstractService return ADMIN_KEY; } - public List getServerHeaders() - { - return SERVER_HEADERS; - } - - public List getAdminHeaders() - { - return ADMIN_HEADERS; - } - public boolean isEnabled() { return enabled;