+
+## Cloudron.io
+
+Install Rocket.Chat on [Cloudron](https://cloudron.io) Smartserver:
+
+[](https://cloudron.io/button.html?app=chat.rocket.cloudronapp)
+
+## Helm Kubernetes
+Deploy on Kubernetes using the official [helm chart](https://github.com/helm/charts/tree/master/stable/rocketchat).
+
+## Scalingo
+Deploy your own Rocket.Chat server instantly on [Scalingo](https://scalingo.com).
+
+[](https://my.scalingo.com/deploy?source=https://github.com/RocketChat/Rocket.Chat#master)
+
+
+## Sloppy.io
+Host your docker container at [sloppy.io](http://sloppy.io). Get an account and use the [quickstarter](https://github.com/sloppyio/quickstarters/tree/master/rocketchat).
+
+
+## Docker
+[Deploy with docker compose](https://rocket.chat/docs/installation/docker-containers/docker-compose/)
+
+[](https://hub.docker.com/r/rocketchat/rocket.chat/)
+
+OR Use the automated build image of our [most recent release](https://hub.docker.com/r/lltcggie/rocket.chat/)
+
+```
+docker pull lltcggie/rocket.chat:latest
+```
+
+OR select a specific release ([details of releases available](https://github.com/RocketChat/Rocket.Chat/releases)):
+```
+docker pull lltcggie/rocket.chat:X.X.X
+```
+
+## Ansible
+Automated production-grade deployment in minutes, for RHEL / CentOS 7 or Ubuntu 14.04 LTS / 15.04.
+
+[](https://rocket.chat/docs/installation/automation-tools/ansible/)
+
+## Raspberry Pi 4
+Run Rocket.Chat on this world famous $35 quad-core server.
+
+[](https://github.com/RocketChat/Rocket.Chat.RaspberryPi)
+
+## Koozali SME
+
+Add Rocket.Chat to this world famous time tested small enterprise server today.
+
+[](https://wiki.contribs.org/Rocket_Chat)
+
+## Ubuntu VPS
+Follow these [deployment instructions](https://rocket.chat/docs/installation/manual-installation/ubuntu/).
+
+## D2C.io
+Deploy Rocket.Chat stack to your server with [D2C](https://d2c.io/). Scale with a single click, check live logs and metrics:
+
+[](https://panel.d2c.io/?import=https://github.com/d2cio/rocketchat-stack/archive/master.zip/)
+
+## Syncloud.org
+Run Rocket.Chat on your easy to use personal device.
+
+[](https://syncloud.org)
+
+# About Rocket.Chat
+
+Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](https://www.meteor.com/install) full stack framework.
+
+It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms.
+
+## In the News
+
+##### [Wired](http://www.wired.com/2016/03/open-source-devs-racing-build-better-versions-slack/)
+> Open Sourcers Race to Build Better Versions of Slack
+
+##### [Hacker News](https://news.ycombinator.com/item?id=9624737)
+> Yes, we made it to the #1
+
+##### [Product Hunt](https://www.producthunt.com/tech/rocket-chat)
+> Your own open source Slack-like chat
+
+##### [JavaScript Weekly](http://javascriptweekly.com/issues/234)
+> An open source Web based, channel based chat system (a la Slack) built using Meteor, the full stack JavaScript development platform.
+
+##### [Open Source China](http://www.oschina.net/p/rocket-chat)
+> Rocket.Chat 是特性最丰富的 Slack 开源替代品之一。 主要功能：群组聊天，直接通信，私聊群，桌面通知，媒体嵌入，链接预览，文件上传，语音/视频 聊天，截图等等。
+
+##### [wwwhatsnew.com](http://wwwhatsnew.com/2015/05/30/rocket-chat-para-los-programadores-que-quieran-ofrecer-un-chat-en-su-web/)
+> Para los programadores que quieran ofrecer un chat en su web
+
+##### [clasesdeperiodismo.com](http://www.clasesdeperiodismo.com/2015/05/30/un-chat-de-codigo-abierto-que-puedes-anadir-a-la-web/)
+> Un chat de código abierto que puedes añadir a la web
+
+##### [snowulf.com](https://snowulf.com/2015/09/25/why-slack-when-you-can-rocket-chat/)
+> Why Slack when you can Rocket.chat?
+
+##### [liminality.xyz](http://liminality.xyz/self-hosting/)
+> Self-hosted alternatives to popular cloud services
+
+
+## Features
+
+- BYOS (Bring Your Own Server)
+- Multiple Rooms
+- Direct Messages
+- Private Groups
+- Public Channels
+- Desktop Notifications
+- Mentions
+- Avatars
+- Markdown
+- Emojis
+- Custom Emojis
+- Reactions
+- One touch Geolocation
+- TeX Math Rendering - inline math typesetting
+- Media Embeds
+- Link Previews
+- Sent Message Edit and Deletion
+- Transcripts / History
+- File Upload / Sharing
+- Scalable file sharing - S3 uploads with CDN downloads
+- Full text search
+- Global search (from all channels/rooms at once)
+- Live chat / Messaging call center
+- LDAP Authentication
+- CAS 1.0, 2.0 support for educational institutions and hosting providers worldwide
+- Support for Okta SSO through SAML v2
+- I18n - Supports 22 Languages
+- Hubot Friendly
+- (Beta) Face to Face Video Conferencing (aka WebRTC )
+- (Beta) Multi-users Video Group Chat
+- (Beta) Jitsi integration
+- Audio calls
+- Multi-users Audio Conference
+- Screen sharing
+- Drupal 7.x and 8.x Plug-in (both stable and development flavours) ([download](https://www.drupal.org/project/rocket_chat) and [source code](https://git.drupal.org/project/rocket_chat.git) )
+- XMPP bridge ([try it](https://open.rocket.chat/channel/general))
+- REST APIs
+- Remote Video Monitoring
+- Native real-time APIs for Microsoft C#, Visual Basic, F# and other .NET supported languages ([Get it!](https://www.nuget.org/packages/Rocket.Chat.Net/0.0.12-pre))
+- API access from [Perl](https://metacpan.org/pod/Net::RocketChat) and [Java](https://github.com/baloise/rocket-chat-rest-client) (community contributions)
+- Chat-ops powered by Hubot: scalable horizontal app integration (early access)
+- Massively scalable hosting and provisioning (beta testing now)
+- Native Cross-Platform Desktop Application [Windows, macOS, or Linux](https://rocket.chat/)
+- Mobile app for iPhone, iPad, and iPod touch [Download on App Store](https://geo.itunes.apple.com/us/app/rocket-chat/id1148741252?mt=8)
+- Mobile app for Android phone, tablet, and TV stick [Available now on Google Play](https://play.google.com/store/apps/details?id=chat.rocket.android)
+- Available on [Cloudron Store](https://cloudron.io/appstore.html#chat.rocket.cloudronapp)
+
+## Roadmap
+
+To see an up to date view of what we have planned, view our [milestones](https://github.com/RocketChat/Rocket.Chat/milestones).
+
+
+## How it all started
+
+Read about [how it all started](https://www.synopsys.com/blogs/software-security/rocket-chat-privately-hosted-chat-services/).
+
+## Awards
+[](http://www.infoworld.com/article/3122000/open-source-tools/bossie-awards-2016-the-best-open-source-applications.html#slide4)
+
+[](https://info.blackducksoftware.com/OpenSourceRookies2015)
+
+[](http://www.softpedia.com/get/Internet/Chat/Other-Chat-Tools/Rocket-Chat.shtml#status)
+
+## Issues
+
+[GitHub Issues](https://github.com/RocketChat/Rocket.Chat/issues) are used to track bugs and tasks on the roadmap.
+
+## Feature Requests
+
+[RocketChat/feature-requests](https://github.com/RocketChat/feature-requests) is used to track Rocket.Chat feature requests and discussions. Click [here](https://github.com/RocketChat/feature-requests/issues/new?template=feature_request.md) to open a new feature request.
+[Feature Request Forums](https://forums.rocket.chat/c/feature-requests) stores the historical archives of old feature requests (up to 2018).
+
+### Stack Overflow
+
+Please use the [Stack Overflow TAG](http://stackoverflow.com/questions/tagged/rocket.chat)
+
+## Integrations
+
+#### Hubot
+
+The docker image is ready.
+Everyone can start hacking the adapter code or launch his/her own bot within a few minutes now.
+Please head over to the [Hubot Integration Project](https://github.com/RocketChat/hubot-rocketchat) for more information.
+
+
+#### Chat-ops integrations powered by Hubot
+
+Integrate your application with fly-in panels today! Early access is available for developers.
+
+
+
+#### Many, many, many more to come!
+
+We are developing the APIs based on the competition, so stay tuned and you will see a lot happening here.
+
+## Documentation
+
+Check out [Rocket.Chat documentation](https://rocket.chat/docs/).
+
+## License
+
+Note that Rocket.Chat is distributed under the [MIT License](http://opensource.org/licenses/MIT).
+
+# Development
+
+## Quick start for code developers
+Prerequisites:
+
+* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
+* [Meteor](https://www.meteor.com/install)
+
+> Meteor automatically installs a hidden [NodeJS v12](https://nodejs.org/download/release/v12.18.4/) and [MongoDB v4.2](https://docs.mongodb.com/manual/introduction/) to be used when you run your app in development mode using the `meteor` command.
+
+Now just clone and start the app:
+
+```sh
+git clone https://github.com/RocketChat/Rocket.Chat.git
+cd Rocket.Chat
+meteor npm install
+meteor npm start
+```
+For more detailed step-by-step, see our [quick start for developers](https://docs.rocket.chat/guides/developer/quick-start) docs.
+
+To debug the server part, use [meteor debugging](https://docs.meteor.com/commandline.html#meteordebug). You should use Chrome for best debugging experience:
+
+```sh
+meteor debug
+```
+You'll find a nodejs icon in the developer console.
+
+If you are not a developer and just want to run the server - see [deployment methods](https://rocket.chat/docs/installation/paas-deployments/).
+
+## Branching Model
+
+See [Branches and Releases](https://rocket.chat/docs/developer-guides/branches-and-releases/).
+
+It is based on [Gitflow Workflow](http://nvie.com/posts/a-successful-git-branching-model/), reference section below is derived from Vincent Driessen at nvie.
+
+See also this [Git Workflows Comparison](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for more details.
+
+## Translations
+We are experimenting with [Lingohub](https://translate.lingohub.com/rocketchat/dashboard).
+If you want to help, send an email to support at rocket.chat to be invited to the translation project.
+
+## How to Contribute
+
+Already a JavaScript developer? Familiar with Meteor? [Pick an issue](https://github.com/RocketChat/Rocket.Chat/labels/contrib%3A%20easy), push a PR and instantly become a member of Rocket.Chat's international contributors' community. For more information, check out our [Contributing Guide](.github/CONTRIBUTING.md) and our [Official Documentation for Contributors](https://rocket.chat/docs/contributing/).
+
+A lot of work has already gone into Rocket.Chat, but we have much bigger plans for it!
+
+### Contributor License Agreement
+
+Please review and sign our CLA at https://cla-assistant.io/RocketChat/Rocket.Chat
+
+# Credits
+
+Thanks to our core team
+[Aaron Ogle](https://github.com/geekgonecrazy),
+[Bradley Hilton](https://github.com/Graywolf336),
+[Diego Sampaio](https://github.com/sampaiodiego),
+[Gabriel Engel](https://github.com/engelgabriel),
+[Marcelo Schmidt](https://github.com/marceloschmidt),
+[Rodrigo Nascimento](https://github.com/rodrigok),
+[Sing Li](https://github.com/Sing-Li),
+and hundreds of awesome [contributors](https://github.com/RocketChat/Rocket.Chat/graphs/contributors).
+
+
+
+Emoji provided graciously by [JoyPixels](https://www.joypixels.com/)
+
+
+
+Testing with [BrowserStack](https://www.browserstack.com)
+
+
+
+Translations done with [LingoHub](https://www.lingohub.com)
+
+# Donate
+
+Rocket.Chat will be free forever, but you can help us speed up the development!
+
+[](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9MT88JJ9X4A6U&source=url)
+
+
+[BountySource](https://www.bountysource.com/teams/rocketchat)
diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
index 7a526e30ce8c9..823d767aa5a21 100644
--- a/app/file-upload/server/lib/FileUpload.js
+++ b/app/file-upload/server/lib/FileUpload.js
@@ -267,7 +267,7 @@ export const FileUpload = {
},
uploadsOnValidate(file) {
- if (!/^image\/((x-windows-)?bmp|p?jpeg|png|gif)$/.test(file.type)) {
+ if (!/^image\/(p?jpeg)$/.test(file.type)) {
return;
}
@@ -375,7 +375,7 @@ export const FileUpload = {
// This file type can be pretty much anything, so it's better if we don't mess with the file extension
if (file.type !== 'application/octet-stream') {
const ext = mime.extension(file.type);
- if (ext && new RegExp(`\\.${ ext }$`, 'i').test(file.name) === false) {
+ if (ext && new RegExp(`\\.${ ext }$`, 'i').test(file.name) === false && ext !== 'bin') {
file.name = `${ file.name }.${ ext }`;
}
}
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 4e1153dd30768..d43bdbb8a3731 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -1196,6 +1196,11 @@ settings.addGroup('Message', function() {
this.add('API_EmbedSafePorts', '80, 443', {
type: 'string',
});
+ this.add('API_EmbedParameter', '', {
+ type: 'string',
+ multiline: true,
+ i18nDescription: 'API_EmbedParameter_Description',
+ });
this.add('Message_TimeFormat', 'LT', {
type: 'string',
public: true,
diff --git a/app/notification-queue/server/NotificationQueue.ts b/app/notification-queue/server/NotificationQueue.ts
index a1533e958a165..363f46ae38047 100644
--- a/app/notification-queue/server/NotificationQueue.ts
+++ b/app/notification-queue/server/NotificationQueue.ts
@@ -9,7 +9,7 @@ import { IUser } from '../../../definition/IUser';
const {
NOTIFICATIONS_WORKER_TIMEOUT = 2000,
NOTIFICATIONS_BATCH_SIZE = 100,
- NOTIFICATIONS_SCHEDULE_DELAY_ONLINE = 120,
+ NOTIFICATIONS_SCHEDULE_DELAY_ONLINE = 15,
NOTIFICATIONS_SCHEDULE_DELAY_AWAY = 0,
NOTIFICATIONS_SCHEDULE_DELAY_OFFLINE = 0,
} = process.env;
diff --git a/app/oembed/server/jumpToMessage.js b/app/oembed/server/jumpToMessage.js
index 961fbb656aaf6..7db82a7c28540 100644
--- a/app/oembed/server/jumpToMessage.js
+++ b/app/oembed/server/jumpToMessage.js
@@ -4,11 +4,10 @@ import QueryString from 'querystring';
import { Meteor } from 'meteor/meteor';
import _ from 'underscore';
-import { Messages, Rooms, Users } from '../../models/server';
+import { Messages } from '../../models/server';
import { settings } from '../../settings/server';
import { callbacks } from '../../callbacks/server';
import { getUserAvatarURL } from '../../utils/lib/getUserAvatarURL';
-import { canAccessRoom } from '../../authorization/server/functions/canAccessRoom';
const recursiveRemove = (message, deep = 1) => {
if (message) {
@@ -27,8 +26,6 @@ callbacks.add('beforeSaveMessage', (msg) => {
return msg;
}
- const currentUser = Users.findOneById(msg.u._id);
-
msg.urls.forEach((item) => {
// if the URL is not internal, skip
if (!item.url.includes(Meteor.absoluteUrl())) {
@@ -53,14 +50,6 @@ callbacks.add('beforeSaveMessage', (msg) => {
return;
}
- // validates if user can see the message
- // user has to belong to the room the message was first wrote in
- const room = Rooms.findOneById(jumpToMessage.rid);
- const canAccessRoomForUser = canAccessRoom(room, currentUser);
- if (!canAccessRoomForUser) {
- return;
- }
-
msg.attachments = msg.attachments || [];
const index = msg.attachments.findIndex((a) => a.message_link === item.url);
if (index > -1) {
diff --git a/app/oembed/server/server.js b/app/oembed/server/server.js
index 34aa1a8eee1a6..22137b873e5d6 100644
--- a/app/oembed/server/server.js
+++ b/app/oembed/server/server.js
@@ -60,6 +60,58 @@ const toUtf8 = function(contentType, body) {
return iconv.decode(body, getCharset(contentType, body));
};
+const addQueryTo = (href, query) => {
+ const urlObject = URL.parse(href, true);
+
+ urlObject.search = undefined;
+ Object.assign(urlObject.query, query);
+
+ return URL.format(urlObject);
+};
+
+const getSendHeaders = function(url) {
+ const addSendQuerys = {
+ };
+ const sendHeaders = {
+ 'User-Agent': settings.get('API_Embed_UserAgent'),
+ };
+
+ const embedParameter = url && settings.get('API_EmbedParameter');
+ try {
+ if (/\S/.test(embedParameter)) {
+ // embedParameter is not empty or whitespace only
+ const embedParameterJSON = JSON.parse(embedParameter);
+ for (let i = 0; i < embedParameterJSON.length; i++) {
+ const headerElm = embedParameterJSON[i];
+ if (!url.indexOf(headerElm.URL)) {
+ if ('Query' in headerElm) {
+ for (const key in headerElm.Query) {
+ if (headerElm.Query.hasOwnProperty(key)) {
+ addSendQuerys[key] = headerElm.Query[key];
+ }
+ }
+ }
+ if ('Header' in headerElm) {
+ for (const key in headerElm.Header) {
+ if (headerElm.Header.hasOwnProperty(key)) {
+ sendHeaders[key] = headerElm.Header[key];
+ }
+ }
+ }
+ }
+ }
+ }
+ } catch (e) {
+ // parsing JSON faild
+ console.log('Error while parsing JSON value of "API_EmbedParameter": ', e);
+ }
+ let retUrl = url;
+ if (Object.keys(addSendQuerys).length > 0) {
+ retUrl = addQueryTo(url, addSendQuerys);
+ }
+ return [retUrl, sendHeaders];
+};
+
const getUrlContent = Meteor.wrapAsync(function(urlObj, redirectCount = 5, callback) {
if (_.isString(urlObj)) {
urlObj = URL.parse(urlObj);
@@ -94,16 +146,13 @@ const getUrlContent = Meteor.wrapAsync(function(urlObj, redirectCount = 5, callb
if (data.attachments != null) {
return callback(null, data);
}
- const url = URL.format(data.urlObj);
+ const [url, sendHeaders] = getSendHeaders(URL.format(data.urlObj));
const opts = {
url,
strictSSL: !settings.get('Allow_Invalid_SelfSigned_Certs'),
gzip: true,
maxRedirects: redirectCount,
- headers: {
- 'User-Agent': settings.get('API_Embed_UserAgent'),
- 'Accept-Language': settings.get('Language') || 'en',
- },
+ headers: sendHeaders,
};
let headers = null;
let statusCode = null;
diff --git a/client/components/MarkdownText.tsx b/client/components/MarkdownText.tsx
index 7f90ab538be4f..2ee9be70e4a83 100644
--- a/client/components/MarkdownText.tsx
+++ b/client/components/MarkdownText.tsx
@@ -3,6 +3,8 @@ import dompurify from 'dompurify';
import marked from 'marked';
import React, { FC, useMemo } from 'react';
+import { escapeHTML } from '@rocket.chat/string-helpers';
+
type MarkdownTextParams = {
content: string;
variant: 'inline' | 'inlineWithoutBreaks' | 'document';
@@ -28,18 +30,30 @@ const listItemMarked = (text: string): string => {
const cleanText = text.replace(/${ escaped ? code : escapeHTML(code) }`
+ : `${ escaped ? code : escapeHTML(code) }`);
+const codespanMarked = (text: string): string =>
+ `${ text }`;
documentRenderer.link = linkMarked;
documentRenderer.listitem = listItemMarked;
+documentRenderer.code = codeMarked;
+documentRenderer.codespan = codespanMarked;
inlineRenderer.link = linkMarked;
inlineRenderer.paragraph = paragraphMarked;
inlineRenderer.listitem = listItemMarked;
+inlineRenderer.code = codeMarked;
+inlineRenderer.codespan = codespanMarked;
inlineWithoutBreaks.link = linkMarked;
inlineWithoutBreaks.paragraph = paragraphMarked;
inlineWithoutBreaks.br = brMarked;
inlineWithoutBreaks.listitem = listItemMarked;
+inlineWithoutBreaks.code = codeMarked;
+inlineWithoutBreaks.codespan = codespanMarked;
const defaultOptions = {
gfm: true,
@@ -89,7 +103,7 @@ const MarkdownText: FC${ marked(new Option(content).innerHTML, markedOptions).replace('', '').replace('', '') }`;
return preserveHtml ? html : html && sanitizer(html, { ADD_ATTR: ['target'] });
}, [content, preserveHtml, sanitizer, markedOptions]);
diff --git a/client/components/Message/Attachments/Files/GenericFileAttachment.tsx b/client/components/Message/Attachments/Files/GenericFileAttachment.tsx
index af0883d026960..233a8f8018c2c 100644
--- a/client/components/Message/Attachments/Files/GenericFileAttachment.tsx
+++ b/client/components/Message/Attachments/Files/GenericFileAttachment.tsx
@@ -1,8 +1,9 @@
+import { escapeHTML } from '@rocket.chat/string-helpers';
import React, { FC } from 'react';
import { FileProp } from '../../../../../definition/IMessage/MessageAttachment/Files/FileProp';
import { MessageAttachmentBase } from '../../../../../definition/IMessage/MessageAttachment/MessageAttachmentBase';
-import MarkdownText from '../../../MarkdownText';
+import RawText from '../../../RawText';
import Attachment from '../Attachment';
import { useMediaUrl } from '../context/AttachmentContext';
@@ -26,24 +27,21 @@ export const GenericFileAttachment: FC