Merge pull request #124 from k81/wildfirechat

Fix race condition during SensitiveFilter update and potential resource leak of GZIPOutputStream on exception
This commit is contained in:
heavyrain.lee
2019-12-02 14:43:55 +08:00
committed by GitHub
2 changed files with 9 additions and 9 deletions
@@ -41,6 +41,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException; import java.sql.SQLException;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.Lock;
@@ -110,7 +111,7 @@ public class MemoryMessagesStore implements IMessagesStore {
private final DatabaseStore databaseStore; private final DatabaseStore databaseStore;
private ConcurrentHashMap<String, Long> userMaxPullSeq = new ConcurrentHashMap<>(); private ConcurrentHashMap<String, Long> userMaxPullSeq = new ConcurrentHashMap<>();
private SensitiveFilter mSensitiveFilter; private AtomicReference<SensitiveFilter> mSensitiveFilter;
private volatile long lastUpdateSensitiveTime = 0; private volatile long lastUpdateSensitiveTime = 0;
private ConcurrentHashMap<String, Boolean> userGlobalSlientMap = new ConcurrentHashMap<>(); private ConcurrentHashMap<String, Boolean> userGlobalSlientMap = new ConcurrentHashMap<>();
@@ -145,7 +146,7 @@ public class MemoryMessagesStore implements IMessagesStore {
} }
} }
Set<String> sensitiveWords = databaseStore.getSensitiveWord(); Set<String> sensitiveWords = databaseStore.getSensitiveWord();
mSensitiveFilter = new SensitiveFilter(sensitiveWords); mSensitiveFilter.set(new SensitiveFilter(sensitiveWords));
} }
} }
@@ -2492,7 +2493,7 @@ public class MemoryMessagesStore implements IMessagesStore {
@Override @Override
public Set<String> handleSensitiveWord(String message) { public Set<String> handleSensitiveWord(String message) {
updateSensitiveWord(); updateSensitiveWord();
return mSensitiveFilter.getSensitiveWords(message, SensitiveFilter.MatchType.MAX_MATCH); return mSensitiveFilter.get().getSensitiveWords(message, SensitiveFilter.MatchType.MAX_MATCH);
} }
@Override @Override
@@ -179,16 +179,15 @@ public class Qos1PublishHandler extends QosPublishHandler {
MemorySessionStore.Session session = m_sessionStore.getSession(clientID); MemorySessionStore.Session session = m_sessionStore.getSession(clientID);
if (session != null && session.getUsername().equals(fromUser)) { if (session != null && session.getUsername().equals(fromUser)) {
if (data.length > 7*1024 && session.getMqttVersion().protocolLevel() >= MqttVersion.Wildfire_1.protocolLevel()) { if (data.length > 7*1024 && session.getMqttVersion().protocolLevel() >= MqttVersion.Wildfire_1.protocolLevel()) {
ByteArrayOutputStream out = new ByteArrayOutputStream(); try (
GZIPOutputStream gzip; ByteArrayOutputStream out = new ByteArrayOutputStream();
try { GZIPOutputStream gzip = new GZIPOutputStream(out)
gzip = new GZIPOutputStream(out); ) {
gzip.write(data); gzip.write(data);
gzip.close(); data = out.toByteArray();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
data = out.toByteArray();
code = (byte)ErrorCode.ERROR_CODE_SUCCESS_GZIPED.code; code = (byte)ErrorCode.ERROR_CODE_SUCCESS_GZIPED.code;
} }