Attachment #287901 for bug #369814

Attachment #287901: first stab for bug #369814

View | Details | Raw Unified | Return to bug 369814
Collapse All | Expand All





#include "nsICacheVisitor.h"
#include "nsIMultiPartChannel.h"
#include "nsIWyciwygChannel.h"
#include "nsIAllowScriptsChannel.h"

// The following are for bug #13871: Prevent frameset spoofing
#include "nsIHTMLDocument.h"

    NS_ENSURE_ARG_POINTER(aAllowJavascript);

    *aAllowJavascript = mAllowJavascript;

    if (!mAllowJavascript) {
        return NS_OK;
    }

    // Disallow javascript when requested by the loading channel.
    nsCOMPtr<nsIChannel> channel;
    GetCurrentDocumentChannel(getter_AddRefs(channel));
    if (!channel) {
        return NS_OK;
    }

    nsCOMPtr<nsIAllowScriptsChannel> allowChannel = do_QueryInterface(channel);
    if (!allowChannel) {
        return NS_OK;
    }

    return allowChannel->GetAllowScripts(aAllowJavascript);
}

NS_IMETHODIMP





    , mLoadFlags(LOAD_NORMAL)
    , mStatus(NS_OK)
    , mIsPending(PR_FALSE)
    , mAllowScripts(PR_FALSE)
    , mJarInput(nsnull)
{
#if defined(PR_LOGGING)

    NS_RELEASE(handler); // NULL parameter
}

NS_IMPL_ISUPPORTS7(nsJARChannel,
                   nsIRequest,
                   nsIChannel,
                   nsIStreamListener,
                   nsIRequestObserver,
                   nsIDownloadObserver,
                   nsIJARChannel,
                   nsIAllowScriptsChannel)

nsresult 
nsJARChannel::Init(nsIURI *uri)

    }

    if (mJarFile) {
        mAllowScripts = PR_TRUE;

        // NOTE: we do not need to deal with mSecurityInfo here,
        // because we're loading from a local file
        rv = CreateJarInput(gJarHandler->JarCache());

}

//-----------------------------------------------------------------------------
// nsIAllowScriptsChannel
//-----------------------------------------------------------------------------
NS_IMETHODIMP
nsJARChannel::GetAllowScripts(PRBool *allowScripts)
{
    *allowScripts = mAllowScripts;
    return PR_TRUE;
}

//-----------------------------------------------------------------------------
// nsIDownloadObserver
//-----------------------------------------------------------------------------


{
    // Grab the security info from our base channel
    nsCOMPtr<nsIChannel> channel(do_QueryInterface(request));
    if (channel) {
        nsCAutoString contentType;
        channel->GetContentType(contentType);

        if (contentType == NS_LITERAL_CSTRING("application/java-archive") ||
            contentType == NS_LITERAL_CSTRING("application/x-jar")) {
            mAllowScripts = PR_TRUE;
        }

        channel->GetSecurityInfo(getter_AddRefs(mSecurityInfo));
    }

    if (NS_SUCCEEDED(status)) {
        mJarFile = file;
    





#include "nsILoadGroup.h"
#include "nsIFile.h"
#include "nsIURI.h"
#include "nsIAllowScriptsChannel.h"
#include "nsCOMPtr.h"
#include "nsString.h"
#include "prlog.h"

class nsJARChannel : public nsIJARChannel
                   , public nsIDownloadObserver
                   , public nsIStreamListener
                   , public nsIAllowScriptsChannel
{
public:
    NS_DECL_ISUPPORTS

    NS_DECL_NSIDOWNLOADOBSERVER
    NS_DECL_NSIREQUESTOBSERVER
    NS_DECL_NSISTREAMLISTENER
    NS_DECL_NSIALLOWSCRIPTSCHANNEL

    nsJARChannel();
    virtual ~nsJARChannel();

    PRUint32                        mLoadFlags;
    nsresult                        mStatus;
    PRBool                          mIsPending;
    PRBool                          mAllowScripts;

    nsJARInputThunk                *mJarInput;
    nsCOMPtr<nsIStreamListener>     mDownloader;

(-)a/netwerk/base/public/Makefile.in (+1 lines)

Line	Link Here

Lines 61-66 SDK_XPIDLSRCS = \	Link Here

		$(NULL)

		$(NULL)

XPIDLSRCS	= \

XPIDLSRCS	= \

		nsIAllowScriptsChannel.idl \

		nsIAuthInformation.idl \

		nsIAuthInformation.idl \

		nsIAuthPrompt.idl \

		nsIAuthPrompt.idl \

		nsIAuthPrompt2.idl \

		nsIAuthPrompt2.idl \

-      Line
+  Link Here
-      Line 0
+  Link Here
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2007
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+#include "nsISupports.idl"
+[scriptable, uuid(b8b50310-a009-4fca-b575-38a5f46c5463)]
+interface nsIAllowScriptsChannel : nsISupports
+{
+    readonly attribute boolean allowScripts;
+};

Return to bug 369814