Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 13:15:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix id-by-ip settings - not migrated to servlet code initialization

Browse Source
This commit is contained in:
Mike Primm 2012-01-16 19:40:58 -06:00
parent 8d1def2ea0
commit ecf3a64b74
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/dynmap/InternalClientUpdateComponent.java
View File

@ -7,17 +7,20 @@ import static org.dynmap.JSONUtils.*;
public class InternalClientUpdateComponent extends ClientUpdateComponent { public class InternalClientUpdateComponent extends ClientUpdateComponent {
public InternalClientUpdateComponent(final DynmapCore plugin, final ConfigurationNode configuration) { public InternalClientUpdateComponent(final DynmapCore dcore, final ConfigurationNode configuration) {
super(plugin, configuration); super(dcore, configuration);
plugin.addServlet("/up/world/*", new ClientUpdateServlet(plugin)); dcore.addServlet("/up/world/*", new ClientUpdateServlet(dcore));
final Boolean allowwebchat = configuration.getBoolean("allowwebchat", false); final Boolean allowwebchat = configuration.getBoolean("allowwebchat", false);
final Boolean hidewebchatip = configuration.getBoolean("hidewebchatip", false); final Boolean hidewebchatip = configuration.getBoolean("hidewebchatip", false);
final Boolean trust_client_name = configuration.getBoolean("trustclientname", false); final Boolean trust_client_name = configuration.getBoolean("trustclientname", false);
final float webchatInterval = configuration.getFloat("webchat-interval", 1); final float webchatInterval = configuration.getFloat("webchat-interval", 1);
final String spammessage = plugin.configuration.getString("spammessage", "You may only chat once every %interval% seconds."); final String spammessage = dcore.configuration.getString("spammessage", "You may only chat once every %interval% seconds.");
final Boolean use_player_ip = configuration.getBoolean("use-player-login-ip", true);
final Boolean req_player_ip = configuration.getBoolean("require-player-login-ip", false);
final Boolean block_banned_player_chat = configuration.getBoolean("block-banned-player-chat", false);
plugin.events.addListener("buildclientconfiguration", new Event.Listener<JSONObject>() { dcore.events.addListener("buildclientconfiguration", new Event.Listener<JSONObject>() {
@Override @Override
public void triggered(JSONObject t) { public void triggered(JSONObject t) {
s(t, "allowwebchat", allowwebchat); s(t, "allowwebchat", allowwebchat);
@ -31,6 +34,11 @@ public class InternalClientUpdateComponent extends ClientUpdateComponent {
spamMessage = "\""+spammessage+"\""; spamMessage = "\""+spammessage+"\"";
hideip = hidewebchatip; hideip = hidewebchatip;
this.trustclientname = trust_client_name; this.trustclientname = trust_client_name;
this.use_player_login_ip = use_player_ip;
this.require_player_login_ip = req_player_ip;
this.check_user_ban = block_banned_player_chat;
this.core = dcore;
onMessageReceived.addListener(new Event.Listener<Message> () { onMessageReceived.addListener(new Event.Listener<Message> () {
@Override @Override
public void triggered(Message t) { public void triggered(Message t) {
@ -38,7 +46,7 @@ public class InternalClientUpdateComponent extends ClientUpdateComponent {
} }
}); });
}}; }};
plugin.addServlet("/up/sendmessage", messageHandler); dcore.addServlet("/up/sendmessage", messageHandler);
} }
} }

6
src/main/java/org/dynmap/servlet/SendMessageServlet.java
View File

@ -39,7 +39,7 @@ public class SendMessageServlet extends HttpServlet {
public boolean use_player_login_ip = false; public boolean use_player_login_ip = false;
public boolean require_player_login_ip = false; public boolean require_player_login_ip = false;
public boolean check_user_ban = false; public boolean check_user_ban = false;
public DynmapCore plug_in; public DynmapCore core;
@Override @Override
@ -72,11 +72,11 @@ public class SendMessageServlet extends HttpServlet {
message.name = request.getRemoteAddr(); message.name = request.getRemoteAddr();
} }
if (use_player_login_ip) { if (use_player_login_ip) {
List<String> ids = plug_in.getIDsForIP(message.name); List<String> ids = core.getIDsForIP(message.name);
if (ids != null) { if (ids != null) {
String id = ids.get(0); String id = ids.get(0);
if (check_user_ban) { if (check_user_ban) {
if (plug_in.getServer().isPlayerBanned(id)) { if (core.getServer().isPlayerBanned(id)) {
Log.info("Ignore message from '" + message.name + "' - banned player (" + id + ")"); Log.info("Ignore message from '" + message.name + "' - banned player (" + id + ")");
response.sendError(HttpStatus.Forbidden.getCode()); response.sendError(HttpStatus.Forbidden.getCode());
return; return;