Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Security Fixes #6354

Merged
merged 4 commits into from
Mar 16, 2017
Merged

Security Fixes #6354

merged 4 commits into from
Mar 16, 2017

Conversation

kamushadenes
Copy link
Contributor

@RocketChat/core

Closes issues #1, #2 and #3 from security repo

@CLAassistant
Copy link

CLAassistant commented Mar 13, 2017

CLA assistant check
All committers have signed the CLA.

@@ -40,6 +40,8 @@ WebApp.connectHandlers.use('/file-upload/', function(req, res, next) {
}
}

res.header('Content-Security-Policy', 'default-src \'none\'')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebased

@theblazehen
Copy link

Doesn't address #3, just perhaps my one example of it. Will comment on the issue in the security repo

@engelgabriel engelgabriel merged commit 0320520 into RocketChat:develop Mar 16, 2017
@engelgabriel engelgabriel added this to the 0.54.0 milestone Mar 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants