Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-06-28 07:35:07 +02:00
Code Issues Projects Releases Wiki Activity

Added webchat-interval for anti-spam webmessaging.

Browse Source
This commit is contained in:
FrozenCow 2011-03-15 22:43:48 +01:00
parent 6c6d29a402
commit 38e997cf37
3 changed files with 57 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configuration.txt
View File

@ -71,7 +71,8 @@ web:
focuschatballoons: false
showchatwindow: true
allowwebchat: true
allowwebchat: true
webchat-interval: 1000
messagettl: 15000
showplayerfacesonmap: true

17
src/main/java/org/dynmap/DynmapPlugin.java
View File

@ -144,13 +144,16 @@ public class DynmapPlugin extends JavaPlugin {
webServer.handlers.put("/up/configuration", new ClientConfigurationHandler((Map<?, ?>) configuration.getProperty("web")));
if (configuration.getNode("web").getBoolean("allowwebchat", false)) {
SendMessageHandler messageHandler = new SendMessageHandler();
messageHandler.onMessageReceived.addListener(new Listener<SendMessageHandler.Message>() {
@Override
public void triggered(Message t) {
webChat(t.name, t.message);
}
});
SendMessageHandler messageHandler = new SendMessageHandler() {{
maximumMessageInterval = configuration.getNode("web").getInt("webchat-interval", 1000);
onMessageReceived.addListener(new Listener<SendMessageHandler.Message>() {
@Override
public void triggered(Message t) {
webChat(t.name, t.message);
}
});
}};
webServer.handlers.put("/up/sendmessage", messageHandler);
}

46
src/main/java/org/dynmap/web/handlers/SendMessageHandler.java
View File

@ -1,6 +1,9 @@
package org.dynmap.web.handlers;
import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.logging.Logger;
import org.dynmap.Event;
@ -18,6 +21,12 @@ public class SendMessageHandler implements HttpHandler {
private static final JSONParser parser = new JSONParser();
public Event<Message> onMessageReceived = new Event<SendMessageHandler.Message>();
public int maximumMessageInterval = 1000;
private HashMap<String, WebUser> disallowedUsers = new HashMap<String, WebUser>();
private LinkedList<WebUser> disallowedUserQueue = new LinkedList<WebUser>();
private Object disallowedUsersLock = new Object();
@Override
public void handle(String path, HttpRequest request, HttpResponse response) throws Exception {
if (!request.method.equals(HttpMethod.Post)) {
@ -29,9 +38,39 @@ public class SendMessageHandler implements HttpHandler {
InputStreamReader reader = new InputStreamReader(request.body);
JSONObject o = (JSONObject)parser.parse(reader);
Message message = new Message();
final Message message = new Message();
message.name = String.valueOf(o.get("name"));
message.message = String.valueOf(o.get("message"));
final long now = System.currentTimeMillis();
synchronized(disallowedUsersLock) {
// Allow users that user that are now allowed to send messages.
while (!disallowedUserQueue.isEmpty()) {
WebUser wu = disallowedUserQueue.getFirst();
if (now >= wu.nextMessageTime) {
disallowedUserQueue.remove();
disallowedUsers.remove(wu.name);
} else {
break;
}
}
WebUser user = disallowedUsers.get(message.name);
if (user == null) {
user = new WebUser() {{
name = message.name;
nextMessageTime = now+maximumMessageInterval;
}};
disallowedUsers.put(user.name, user);
disallowedUserQueue.add(user);
} else {
response.fields.put(HttpField.ContentLength, "0");
response.status = HttpStatus.Forbidden;
response.getBody();
return;
}
}
onMessageReceived.trigger(message);
@ -39,8 +78,13 @@ public class SendMessageHandler implements HttpHandler {
response.status = HttpStatus.OK;
response.getBody();
}
public static class Message {
public String name;
public String message;
}
public static class WebUser {
public long nextMessageTime;
public String name;
}
}