Skip to content
This repository was archived by the owner on Dec 11, 2019. It is now read-only.

Send isSecure false instead of null when an insecure site has passive mixed content #9727

Merged
merged 1 commit into from
Jun 27, 2017
Merged

Send isSecure false instead of null when an insecure site has passive mixed content #9727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions app/renderer/components/frame/frame.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,12 +707,11 @@ class Frame extends React.Component {
isSecure = false
const parsedUrl = urlParse(this.props.location)
ipc.send(messages.CHECK_CERT_ERROR_ACCEPTED, parsedUrl.host, this.props.frameKey)
} else if (this.props.isSecure !== false &&
['warning', 'passive-mixed-content'].includes(e.securityState)) {
} else if (['warning', 'passive-mixed-content'].includes(e.securityState)) {
// Passive mixed content should not upgrade an insecure connection to a
// partially-secure connection. It can only downgrade a secure
// connection.
isSecure = 1
isSecure = this.props.isSecure !== false ? 1 : false
}
windowActions.setSecurityState(this.frame, {
secure: runInsecureContent ? false : isSecure,
Expand Down