Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into mult…

…iple-user-add-userRole
RocketChat · Apr 4, 2022 · 2f93717 · 2f93717
2 parents a0b709a + c6a1f93
commit 2f93717
Show file tree

Hide file tree

Showing 3,968 changed files with 142,993 additions and 96,109 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,5 +1,6 @@
 {
 	"presets": [
-		"@babel/preset-env"
+		"@babel/preset-env",
+		"@babel/preset-react"
 	]
 }
diff --git a/.docker-mongo/Dockerfile b/.docker-mongo/Dockerfile
@@ -1,24 +1,24 @@
-FROM node:12.22.1-buster-slim
+FROM node:14.18.3-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 
 # Install MongoDB and dependencies
-ENV MONGO_MAJOR 4.2
-ENV MONGO_VERSION 4.2.10
+ENV MONGO_MAJOR=5.0 \
+    MONGO_VERSION=5.0.5
 
 RUN set -x \
     && apt-get update \
     && apt-get install -y wget gnupg dirmngr pwgen \
-    && wget -qO - "https://www.mongodb.org/static/pgp/server-${MONGO_MAJOR}.asc" | apt-key add - \
-    && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/$MONGO_MAJOR main" | tee "/etc/apt/sources.list.d/mongodb-org-${MONGO_MAJOR}.list" \
+    && wget -qO - "https://www.mongodb.org/static/pgp/server-$MONGO_MAJOR.asc" | apt-key add - \
+    && echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/$MONGO_MAJOR main" | tee "/etc/apt/sources.list.d/mongodb-org-$MONGO_MAJOR.list" \
     && apt-get update \
     && apt-get install -y \
-       mongodb-org=$MONGO_VERSION \
-       mongodb-org-server=$MONGO_VERSION \
-       mongodb-org-shell=$MONGO_VERSION \
-       mongodb-org-mongos=$MONGO_VERSION \
-       mongodb-org-tools=$MONGO_VERSION \
-       fontconfig \
+    mongodb-org=$MONGO_VERSION \
+    mongodb-org-server=$MONGO_VERSION \
+    mongodb-org-shell=$MONGO_VERSION \
+    mongodb-org-mongos=$MONGO_VERSION \
+    mongodb-org-tools=$MONGO_VERSION \
+    fontconfig \
     && apt-get clean my room \
     && groupadd -g 65533 -r rocketchat \
     && useradd -u 65533 -r -g rocketchat rocketchat \
@@ -36,12 +36,12 @@ RUN aptMark="$(apt-mark showmanual)" \
     && apt-mark auto '.*' > /dev/null \
     && apt-mark manual $aptMark > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-       | awk '/=>/ { print $(NF-1) }' \
-       | sort -u \
-       | xargs -r dpkg-query --search \
-       | cut -d: -f1 \
-       | sort -u \
-       | xargs -r apt-mark manual \
+    | awk '/=>/ { print $(NF-1) }' \
+    | sort -u \
+    | xargs -r dpkg-query --search \
+    | cut -d: -f1 \
+    | sort -u \
+    | xargs -r apt-mark manual \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
     && npm cache clear --force
 

diff --git a/.docker-mongo/licenses/LICENSE b/.docker-mongo/licenses/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
+Copyright (c) 2015-2022 Rocket.Chat Technologies Corp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:12.22.1-buster-slim
+FROM node:14.18.3-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 
@@ -20,12 +20,12 @@ RUN aptMark="$(apt-mark showmanual)" \
     && apt-mark auto '.*' > /dev/null \
     && apt-mark manual $aptMark > /dev/null \
     && find /usr/local -type f -executable -exec ldd '{}' ';' \
-       | awk '/=>/ { print $(NF-1) }' \
-       | sort -u \
-       | xargs -r dpkg-query --search \
-       | cut -d: -f1 \
-       | sort -u \
-       | xargs -r apt-mark manual \
+    | awk '/=>/ { print $(NF-1) }' \
+    | sort -u \
+    | xargs -r dpkg-query --search \
+    | cut -d: -f1 \
+    | sort -u \
+    | xargs -r apt-mark manual \
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
     && npm cache clear --force
 

diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine
@@ -0,0 +1,36 @@
+FROM node:14.18.3-alpine3.15
+
+RUN apk add --no-cache python3 make g++ libc6-compat ttf-dejavu
+
+ADD . /app
+
+LABEL maintainer="buildmaster@rocket.chat"
+
+RUN set -x \
+    && cd /app/bundle/programs/server \
+    && npm install --production \
+    # Start hack for sharp...
+    && rm -rf npm/node_modules/sharp \
+    && npm install sharp@0.29.3 \
+    && mv node_modules/sharp npm/node_modules/sharp \
+    # End hack for sharp
+    && cd npm \
+    && npm rebuild bcrypt --build-from-source \
+    && npm cache clear --force
+
+# needs a mongo instance - defaults to container linking with alias 'mongo'
+ENV DEPLOY_METHOD=docker \
+    NODE_ENV=production \
+    MONGO_URL=mongodb://mongo:27017/rocketchat \
+    HOME=/tmp \
+    PORT=3000 \
+    ROOT_URL=http://localhost:3000 \
+    Accounts_AvatarStorePath=/app/uploads
+
+VOLUME /app/uploads
+
+WORKDIR /app/bundle
+
+EXPOSE 3000
+
+CMD ["node", "main.js"]
diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
@@ -1,30 +1,30 @@
 FROM registry.access.redhat.com/ubi8/nodejs-12
 
