Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-01-25 09:41:23 +01:00
Code Issues Projects Releases Wiki Activity

Switch from hastebin to pastes.dev and fix non multi-file services

Browse Source
This commit is contained in:
zax71 2023-08-28 14:38:42 +01:00
parent e06536acd6
commit 5af06d9a0f
5 changed files with 84 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/java/com/onarandombox/MultiverseCore/commands/DumpsCommand.java
View File

@ -1,8 +1,6 @@
package com.onarandombox.MultiverseCore.commands;
import co.aikar.commands.CommandIssuer;
import co.aikar.commands.CommandManager;
import co.aikar.commands.MessageType;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
@ -10,7 +8,6 @@ import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Optional;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import co.aikar.locales.MessageKeyProvider;
import com.dumptruckman.minecraft.util.Logging;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MVWorldManager;
@ -28,7 +25,6 @@ import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
import jakarta.inject.Inject;
import org.apache.commons.lang.StringUtils;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -63,11 +59,8 @@ public class DumpsCommand extends MultiverseCommand {
.add(CommandFlag.builder("--pastebincom")
.addAlias("-b")
.build())
.add(CommandFlag.builder("--github")
.addAlias("-g")
.build())
.add(CommandFlag.builder("--hastebin")
.addAlias("-h")
.add(CommandFlag.builder("--pastesdev")
.addAlias("-d")
.build())
.add(CommandFlag.builder("--pastegg")
.addAlias("-p")
@ -84,12 +77,12 @@ public class DumpsCommand extends MultiverseCommand {
@Subcommand("dumps")
@CommandPermission("multiverse.core.dumps")
@CommandCompletion("@flags:groupName=mvdumps")
@Syntax("--pastebincom --hastebin --pastegg --logs --exclude-plugin-list")
@Syntax("--pastebincom --pastesdev --pastegg --logs --exclude-plugin-list")
@Description("{@@mv-core.dumps.description}")
public void onDumpsCommand(CommandIssuer issuer,
@Optional
@Syntax("--pastebincom --hastebin --pastegg --logs --exclude-plugin-list")
@Syntax("--pastebincom --pastesdev --pastegg --logs --exclude-plugin-list")
@Description("{@@mv-core.dumps.flags.description}")
String[] flags
) {
@ -100,8 +93,6 @@ public class DumpsCommand extends MultiverseCommand {
this.addDebugInfoToEvent(versionEvent);
plugin.getServer().getPluginManager().callEvent(versionEvent);
final String versionInfo = versionEvent.getVersionInfo();
if (!parsedFlags.hasFlag("--exclude-plugin-list")) {
versionEvent.putDetailedVersionInfo("plugins.md", "# Plugins\n\n" + getPluginList());
}
@ -117,13 +108,13 @@ public class DumpsCommand extends MultiverseCommand {
if (parsedFlags.hasFlag("--pastebincom")) {
hasArgs = true;
issuer.sendInfo(MVCorei18n.DUMPS_UPLOADING, "{link}", "https://pastebin.com");
pasteURLs.put("pastebin.com", postToService(PasteServiceType.PASTEBIN, true, versionInfo, files));
pasteURLs.put("pastebin.com", postToService(PasteServiceType.PASTEBIN, true, null, files));
}
if (parsedFlags.hasFlag("--hastebin")) {
if (parsedFlags.hasFlag("--pastesdev")) {
hasArgs = true;
issuer.sendInfo(MVCorei18n.DUMPS_UPLOADING, "{link}", "need to yeet"); //TODO yeet it
pasteURLs.put("hastebin.com", postToService(PasteServiceType.HASTEBIN, true, versionInfo, files));
issuer.sendInfo(MVCorei18n.DUMPS_UPLOADING, "{link}", "https://pastes.dev");
pasteURLs.put("pastes.dev", postToService(PasteServiceType.PASTESDEV, true, null, files));
}
if (parsedFlags.hasFlag("--logs")) {
@ -138,7 +129,6 @@ public class DumpsCommand extends MultiverseCommand {
try {
logs = Files.readString(logsPath);
} catch (IOException e) {
logs = "Could not read logs/latest.log";
Logging.warning("Could not read logs/latest.log");
throw new RuntimeException(e);
}
@ -149,7 +139,7 @@ public class DumpsCommand extends MultiverseCommand {
// Fallback to paste.gg if no other sites where specified
if (parsedFlags.hasFlag("--pastegg") || !hasArgs) {
issuer.sendInfo(MVCorei18n.DUMPS_UPLOADING, "{link}", "https://paste.gg");
pasteURLs.put("paste.gg", postToService(PasteServiceType.PASTEGG, true, versionInfo, files));
pasteURLs.put("paste.gg", postToService(PasteServiceType.PASTEGG, true, null, files));
}
// Finally, loop through and print all URLs
@ -206,27 +196,56 @@ public class DumpsCommand extends MultiverseCommand {
return " - " + StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), "\n - ");
}
/**
* Turns a list of files in to a string containing askii art
* @param files Map of filenames/contents
* @return The askii art
*/
private String encodeAsString(Map<String, String> files) {
StringBuilder uploadData = new StringBuilder();
for (String file : files.keySet()) {
String data = files.get(file);
uploadData.append("# ---------- ")
.append(file)
.append(" ----------\n\n")
.append(data)
.append("\n\n");
}
return uploadData.toString();
}
/**
* Send the current contents of this.pasteBinBuffer to a web service.
*
* @param type Service type to send paste data to.
* @param isPrivate Should the paste be marked as private.
* @param pasteData Legacy string only data to post to a service.
* @param type Service type to send paste data to.
* @param isPrivate Should the paste be marked as private.
* @param rawPasteData Legacy string containing only data to post to a service.
* @param pasteFiles Map of filenames/contents of debug info.
* @return URL of visible paste
*/
private static String postToService(PasteServiceType type, boolean isPrivate, @Nullable String pasteData, @Nullable Map<String, String> pasteFiles) {
private String postToService(@NotNull PasteServiceType type, boolean isPrivate, @Nullable String rawPasteData, @Nullable Map<String, String> pasteFiles) {
PasteService pasteService = PasteServiceFactory.getService(type, isPrivate);
try {
String result;
// Upload normally when multi file is supported
if (pasteService.supportsMultiFile()) {
result = pasteService.postData(pasteFiles);
} else {
result = pasteService.postData(pasteData);
return pasteService.postData(pasteFiles);
}
return result;
// When there is raw paste data, use that
if (rawPasteData != null) { // For the logs
return pasteService.postData(rawPasteData);
}
// If all we have are files and the paste service does not support multi file then encode them
if (pasteFiles != null) {
return pasteService.postData(this.encodeAsString(pasteFiles));
}
// Should never get here
return "No data specified in code";
} catch (PasteFailedException e) {
e.printStackTrace();
return "Error posting to service.";

54
src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HttpAPIClient.java
View File

@ -26,6 +26,7 @@ abstract class HttpAPIClient {
enum ContentType {
JSON,
PLAINTEXT,
PLAINTEXT_YAML,
URLENCODED
}
@ -44,16 +45,13 @@ abstract class HttpAPIClient {
* @return The HTTP Content-Type header that corresponds with the type of data.
*/
private String getContentHeader(ContentType type) {
switch (type) {
case JSON:
return "application/json; charset=utf-8";
case PLAINTEXT:
return "text/plain; charset=utf-8";
case URLENCODED:
return "application/x-www-form-urlencoded; charset=utf-8";
default:
throw new IllegalArgumentException("Unexpected value: " + type);
}
return switch (type) {
case JSON -> "application/json; charset=utf-8";
case PLAINTEXT -> "text/plain; charset=utf-8";
case PLAINTEXT_YAML -> "text/yaml";
case URLENCODED -> "application/x-www-form-urlencoded; charset=utf-8";
default -> throw new IllegalArgumentException("Unexpected value: " + type);
};
}
/**
@ -80,48 +78,48 @@ abstract class HttpAPIClient {
* @throws IOException When the I/O-operation failed.
*/
final String exec(String payload, ContentType type) throws IOException {
BufferedReader rd = null;
OutputStreamWriter wr = null;
BufferedReader bufferedReader = null;
OutputStreamWriter streamWriter = null;
try {
HttpsURLConnection conn = (HttpsURLConnection) new URL(this.url).openConnection();
conn.setRequestMethod("POST");
conn.setDoOutput(true);
HttpsURLConnection connection = (HttpsURLConnection) new URL(this.url).openConnection();
connection.setRequestMethod("POST");
connection.setDoOutput(true);
// we can receive anything!
conn.addRequestProperty("Accept", "*/*");
connection.addRequestProperty("Accept", "*/*");
// set a dummy User-Agent
conn.addRequestProperty("User-Agent", "placeholder");
connection.addRequestProperty("User-Agent", "multiverse/dumps");
// this isn't required, but is technically correct
conn.addRequestProperty("Content-Type", getContentHeader(type));
connection.addRequestProperty("Content-Type", getContentHeader(type));
// only some API requests require an access token
if (this.accessToken != null) {
conn.addRequestProperty("Authorization", this.accessToken);
connection.addRequestProperty("Authorization", this.accessToken);
}
wr = new OutputStreamWriter(conn.getOutputStream(), StandardCharsets.UTF_8.newEncoder());
wr.write(payload);
wr.flush();
streamWriter = new OutputStreamWriter(connection.getOutputStream(), StandardCharsets.UTF_8.newEncoder());
streamWriter.write(payload);
streamWriter.flush();
String line;
StringBuilder responseString = new StringBuilder();
// this has to be initialized AFTER the data has been flushed!
rd = new BufferedReader(new InputStreamReader(conn.getInputStream(), StandardCharsets.UTF_8));
bufferedReader = new BufferedReader(new InputStreamReader(connection.getInputStream(), StandardCharsets.UTF_8));
while ((line = rd.readLine()) != null) {
while ((line = bufferedReader.readLine()) != null) {
responseString.append(line);
}
return responseString.toString();
} finally {
if (wr != null) {
if (streamWriter != null) {
try {
wr.close();
streamWriter.close();
} catch (IOException ignore) { }
}
if (rd != null) {
if (bufferedReader != null) {
try {
rd.close();
bufferedReader.close();
} catch (IOException ignore) { }
}
}

2
src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceFactory.java
View File

@ -16,7 +16,7 @@ public class PasteServiceFactory {
return switch (type) {
case PASTEGG -> new PasteGGPasteService(isPrivate);
case PASTEBIN -> new PastebinPasteService(isPrivate);
case HASTEBIN -> new HastebinPasteService();
case PASTESDEV -> new PastesDevPasteService();
case GITHUB -> new GitHubPasteService(isPrivate);
case MCLOGS -> new McloGsPasteService();
};

4
src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PasteServiceType.java
View File

@ -16,9 +16,9 @@ public enum PasteServiceType {
*/
PASTEBIN,
/**
* @see HastebinPasteService
* @see PastesDevPasteService
*/
HASTEBIN,
PASTESDEV,
/**
* @see GitHubPasteService
*/

21
src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/HastebinPasteService.java → src/main/java/com/onarandombox/MultiverseCore/utils/webpaste/PastesDevPasteService.java
View File

@ -10,11 +10,11 @@ import net.minidev.json.parser.ParseException;
/**
* Pastes to {@code hastebin.com}.
*/
class HastebinPasteService extends PasteService {
private static final String HASTEBIN_POST_REQUEST = "https://hastebin.com/documents";
class PastesDevPasteService extends PasteService {
private static final String PASTESDEV_POST_REQUEST = "https://api.pastes.dev/post";
HastebinPasteService() {
super(HASTEBIN_POST_REQUEST);
PastesDevPasteService() {
super(PASTESDEV_POST_REQUEST);
}
/**
@ -39,8 +39,8 @@ class HastebinPasteService extends PasteService {
@Override
public String postData(String data) throws PasteFailedException {
try {
String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT_YAML);
return "https://pastes.dev/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
} catch (IOException | ParseException e) {
throw new PasteFailedException(e);
}
@ -50,13 +50,8 @@ class HastebinPasteService extends PasteService {
* {@inheritDoc}
*/
@Override
public String postData(Map<String, String> data) throws PasteFailedException {
try {
String stringJSON = this.exec(encodeData(data), ContentType.PLAINTEXT);
return "https://hastebin.com/" + ((JSONObject) new JSONParser().parse(stringJSON)).get("key");
} catch (IOException | ParseException e) {
throw new PasteFailedException(e);
}
public String postData(Map<String, String> data) throws UnsupportedOperationException {
throw new UnsupportedOperationException();
}
/**