Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Improved stability and other related fixes:

Browse source 
* server: added limit to max chat message (related to #11285);
* gui: fixed possible error after auto-submit deck;
* gui: fixed possible error after end game dialog;
* refactor: other code improves;
This commit is contained in:
Oleg Agafonov 2023-11-25 12:29:54 +04:00
parent 81f97c3b0e
commit d1f9e9cc90
15 changed files with 86 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Mage.Server/src/main/java/mage/server/MageServerImpl.java
View file

@ -7,6 +7,7 @@ import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.cards.repository.ExpansionInfo;
import mage.cards.repository.ExpansionRepository;
import mage.constants.Constants;
import mage.constants.ManaType;
import mage.constants.PlayerAction;
import mage.constants.TableState;
@ -488,7 +489,13 @@ public class MageServerImpl implements MageServer {
@Override
//FIXME: why no sessionId here???
public void chatSendMessage(final UUID chatId, final String userName, final String message) throws MageException {
if (message.length() > Constants.MAX_CHAT_MESSAGE_SIZE) {
logger.error("Chat message too big: " + message.length() + ", from user " + userName);
return;
}
try {
// TODO: check and replace all usage of callExecutor.execute() by execute("actionName")
callExecutor.execute(
() -> managerFactory.chatManager().broadcast(chatId, userName, HtmlEscape.escapeHtml4(message), MessageColor.BLUE, true, null, ChatMessage.MessageType.TALK, null)
);
@ -953,8 +960,14 @@ public class MageServerImpl implements MageServer {
}
@Override
//TODO: check how often it is used
public ServerState getServerState() throws MageException {
// called one time per login, must work without auth and with diff versions
try {
// some ddos protection
Thread.sleep(1000);
} catch (InterruptedException ignore) {
}
try {
return new ServerState(
GameFactory.instance.getGameTypes(),