Merge branch 'develop' into feat/persist-app-actions

RocketChat · Nov 21, 2024 · a7b0926 · a7b0926
2 parents af642f2 + 1b2f310
commit a7b0926
Show file tree

Hide file tree

Showing 130 changed files with 1,928 additions and 1,380 deletions.
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
@@ -10,7 +10,7 @@ import { mockedStore as store } from '../app/reducers/mockedStore';
 import { setUser } from '../app/actions/login';
 
 const baseUrl = 'https://open.rocket.chat';
-store.dispatch(selectServerRequest(baseUrl));
+store.dispatch(selectServerRequest(baseUrl, '7.0.0'));
 store.dispatch(setUser({ id: 'abc', username: 'rocket.cat', name: 'Rocket Cat' }));
 
 const preview: Preview = {

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -93,7 +93,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode VERSIONCODE as Integer
-        versionName "4.54.0"
+        versionName "4.55.0"
         vectorDrawables.useSupportLibrary = true
         if (!isFoss) {
             manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]

diff --git a/android/app/src/main/assets/fonts/custom.ttf b/android/app/src/main/assets/fonts/custom.ttf
diff --git a/android/app/src/play/java/chat/rocket/reactnative/Ejson.java b/android/app/src/play/java/chat/rocket/reactnative/Ejson.java
@@ -36,6 +36,8 @@ public class Ejson {
 
     String tmid;
 
+    Content content;
+
     private MMKV mmkv;
 
     private String TOKEN_KEY = "reactnativemeteor_usertoken-";
@@ -102,4 +104,9 @@ public class Sender {
         String username;
         String _id;
     }
+
+    public class Content {
+        String ciphertext;
+        String algorithm;
+    }
 }
diff --git a/android/app/src/play/java/chat/rocket/reactnative/Encryption.java b/android/app/src/play/java/chat/rocket/reactnative/Encryption.java
@@ -9,12 +9,12 @@
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.WritableMap;
 import com.google.gson.Gson;
-import com.nozbe.watermelondb.Database;
 import com.pedrouid.crypto.RCTAes;
 import com.pedrouid.crypto.RCTRsaUtils;
 import com.pedrouid.crypto.RSA;
 import com.pedrouid.crypto.Util;
 
+import java.io.File;
 import java.lang.reflect.Field;
 import java.security.SecureRandom;
 import java.util.Arrays;
@@ -31,6 +31,14 @@ class Message {
     }
 }
 
