Skip to content

Commit

Permalink
chore: Merge 4.55.0 into master (#6038)
Browse files Browse the repository at this point in the history
  • Loading branch information
@diegolmello
diegolmello authored Dec 2, 2024
2 parents ae9875d + 53722ec commit d858a24
Show file tree
Hide file tree
Showing 82 changed files with 1,023 additions and 707 deletions.
2 changes: 1 addition & 1 deletion android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode VERSIONCODE as Integer
versionName "4.54.1"
versionName "4.55.0"
vectorDrawables.useSupportLibrary = true
if (!isFoss) {
manifestPlaceholders = [BugsnagAPIKey: BugsnagAPIKey as String]
Expand Down
Binary file modified android/app/src/main/assets/fonts/custom.ttf
View file
Binary file not shown.
7 changes: 7 additions & 0 deletions android/app/src/play/java/chat/rocket/reactnative/Ejson.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ public class Ejson {

String tmid;

Content content;

private MMKV mmkv;

private String TOKEN_KEY = "reactnativemeteor_usertoken-";
Expand Down Expand Up @@ -102,4 +104,9 @@ public class Sender {
String username;
String _id;
}

public class Content {
String ciphertext;
String algorithm;
}
}
131 changes: 85 additions & 46 deletions android/app/src/play/java/chat/rocket/reactnative/Encryption.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -31,6 +31,14 @@ class Message {
}
}

class DecryptedContent {
String msg;

DecryptedContent(String msg) {
this.msg = msg;
}
}

class PrivateKey {
String d;
String dp;
Expand Down Expand Up @@ -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 {
Expand All @@ -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);
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}
}
}
7 changes: 4 additions & 3 deletions app/containers/CustomIcon/mappedIcons.js
View file
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion app/containers/CustomIcon/selection.json
View file

Large diffs are not rendered by default.

23 changes: 15 additions & 8 deletions app/containers/FormContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import SafeAreaView from './SafeAreaView';
interface IFormContainer extends ScrollViewProps {
testID: string;
children: React.ReactElement | React.ReactElement[] | null;
showAppVersion?: boolean;
}

const styles = StyleSheet.create({
Expand All @@ -22,29 +23,35 @@ const styles = StyleSheet.create({
}
});

export const FormContainerInner = ({ children }: { children: (React.ReactElement | null)[] }) => (
<View style={[sharedStyles.container, isTablet && sharedStyles.tabletScreenContent]}>{children}</View>
export const FormContainerInner = ({
children,
accessibilityLabel
}: {
children: (React.ReactElement | null)[];
accessibilityLabel?: string;
}) => (
<View accessibilityLabel={accessibilityLabel} style={[sharedStyles.container, isTablet && sharedStyles.tabletScreenContent]}>
{children}
</View>
);

const FormContainer = ({ children, testID, ...props }: IFormContainer) => {
const FormContainer = ({ children, testID, showAppVersion = true, ...props }: IFormContainer) => {
const { theme } = useTheme();

return (
<KeyboardView
style={{ backgroundColor: themes[theme].surfaceRoom }}
contentContainerStyle={sharedStyles.container}
keyboardVerticalOffset={128}
>
keyboardVerticalOffset={128}>
<StatusBar />
<ScrollView
style={sharedStyles.container}
contentContainerStyle={[sharedStyles.containerScrollView, styles.scrollView]}
{...scrollPersistTaps}
{...props}
>
{...props}>
<SafeAreaView testID={testID} style={{ backgroundColor: themes[theme].surfaceRoom }}>
{children}
<AppVersion theme={theme} />
<>{showAppVersion && <AppVersion theme={theme} />}</>
</SafeAreaView>
</ScrollView>
</KeyboardView>
Expand Down
7 changes: 3 additions & 4 deletions app/containers/MessageComposer/MessageComposer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { sanitizeLikeString } from '../../lib/database/utils';
import { generateTriggerId } from '../../lib/methods';
import { Services } from '../../lib/services';
import log from '../../lib/methods/helpers/log';
import { prepareQuoteMessage } from './helpers';
import { prepareQuoteMessage, insertEmojiAtCursor } from './helpers';
import { RecordAudio } from './components/RecordAudio';
import { useKeyboardListener } from './hooks';
import { emitter } from '../../lib/methods/helpers/emitter';
Expand Down Expand Up @@ -179,9 +179,8 @@ export const MessageComposer = ({
} else {
emojiText = `:${emoji.name}:`;
}
newText = `${text.substr(0, cursor)}${emojiText}${text.substr(cursor)}`;
newCursor = cursor + emojiText.length;
composerInputComponentRef.current.setInput(newText, { start: newCursor, end: newCursor });
const { updatedCursor, updatedText } = insertEmojiAtCursor(text, emojiText, cursor);
composerInputComponentRef.current.setInput(updatedText, { start: updatedCursor, end: updatedCursor });
break;
case EventTypes.SEARCH_PRESSED:
openSearchEmojiKeyboard();
Expand Down
1 change: 1 addition & 0 deletions app/containers/MessageComposer/helpers/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ export * from './fetchIsAllOrHere';
export * from './forceJpgExtension';
export * from './getMentionRegexp';
export * from './prepareQuoteMessage';
export * from './insertEmojiAtCursor';
Loading

0 comments on commit d858a24

Please sign in to comment.