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

Bug 416958 - "Update header names" [p=suryaismail@gmail.com (Surya Ismail) r+sr=sicking a=blocking1.9+]

Browse Source
This commit is contained in:
reed@reedloden.com 2008-02-16 19:26:13 -08:00
parent 6ae5c6a935
commit 33749ae106
6 changed files with 34 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
content/base/src/nsCrossSiteListenerProxy.cpp
View File

@ -886,25 +886,22 @@ nsCrossSiteListenerProxy::AddRequestHeaders(nsIChannel* aChannel,
rv = uri->GetAsciiHost(host);
NS_ENSURE_SUCCESS(rv, rv);
nsCString root = scheme + NS_LITERAL_CSTRING("://") + host +
NS_LITERAL_CSTRING(":");
// If needed, append the default port
nsCString root = scheme + NS_LITERAL_CSTRING("://") + host;
// Append the port
PRInt32 port;
uri->GetPort(&port);
if (port == -1) {
port = NS_GetDefaultPort(scheme.get());
if (port == -1) {
return NS_ERROR_DOM_BAD_URI;
if (port != -1) {
PRInt32 defaultPort = NS_GetDefaultPort(scheme.get());
if (port != defaultPort) {
root.Append(":");
root.AppendInt(port);
}
}
root.AppendInt(port);
// Now add the referer-root header
// Now add the access-control-origin header
nsCOMPtr<nsIHttpChannel> http = do_QueryInterface(aChannel);
NS_ENSURE_TRUE(http, NS_ERROR_FAILURE);
return http->SetRequestHeader(NS_LITERAL_CSTRING("Referer-Root"),
return http->SetRequestHeader(NS_LITERAL_CSTRING("Access-Control-Origin"),
root, PR_FALSE);
}

51
content/base/src/nsXMLHttpRequest.cpp
View File

@ -277,31 +277,15 @@ nsACProxyListener::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
rv = status;
}
nsCOMPtr<nsIHttpChannel> http;
if (NS_SUCCEEDED(rv)) {
http = do_QueryInterface(aRequest, &rv);
}
if (NS_SUCCEEDED(rv)) {
rv = NS_ERROR_DOM_BAD_URI;
nsCString allow;
http->GetResponseHeader(NS_LITERAL_CSTRING("Allow"), allow);
nsCWhitespaceTokenizer tok(allow);
while (tok.hasMoreTokens()) {
if (mRequestMethod.Equals(tok.nextToken(),
nsCaseInsensitiveCStringComparator())) {
rv = NS_OK;
break;
}
}
}
if (NS_SUCCEEDED(rv)) {
// Everything worked, check to see if there is an expiration time set on
// this access control list. If so go ahead and cache it.
// The "Method-Check-Max-Age" header should return an age in seconds.
nsCOMPtr<nsIHttpChannel> http = do_QueryInterface(aRequest, &rv);
// The "Access-Control-Max-Age" header should return an age in seconds.
nsCAutoString ageString;
http->GetResponseHeader(NS_LITERAL_CSTRING("Method-Check-Max-Age"),
http->GetResponseHeader(NS_LITERAL_CSTRING("Access-Control-Max-Age"),
ageString);
// Sanitize the string. We only allow 'delta-seconds' as specified by
@ -322,8 +306,7 @@ nsACProxyListener::OnStartRequest(nsIRequest *aRequest, nsISupports *aContext)
// PR_Now gives microseconds
PRTime expirationTime = PR_Now() + age * PR_USEC_PER_SEC;
nsXMLHttpRequest::sAccessControlCache->PutEntry(mRequestMethod, uri,
mReferrerPrincipal,
nsXMLHttpRequest::sAccessControlCache->PutEntry(uri, mReferrerPrincipal,
expirationTime);
}
}
@ -405,13 +388,12 @@ GetDocumentFromScriptContext(nsIScriptContext *aScriptContext)
}
void
nsAccessControlLRUCache::GetEntry(const nsACString& aMethod,
nsIURI* aURI,
nsAccessControlLRUCache::GetEntry(nsIURI* aURI,
nsIPrincipal* aPrincipal,
PRTime* _retval)
{
nsCAutoString key;
if (GetCacheKey(aMethod, aURI, aPrincipal, key)) {
if (GetCacheKey(aURI, aPrincipal, key)) {
CacheEntry* entry;
if (GetEntryInternal(key, &entry)) {
*_retval = entry->value;
@ -422,13 +404,12 @@ nsAccessControlLRUCache::GetEntry(const nsACString& aMethod,
}
void
nsAccessControlLRUCache::PutEntry(const nsACString& aMethod,
nsIURI* aURI,
nsAccessControlLRUCache::PutEntry(nsIURI* aURI,
nsIPrincipal* aPrincipal,
PRTime aValue)
{
nsCString key;
if (!GetCacheKey(aMethod, aURI, aPrincipal, key)) {
if (!GetCacheKey(aURI, aPrincipal, key)) {
NS_WARNING("Invalid cache key!");
return;
}
@ -520,12 +501,10 @@ nsAccessControlLRUCache::RemoveExpiredEntries(const nsACString& aKey,
}
/* static */ PRBool
nsAccessControlLRUCache::GetCacheKey(const nsACString& aMethod,
nsIURI* aURI,
nsAccessControlLRUCache::GetCacheKey(nsIURI* aURI,
nsIPrincipal* aPrincipal,
nsACString& _retval)
{
NS_ASSERTION(!aMethod.IsEmpty(), "Empty method string!");
NS_ASSERTION(aURI, "Null uri!");
NS_ASSERTION(aPrincipal, "Null principal!");
@ -544,7 +523,7 @@ nsAccessControlLRUCache::GetCacheKey(const nsACString& aMethod,
rv = aURI->GetSpec(spec);
NS_ENSURE_SUCCESS(rv, PR_FALSE);
_retval.Assign(aMethod + space + host + space + spec);
_retval.Assign(host + space + spec);
return PR_TRUE;
}
@ -1560,7 +1539,7 @@ nsXMLHttpRequest::OpenRequest(const nsACString& method,
// our special Access Control Cache.
PRTime expiration = 0;
if (sAccessControlCache) {
sAccessControlCache->GetEntry(method, uri, mPrincipal, &expiration);
sAccessControlCache->GetEntry(uri, mPrincipal, &expiration);
}
if (expiration <= PR_Now()) {
@ -1577,10 +1556,6 @@ nsXMLHttpRequest::OpenRequest(const nsACString& method,
rv = acHttp->SetRequestMethod(NS_LITERAL_CSTRING("OPTIONS"));
NS_ENSURE_SUCCESS(rv, rv);
rv = acHttp->SetRequestHeader(NS_LITERAL_CSTRING("Method-Check"), method,
PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
}
}
@ -2398,7 +2373,7 @@ nsXMLHttpRequest::SetRequestHeader(const nsACString& header,
const char *kInvalidHeaders[] = {
"accept-charset", "accept-encoding", "connection", "content-length",
"content-transfer-encoding", "date", "expect", "host", "keep-alive",
"proxy-connection", "referer", "referer-root", "te", "trailer",
"proxy-connection", "referer", "access-control-origin", "te", "trailer",
"transfer-encoding", "upgrade", "via", "xmlhttprequest-security-check"
};
PRUint32 i;

12
content/base/src/nsXMLHttpRequest.h
View File

@ -107,11 +107,11 @@ public:
return mTable.Init();
}
void GetEntry(const nsACString& aMethod, nsIURI* aURI,
nsIPrincipal* aPrincipal, PRTime* _retval);
void GetEntry(nsIURI* aURI, nsIPrincipal* aPrincipal,
PRTime* _retval);
void PutEntry(const nsACString& aMethod, nsIURI* aURI,
nsIPrincipal* aPrincipal, PRTime aValue);
void PutEntry(nsIURI* aURI, nsIPrincipal* aPrincipal,
PRTime aValue);
void Clear();
@ -122,8 +122,8 @@ private:
RemoveExpiredEntries(const nsACString& aKey, nsAutoPtr<CacheEntry>& aValue,
void* aUserData);
static PRBool GetCacheKey(const nsACString& aMethod, nsIURI* aURI,
nsIPrincipal* aPrincipal, nsACString& _retval);
static PRBool GetCacheKey(nsIURI* aURI, nsIPrincipal* aPrincipal,
nsACString& _retval);
nsClassHashtable<nsCStringHashKey, CacheEntry> mTable;
PRCList mList;

4
content/base/test/file_CrossSiteXHR2_inner.html
View File

@ -47,12 +47,12 @@ for (i = 0; i < passFiles.length; ++i)
doFail("Sending failed : " + passFiles[i][0]);
}
// Check the Referer-Root
// Check the Access-Control-Origin
var channel =
xhr.channel.QueryInterface(Components.interfaces.nsIHttpChannel);
var value = null;
try {
value = channel.getRequestHeader("Referer-Root");
value = channel.getRequestHeader("Access-Control-Origin");
}
catch(e) {
doFail("Getting request header failed : " + passFiles[i][0]);

6
content/base/test/file_CrossSiteXHR3_inner.html
View File

@ -42,17 +42,17 @@ for (i = 0; i < passFiles.length; ++i)
doFail("Sending failed : " + passFiles[i][0]);
}
// Check the Referer-Root
// Check the Access-Control-Origin
var channel =
xhr.channel.QueryInterface(Components.interfaces.nsIHttpChannel);
var value = null;
try {
value = channel.getRequestHeader("Referer-Root");
value = channel.getRequestHeader("Access-Control-Origin");
}
catch(e) {
doFail("Getting request header failed : " + passFiles[i][0]);
}
if (value != "http://sub2.xn--lt-uia.example.org:80")
if (value != "http://sub2.xn--lt-uia.example.org")
doFail("Referer-root incorrect : " + value);
// Check the response

2
content/base/test/test_CrossSiteXHR3.html
View File

@ -13,7 +13,7 @@
</div>
<iframe id="inner" src="http://sub2.xn--lt-uia.example.org/tests/content/base/test/file_CrossSiteXHR3_inner.html">
<iframe id="inner" src="http://sub2.xn--lt-uia.example.org:80/tests/content/base/test/file_CrossSiteXHR3_inner.html">
</iframe>
<pre id="test">