sparrowwallet/sparrow
1
0
Fork 0
mirror of https://github.com/sparrowwallet/sparrow.git synced 2024-11-02 20:36:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix premature decompression of bbqr zlib parts

Browse source
This commit is contained in:
Craig Raw 2024-05-03 11:46:33 +02:00
parent 83719e7df2
commit 7b0dfd66a7
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQRDecoder.java
View file

@ -37,6 +37,7 @@ public class BBQRDecoder {
if(receivedParts.size() == totalParts) {
byte[] data = concatParts();
data = header.inflate(data);
if(type == BBQRType.PSBT) {
result = new Result(new PSBT(data));

2
src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQREncoder.java
View file

@ -35,7 +35,7 @@ public class BBQREncoder {
BBQREncoding encoding = desiredEncoding;
try {
encoded = encoding.encode(data);
encoded = encoding.encode(encoding.deflate(data));
if(encoding == BBQREncoding.ZLIB) {
String uncompressed = BBQREncoding.BASE32.encode(data);
if(encoded.length() > uncompressed.length()) {

22
src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQREncoding.java
View file

@ -42,6 +42,11 @@ public enum BBQREncoding {
}, ZLIB("Z") {
@Override
public String encode(byte[] data) throws BBQREncodingException {
return BASE32.encode(data);
}
@Override
public byte[] deflate(byte[] data) throws BBQREncodingException {
try {
Deflater deflater = new Deflater(JZlib.Z_BEST_COMPRESSION, 10, true);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@ -49,7 +54,7 @@ public enum BBQREncoding {
zOut.write(data);
zOut.close();
return BASE32.encode(out.toByteArray());
return out.toByteArray();
} catch(Exception e) {
throw new BBQREncodingException("Error deflating with zlib", e);
}
@ -57,9 +62,14 @@ public enum BBQREncoding {
@Override
public byte[] decode(String part) throws BBQREncodingException {
return BASE32.decode(part);
}
@Override
public byte[] inflate(byte[] data) throws BBQREncodingException {
try {
Inflater inflater = new Inflater(10, true);
ByteArrayInputStream in = new ByteArrayInputStream(BASE32.decode(part));
ByteArrayInputStream in = new ByteArrayInputStream(data);
InflaterInputStream zIn = new InflaterInputStream(in, inflater);
byte[] decoded = zIn.readAllBytes();
zIn.close();
@ -96,6 +106,14 @@ public enum BBQREncoding {
return code;
}
public byte[] deflate(byte[] data) throws BBQREncodingException {
return data;
}
public byte[] inflate(byte[] data) throws BBQREncodingException {
return data;
}
public abstract String encode(byte[] data) throws BBQREncodingException;
public abstract byte[] decode(String part) throws BBQREncodingException;

4
src/main/java/com/sparrowwallet/sparrow/io/bbqr/BBQRHeader.java
View file

@ -13,6 +13,10 @@ public record BBQRHeader(BBQREncoding encoding, BBQRType type, int seqTotal, int
return encoding.decode(part.substring(8));
}
public byte[] inflate(byte[] data) {
return encoding.inflate(data);
}
public static BBQRHeader fromString(String part) {
if(part.length() < 8) {
throw new IllegalArgumentException("Part too short");