Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 03:27:37 +01:00
Code Issues Projects Releases Wiki Activity

Replaced Apache HttpClient implementation with base Java implementation of Post request.

Browse Source
This commit is contained in:
Rsl1122 2017-09-15 17:11:45 +03:00
parent 23dd0f37e7
commit 3c2c710115
6 changed files with 220 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPI.java
View File

@ -10,19 +10,13 @@ import main.java.com.djrapitops.plan.api.exceptions.WebAPIConnectionFailExceptio
import main.java.com.djrapitops.plan.api.exceptions.WebAPIException;
import main.java.com.djrapitops.plan.systems.webserver.response.Response;
import main.java.com.djrapitops.plan.utilities.MiscUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.*;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.Map;
import java.util.UUID;
/**
* @author Rsl1122
@ -33,40 +27,43 @@ public abstract class WebAPI {
public abstract Response onResponse(IPlan plugin, Map<String, String> variables);
public String sendRequest(String address, UUID receiverUUID) throws WebAPIException {
public void sendRequest(String address, UUID receiverUUID) throws WebAPIException {
Verify.nullCheck(address, receiverUUID);
HttpClient httpClient = HttpClients.createDefault();
HttpPost postRequest = new HttpPost(address + "/api/" + this.getClass().getSimpleName().toLowerCase());
List<NameValuePair> parameters = new ArrayList<>();
String serverUUID = MiscUtils.getIPlan().getServerInfoManager().getServerUUID().toString();
parameters.add(new BasicNameValuePair("sender", serverUUID));
parameters.add(new BasicNameValuePair("key", receiverUUID.toString()));
for (Map.Entry<String, String> entry : variables.entrySet()) {
parameters.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
}
try {
postRequest.setEntity(new UrlEncodedFormEntity(parameters, "ISO-8859-1"));
} catch (UnsupportedEncodingException e) {
throw new WebAPIException("Unsupported parameter encoding", e);
}
URL url = new URL(address + "/api/" + this.getClass().getSimpleName().toLowerCase());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
connection.setDoOutput(true);
connection.setInstanceFollowRedirects(false);
connection.setRequestMethod("POST");
connection.setRequestProperty("Content-Type", "application/x-www-form-urlencoded");
connection.setRequestProperty("charset", "ISO-8859-1");
try {
HttpResponse response = httpClient.execute(postRequest);
HttpEntity responseEntity = response.getEntity();
StringBuilder parameters = new StringBuilder();
String serverUUID = MiscUtils.getIPlan().getServerInfoManager().getServerUUID().toString();
parameters.append("sender=").append(serverUUID).append("&");
parameters.append("key=").append(receiverUUID.toString());
for (Map.Entry<String, String> entry : variables.entrySet()) {
parameters.append("&").append(entry.getKey()).append(entry.getValue());
}
byte[] toSend = parameters.toString().getBytes();
int length = toSend.length;
if (responseEntity != null) {
StringBuilder content = new StringBuilder();
try (InputStream inputStream = responseEntity.getContent()) {
Scanner scanner = new Scanner(inputStream);
while (scanner.hasNextLine()) {
content.append(scanner.nextLine());
}
}
return content.toString();
connection.setRequestProperty("Content-Length", Integer.toString(length));
connection.setUseCaches(false);
try (DataOutputStream out = new DataOutputStream(connection.getOutputStream())) {
out.write(toSend);
}
int responseCode = connection.getResponseCode();
switch (responseCode) {
case 200:
break;
case 400:
throw new WebAPIException("Bad Request: " + url.toString() + "|" + parameters);
default:
throw new WebAPIException(url.toString() + "| Wrong response code " + responseCode);
}
} catch (IOException e) {
throw new WebAPIConnectionFailException("API connection failed.", e);

4
Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/WebAPIManager.java
View File

@ -25,6 +25,10 @@ public class WebAPIManager {
registry.put(api.getClass().getSimpleName().toLowerCase(), api);
}
public WebAPI getAPI(Class api) {
return getAPI(api.getSimpleName());
}
public WebAPI getAPI(String apiName) {
return registry.get(apiName.toLowerCase());
}

4
Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/bukkit/InspectWebAPI.java
View File

@ -33,8 +33,8 @@ public class InspectWebAPI extends WebAPI {
return PageCache.loadPage("success", SuccessResponse::new);
}
public String sendRequest(String address, UUID receiverUUID, UUID uuid) throws WebAPIException {
public void sendRequest(String address, UUID receiverUUID, UUID uuid) throws WebAPIException {
addVariable("uuid", uuid.toString());
return super.sendRequest(address, receiverUUID);
super.sendRequest(address, receiverUUID);
}
}

2
Plan/src/main/java/com/djrapitops/plan/systems/webserver/webapi/universal/PingWebAPI.java
View File

@ -15,7 +15,7 @@ import java.util.Map;
/**
* @author Fuzzlemann
*/
public class PingWebAPI implements WebAPI {
public class PingWebAPI extends WebAPI {
@Override
public Response onResponse(IPlan plugin, Map<String, String> variables) {
return PageCache.loadPage("success", SuccessResponse::new);

39
Plan/test/main/java/com/djrapitops/plan/systems/webserver/WebAPITest.java Normal file
View File

@ -0,0 +1,39 @@
/*
* Licence is provided in the jar as license.yml also here:
* https://github.com/Rsl1122/Plan-PlayerAnalytics/blob/master/Plan/src/main/resources/license.yml
*/
package main.java.com.djrapitops.plan.systems.webserver;
import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.api.exceptions.WebAPIException;
import main.java.com.djrapitops.plan.systems.webserver.webapi.WebAPI;
import main.java.com.djrapitops.plan.systems.webserver.webapi.universal.PingWebAPI;
import org.junit.Before;
import org.junit.Test;
import test.java.utils.TestInit;
import static org.junit.Assert.assertTrue;
/**
* //TODO Class Javadoc Comment
*
* @author Rsl1122
*/
public class WebAPITest {
private WebServer webServer;
@Before
public void setUp() throws Exception {
TestInit.initEmptyLocale();
webServer = new WebServer(null);
webServer.initServer();
assertTrue(webServer.isEnabled());
}
@Test
public void testPingWebAPI() throws WebAPIException {
WebAPI api = webServer.getWebAPI().getAPI(PingWebAPI.class);
api.sendRequest(webServer.getAccessAddress(), Plan.getServerUUID());
}
}

137
Plan/test/test/java/utils/TestInit.java
View File

@ -19,13 +19,21 @@ import main.java.com.djrapitops.plan.systems.info.server.ServerInfoManager;
import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer;
import org.bukkit.Server;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.conversations.Conversation;
import org.bukkit.conversations.ConversationAbandonedEvent;
import org.bukkit.permissions.Permission;
import org.bukkit.permissions.PermissionAttachment;
import org.bukkit.permissions.PermissionAttachmentInfo;
import org.bukkit.plugin.Plugin;
import org.powermock.api.mockito.PowerMockito;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Set;
import java.util.Timer;
import java.util.TimerTask;
import java.util.UUID;
@ -209,9 +217,138 @@ public class TestInit {
when(mockServer.getMaxPlayers()).thenReturn(20);
when(mockServer.getName()).thenReturn("Bukkit");
when(mockServer.getOfflinePlayers()).thenReturn(ops);
ConsoleCommandSender sender = mockServerCmdSender();
when(mockServer.getConsoleSender()).thenReturn(sender);
return mockServer;
}
private ConsoleCommandSender mockServerCmdSender() {
return new ConsoleCommandSender() {
@Override
public void sendMessage(String s) {
System.out.println("Log: " + s);
}
@Override
public void sendMessage(String[] strings) {
for (String string : strings) {
sendMessage(string);
}
}
@Override
public Server getServer() {
return null;
}
@Override
public String getName() {
return null;
}
@Override
public Spigot spigot() {
return null;
}
@Override
public boolean isConversing() {
return false;
}
@Override
public void acceptConversationInput(String s) {
}
@Override
public boolean beginConversation(Conversation conversation) {
return false;
}
@Override
public void abandonConversation(Conversation conversation) {
}
@Override
public void abandonConversation(Conversation conversation, ConversationAbandonedEvent conversationAbandonedEvent) {
}
@Override
public void sendRawMessage(String s) {
}
@Override
public boolean isPermissionSet(String s) {
return false;
}
@Override
public boolean isPermissionSet(Permission permission) {
return false;
}
@Override
public boolean hasPermission(String s) {
return false;
}
@Override
public boolean hasPermission(Permission permission) {
return false;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b) {
return null;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin) {
return null;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, String s, boolean b, int i) {
return null;
}
@Override
public PermissionAttachment addAttachment(Plugin plugin, int i) {
return null;
}
@Override
public void removeAttachment(PermissionAttachment permissionAttachment) {
}
@Override
public void recalculatePermissions() {
}
@Override
public Set<PermissionAttachmentInfo> getEffectivePermissions() {
return null;
}
@Override
public boolean isOp() {
return false;
}
@Override
public void setOp(boolean b) {
}
};
}
private YamlConfiguration mockConfig() throws IOException, InvalidConfigurationException {
File configFile = new File(getClass().getResource("/config.yml").getPath());
YamlConfiguration configuration = new YamlConfiguration();