Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/api/server/v1/rooms.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import { API } from '../api';
import { findAdminRooms, findChannelAndPrivateAutocomplete, findAdminRoom, findRoomsAvailableForTeams } from '../lib/rooms';
import { sendFile, sendViaEmail } from '../../../../server/lib/channelExport';
import { canAccessRoom, hasPermission } from '../../../authorization/server';
import { Media } from '../../../../server/sdk';
import { settings } from '../../../settings/server/index';

function findRoomByIdOrName({ params, checkedArchived = true }) {
if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
Expand Down Expand Up @@ -120,7 +122,12 @@ API.v1.addRoute('rooms.upload/:rid', { authRequired: true }, {
};

const fileData = Meteor.runAsUser(this.userId, () => {
const stripExif = settings.get('Message_Attachments_Strip_Exif');
const fileStore = FileUpload.getStore('Uploads');
if (stripExif) {
// No need to check mime. Library will ignore any files without exif/xmp tags (like BMP, ico, PDF, etc)
file.fileBuffer = Promise.await(Media.stripExifFromBuffer(file.fileBuffer));
}
const uploadedFile = fileStore.insertSync(details, file.fileBuffer);

uploadedFile.description = fields.description;
Expand Down
3 changes: 2 additions & 1 deletion app/emoji-custom/server/methods/uploadEmojiCustom.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ Meteor.methods({
if (['gif', 'x-icon', 'bmp', 'webm'].includes(emojiData.extension)) {
fileBuffer = file;
} else {
const { data: resizedEmojiBuffer } = await Media.resizeFromBuffer(file, 128, 128, true, false, false, 'inside');
// This is to support the idea of having "sticker-like" emojis
const { data: resizedEmojiBuffer } = await Media.resizeFromBuffer(file, 512, 512, true, false, false, 'inside');
fileBuffer = resizedEmojiBuffer;
}

Expand Down
5 changes: 5 additions & 0 deletions app/lib/server/startup/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -1037,6 +1037,11 @@ settings.addGroup('Message', function() {
public: true,
i18nDescription: 'Message_Attachments_GroupAttachDescription',
});
this.add('Message_Attachments_Strip_Exif', false, {
type: 'boolean',
public: true,
i18nDescription: 'Message_Attachments_Strip_ExifDescription',
});
});
this.section('Message_Audio', function() {
this.add('Message_AudioRecorderEnabled', true, {
Expand Down
32 changes: 28 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
"emojione": "^4.5.0",
"eslint-plugin-import": "^2.22.0",
"eventemitter3": "^4.0.7",
"exif-be-gone": "^1.2.0",
"express": "^4.17.1",
"express-rate-limit": "^5.1.3",
"fflate": "^0.5.3",
Expand Down
2 changes: 2 additions & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
Original file line number Diff line number Diff line change
Expand Up @@ -2714,6 +2714,8 @@
"Message_Attachments": "Message Attachments",
"Message_Attachments_GroupAttach": "Group Attachment Buttons",
"Message_Attachments_GroupAttachDescription": "This groups the icons under an expandable menu. Takes up less screen space.",
"Message_Attachments_Strip_Exif": "Remove EXIF metadata from supported files",
"Message_Attachments_Strip_ExifDescription": "Strips out EXIF metadata from image files (jpeg, tiff, etc). This setting is not retroactive, so files uploaded while disabled will have EXIF data",
"Message_Audio": "Audio Message",
"Message_Audio_bitRate": "Audio Message Bit Rate",
"Message_AudioRecorderEnabled": "Audio Recorder Enabled",
Expand Down
4 changes: 3 additions & 1 deletion server/sdk/types/IMediaService.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Readable } from 'stream';
import { Readable, Stream } from 'stream';

import sharp from 'sharp';

Expand All @@ -12,4 +12,6 @@ export interface IMediaService {
resizeFromBuffer(input: Buffer, width: number, height: number, keepType: boolean, blur: boolean, enlarge: boolean, fit?: keyof sharp.FitEnum | undefined): Promise<ResizeResult>;
resizeFromStream(input: Readable, width: number, height: number, keepType: boolean, blur: boolean, enlarge: boolean, fit?: keyof sharp.FitEnum | undefined): Promise<ResizeResult>;
isImage(buff: Buffer): boolean;
stripExifFromImageStream(stream: Stream): Readable;
stripExifFromBuffer(buffer: Buffer): Promise<Buffer>;
}
52 changes: 32 additions & 20 deletions server/services/image/service.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Readable } from 'stream';
import stream, { Readable } from 'stream';

import fileType from 'file-type';
import sharp from 'sharp';
Expand All @@ -7,6 +7,11 @@ import isSvg from 'is-svg';
import { ServiceClass } from '../../sdk/types/ServiceClass';
import { IMediaService, ResizeResult } from '../../sdk/types/IMediaService';

/* eslint-disable @typescript-eslint/no-var-requires */
const ExifTransformer = require('exif-be-gone');
/* eslint-enable @typescript-eslint/no-var-requires */


export class MediaService extends ServiceClass implements IMediaService {
protected name = 'media';

Expand All @@ -32,27 +37,11 @@ export class MediaService extends ServiceClass implements IMediaService {
]);

async resizeFromBuffer(input: Buffer, width: number, height: number, keepType: boolean, blur: boolean, enlarge: boolean, fit?: keyof sharp.FitEnum | undefined): Promise<ResizeResult> {
const transformer = sharp(input)
.resize({ width, height, fit, withoutEnlargement: !enlarge });

if (!keepType) {
transformer.jpeg();
}

if (blur) {
transformer.blur();
}

const { data, info: { width: widthInfo, height: heightInfo } } = await transformer.toBuffer({ resolveWithObject: true });

return {
data,
width: widthInfo,
height: heightInfo,
};
const stream = this.bufferToStream(input);
return this.resizeFromStream(stream, width, height, keepType, blur, enlarge, fit);
}

async resizeFromStream(input: Readable, width: number, height: number, keepType: boolean, blur: boolean, enlarge: boolean, fit?: keyof sharp.FitEnum | undefined): Promise<ResizeResult> {
async resizeFromStream(input: stream.Stream, width: number, height: number, keepType: boolean, blur: boolean, enlarge: boolean, fit?: keyof sharp.FitEnum | undefined): Promise<ResizeResult> {
const transformer = sharp()
.resize({ width, height, fit, withoutEnlargement: !enlarge });

Expand Down Expand Up @@ -86,4 +75,27 @@ export class MediaService extends ServiceClass implements IMediaService {
isSvgImage(buff: Buffer): boolean {
return isSvg(buff);
}

stripExifFromBuffer(buffer: Buffer): Promise<Buffer> {
return this.streamToBuffer(this.stripExifFromImageStream(this.bufferToStream(buffer)));
}

stripExifFromImageStream(stream: stream.Stream): Readable {
return stream.pipe(new ExifTransformer());
}

private bufferToStream(buffer: Buffer): stream.PassThrough {
const bufferStream = new stream.PassThrough();
bufferStream.end(buffer);
return bufferStream;
}

private streamToBuffer(stream: stream.Stream): Promise<Buffer> {
return new Promise((resolve) => {
const chunks: Array<Buffer> = [];
stream
.on('data', (data) => chunks.push(data))
.on('end', () => resolve(Buffer.concat(chunks)));
});
}
}