Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 55731, files on disk need explicit html suffix, r=valeski, a=gagan, sr=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@81975 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
morse%netscape.com 2000-10-29 01:57:24 +00:00
parent 327f36258e
commit 5e4a6d80b4
2 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
mozilla/netwerk/streamconv/converters/nsUnknownDecoder.cpp
View File

@ -30,10 +30,13 @@
#include "nsIOutputStream.h"
#include "nsMimeTypes.h"
#include "netCore.h"
#include "nsXPIDLString.h"
#include "nsIPref.h"
#define MAX_BUFFER_SIZE 1024
static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID);
static NS_DEFINE_IID(kPrefServiceCID, NS_PREF_CID);
nsUnknownDecoder::nsUnknownDecoder()
@ -42,6 +45,14 @@ nsUnknownDecoder::nsUnknownDecoder()
mBuffer = nsnull;
mBufferLen = 0;
mRequireHTMLsuffix = PR_FALSE;
nsresult rv;
nsCOMPtr<nsIPref> pPrefService = do_GetService(kPrefServiceCID, &rv);
if (NS_SUCCEEDED(rv)) {
rv = pPrefService->GetBoolPref("security.requireHTMLsuffix", &mRequireHTMLsuffix);
}
}
@ -150,7 +161,7 @@ nsUnknownDecoder::OnDataAvailable(nsIChannel *aChannel,
//
aSourceOffset += mBufferLen;
DetermineContentType();
DetermineContentType(aChannel);
NS_ASSERTION(!mContentType.IsEmpty(),
"Content type should be known by now.");
@ -208,7 +219,7 @@ nsUnknownDecoder::OnStopRequest(nsIChannel *aChannel, nsISupports *aCtxt,
// Analyze the buffer now...
//
if (mContentType.IsEmpty()) {
DetermineContentType();
DetermineContentType(aChannel);
NS_ASSERTION(!mContentType.IsEmpty(),
"Content type should be known by now.");
@ -226,7 +237,7 @@ nsUnknownDecoder::OnStopRequest(nsIChannel *aChannel, nsISupports *aCtxt,
}
void nsUnknownDecoder::DetermineContentType()
void nsUnknownDecoder::DetermineContentType(nsIChannel *aChannel)
{
PRUint32 i;
@ -258,24 +269,47 @@ void nsUnknownDecoder::DetermineContentType()
// If the buffer contains "common" HTML tags then lets call it HTML :-)
//
else {
PRInt32 offset;
offset = str.Find("<HTML", PR_TRUE);
if (offset < 0) {
offset = str.Find("<TITLE", PR_TRUE);
if (offset < 0) {
offset = str.Find("<FRAMESET", PR_TRUE);
if (offset < 0) {
offset = str.Find("<SCRIPT", PR_TRUE);
if (offset < 0) {
offset = str.Find("<BODY", PR_TRUE);
/*
* To prevent a possible attack, we will not consider this to be html
* content if it comes from the local file system
*/
PRBool isLocalFile = PR_FALSE;
if (aChannel) {
nsCOMPtr<nsIURI> pURL;
nsresult rv = aChannel->GetURI(getter_AddRefs(pURL));
if (NS_SUCCEEDED(rv)) {
nsXPIDLCString protocol;
rv = pURL->GetScheme(getter_Copies(protocol));
if (NS_SUCCEEDED(rv)) {
if (!PL_strcasecmp(protocol, "file")) {
isLocalFile = PR_TRUE;
}
}
}
}
if (offset >= 0) {
mContentType = TEXT_HTML;
if (!mRequireHTMLsuffix || !isLocalFile) {
PRInt32 offset;
offset = str.Find("<HTML", PR_TRUE);
if (offset < 0) {
offset = str.Find("<TITLE", PR_TRUE);
if (offset < 0) {
offset = str.Find("<FRAMESET", PR_TRUE);
if (offset < 0) {
offset = str.Find("<SCRIPT", PR_TRUE);
if (offset < 0) {
offset = str.Find("<BODY", PR_TRUE);
}
}
}
}
if (offset >= 0) {
mContentType = TEXT_HTML;
}
}
}

3
mozilla/netwerk/streamconv/converters/nsUnknownDecoder.h
View File

@ -59,7 +59,7 @@ public:
protected:
virtual ~nsUnknownDecoder();
void DetermineContentType();
void DetermineContentType(nsIChannel *aChannel);
nsresult FireListenerNotifications(nsIChannel *aChannel, nsISupports *aCtxt);
protected:
@ -67,6 +67,7 @@ protected:
char *mBuffer;
PRUint32 mBufferLen;
PRBool mRequireHTMLsuffix;
nsCString mContentType;
};