fix(qr): Use Qt qCompress format for QR code encoding
Amnezia Android uses qUncompress which expects: - 4-byte big-endian uncompressed length prefix - zlib compressed data (gzcompress output) Previously we used a custom 12-byte header (version, compressedLen, uncompressedLen) which was incompatible with Qt's qUncompress. This fix ensures X-Ray QR codes can be properly decoded by Amnezia VPN app.
This commit is contained in:
+4
-4
@@ -63,15 +63,15 @@ class QrUtil
|
|||||||
public static function encodeOldPayloadFromJson(string $jsonText): string
|
public static function encodeOldPayloadFromJson(string $jsonText): string
|
||||||
{
|
{
|
||||||
$json = self::normalizeJson($jsonText);
|
$json = self::normalizeJson($jsonText);
|
||||||
// Old format uses zlib (gzcompress) with header [version, compressed_len, uncompressed_len]
|
// Qt qCompress format: 4-byte big-endian uncompressed length + zlib compressed data
|
||||||
|
// This is what Amnezia Android's qUncompress expects
|
||||||
$compressed = gzcompress($json, 9);
|
$compressed = gzcompress($json, 9);
|
||||||
if ($compressed === false) {
|
if ($compressed === false) {
|
||||||
throw new RuntimeException('gzcompress failed');
|
throw new RuntimeException('gzcompress failed');
|
||||||
}
|
}
|
||||||
$uncompressedLen = strlen($json);
|
$uncompressedLen = strlen($json);
|
||||||
$compressedLen = strlen($compressed) + 4;
|
// Qt format: 4 bytes of uncompressed length (big-endian) + zlib data
|
||||||
$version = 0x07C00100; // align with working payload header (big-endian)
|
$header = pack('N', $uncompressedLen);
|
||||||
$header = pack('N3', $version, $compressedLen, $uncompressedLen);
|
|
||||||
return self::urlsafe_b64_encode($header . $compressed);
|
return self::urlsafe_b64_encode($header . $compressed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user