ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing missed commit for PlayerDAO correct result calculation. Fixed MOTD retrieval on the admin panel not escaping quotes correctly.

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2023-03-10 23:31:54 -06:00
parent b9b859c402
commit 369f01d64a
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/GempukkuHttpRequestHandler.java
View File

@@ -1,22 +1,13 @@
package com.gempukku.lotro.async; package com.gempukku.lotro.async;
import com.alibaba.fastjson.JSONObject;
import com.gempukku.lotro.async.handler.UriRequestHandler; import com.gempukku.lotro.async.handler.UriRequestHandler;
import com.gempukku.lotro.db.IpBanDAO; import com.gempukku.lotro.db.IpBanDAO;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelFutureListener;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.SimpleChannelInboundHandler; import io.netty.channel.SimpleChannelInboundHandler;
import io.netty.handler.codec.http.DefaultFullHttpResponse; import io.netty.handler.codec.http.*;
import io.netty.handler.codec.http.DefaultHttpHeaders;
import io.netty.handler.codec.http.EmptyHttpHeaders;
import io.netty.handler.codec.http.FullHttpRequest;
import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.HttpHeaderValues;
import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpRequest;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.netty.handler.codec.http.HttpUtil;
import io.netty.util.CharsetUtil; import io.netty.util.CharsetUtil;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
@@ -35,9 +26,7 @@ import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import static io.netty.handler.codec.http.HttpHeaderNames.CONNECTION; import static io.netty.handler.codec.http.HttpHeaderNames.*;
import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_LENGTH;
import static io.netty.handler.codec.http.HttpHeaderNames.CONTENT_TYPE;
import static io.netty.handler.codec.http.HttpResponseStatus.CONTINUE; import static io.netty.handler.codec.http.HttpResponseStatus.CONTINUE;
import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1; import static io.netty.handler.codec.http.HttpVersion.HTTP_1_1;
@@ -307,8 +296,11 @@ public class GempukkuHttpRequestHandler extends SimpleChannelInboundHandler<Full
if (json == null) if (json == null)
json = "{}"; json = "{}";
if(!json.startsWith("{") && !json.startsWith("[")) if(!json.startsWith("{") && !json.startsWith("[")) {
json = "{ \"response\": \"" + json + "\"}"; JSONObject obj = new JSONObject();
obj.put("response", json);
json = obj.toString();
}
// Build the response object. // Build the response object.
FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, HttpResponseStatus.OK, Unpooled.wrappedBuffer(json.getBytes(CharsetUtil.UTF_8)), headers, EmptyHttpHeaders.INSTANCE); FullHttpResponse response = new DefaultFullHttpResponse(HTTP_1_1, HttpResponseStatus.OK, Unpooled.wrappedBuffer(json.getBytes(CharsetUtil.UTF_8)), headers, EmptyHttpHeaders.INSTANCE);
sendResponse(ctx, request, response); sendResponse(ctx, request, response);

7
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/DbPlayerDAO.java
View File

@@ -123,7 +123,8 @@ public class DbPlayerDAO implements PlayerDAO {
.executeUpdate(); .executeUpdate();
conn.commit(); conn.commit();
return true;
return conn.getResult() == 1;
} }
} catch (Exception ex) { } catch (Exception ex) {
throw new RuntimeException("Unable to reset password", ex); throw new RuntimeException("Unable to reset password", ex);
@@ -287,7 +288,7 @@ public class DbPlayerDAO implements PlayerDAO {
.executeUpdate(); .executeUpdate();
conn.commit(); conn.commit();
return true; return conn.getResult() == 1;
} }
} catch (Exception ex) { } catch (Exception ex) {
throw new RuntimeException("Unable to update password", ex); throw new RuntimeException("Unable to update password", ex);
@@ -311,7 +312,7 @@ public class DbPlayerDAO implements PlayerDAO {
.executeUpdate(); .executeUpdate();
conn.commit(); conn.commit();
return true; return conn.getResult() == 1;
} }
} catch (Exception ex) { } catch (Exception ex) {
throw new RuntimeException("Unable to insert new user", ex); throw new RuntimeException("Unable to insert new user", ex);