+class DecryptedContent {
+    String msg;
+
+    DecryptedContent(String msg) {
+        this.msg = msg;
+    }
+}
+
 class PrivateKey {
     String d;
     String dp;
@@ -58,44 +66,66 @@ class Room {
 
 class Encryption {
     private Gson gson = new Gson();
-    private String E2ERoomKey;
     private String keyId;
 
     public static Encryption shared = new Encryption();
     private ReactApplicationContext reactContext;
 
-    public Room readRoom(final Ejson ejson) throws NoSuchFieldException {
+    public Room readRoom(final Ejson ejson) {
+        String dbName = getDatabaseName(ejson.serverURL());
+        SQLiteDatabase db = null;
+
+        try {
+            db = SQLiteDatabase.openDatabase(dbName, null, SQLiteDatabase.OPEN_READONLY);
+            String[] queryArgs = {ejson.rid};
+
+            Cursor cursor = db.rawQuery("SELECT * FROM subscriptions WHERE id == ? LIMIT 1", queryArgs);
+
+            if (cursor.getCount() == 0) {
+                cursor.close();
+                return null;
+            }
+
+            cursor.moveToFirst();
+            String e2eKey = cursor.getString(cursor.getColumnIndex("e2e_key"));
+            Boolean encrypted = cursor.getInt(cursor.getColumnIndex("encrypted")) > 0;
+            cursor.close();
+
+            return new Room(e2eKey, encrypted);
+
+        } catch (Exception e) {
+            Log.e("[ENCRYPTION]", "Error reading room", e);
+            return null;
+
+        } finally {
+            if (db != null) {
+                db.close();
+            }
+        }
+    }
+
+    private String getDatabaseName(String serverUrl) {
         int resId = reactContext.getResources().getIdentifier("rn_config_reader_custom_package", "string", reactContext.getPackageName());
         String className = reactContext.getString(resId);
-        Class clazz = null;
         Boolean isOfficial = false;
+
         try {
-            clazz = Class.forName(className + ".BuildConfig");
+            Class<?> clazz = Class.forName(className + ".BuildConfig");
             Field IS_OFFICIAL = clazz.getField("IS_OFFICIAL");
             isOfficial = (Boolean) IS_OFFICIAL.get(null);
-        } catch (ClassNotFoundException | IllegalAccessException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
-        String dbName = ejson.serverURL().replace("https://", "");
+
+        String dbName = serverUrl.replace("https://", "");
         if (!isOfficial) {
             dbName += "-experimental";
         }
-        dbName += ".db";
-        Database database = new Database(dbName, reactContext, SQLiteDatabase.CREATE_IF_NECESSARY);
-        String[] query = {ejson.rid};
-        Cursor cursor = database.rawQuery("select * from subscriptions where id == ? limit 1", query);
-
-        // Room not found
-        if (cursor.getCount() == 0) {
-            return null;
-        }
-
-        cursor.moveToFirst();
-        String e2eKey = cursor.getString(cursor.getColumnIndex("e2e_key"));
-        Boolean encrypted = cursor.getInt(cursor.getColumnIndex("encrypted")) > 0;
-        cursor.close();
-
-        return new Room(e2eKey, encrypted);
+        // Old issue. Safer to accept it then to migrate away from it.
+        dbName += ".db.db";
+        // https://github.com/Nozbe/WatermelonDB/blob/a757e646141437ad9a06f7314ad5555a8a4d252e/native/android-jsi/src/main/java/com/nozbe/watermelondb/jsi/JSIInstaller.java#L18
+        File databasePath = new File(reactContext.getDatabasePath(dbName).getPath().replace("/databases", ""));
+        return databasePath.getPath();
     }
 
     public String readUserKey(final Ejson ejson) throws Exception {
@@ -120,7 +150,7 @@ public String readUserKey(final Ejson ejson) throws Exception {
     }
 
     public String decryptRoomKey(final String e2eKey, final Ejson ejson) throws Exception {
-        String key = e2eKey.substring(12, e2eKey.length());
+        String key = e2eKey.substring(12);
         keyId = e2eKey.substring(0, 12);
 
         String userKey = readUserKey(ejson);
@@ -138,6 +168,15 @@ public String decryptRoomKey(final String e2eKey, final Ejson ejson) throws Exce
         return Util.bytesToHex(decoded);
     }
 
+    private String decryptText(String text, String e2eKey) throws Exception {
+        String msg = text.substring(12);
+        byte[] msgData = Base64.decode(msg, Base64.NO_WRAP);
+        String b64 = Base64.encodeToString(Arrays.copyOfRange(msgData, 16, msgData.length), Base64.DEFAULT);
+        String decrypted = RCTAes.decrypt(b64, e2eKey, Util.bytesToHex(Arrays.copyOfRange(msgData, 0, 16)));
+        byte[] data = Base64.decode(decrypted, Base64.NO_WRAP);
+        return new String(data, "UTF-8");
+    }
+
     public String decryptMessage(final Ejson ejson, final ReactApplicationContext reactContext) {
         try {
             this.reactContext = reactContext;
@@ -151,19 +190,22 @@ public String decryptMessage(final Ejson ejson, final ReactApplicationContext re
                 return null;
             }
 
-            String message = ejson.msg;
-            String msg = message.substring(12, message.length());
-            byte[] msgData = Base64.decode(msg, Base64.NO_WRAP);
-
-            String b64 = Base64.encodeToString(Arrays.copyOfRange(msgData, 16, msgData.length), Base64.DEFAULT);
-
-            String decrypted = RCTAes.decrypt(b64, e2eKey, Util.bytesToHex(Arrays.copyOfRange(msgData, 0, 16)));
-            byte[] data = Base64.decode(decrypted, Base64.NO_WRAP);
-            Message m = gson.fromJson(new String(data, "UTF-8"), Message.class);
+            if (ejson.msg != null && !ejson.msg.isEmpty()) {
+                String message = ejson.msg;
+                String decryptedText = decryptText(message, e2eKey);
+                Message m = gson.fromJson(decryptedText, Message.class);
+                return m.text;
+            } else if (ejson.content != null && "rc.v1.aes-sha2".equals(ejson.content.algorithm)) {
+                String message = ejson.content.ciphertext;
+                String decryptedText = decryptText(message, e2eKey);
+                DecryptedContent m = gson.fromJson(decryptedText, DecryptedContent.class);
+                return m.msg;
+            } else {
+                return null;
+            }
 
-            return m.text;
         } catch (Exception e) {
-            Log.d("[ROCKETCHAT][E2E]", Log.getStackTraceString(e));
+            Log.e("[ROCKETCHAT][E2E]", Log.getStackTraceString(e));
         }
 
         return null;
@@ -193,29 +235,26 @@ public String encryptMessage(final String message, final String id, final Ejson
 
             return keyId + Base64.encodeToString(concat(bytes, data), Base64.NO_WRAP);
         } catch (Exception e) {
-            Log.d("[ROCKETCHAT][E2E]", Log.getStackTraceString(e));
+            Log.e("[ROCKETCHAT][E2E]", Log.getStackTraceString(e));
         }
 
         return message;
     }
 
     static byte[] concat(byte[]... arrays) {
-        // Determine the length of the result array
         int totalLength = 0;
-        for (int i = 0; i < arrays.length; i++) {
-            totalLength += arrays[i].length;
+        for (byte[] array : arrays) {
+            totalLength += array.length;
         }
 
-        // create the result array
         byte[] result = new byte[totalLength];
-
-        // copy the source arrays into the result array
         int currentIndex = 0;
-        for (int i = 0; i < arrays.length; i++) {
-            System.arraycopy(arrays[i], 0, result, currentIndex, arrays[i].length);
-            currentIndex += arrays[i].length;
+
+        for (byte[] array : arrays) {
+            System.arraycopy(array, 0, result, currentIndex, array.length);
+            currentIndex += array.length;
         }
 
         return result;
     }
-}
+}
diff --git a/app/actions/server.ts b/app/actions/server.ts
@@ -4,7 +4,7 @@ import { SERVER } from './actionsTypes';
 
 export interface ISelectServerAction extends Action {
 	server: string;
-	version?: string;
+	version: string;
 	fetchVersion: boolean;
 	changeServer: boolean;
 }
@@ -29,7 +29,7 @@ export type TActionServer = ISelectServerAction & ISelectServerSuccess & IServer
 
 export function selectServerRequest(
 	server: string,
-	version?: string,
+	version: string,
 	fetchVersion = true,
 	changeServer = false
 ): ISelectServerAction {

diff --git a/app/containers/Button/Button.stories.tsx b/app/containers/Button/Button.stories.tsx
@@ -23,6 +23,8 @@ export const DisabledButton = () => <Button disabled {...buttonProps} />;
 
 export const DisabledLoadingButton = () => <Button disabled loading {...buttonProps} />;
 
+export const SmallButton = () => <Button small {...buttonProps} />;
+
 export const CustomButton = () => (
 	<Button
 		{...buttonProps}

diff --git a/app/containers/Button/index.tsx b/app/containers/Button/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { StyleProp, StyleSheet, Text, TextStyle } from 'react-native';
+import { StyleProp, StyleSheet, Text, TextStyle, ViewStyle } from 'react-native';
 import Touchable, { PlatformTouchableProps } from 'react-native-platform-touchable';
 
 import { useTheme } from '../../theme';
@@ -14,16 +14,25 @@ interface IButtonProps extends PlatformTouchableProps {
 	loading?: boolean;
 	color?: string;
 	fontSize?: number;
+	style?: StyleProp<ViewStyle> | StyleProp<ViewStyle>[];
 	styleText?: StyleProp<TextStyle> | StyleProp<TextStyle>[];
+	small?: boolean;
 }
 
 const styles = StyleSheet.create({
 	container: {
+		marginBottom: 12,
+		borderRadius: 4
+	},
+	normalButton: {
 		paddingHorizontal: 14,
 		justifyContent: 'center',
-		height: 48,
-		borderRadius: 4,
-		marginBottom: 12
+		height: 48
+	},
+	smallButton: {
+		paddingHorizontal: 12,
+		paddingVertical: 8,
+		alignSelf: 'center'
 	},
 	text: {
 		...sharedStyles.textMedium,
@@ -45,6 +54,7 @@ const Button: React.FC<IButtonProps> = ({
 	color,
 	style,
 	styleText,
+	small,
 	...otherProps
 }) => {
 	const { colors } = useTheme();
@@ -58,6 +68,7 @@ const Button: React.FC<IButtonProps> = ({
 	const resolvedTextColor = color || (isPrimary ? colors.fontWhite : colors.fontDefault);
 
 	const containerStyle = [
+		small ? styles.smallButton : styles.normalButton,
 		styles.container,
 		{ backgroundColor: isDisabled ? disabledBackgroundColor : resolvedBackgroundColor },
 		isDisabled && backgroundColor ? styles.disabled : {},

diff --git a/app/containers/CustomIcon/mappedIcons.js b/app/containers/CustomIcon/mappedIcons.js
@@ -1,7 +1,4 @@
 export const mappedIcons = {
-	'play-shape-filled': 59842,
-	'pause-shape-filled': 59843,
-	'loading': 59844,
 	'add': 59872,
 	'administration': 59662,
 	'adobe-reader-monochromatic': 59663,
@@ -126,6 +123,7 @@ export const mappedIcons = {
 	'live': 59774,
 	'live-streaming': 59773,
 	'livechat-monochromatic': 59775,
+	'loading': 59844,
 	'lock-filled': 59748,
 	'locker': 59749,
 	'log-view': 59778,
@@ -153,6 +151,7 @@ export const mappedIcons = {
 	'ordering-descending': 59800,
 	'pause': 59803,
 	'pause-filled': 59802,
+	'pause-shape-filled': 59843,
 	'percentage': 59777,
 	'phone': 59806,
 	'phone-disabled': 59804,
@@ -163,6 +162,7 @@ export const mappedIcons = {
 	'pin-map': 59807,
 	'play': 59811,
 	'play-filled': 59810,
+	'play-shape-filled': 59842,
 	'prune': 59817,
 	'queue': 59818,
 	'quote': 59819,
@@ -184,6 +184,7 @@ export const mappedIcons = {
 	'sort-az': 59831,
 	'star': 59834,
 	'star-filled': 59833,
+	'stars': 59845,
 	'status-away': 59741,
 	'status-busy': 59742,
 	'status-disabled': 59837,

diff --git a/app/containers/CustomIcon/selection.json b/app/containers/CustomIcon/selection.json