Issue #1498 - Part 3: Remove support for storing "knockout" values.

This commit is contained in:
wolfbeast 2020-03-27 15:07:34 +01:00 • committed by Roy Tam
commit bcfc5b3a88
2 changed files with 4 additions and 10 deletions

View file

@ -106,13 +106,10 @@ interface nsISiteSecurityService : nsISupports
* @param aURI the URI of the target host * @param aURI the URI of the target host
* @param aFlags options for this request as defined in nsISocketProvider: * @param aFlags options for this request as defined in nsISocketProvider:
* NO_PERMANENT_STORAGE * NO_PERMANENT_STORAGE
* @param force if set, forces no-HSTS state by writing a knockout value,
* overriding any preload list state
*/ */
void removeState(in uint32_t aType, void removeState(in uint32_t aType,
in nsIURI aURI, in nsIURI aURI,
in uint32_t aFlags, in uint32_t aFlags);
[optional] in boolean force);
/** /**
* See isSecureURI * See isSecureURI

View file

@ -326,11 +326,9 @@ nsSiteSecurityService::SetHSTSState(uint32_t aType,
return NS_OK; return NS_OK;
} }
// If max-age is zero, the host is no longer considered HSTS. If the host was // If max-age is zero, the host is no longer considered HSTS.
// preloaded, we store an entry indicating that this host is not HSTS, causing
// the preloaded information to be ignored.
if (maxage == 0) { if (maxage == 0) {
return RemoveState(aType, aSourceURI, flags, true); return RemoveState(aType, aSourceURI, flags);
} }
MOZ_ASSERT((aHSTSState == SecurityPropertySet || MOZ_ASSERT((aHSTSState == SecurityPropertySet ||
@ -358,8 +356,7 @@ nsSiteSecurityService::SetHSTSState(uint32_t aType,
} }
NS_IMETHODIMP NS_IMETHODIMP
nsSiteSecurityService::RemoveState(uint32_t aType, nsIURI* aURI, nsSiteSecurityService::RemoveState(uint32_t aType, nsIURI* aURI, uint32_t aFlags)
uint32_t aFlags, bool force = false)
{ {
// Child processes are not allowed direct access to this. // Child processes are not allowed direct access to this.
if (!XRE_IsParentProcess()) { if (!XRE_IsParentProcess()) {