Skip to content
Snippets Groups Projects
Commit d6ff269b authored by Marcos Spessatto Defendi's avatar Marcos Spessatto Defendi Committed by Rodrigo Nascimento
Browse files

Add verification to authorize get images with X-user-id and X-auth-token (#10741)

parent 0f5cffa3
No related branches found
No related tags found
No related merge requests found
...@@ -203,17 +203,13 @@ Object.assign(FileUpload, { ...@@ -203,17 +203,13 @@ Object.assign(FileUpload, {
let { rc_uid, rc_token } = query; let { rc_uid, rc_token } = query;
if (!rc_uid && headers.cookie) { if (!rc_uid && headers.cookie) {
rc_uid = cookie.get('rc_uid', headers.cookie) ; rc_uid = cookie.get('rc_uid', headers.cookie);
rc_token = cookie.get('rc_token', headers.cookie); rc_token = cookie.get('rc_token', headers.cookie);
} }
const isAuthorizedByCookies = rc_uid && rc_token && RocketChat.models.Users.findOneByIdAndLoginToken(rc_uid, rc_token);
if (!rc_uid || !rc_token || !RocketChat.models.Users.findOneByIdAndLoginToken(rc_uid, rc_token)) { const isAuthorizedByHeaders = headers['x-user-id'] && headers['x-auth-token'] && RocketChat.models.Users.findOneByIdAndLoginToken(headers['x-user-id'], headers['x-auth-token']);
return false; return isAuthorizedByCookies || isAuthorizedByHeaders;
}
return true;
}, },
addExtensionTo(file) { addExtensionTo(file) {
if (mime.lookup(file.name) === file.type) { if (mime.lookup(file.name) === file.type) {
return file; return file;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment