Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1154068 - rename relaxed to insecure scheme and add more runtime checks r=hurley

Browse Source 
we used the term relaxed for http:// over tls; but someitmes we also
enforced the authentication if alt-svc changed the host involved. That
was all done correctly but the term relaxed wasn't very accurate in
those cases.

For clarity rename "relaxed" to be "insecureScheme". Also add a
runtime check (with debug assert) to paths to enforce that bit isn't
set where it shouldn't be (it isn't known to be).
This commit is contained in:
Patrick McManus 2015-04-06 17:30:29 -04:00
parent dea53428c8
commit 965b4acedf
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
netwerk/protocol/http/AlternateServices.cpp
View File

@ -230,9 +230,7 @@ AltSvcMapping::GetConnectionInfo(nsHttpConnectionInfo **outCI,
nsRefPtr<nsHttpConnectionInfo> ci =
new nsHttpConnectionInfo(mAlternateHost, mAlternatePort, mNPNToken,
mUsername, pi, mOriginHost, mOriginPort);
if (!mHttps) {
ci->SetRelaxed(true);
}
ci->SetInsecureScheme(!mHttps);
ci->SetPrivate(mPrivate);
ci.forget(outCI);
}
@ -330,6 +328,13 @@ public:
this, socketControl.get(), bypassAuth));
if (bypassAuth) {
if (mMapping->HTTPS()) {
MOZ_ASSERT(false); // cannot happen but worth the runtime sanity check
LOG(("AltSvcTransaction::MaybeValidate %p"
"somehow indicates bypassAuth on https:// origin\n", this));
return;
}
LOG(("AltSvcTransaction::MaybeValidate() %p "
"validating alternate service because relaxed", this));
mMapping->SetValidated(true);

3
netwerk/protocol/http/AlternateServices.h
View File

@ -68,6 +68,7 @@ public:
void SetExpiresAt(int32_t val) { mExpiresAt = val; }
void SetExpired();
bool RouteEquals(AltSvcMapping *map);
bool HTTPS() { return mHttps; }
void GetConnectionInfo(nsHttpConnectionInfo **outCI, nsProxyInfo *pi);
int32_t TTL();
@ -95,7 +96,7 @@ private:
bool mValidated;
bool mRunning;
bool mHttps;
bool mHttps; // origin is https://
nsCString mNPNToken;
};

2
netwerk/protocol/http/Http2Session.cpp
View File

@ -2186,7 +2186,7 @@ Http2Session::RecvAltSvc(Http2Session *self)
nsAutoCString specifiedOriginHost;
if (origin.EqualsIgnoreCase("https://", 8)) {
specifiedOriginHost.Assign(origin.get() + 8, origin.Length() - 8);
if (ci->GetRelaxed()) {
if (ci->GetInsecureScheme()) {
// technically this is ok because it will still be confirmed before being used
// but let's not support it.
okToReroute = false;

8
netwerk/protocol/http/nsHttpConnection.cpp
View File

@ -519,7 +519,7 @@ nsHttpConnection::SetupNPNList(nsISSLSocketControl *ssl, uint32_t caps)
ssl->SetAuthenticationPort(authPort);
}
if (mConnInfo->GetRelaxed()) { // http:// over tls
if (mConnInfo->GetInsecureScheme()) { // http:// over tls
if (authHost.IsEmpty() || authHost.Equals(mConnInfo->GetHost())) {
LOG(("nsHttpConnection::SetupSSL %p TLS-Relaxed "
"with Same Host Auth Bypass", this));
@ -555,10 +555,10 @@ nsHttpConnection::AddTransaction(nsAHttpTransaction *httpTransaction,
needTunnel ? " over tunnel" : ""));
// do a runtime check here just for defense in depth
if (transCI->GetRelaxed() &&
if (transCI->GetInsecureScheme() &&
httpTransaction->RequestHead() && httpTransaction->RequestHead()->IsHTTPS()) {
LOG(("This Cannot happen - https on relaxed tls stream\n"));
MOZ_ASSERT(false, "https:// on tls relaxed");
LOG(("This Cannot happen - https on insecure scheme tls stream\n"));
MOZ_ASSERT(false, "https:// on tls insecure scheme");
return NS_ERROR_FAILURE;
}

10
netwerk/protocol/http/nsHttpConnectionInfo.cpp
View File

@ -114,7 +114,7 @@ void nsHttpConnectionInfo::BuildHashKey()
// byte 1 is S/. S is for end to end ssl such as https:// uris
// byte 2 is A/. A is for an anonymous channel (no cookies, etc..)
// byte 3 is P/. P is for a private browising channel
// byte 4 is R/. R is for 'relaxed' unauthed TLS for http:// uris
// byte 4 is I/. I is for insecure scheme on TLS for http:// uris
// byte 5 is X/. X is for disallow_spdy flag
mHashKey.AssignLiteral("......");
@ -202,10 +202,10 @@ nsHttpConnectionInfo::Clone() const
clone->SetNetworkInterfaceId(mNetworkInterfaceId);
}
// Make sure the anonymous, relaxed, and private flags are transferred
// Make sure the anonymous, insecure-scheme, and private flags are transferred
clone->SetAnonymous(GetAnonymous());
clone->SetPrivate(GetPrivate());
clone->SetRelaxed(GetRelaxed());
clone->SetInsecureScheme(GetInsecureScheme());
clone->SetNoSpdy(GetNoSpdy());
MOZ_ASSERT(clone->Equals(this));
@ -223,10 +223,10 @@ nsHttpConnectionInfo::CloneAsDirectRoute(nsHttpConnectionInfo **outCI)
nsRefPtr<nsHttpConnectionInfo> clone =
new nsHttpConnectionInfo(mAuthenticationHost, mAuthenticationPort,
EmptyCString(), mUsername, mProxyInfo, mEndToEndSSL);
// Make sure the anonymous, relaxed, and private flags are transferred
// Make sure the anonymous, insecure-scheme, and private flags are transferred
clone->SetAnonymous(GetAnonymous());
clone->SetPrivate(GetPrivate());
clone->SetRelaxed(GetRelaxed());
clone->SetInsecureScheme(GetInsecureScheme());
clone->SetNoSpdy(GetNoSpdy());
if (!mNetworkInterfaceId.IsEmpty()) {
clone->SetNetworkInterfaceId(mNetworkInterfaceId);

6
netwerk/protocol/http/nsHttpConnectionInfo.h
View File

@ -99,9 +99,9 @@ public:
bool GetAnonymous() const { return mHashKey.CharAt(2) == 'A'; }
void SetPrivate(bool priv) { mHashKey.SetCharAt(priv ? 'P' : '.', 3); }
bool GetPrivate() const { return mHashKey.CharAt(3) == 'P'; }
void SetRelaxed(bool relaxed)
{ mHashKey.SetCharAt(relaxed ? 'R' : '.', 4); }
bool GetRelaxed() const { return mHashKey.CharAt(4) == 'R'; }
void SetInsecureScheme(bool insecureScheme)
{ mHashKey.SetCharAt(insecureScheme ? 'I' : '.', 4); }
bool GetInsecureScheme() const { return mHashKey.CharAt(4) == 'I'; }
void SetNoSpdy(bool aNoSpdy)
{ mHashKey.SetCharAt(aNoSpdy ? 'X' : '.', 5); }