verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Use base64 directly and fix enc/dec from/to web

This commit is contained in:
Diego Mello 2024-05-14 14:51:59 -03:00
parent 058efeb7e8
commit f8788963ca
3 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/lib/methods/handleMediaDownload.ts
View File

@ -227,15 +227,15 @@ export function downloadMediaFile({
// console.log('🚀 ~ downloadMediaFile ~ decryptedFile:', decryptedFile); // console.log('🚀 ~ downloadMediaFile ~ decryptedFile:', decryptedFile);
console.log('🚀 ~ returnnewPromise ~ encryption:', encryption); console.log('🚀 ~ returnnewPromise ~ encryption:', encryption);
const exportedKeyArrayBuffer = b64URIToBuffer(encryption.key.k); // const exportedKeyArrayBuffer = b64URIToBuffer(encryption.key.k);
// const vector = b64URIToBuffer(encryption.iv); // const vector = b64URIToBuffer(encryption.iv);
// const vector = b64ToBuffer(encryption.iv); // const vector = b64ToBuffer(encryption.iv);
// const vector = Base64.decode(encryption.iv); // const vector = Base64.decode(encryption.iv);
// const vector = Base64.decode(encryption.iv); // const vector = Base64.decode(encryption.iv);
const vector = b64ToBuffer(encryption.iv); // const vector = b64ToBuffer(encryption.iv);
console.log('🚀 ~ returnnewPromise ~ vector:', vector); // console.log('🚀 ~ returnnewPromise ~ vector:', vector);
const decryptedFile = await decryptAESCTR(result.uri.substring(7), exportedKeyArrayBuffer, vector); const decryptedFile = await decryptAESCTR(result.uri.substring(7), encryption.key.k, encryption.iv);
console.log('🚀 ~ handleMediaDownload ~ decryptedFile:', decryptedFile); console.log('🚀 ~ handleMediaDownload ~ decryptedFile:', decryptedFile);
if (decryptedFile) { if (decryptedFile) {

9
app/views/ShareView/index.tsx
View File

@ -279,11 +279,12 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
const exportedKey = await exportAESCTR(key); const exportedKey = await exportAESCTR(key);
// console.log('🚀 ~ ShareView ~ send= ~ exportedKey:', exportedKey, exportedKey.k); // console.log('🚀 ~ ShareView ~ send= ~ exportedKey:', exportedKey, exportedKey.k);
const exportedKeyArrayBuffer = b64URIToBuffer(exportedKey.k); // const exportedKeyArrayBuffer = b64URIToBuffer(exportedKey.k);
console.log('BASE64 BASE64 BASE64 key:', exportedKey, exportedKey.k); // console.log('BASE64 BASE64 BASE64 key:', exportedKey, exportedKey.k);
console.log('BASE64 BASE64 BASE64 vector:', bufferToB64(vector)); // console.log('BASE64 BASE64 BASE64 vector:', bufferToB64(vector));
// console.log('BASE64 BASE64 BASE64 vector:', bufferToB64(vector));
const encryptedFile = await encryptAESCTR(path, exportedKeyArrayBuffer, vector); const encryptedFile = await encryptAESCTR(path, exportedKey.k, bufferToB64(vector));
// console.log('🚀 ~ ShareView ~ send= ~ encryptedFile:', encryptedFile); // console.log('🚀 ~ ShareView ~ send= ~ encryptedFile:', encryptedFile);
// const decryptedFile = await decryptAESCTR(encryptedFile, exportedKeyArrayBuffer, vector); // const decryptedFile = await decryptAESCTR(encryptedFile, exportedKeyArrayBuffer, vector);

62
patches/react-native-simple-crypto+0.5.1.patch
View File

@ -3939,7 +3939,7 @@ index b4fcde6..8b957d7 100644
export namespace SHA { export namespace SHA {
diff --git a/node_modules/react-native-simple-crypto/index.js b/node_modules/react-native-simple-crypto/index.js diff --git a/node_modules/react-native-simple-crypto/index.js b/node_modules/react-native-simple-crypto/index.js
index d756fbc..d819fe6 100644 index d756fbc..ea2022b 100644
--- a/node_modules/react-native-simple-crypto/index.js --- a/node_modules/react-native-simple-crypto/index.js
+++ b/node_modules/react-native-simple-crypto/index.js +++ b/node_modules/react-native-simple-crypto/index.js
@@ -92,6 +92,19 @@ const AES = { @@ -92,6 +92,19 @@ const AES = {
@ -3947,18 +3947,18 @@ index d756fbc..d819fe6 100644
const ivHex = convertArrayBufferToHex(ivArrayBuffer); const ivHex = convertArrayBufferToHex(ivArrayBuffer);
return convertBase64ToArrayBuffer(await NativeModules.Aes.decrypt(cipherTextBase64, keyHex, ivHex)); return convertBase64ToArrayBuffer(await NativeModules.Aes.decrypt(cipherTextBase64, keyHex, ivHex));
+ }, + },
+ encryptFile: async function (filePath, keyArrayBuffer, ivArrayBuffer) { + encryptFile: async function (filePath, key, iv) {
+ console.log('🚀 ~ filePath:', filePath); + console.log('🚀 ~ filePath:', filePath);
+ // const textBase64 = convertArrayBufferToBase64(filePath); + // const textBase64 = convertArrayBufferToBase64(filePath);
+ const keyHex = convertArrayBufferToHex(keyArrayBuffer); + // const keyHex = convertArrayBufferToHex(keyArrayBuffer);
+ const ivHex = convertArrayBufferToHex(ivArrayBuffer); + // const ivHex = convertArrayBufferToHex(ivArrayBuffer);
+ return NativeModules.Aes.encryptFile(filePath, keyHex, ivHex); + return NativeModules.Aes.encryptFile(filePath, key, iv);
+ }, + },
+ decryptFile: async function (filePath, keyArrayBuffer, ivArrayBuffer) { + decryptFile: async function (filePath, key, iv) {
+ console.log('🚀 ~ filePath:', filePath); + console.log('🚀 ~ filePath:', filePath);
+ const keyHex = convertArrayBufferToHex(keyArrayBuffer); + // const keyHex = convertArrayBufferToHex(keyArrayBuffer);
+ const ivHex = convertArrayBufferToHex(ivArrayBuffer); + // const ivHex = convertArrayBufferToHex(ivArrayBuffer);
+ return NativeModules.Aes.decryptFile(filePath, keyHex, ivHex); + return NativeModules.Aes.decryptFile(filePath, key, iv);
} }
}; };
@ -4048,20 +4048,45 @@ index 72432fe..8a2020b 100644
+ +
@end @end
diff --git a/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m b/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m diff --git a/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m b/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m
index 4ef555a..02c539b 100644 index 4ef555a..b7e0bae 100644
--- a/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m --- a/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m
+++ b/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m +++ b/node_modules/react-native-simple-crypto/ios/RCTCrypto/lib/Aes.m
@@ -45,4 +45,63 @@ @@ -45,4 +45,93 @@
return [result base64EncodedStringWithOptions:0]; return [result base64EncodedStringWithOptions:0];
} }
++ (NSString *)base64FromBase64URL:(NSString *)base64URL {
+ NSMutableString *base64 = [NSMutableString stringWithString:base64URL];
+ [base64 replaceOccurrencesOfString:@"-" withString:@"+" options:NSLiteralSearch range:NSMakeRange(0, base64.length)];
+ [base64 replaceOccurrencesOfString:@"_" withString:@"/" options:NSLiteralSearch range:NSMakeRange(0, base64.length)];
+
+ // Pad with '=' to ensure the base64 string length is a multiple of 4
+ while (base64.length % 4 != 0) {
+ [base64 appendString:@"="];
+ }
+ return base64;
+}
+
++ (NSString *)processFile:(NSString *)filePath ++ (NSString *)processFile:(NSString *)filePath
+ outputFile:(NSString *)outputFilePath + outputFile:(NSString *)outputFilePath
+ operation:(CCOperation)operation + operation:(CCOperation)operation
+ key:(NSString *)key + key:(NSString *)keyBase64URL
+ iv:(NSString *)iv { + iv:(NSString *)ivBase64 {
+ NSData *keyData = [Shared fromHex:key]; + NSString *keyBase64 = [self base64FromBase64URL:keyBase64URL];
+ NSData *ivData = [Shared fromHex:iv]; + NSData *keyData = [[NSData alloc] initWithBase64EncodedString:keyBase64 options:0];
+ NSData *ivData = [[NSData alloc] initWithBase64EncodedString:ivBase64 options:0];
+
+ // Check key length for AES-256
+ if (keyData.length != 32) {
+ NSLog(@"Key length is %lu bytes; expected 32 bytes for AES-256.", (unsigned long)keyData.length);
+ return nil;
+ }
+
+ // Check IV length for AES
+ if (ivData.length != 16) {
+ NSLog(@"IV length is %lu bytes; expected 16 bytes for AES.", (unsigned long)ivData.length);
+ return nil;
+ }
+ +
+ NSInputStream *inputStream = [NSInputStream inputStreamWithFileAtPath:filePath]; + NSInputStream *inputStream = [NSInputStream inputStreamWithFileAtPath:filePath];
+ NSOutputStream *outputStream = [NSOutputStream outputStreamToFileAtPath:outputFilePath append:NO]; + NSOutputStream *outputStream = [NSOutputStream outputStreamToFileAtPath:outputFilePath append:NO];
@ -4071,8 +4096,12 @@ index 4ef555a..02c539b 100644
+ size_t bufferSize = 4096; // 4KB buffer size + size_t bufferSize = 4096; // 4KB buffer size
+ uint8_t buffer[bufferSize]; + uint8_t buffer[bufferSize];
+ CCCryptorRef cryptor = NULL; + CCCryptorRef cryptor = NULL;
+ CCCryptorStatus status = CCCryptorCreate(operation, kCCAlgorithmAES, kCCModeCTR, keyData.bytes, keyData.length, ivData.bytes, &cryptor); +// CCCryptorStatus status = CCCryptorCreate(operation, kCCAlgorithmAES, kCCModeCTR | kCCOptionECBMode, keyData.bytes, keyData.length, ivData.bytes, &cryptor);
+ CCCryptorStatus status = CCCryptorCreateWithMode(operation, kCCModeCTR, kCCAlgorithmAES,
+ ccNoPadding, ivData.bytes, keyData.bytes,
+ keyData.length, NULL, 0, 0, kCCModeOptionCTR_BE, &cryptor);
+ +
+// status = CCCryptorUpdate(cryptor, cipherData.bytes, cipherData.length, decryptedData.mutableBytes, decryptedData.length, &outLength);
+ if (status != kCCSuccess) { + if (status != kCCSuccess) {
+ NSLog(@"Failed to create cryptor: %d", status); + NSLog(@"Failed to create cryptor: %d", status);
+ return nil; + return nil;
@ -4104,6 +4133,7 @@ index 4ef555a..02c539b 100644
+ } + }
+} +}
+ +
+
++ (NSString *)encryptFile:(NSString *)filePath key:(NSString *)key iv:(NSString *)iv { ++ (NSString *)encryptFile:(NSString *)filePath key:(NSString *)key iv:(NSString *)iv {
+ NSString *outputFilePath = [filePath stringByAppendingPathExtension:@"enc"]; + NSString *outputFilePath = [filePath stringByAppendingPathExtension:@"enc"];
+ return [self processFile:filePath outputFile:outputFilePath operation:kCCEncrypt key:key iv:iv]; + return [self processFile:filePath outputFile:outputFilePath operation:kCCEncrypt key:key iv:iv];