Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Commit

Permalink
Block active mixed content by default in content settings
Browse files Browse the repository at this point in the history 
Auditors: @bbondy, @bridiver
  • Loading branch information
@diracdeltas
diracdeltas committed Aug 2, 2016
1 parent 24aa654 commit 2b096b7
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion atom/renderer/content_settings_manager.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ ContentSetting ContentSettingsManager::GetSetting(
return GetContentSettingFromRules(primary_url,
secondary_url,
content_type,
true);
content_type != "runInsecureContent"
? true : false);
}

std::vector<std::string> ContentSettingsManager::GetContentTypes() {
Expand Down

4 comments on commit 2b096b7

@bridiver
Copy link
Collaborator

@bridiver bridiver commented on 2b096b7 Aug 5, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

isn't this already set in browser? https://github.com/brave/browser-laptop/blob/master/js/state/contentSettings.js#L82

@bridiver
Copy link
Collaborator

Choose a reason for hiding this comment

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

actually this is definitely not correct because it only controls what the method returns, not the actual setting

@bridiver
Copy link
Collaborator

Choose a reason for hiding this comment

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

not a blocker because it will be correct right now, but pushed c599e30

@diracdeltas
Copy link
Member Author

Choose a reason for hiding this comment

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

this commit was added before i added https://github.com/brave/browser-laptop/blob/master/js/state/contentSettings.js#L82; i did verify that this commit alone re-enabled mixed script blocking

Please sign in to comment.