goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

provision for future versions sending profiles with search results

dbus-notify
Zlatin Balevsky 2022-04-13 20:09:42 +01:00
parent cb695ff751
commit a3f40da51c
No known key found for this signature in database
GPG Key ID: A72832072D525E41
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy
View File

@ -339,6 +339,9 @@ class ConnectionAcceptor {
boolean feed = false boolean feed = false
if (headers.containsKey('Feed')) if (headers.containsKey('Feed'))
feed = Boolean.parseBoolean(headers['Feed']) feed = Boolean.parseBoolean(headers['Feed'])
boolean profile = false
if (headers.containsKey("Profile"))
profile = Boolean.parseBoolean(headers['Profile'])
byte [] personaBytes = Base64.decode(headers['Sender']) byte [] personaBytes = Base64.decode(headers['Sender'])
Persona sender = new Persona(new ByteArrayInputStream(personaBytes)) Persona sender = new Persona(new ByteArrayInputStream(personaBytes))
@ -349,6 +352,13 @@ class ConnectionAcceptor {
if (nResults > Constants.MAX_RESULTS) if (nResults > Constants.MAX_RESULTS)
throw new IOException("too many results $nResults") throw new IOException("too many results $nResults")
if (profile) {
int profileLength = dis.readInt()
if (profileLength > Constants.MAX_PROFILE_LENGTH)
throw new IOException("profile too large $profileLength")
dis.skipBytes(profileLength) // skip profile data for now
}
dis = new DataInputStream(new GZIPInputStream(dis)) dis = new DataInputStream(new GZIPInputStream(dis))
UIResultEvent[] results = new UIResultEvent[Math.min(RESULT_BATCH_SIZE, nResults)] UIResultEvent[] results = new UIResultEvent[Math.min(RESULT_BATCH_SIZE, nResults)]
int j = 0 int j = 0

1
core/src/main/java/com/muwire/core/Constants.java
View File

@ -23,6 +23,7 @@ public class Constants {
public static final long MAX_HEADER_TIME = 60 * 1000; public static final long MAX_HEADER_TIME = 60 * 1000;
public static final int MAX_RESULTS = 0x1 << 20; public static final int MAX_RESULTS = 0x1 << 20;
public static final int MAX_PROFILE_LENGTH = 0x1 << 18;
public static final int MAX_COMMENT_LENGTH = 0x1 << 15; public static final int MAX_COMMENT_LENGTH = 0x1 << 15;