mirror of
https://github.com/plexusorg/Module-HTTPD.git
synced 2025-07-01 16:06:42 +00:00
Organize a few things
This commit is contained in:
@ -2,7 +2,7 @@ package dev.plex.request;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
import dev.plex.HTTPDModule;
|
||||
import dev.plex.util.PlexLog;
|
||||
import dev.plex.logging.Log;
|
||||
import jakarta.servlet.ServletException;
|
||||
import jakarta.servlet.http.HttpServlet;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
@ -16,7 +16,6 @@ import org.eclipse.jetty.servlet.ServletHolder;
|
||||
|
||||
public class AbstractServlet extends HttpServlet
|
||||
{
|
||||
|
||||
private final List<Mapping> GET_MAPPINGS = Lists.newArrayList();
|
||||
|
||||
public AbstractServlet()
|
||||
@ -42,16 +41,13 @@ public class AbstractServlet extends HttpServlet
|
||||
@Override
|
||||
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException
|
||||
{
|
||||
|
||||
PlexLog.debug("Context Path: " + req.getHttpServletMapping().getMatchValue());
|
||||
|
||||
String ipAddress = req.getHeader("X-FORWARDED-FOR");
|
||||
if (ipAddress == null)
|
||||
{
|
||||
ipAddress = req.getRemoteAddr();
|
||||
}
|
||||
PlexLog.debug("HTTP Remote IP: " + ipAddress);
|
||||
PlexLog.debug("HTTP Local IP: " + req.getLocalAddr());
|
||||
|
||||
Log.log(ipAddress + " visited endpoint " + req.getHttpServletMapping().getMatchValue());
|
||||
|
||||
/*Enumeration<String> headerz = req.getHeaderNames();
|
||||
while (headerz.hasMoreElements()) {
|
||||
@ -59,7 +55,6 @@ public class AbstractServlet extends HttpServlet
|
||||
PlexLog.debug("Header: {0} Value {1}", header, req.getHeader(header));
|
||||
}*/
|
||||
|
||||
PlexLog.debug("-------------------------");
|
||||
GET_MAPPINGS.stream().filter(mapping -> mapping.getMapping().endpoint().substring(1, mapping.getMapping().endpoint().length() - 1).equalsIgnoreCase(req.getHttpServletMapping().getMatchValue())).forEach(mapping ->
|
||||
{
|
||||
if (mapping.headers != null)
|
||||
@ -86,7 +81,7 @@ public class AbstractServlet extends HttpServlet
|
||||
|
||||
|
||||
@Data
|
||||
public class Mapping
|
||||
public static class Mapping
|
||||
{
|
||||
private final Method method;
|
||||
private final GetMapping mapping;
|
||||
|
@ -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());
|
||||
}
|
||||
}
|
51
src/main/java/dev/plex/request/impl/IndefBansEndpoint.java
Normal file
51
src/main/java/dev/plex/request/impl/IndefBansEndpoint.java
Normal 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());
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user