This repository has been archived by the owner on Dec 11, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 972
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Various improvements to urlbar icon UX
Fix #3651 (display insecure icon in titlemode) Fix #5695 (expand siteInfo explanations, change insecure to red unlocked icon) Also addresses edge case where a site is HTTPS-but-insecure, for instance due to having a SHA1 certificate, and tries to load mixed content. Ex: very.badssl.com. In this case, the siteInfo should not say that the site is partially secure. Auditors: @bradleyrichter @darkdh Test Plan: Covered by automated tests
- Loading branch information
1 parent
18ab968
commit c16baaa
Showing
8 changed files
with
78 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -60,10 +60,10 @@ class SiteInfo extends ImmutableComponent { | |
'fa-lock': true, | ||
extendedValidation: this.isExtendedValidation | ||
})} /><span data-l10n-id='secureConnection' /></li> | ||
} else if (this.runInsecureContent) { | ||
secureIcon = <li><span className='fa fa-exclamation-triangle' /><span data-l10n-id='mixedConnection' /></li> | ||
} else if (this.isSecure && this.runInsecureContent) { | ||
secureIcon = <li><span className='fa fa-unlock' /><span data-l10n-id='mixedConnection' /></li> | ||
} else { | ||
secureIcon = <li><span className='fa fa-exclamation-triangle' /><span data-l10n-id='insecureConnection' data-l10n-args={JSON.stringify(l10nArgs)} /></li> | ||
secureIcon = <li><span className='fa fa-unlock' /><span data-l10n-id='insecureConnection' data-l10n-args={JSON.stringify(l10nArgs)} /></li> | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
bbondy
Member
|
||
} | ||
|
||
// Figure out the partition info display | ||
|
@@ -77,9 +77,9 @@ class SiteInfo extends ImmutableComponent { | |
<span data-l10n-args={JSON.stringify(l10nArgs)} data-l10n-id='sessionInfo' /></li> | ||
} | ||
|
||
let runInsecureContentInfo = null | ||
let connectionInfo = null | ||
if (this.isBlockedRunInsecureContent) { | ||
runInsecureContentInfo = | ||
connectionInfo = | ||
<li> | ||
<ul> | ||
<li><span className='runInsecureContentWarning' data-l10n-id='runInsecureContentWarning' /></li> | ||
|
@@ -90,7 +90,7 @@ class SiteInfo extends ImmutableComponent { | |
</ul> | ||
</li> | ||
} else if (this.runInsecureContent) { | ||
runInsecureContentInfo = | ||
connectionInfo = | ||
<li> | ||
<ul> | ||
<li><span className='denyRunInsecureContentWarning' data-l10n-id='denyRunInsecureContentWarning' /></li> | ||
|
@@ -100,6 +100,12 @@ class SiteInfo extends ImmutableComponent { | |
</li> | ||
</ul> | ||
</li> | ||
} else if (this.isSecure) { | ||
connectionInfo = | ||
<div className='connectionInfo' data-l10n-id='secureConnectionInfo' /> | ||
} else { | ||
connectionInfo = | ||
<div className='connectionInfo' data-l10n-id='insecureConnectionInfo' /> | ||
} | ||
|
||
return <Dialog onHide={this.props.onHide} className='siteInfo' isClickDismiss> | ||
|
@@ -111,7 +117,7 @@ class SiteInfo extends ImmutableComponent { | |
partitionInfo | ||
} | ||
{ | ||
runInsecureContentInfo | ||
connectionInfo | ||
} | ||
</ul> | ||
</Dialog> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -83,3 +83,7 @@ | |
} | ||
} | ||
} | ||
.connectionInfo { | ||
max-width: 400px; | ||
padding: 10px; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 comment
on commit c16baaa
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
++
unsecure sites fail here because
l10nArgs
isn't defined yet, I'll fix just an FYI.