-ENV RC_VERSION 4.2.0-develop
+ENV RC_VERSION 4.7.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 
 LABEL name="Rocket.Chat" \
-      vendor="Rocket.Chat" \
-      version="${RC_VERSION}" \
-      release="1" \
-      url="https://rocket.chat" \
-      summary="The Ultimate Open Source Web Chat Platform" \
-      description="The Ultimate Open Source Web Chat Platform" \
-      run="docker run -d --name ${NAME} ${IMAGE}"
+    vendor="Rocket.Chat" \
+    version="${RC_VERSION}" \
+    release="1" \
+    url="https://rocket.chat" \
+    summary="The Ultimate Open Source Web Chat Platform" \
+    description="The Ultimate Open Source Web Chat Platform" \
+    run="docker run -d --name ${NAME} ${IMAGE}"
 
 USER root
 RUN dnf install -y python38 && rm -rf /var/cache /var/log/dnf* /var/log/yum.*
 USER default
 
 RUN set -x \
- && gpg --keyserver keys.openpgp.org --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
- && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
- && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
- && gpg --verify rocket.chat.tgz.asc \
- && tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
- && cd /opt/app-root/src/bundle/programs/server \
- && npm install
+    && gpg --keyserver keys.openpgp.org --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104 \
+    && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/download" -o rocket.chat.tgz \
+    && curl -SLf "https://releases.rocket.chat/${RC_VERSION}/asc" -o rocket.chat.tgz.asc \
+    && gpg --verify rocket.chat.tgz.asc \
+    && tar -zxf rocket.chat.tgz -C /opt/app-root/src/ \
+    && cd /opt/app-root/src/bundle/programs/server \
+    && npm install
 
 COPY licenses /licenses
 

diff --git a/.docker/licenses/LICENSE b/.docker/licenses/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2017 Rocket.Chat Technologies Corp.
+Copyright (c) 2015-2022 Rocket.Chat Technologies Corp.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/.eslintignore b/.eslintignore
@@ -11,12 +11,13 @@ public/packages/rocketchat_videobridge/client/public/external_api.js
 packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
 private/moment-locales/
 public/livechat/
-!.scripts
 public/pdf.worker.min.js
 public/workers/**/*
 imports/client/**/*
-!/.storybook/
 ee/server/services/dist/**
 !/.mocharc.js
+!/.mocharc.*.js
+!/.scripts/
+!/.storybook/
 !/client/.eslintrc.js
 !/ee/client/.eslintrc.js
diff --git a/.eslintrc b/.eslintrc
@@ -1,6 +1,7 @@
 {
   "extends": [
-    "@rocket.chat/eslint-config"
+    "@rocket.chat/eslint-config",
+    "plugin:prettier/recommended"
   ],
   "parser": "babel-eslint",
   "globals": {
@@ -54,7 +55,8 @@
       "extends": [
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/eslint-recommended",
-        "@rocket.chat/eslint-config"
+        "@rocket.chat/eslint-config",
+        "plugin:prettier/recommended"
       ],
       "globals": {
         "Atomics": "readonly",
@@ -72,7 +74,8 @@
       },
       "plugins": [
         "react",
-        "@typescript-eslint"
+        "@typescript-eslint",
+        "anti-trojan-source"
       ],
       "rules": {
         "func-call-spacing": "off",
@@ -82,7 +85,6 @@
         ],
         "indent": "off",
         "no-dupe-class-members": "off",
-        "no-extra-parens": "off",
         "no-spaced-func": "off",
         "no-unused-vars": "off",
         "no-useless-constructor": "off",
@@ -95,34 +97,18 @@
           "syntax"
         ],
         "@typescript-eslint/ban-ts-ignore": "off",
-        "@typescript-eslint/indent": [
-          "error",
-          "tab",
-          {
-            "SwitchCase": 1
-          }
-        ],
         "@typescript-eslint/interface-name-prefix": [
           "error",
           "always"
         ],
-        "@typescript-eslint/no-extra-parens": [
-          "error",
-          "all",
-          {
-            "conditionalAssign": true,
-            "nestedBinaryExpressions": false,
-            "returnAssign": true,
-            "ignoreJSX": "all",
-            "enforceForArrowConditionals": false
-          }
-        ],
         "@typescript-eslint/no-dupe-class-members": "error",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-unused-vars": ["error", {
           "argsIgnorePattern": "^_",
           "ignoreRestSiblings": true
-        }]
+        }],
+        "@typescript-eslint/prefer-optional-chain": "warn",
+        "anti-trojan-source/no-bidi": "error"
       },
       "env": {
         "browser": true,
@@ -144,6 +130,16 @@
           "version": "detect"
         }
       }
+    },
+    {
+      "files": [
+        "**/*.tests.js",
+        "**/*.tests.ts",
+        "**/*.spec.ts"
+      ],
+      "env": {
+        "mocha": true
+      }
     }
   ]
 }
diff --git a/.github/history-manual.json b/.github/history-manual.json
@@ -123,5 +123,29 @@
 			"sampaiodiego",
 			"pierre-lehnen-rc"
 		]
+	}],
+	"4.1.1": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego"
+		]
+	}],
+	"4.3.2": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"sampaiodiego",
+			"yash-rajpal",
+			"pierre-lehnen-rc",
+			"gronke"
+		]
+	}],
+	"4.3.3": [{
+		"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
+		"userLogin": "sampaiodiego",
+		"contributors": [
+			"gronke"
+		]
 	}]
 }