Organize a few things

This commit is contained in:
2022-04-02 15:51:14 -05:00
parent e0fbe479c5
commit f41d09d7bf
6 changed files with 92 additions and 55 deletions

View File

@ -11,15 +11,12 @@ import dev.plex.request.AbstractServlet;
import dev.plex.request.GetMapping;
import dev.plex.util.PlexLog;
import jakarta.servlet.http.HttpServletRequest;
import java.util.UUID;
import java.util.stream.Collectors;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import java.util.UUID;
import java.util.stream.Collectors;
//@RestController
//@RequestMapping("/api/admins")
public class GetEndpoints extends AbstractServlet
public class AdminsEndpoint extends AbstractServlet
{
@GetMapping(endpoint = "/api/admins/")
public String getAdmins(HttpServletRequest request)
@ -32,7 +29,7 @@ public class GetEndpoints extends AbstractServlet
final PlexPlayer player = DataUtils.getPlayerByIP(ipAddress);
if (player == null)
{
return "Couldn't load your IP Address: " + ipAddress + ". Check if your SSL settings are setup correctly.";
return "Couldn't load your IP Address: " + ipAddress + ". Have you joined the server before?";
}
if (Plex.get().getSystem().equalsIgnoreCase("ranks"))
{
@ -53,37 +50,4 @@ public class GetEndpoints extends AbstractServlet
}
return new GsonBuilder().setPrettyPrinting().create().toJson(Plex.get().getAdminList().getAllAdminPlayers());
}
@GetMapping(endpoint = "/api/indefbans/")
public String getBans(HttpServletRequest request)
{
String ipAddress = request.getHeader("X-FORWARDED-FOR");
if (ipAddress == null)
{
ipAddress = request.getRemoteAddr();
}
final PlexPlayer player = DataUtils.getPlayerByIP(ipAddress);
if (player == null)
{
return "Couldn't load your IP Address: " + ipAddress + ". Check if your SSL settings are setup correctly.";
}
if (Plex.get().getSystem().equalsIgnoreCase("ranks"))
{
PlexLog.debug("Plex-HTTPD using ranks check");
if (!player.getRankFromString().isAtLeast(Rank.ADMIN))
{
return "Not a high enough rank to view this page.";
}
}
else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))
{
PlexLog.debug("Plex-HTTPD using permissions check");
final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(UUID.fromString(player.getUuid()));
if (!HTTPDModule.getPermissions().playerHas(null, offlinePlayer, "plex.httpd.indefbans.access"))
{
return "Not enough permissions to view this page.";
}
}
return new GsonBuilder().setPrettyPrinting().create().toJson(Plex.get().getPunishmentManager().getIndefiniteBans().stream().toList());
}
}

View File

@ -0,0 +1,51 @@
package dev.plex.request.impl;
import com.google.gson.GsonBuilder;
import dev.plex.HTTPDModule;
import dev.plex.Plex;
import dev.plex.cache.DataUtils;
import dev.plex.player.PlexPlayer;
import dev.plex.rank.enums.Rank;
import dev.plex.request.AbstractServlet;
import dev.plex.request.GetMapping;
import dev.plex.util.PlexLog;
import jakarta.servlet.http.HttpServletRequest;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
public class IndefBansEndpoint extends AbstractServlet
{
@GetMapping(endpoint = "/api/indefbans/")
public String getBans(HttpServletRequest request)
{
String ipAddress = request.getHeader("X-FORWARDED-FOR");
if (ipAddress == null)
{
ipAddress = request.getRemoteAddr();
}
final PlexPlayer player = DataUtils.getPlayerByIP(ipAddress);
if (player == null)
{
return "Couldn't load your IP Address: " + ipAddress + ". Have you joined the server before?";
}
if (Plex.get().getSystem().equalsIgnoreCase("ranks"))
{
PlexLog.debug("Plex-HTTPD using ranks check");
if (!player.getRankFromString().isAtLeast(Rank.ADMIN))
{
return "Not a high enough rank to view this page.";
}
}
else if (Plex.get().getSystem().equalsIgnoreCase("permissions"))
{
PlexLog.debug("Plex-HTTPD using permissions check");
final OfflinePlayer offlinePlayer = Bukkit.getOfflinePlayer(UUID.fromString(player.getUuid()));
if (!HTTPDModule.getPermissions().playerHas(null, offlinePlayer, "plex.httpd.indefbans.access"))
{
return "Not enough permissions to view this page.";
}
}
return new GsonBuilder().setPrettyPrinting().create().toJson(Plex.get().getPunishmentManager().getIndefiniteBans().stream().toList());
}
}