OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-11-21 22:36:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix user agent strings (#4562)

Browse source
This commit is contained in:
rtm516 2024-04-12 13:12:38 +01:00 committed by GitHub
parent ca0e226aac
commit e856a8af84
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/src/main/java/org/geysermc/geyser/skin/SkinProvider.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -674,7 +674,7 @@ public class SkinProvider {
image = readFiveZigCape(imageUrl); image = readFiveZigCape(imageUrl);
} else { } else {
HttpURLConnection con = (HttpURLConnection) new URL(imageUrl).openConnection(); HttpURLConnection con = (HttpURLConnection) new URL(imageUrl).openConnection();
con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); con.setRequestProperty("User-Agent", WebUtils.getUserAgent());
con.setConnectTimeout(10000); con.setConnectTimeout(10000);
con.setReadTimeout(10000); con.setReadTimeout(10000);

18
core/src/main/java/org/geysermc/geyser/util/WebUtils.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019-2022 GeyserMC. http://geysermc.org * Copyright (c) 2019-2024 GeyserMC. http://geysermc.org
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -55,7 +55,7 @@ public class WebUtils {
URL url = new URL(reqURL); URL url = new URL(reqURL);
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET"); con.setRequestMethod("GET");
con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); // Otherwise Java 8 fails on checking updates con.setRequestProperty("User-Agent", getUserAgent()); // Otherwise Java 8 fails on checking updates
con.setConnectTimeout(10000); con.setConnectTimeout(10000);
con.setReadTimeout(10000); con.setReadTimeout(10000);
@ -73,7 +73,7 @@ public class WebUtils {
*/ */
public static JsonNode getJson(String reqURL) throws IOException { public static JsonNode getJson(String reqURL) throws IOException {
HttpURLConnection con = (HttpURLConnection) new URL(reqURL).openConnection(); HttpURLConnection con = (HttpURLConnection) new URL(reqURL).openConnection();
con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); con.setRequestProperty("User-Agent", getUserAgent());
con.setConnectTimeout(10000); con.setConnectTimeout(10000);
con.setReadTimeout(10000); con.setReadTimeout(10000);
return GeyserImpl.JSON_MAPPER.readTree(con.getInputStream()); return GeyserImpl.JSON_MAPPER.readTree(con.getInputStream());
@ -88,7 +88,7 @@ public class WebUtils {
public static void downloadFile(String reqURL, String fileLocation) { public static void downloadFile(String reqURL, String fileLocation) {
try { try {
HttpURLConnection con = (HttpURLConnection) new URL(reqURL).openConnection(); HttpURLConnection con = (HttpURLConnection) new URL(reqURL).openConnection();
con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); con.setRequestProperty("User-Agent", getUserAgent());
InputStream in = con.getInputStream(); InputStream in = con.getInputStream();
Files.copy(in, Paths.get(fileLocation), StandardCopyOption.REPLACE_EXISTING); Files.copy(in, Paths.get(fileLocation), StandardCopyOption.REPLACE_EXISTING);
} catch (Exception e) { } catch (Exception e) {
@ -109,7 +109,7 @@ public class WebUtils {
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("POST"); con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "text/plain"); con.setRequestProperty("Content-Type", "text/plain");
con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); con.setRequestProperty("User-Agent", getUserAgent());
con.setDoOutput(true); con.setDoOutput(true);
OutputStream out = con.getOutputStream(); OutputStream out = con.getOutputStream();
@ -164,7 +164,7 @@ public class WebUtils {
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("POST"); con.setRequestMethod("POST");
con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); con.setRequestProperty("User-Agent", getUserAgent());
con.setDoOutput(true); con.setDoOutput(true);
try (OutputStream out = con.getOutputStream()) { try (OutputStream out = con.getOutputStream()) {
@ -213,7 +213,7 @@ public class WebUtils {
URL url = new URL(reqURL); URL url = new URL(reqURL);
HttpURLConnection con = (HttpURLConnection) url.openConnection(); HttpURLConnection con = (HttpURLConnection) url.openConnection();
con.setRequestMethod("GET"); con.setRequestMethod("GET");
con.setRequestProperty("User-Agent", "Geyser-" + GeyserImpl.getInstance().getPlatformType().toString() + "/" + GeyserImpl.VERSION); // Otherwise Java 8 fails on checking updates con.setRequestProperty("User-Agent", getUserAgent()); // Otherwise Java 8 fails on checking updates
con.setConnectTimeout(10000); con.setConnectTimeout(10000);
con.setReadTimeout(10000); con.setReadTimeout(10000);
@ -223,4 +223,8 @@ public class WebUtils {
return Stream.empty(); return Stream.empty();
} }
} }
public static String getUserAgent() {
return "Geyser-" + GeyserImpl.getInstance().getPlatformType().platformName() + "/" + GeyserImpl.VERSION;
}
} }