Change text in password dialogs to account for expanded set of capabilities

(beyond just certificates)


git-svn-id: svn://10.0.0.236/branches/SDR_BRANCH@72038 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/extensions/datetime/nsDateTimeChannel.cpp

@@ -1,431 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// datetime implementation
-
-#include "nsDateTimeChannel.h"
-#include "nsIServiceManager.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsISocketTransportService.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-
-// nsDateTimeChannel methods
-nsDateTimeChannel::nsDateTimeChannel() {
-    NS_INIT_REFCNT();
-    mContentLength = -1;
-    mPort = -1;
-}
-
-nsDateTimeChannel::~nsDateTimeChannel() {
-}
-
-NS_IMPL_ISUPPORTS4(nsDateTimeChannel, nsIChannel, nsIRequest, nsIStreamListener, nsIStreamObserver)
-
-nsresult
-nsDateTimeChannel::Init(nsIURI* uri)
-{
-    nsresult rv;
-
-    NS_ASSERTION(uri, "no uri");
-
-    mUrl = uri;
-
-    rv = mUrl->GetPort(&mPort);
-    if (NS_FAILED(rv) || mPort < 1)
-        mPort = DATETIME_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(mHost));
-    if (NS_FAILED(rv)) return rv;
-
-    if (!*(const char *)mHost) return NS_ERROR_NOT_INITIALIZED;
-
-    return NS_OK;
-}
-
-NS_METHOD
-nsDateTimeChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
-{
-    nsDateTimeChannel* dc = new nsDateTimeChannel();
-    if (dc == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(dc);
-    nsresult rv = dc->QueryInterface(aIID, aResult);
-    NS_RELEASE(dc);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP
-nsDateTimeChannel::IsPending(PRBool *result)
-{
-    NS_NOTREACHED("nsDateTimeChannel::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetStatus(nsresult *status)
-{
-    *status = NS_OK;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Cancel(nsresult status)
-{
-    NS_NOTREACHED("nsDateTimeChannel::Cancel");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Suspend(void)
-{
-    NS_NOTREACHED("nsDateTimeChannel::Suspend");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::Resume(void)
-{
-    NS_NOTREACHED("nsDateTimeChannel::Resume");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetOriginalURI(nsIURI* *aURI)
-{
-    *aURI = mOriginalURI ? mOriginalURI : mUrl;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetOriginalURI(nsIURI* aURI)
-{
-    mOriginalURI = aURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetURI(nsIURI* *aURI)
-{
-    *aURI = mUrl;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetURI(nsIURI* aURI)
-{
-    mUrl = aURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::OpenInputStream(nsIInputStream **_retval)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, 32, 32, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return channel->OpenInputStream(_retval);
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::OpenOutputStream(nsIOutputStream **_retval)
-{
-    NS_NOTREACHED("nsDateTimeChannel::OpenOutputStream");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, 32, 32, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return channel->AsyncOpen(observer, ctxt);
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::AsyncRead(nsIStreamListener *aListener,
-                             nsISupports *ctxt)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, 32, 32, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    mListener = aListener;
-
-    return channel->AsyncRead(this, ctxt);
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::AsyncWrite(nsIInputStream *fromStream,
-                              nsIStreamObserver *observer,
-                              nsISupports *ctxt)
-{
-    NS_NOTREACHED("nsDateTimeChannel::AsyncWrite");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-    *aLoadAttributes = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-    mLoadAttributes = aLoadAttributes;
-    return NS_OK;
-}
-
-#define DATETIME_TYPE "text/plain"
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetContentType(char* *aContentType) {
-    if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-    *aContentType = nsCRT::strdup(DATETIME_TYPE);
-    if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetContentType(const char *aContentType)
-{
-    //It doesn't make sense to set the content-type on this type
-    // of channel...
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetContentLength(PRInt32 aContentLength)
-{
-    NS_NOTREACHED("nsDateTimeChannel::SetContentLength");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetTransferOffset(PRUint32 *aTransferOffset)
-{
-    NS_NOTREACHED("nsDateTimeChannel::GetTransferOffset");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetTransferOffset(PRUint32 aTransferOffset)
-{
-    NS_NOTREACHED("nsDateTimeChannel::SetTransferOffset");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetTransferCount(PRInt32 *aTransferCount)
-{
-    NS_NOTREACHED("nsDateTimeChannel::GetTransferCount");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetTransferCount(PRInt32 aTransferCount)
-{
-    NS_NOTREACHED("nsDateTimeChannel::SetTransferCount");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetBufferSegmentSize(PRUint32 *aBufferSegmentSize)
-{
-    NS_NOTREACHED("nsDateTimeChannel::GetBufferSegmentSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetBufferSegmentSize(PRUint32 aBufferSegmentSize)
-{
-    NS_NOTREACHED("nsDateTimeChannel::SetBufferSegmentSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetBufferMaxSize(PRUint32 *aBufferMaxSize)
-{
-    NS_NOTREACHED("nsDateTimeChannel::GetBufferMaxSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetBufferMaxSize(PRUint32 aBufferMaxSize)
-{
-    NS_NOTREACHED("nsDateTimeChannel::SetBufferMaxSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetShouldCache(PRBool *aShouldCache)
-{
-    *aShouldCache = PR_FALSE;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetPipeliningAllowed(PRBool *aPipeliningAllowed)
-{
-    *aPipeliningAllowed = PR_FALSE;
-    return NS_OK;
-}
- 
-NS_IMETHODIMP
-nsDateTimeChannel::SetPipeliningAllowed(PRBool aPipeliningAllowed)
-{
-    NS_NOTREACHED("SetPipeliningAllowed");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    if (mLoadGroup) // if we already had a load group remove ourselves...
-      (void)mLoadGroup->RemoveChannel(this, nsnull, nsnull, nsnull);
-
-    mLoadGroup = aLoadGroup;
-    if (mLoadGroup) {
-        return mLoadGroup->AddChannel(this, nsnull);
-    }
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsDateTimeChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-    *aSecurityInfo = nsnull;
-    return NS_OK;
-}
-
-// nsIStreamObserver methods
-NS_IMETHODIMP
-nsDateTimeChannel::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext) {
-    return mListener->OnStartRequest(this, aContext);
-}
-
-
-NS_IMETHODIMP
-nsDateTimeChannel::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext,
-                                      nsresult aStatus, const PRUnichar* aMsg) {
-    if (mLoadGroup) {
-        nsresult rv = mLoadGroup->RemoveChannel(this, nsnull, aStatus, aMsg);
-        if (NS_FAILED(rv)) return rv;
-    }
-    return mListener->OnStopRequest(this, aContext, aStatus, aMsg);
-}
-
-
-// nsIStreamListener method
-NS_IMETHODIMP
-nsDateTimeChannel::OnDataAvailable(nsIChannel* aChannel, nsISupports* aContext,
-                               nsIInputStream *aInputStream, PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-    mContentLength = aLength;
-    return mListener->OnDataAvailable(this, aContext, aInputStream, aSourceOffset, aLength);
-}
-

mozilla/extensions/datetime/nsDateTimeChannel.h

@@ -1,77 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// A datetime channel retrieves date time information from 
-// RFC 867 compliant datetime servers. The date/time returned
-// to the caller is of MIME type "text/plain".
-
-#ifndef nsDateTimeChannel_h___
-#define nsDateTimeChannel_h___
-
-#include "nsString.h"
-#include "nsILoadGroup.h"
-#include "nsIInputStream.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "nsDateTimeHandler.h"
-#include "nsIStreamListener.h"
-
-
-class nsDateTimeChannel : public nsIChannel, public nsIStreamListener {
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSISTREAMOBSERVER
-
-    // nsDateTimeChannel methods:
-    nsDateTimeChannel();
-    virtual ~nsDateTimeChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-    
-    nsresult Init(nsIURI* uri);
-
-protected:
-    nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-    nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsCOMPtr<nsIURI>                    mUrl;
-    nsCOMPtr<nsIStreamListener>         mListener;
-    PRUint32                            mLoadAttributes;
-    nsCOMPtr<nsILoadGroup>              mLoadGroup;
-    nsCString                           mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsISupports>               mOwner; 
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-
-    PRInt32                             mPort;
-    nsXPIDLCString                      mHost;
-};
-
-#endif /* nsDateTimeChannel_h___ */

mozilla/extensions/datetime/nsDateTimeHandler.cpp

@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nspr.h"
-#include "nsDateTimeChannel.h"
-#include "nsDateTimeHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
-
-static NS_DEFINE_CID(kSimpleURICID,            NS_SIMPLEURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsDateTimeHandler::nsDateTimeHandler() {
-    NS_INIT_REFCNT();
-}
-
-nsDateTimeHandler::~nsDateTimeHandler() {
-}
-
-NS_IMPL_ISUPPORTS(nsDateTimeHandler, NS_GET_IID(nsIProtocolHandler));
-
-NS_METHOD
-nsDateTimeHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
-
-    nsDateTimeHandler* ph = new nsDateTimeHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->QueryInterface(aIID, aResult);
-    NS_RELEASE(ph);
-    return rv;
-}
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsDateTimeHandler::GetScheme(char* *result) {
-    *result = nsCRT::strdup("datetime");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::GetDefaultPort(PRInt32 *result) {
-    *result = DATETIME_PORT;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result) {
-    nsresult rv;
-
-    // no concept of a relative datetime url
-    NS_ASSERTION(!aBaseURI, "base url passed into datetime protocol handler");
-
-    nsIURI* url;
-    rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
-                                            NS_GET_IID(nsIURI),
-                                            (void**)&url);
-    if (NS_FAILED(rv)) return rv;
-    rv = url->SetSpec((char*)aSpec);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsDateTimeHandler::NewChannel(nsIURI* url, nsIChannel* *result)
-{
-    nsresult rv;
-    
-    nsDateTimeChannel* channel;
-    rv = nsDateTimeChannel::Create(nsnull, NS_GET_IID(nsIChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->Init(url);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/extensions/datetime/nsDateTimeHandler.h

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// The datetime protocol handler creates "datetime" URIs of the form
-// "datetime:RFC867Server".
-
-#ifndef nsDateTimeHandler_h___
-#define nsDateTimeHandler_h___
-
-#include "nsIProtocolHandler.h"
-
-#define DATETIME_PORT 13
-
-// {AA27D2A0-B71B-11d3-A1A0-0050041CAF44}
-#define NS_DATETIMEHANDLER_CID \
-{ 0xaa27d2a0, 0xb71b, 0x11d3, { 0xa1, 0xa0, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-
-class nsDateTimeHandler : public nsIProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsDateTimeHandler methods:
-    nsDateTimeHandler();
-    virtual ~nsDateTimeHandler();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-};
-
-#endif /* nsDateTimeHandler_h___ */

mozilla/extensions/datetime/nsDateTimeModule.cpp

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIGenericFactory.h"
-#include "nsDateTimeHandler.h"
-
-static nsModuleComponentInfo gResComponents[] = {
-    { "The DateTime Protocol Handler", 
-      NS_DATETIMEHANDLER_CID,
-      NS_NETWORK_PROTOCOL_PROGID_PREFIX "datetime",
-      nsDateTimeHandler::Create
-    }
-};
-
-NS_IMPL_NSGETMODULE("datetime", gResComponents)

mozilla/extensions/finger/Makefile.in

@@ -1,41 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= necko_finger
-IS_COMPONENT	= 1
-
-CPPSRCS		= \
-		nsFingerHandler.cpp \
-		nsFingerChannel.cpp \
-		nsFingerModule.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/finger/nsFingerChannel.cpp

@@ -1,517 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// finger implementation
-
-#include "nsFingerChannel.h"
-#include "nsIServiceManager.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsXPIDLString.h"
-#include "nsISocketTransportService.h"
-#include "nsIStringStream.h"
-#include "nsMimeTypes.h"
-
-static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID);
-
-#define BUFFER_SEG_SIZE (4*1024)
-#define BUFFER_MAX_SIZE (64*1024)
-
-// nsFingerChannel methods
-nsFingerChannel::nsFingerChannel()
-    : mContentLength(-1),
-      mActAsObserver(PR_TRUE),
-      mPort(-1),
-      mStatus(NS_OK)
-{
-    NS_INIT_REFCNT();
-}
-
-nsFingerChannel::~nsFingerChannel() {
-}
-
-NS_IMPL_THREADSAFE_ISUPPORTS4(nsFingerChannel, nsIChannel, nsIRequest,
-                              nsIStreamListener, nsIStreamObserver)
-
-nsresult
-nsFingerChannel::Init(nsIURI* uri)
-{
-    nsresult rv;
-    nsXPIDLCString autoBuffer;
-
-    NS_ASSERTION(uri, "no uri");
-
-    mUrl = uri;
-
-//  For security reasons, we do not allow the user to specify a
-//  non-default port for finger: URL's.
-
-    mPort = FINGER_PORT;
-
-    rv = mUrl->GetPath(getter_Copies(autoBuffer)); // autoBuffer = user@host
-    if (NS_FAILED(rv)) return rv;
-
-    nsCString cString(autoBuffer);
-    nsCString tempBuf;
-
-    PRUint32 i;
-
-    // Now parse out the user and host
-    for (i=0; cString[i] != '\0'; i++) {
-      if (cString[i] == '@') {
-        cString.Left(tempBuf, i);
-        mUser = tempBuf;
-        cString.Right(tempBuf, cString.Length() - i - 1);
-        mHost = tempBuf;
-        break;
-       }
-    }
-
-    // Catch the case of just the host being given
-
-    if (cString[i] == '\0') {
-      mHost = cString;
-    }
-
-#ifdef DEBUG_bryner
-    printf("Status:mUser = %s, mHost = %s\n", (const char*)mUser,
-           (const char*)mHost);
-#endif
-    if (!*(const char *)mHost) return NS_ERROR_NOT_INITIALIZED;
-
-    return NS_OK;
-}
-
-NS_METHOD
-nsFingerChannel::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult)
-{
-    nsFingerChannel* fc = new nsFingerChannel();
-    if (fc == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(fc);
-    nsresult rv = fc->QueryInterface(aIID, aResult);
-    NS_RELEASE(fc);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods:
-
-NS_IMETHODIMP
-nsFingerChannel::IsPending(PRBool *result)
-{
-    NS_NOTREACHED("nsFingerChannel::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetStatus(nsresult *status)
-{
-    *status = mStatus;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Cancel(nsresult status)
-{
-    nsresult rv = NS_ERROR_FAILURE;
-
-    mStatus = status;
-    if (mTransport) {
-      rv = mTransport->Cancel(status);
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Suspend(void)
-{
-    NS_NOTREACHED("nsFingerChannel::Suspend");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::Resume(void)
-{
-    NS_NOTREACHED("nsFingerChannel::Resume");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods:
-
-NS_IMETHODIMP
-nsFingerChannel::GetOriginalURI(nsIURI* *aURI)
-{
-    *aURI = mOriginalURI ? mOriginalURI : mUrl;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetOriginalURI(nsIURI* aURI)
-{
-    mOriginalURI = aURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetURI(nsIURI* *aURI)
-{
-    *aURI = mUrl;
-    NS_IF_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetURI(nsIURI* aURI)
-{
-    mUrl = aURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::OpenInputStream(nsIInputStream **_retval)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, BUFFER_SEG_SIZE,
-            BUFFER_MAX_SIZE, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    return channel->OpenInputStream(_retval);
-}
-
-NS_IMETHODIMP
-nsFingerChannel::OpenOutputStream(nsIOutputStream **_retval)
-{
-    NS_NOTREACHED("nsFingerChannel::OpenOutputStream");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::AsyncOpen(nsIStreamObserver *observer, nsISupports* ctxt)
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::AsyncRead(nsIStreamListener *aListener, nsISupports *ctxt)
-{
-    nsresult rv = NS_OK;
-
-    NS_WITH_SERVICE(nsISocketTransportService, socketService, kSocketTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> channel;
-    rv = socketService->CreateTransport(mHost, mPort, mHost, BUFFER_SEG_SIZE,
-      BUFFER_MAX_SIZE, getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    mListener = aListener;
-    mResponseContext = ctxt;
-    mTransport = channel;
-
-    return SendRequest(channel);
-}
-
-NS_IMETHODIMP
-nsFingerChannel::AsyncWrite(nsIInputStream *fromStream,
-                            nsIStreamObserver *observer,
-                            nsISupports *ctxt)
-{
-    NS_NOTREACHED("nsFingerChannel::AsyncWrite");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetLoadAttributes(PRUint32 *aLoadAttributes)
-{
-    *aLoadAttributes = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetLoadAttributes(PRUint32 aLoadAttributes)
-{
-    mLoadAttributes = aLoadAttributes;
-    return NS_OK;
-}
-
-#define FINGER_TYPE TEXT_PLAIN
-
-NS_IMETHODIMP
-nsFingerChannel::GetContentType(char* *aContentType) {
-    if (!aContentType) return NS_ERROR_NULL_POINTER;
-
-    *aContentType = nsCRT::strdup(FINGER_TYPE);
-    if (!*aContentType) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetContentType(const char *aContentType)
-{
-    //It doesn't make sense to set the content-type on this type
-    // of channel...
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetContentLength(PRInt32 *aContentLength)
-{
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetContentLength(PRInt32 aContentLength)
-{
-    NS_NOTREACHED("nsFingerChannel::SetContentLength");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetTransferOffset(PRUint32 *aTransferOffset)
-{
-    NS_NOTREACHED("nsFingerChannel::GetTransferOffset");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetTransferOffset(PRUint32 aTransferOffset)
-{
-    NS_NOTREACHED("nsFingerChannel::SetTransferOffset");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetTransferCount(PRInt32 *aTransferCount)
-{
-    NS_NOTREACHED("nsFingerChannel::GetTransferCount");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetTransferCount(PRInt32 aTransferCount)
-{
-    NS_NOTREACHED("nsFingerChannel::SetTransferCount");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetBufferSegmentSize(PRUint32 *aBufferSegmentSize)
-{
-    NS_NOTREACHED("nsFingerChannel::GetBufferSegmentSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetBufferSegmentSize(PRUint32 aBufferSegmentSize)
-{
-    NS_NOTREACHED("nsFingerChannel::SetBufferSegmentSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetBufferMaxSize(PRUint32 *aBufferMaxSize)
-{
-    NS_NOTREACHED("nsFingerChannel::GetBufferMaxSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetBufferMaxSize(PRUint32 aBufferMaxSize)
-{
-    NS_NOTREACHED("nsFingerChannel::SetBufferMaxSize");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetShouldCache(PRBool *aShouldCache)
-{
-    *aShouldCache = PR_FALSE;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetPipeliningAllowed(PRBool *aPipeliningAllowed)
-{
-    *aPipeliningAllowed = PR_FALSE;
-    return NS_OK;
-}
- 
-NS_IMETHODIMP
-nsFingerChannel::SetPipeliningAllowed(PRBool aPipeliningAllowed)
-{
-    NS_NOTREACHED("SetPipeliningAllowed");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    mLoadGroup = aLoadGroup;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetOwner(nsISupports* *aOwner)
-{
-    *aOwner = mOwner.get();
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsFingerChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-    *aSecurityInfo = nsnull;
-    return NS_OK;
-}
-
-// nsIStreamObserver methods
-NS_IMETHODIMP
-nsFingerChannel::OnStartRequest(nsIChannel *aChannel, nsISupports *aContext) {
-    if (!mActAsObserver) {
-      // acting as a listener
-      return mListener->OnStartRequest(this, aContext);
-    } else {
-      // we don't want to pass our AsyncWrite's OnStart through
-      // we just ignore this
-      return NS_OK;
-    }
-}
-
-
-NS_IMETHODIMP
-nsFingerChannel::OnStopRequest(nsIChannel* aChannel, nsISupports* aContext,
-                                      nsresult aStatus, const PRUnichar* aMsg) {
-#ifdef DEBUG_bryner
-    printf("nsFingerChannel::OnStopRequest, mActAsObserver=%d\n",
-            mActAsObserver);
-    printf("  aChannel = %p\n", aChannel);
-#endif
-    nsresult rv = NS_OK;
-
-    if (NS_FAILED(aStatus) || !mActAsObserver) {
-        if (mLoadGroup) {
-          rv = mLoadGroup->RemoveChannel(this, nsnull, aStatus, aMsg);
-          if (NS_FAILED(rv)) return rv;
-        }
-        rv = mListener->OnStopRequest(this, aContext, aStatus, aMsg);
-        mTransport = 0;
-        return rv;
-    } else {
-        // at this point we know the request has been sent.
-        // we're no longer acting as an observer.
- 
-        mActAsObserver = PR_FALSE;
-        return aChannel->AsyncRead(this, mResponseContext);
-    }
-
-}
-
-
-// nsIStreamListener method
-NS_IMETHODIMP
-nsFingerChannel::OnDataAvailable(nsIChannel* aChannel, nsISupports* aContext,
-                               nsIInputStream *aInputStream, PRUint32 aSourceOffset,
-                               PRUint32 aLength) {
-    mContentLength = aLength;
-    return mListener->OnDataAvailable(this, aContext, aInputStream, aSourceOffset, aLength);
-}
-
-nsresult
-nsFingerChannel::SendRequest(nsIChannel* aChannel) {
-  // The text to send should already be in mUser
-
-  nsresult rv = NS_OK;
-  nsCOMPtr<nsISupports> result;
-  nsCOMPtr<nsIInputStream> charstream;
-  nsCString requestBuffer(mUser);
-
-  if (mLoadGroup) {
-    mLoadGroup->AddChannel(this, nsnull);
-  }
-
-  requestBuffer.Append(CRLF);
-
-  mRequest = requestBuffer.ToNewCString();
-
-  rv = NS_NewCharInputStream(getter_AddRefs(result), mRequest);
-  if (NS_FAILED(rv)) return rv;
-
-  charstream = do_QueryInterface(result, &rv);
-  if (NS_FAILED(rv)) return rv;
-
-#ifdef DEBUG_bryner
-  printf("Sending: %s\n", requestBuffer.GetBuffer());
-#endif
-
-  rv = aChannel->SetTransferCount(requestBuffer.Length());
-  if (NS_FAILED(rv)) return rv;
-  rv = aChannel->AsyncWrite(charstream, this, 0);
-  return rv;
-}
-
-

mozilla/extensions/finger/nsFingerChannel.h

@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsFingerChannel_h___
-#define nsFingerChannel_h___
-
-#include "nsString.h"
-#include "nsILoadGroup.h"
-#include "nsIInputStream.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsXPIDLString.h"
-#include "nsIChannel.h"
-#include "nsIURI.h"
-#include "nsFingerHandler.h"
-#include "nsIStreamListener.h"
-
-
-class nsFingerChannel : public nsIChannel, public nsIStreamListener {
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSISTREAMOBSERVER
-
-    // nsFingerChannel methods:
-    nsFingerChannel();
-    virtual ~nsFingerChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-    
-    nsresult Init(nsIURI* uri);
-
-protected:
-    nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-    nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsCOMPtr<nsIURI>                    mUrl;
-    nsCOMPtr<nsIStreamListener>         mListener;
-    PRUint32                            mLoadAttributes;
-    nsCOMPtr<nsILoadGroup>              mLoadGroup;
-    nsCString                           mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsISupports>               mOwner; 
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-    PRBool                              mActAsObserver;
-
-    PRInt32                             mPort;
-    nsXPIDLCString                      mHost;
-    nsXPIDLCString                      mUser;
-
-    nsXPIDLCString                      mRequest;
-
-    nsCOMPtr<nsISupports>               mResponseContext;
-    nsCOMPtr<nsIChannel>                mTransport;
-    nsresult                            mStatus;
-
-protected:
-    nsresult SendRequest(nsIChannel* aChannel);
-};
-
-#endif /* nsFingerChannel_h___ */

mozilla/extensions/finger/nsFingerHandler.cpp

@@ -1,116 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nspr.h"
-#include "nsFingerChannel.h"
-#include "nsFingerHandler.h"
-#include "nsIURL.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsIProgressEventSink.h"
-
-static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsFingerHandler::nsFingerHandler() {
-    NS_INIT_REFCNT();
-}
-
-nsFingerHandler::~nsFingerHandler() {
-}
-
-NS_IMPL_ISUPPORTS(nsFingerHandler, NS_GET_IID(nsIProtocolHandler));
-
-NS_METHOD
-nsFingerHandler::Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult) {
-
-    nsFingerHandler* ph = new nsFingerHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->QueryInterface(aIID, aResult);
-    NS_RELEASE(ph);
-    return rv;
-}
-    
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsFingerHandler::GetScheme(char* *result) {
-    *result = nsCRT::strdup("finger");
-    if (!*result) return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::GetDefaultPort(PRInt32 *result) {
-    *result = FINGER_PORT;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result) {
-    nsresult rv;
-
-    // no concept of a relative finger url
-    NS_ASSERTION(!aBaseURI, "base url passed into finger protocol handler");
-
-    nsIURI* url;
-    rv = nsComponentManager::CreateInstance(kSimpleURICID, nsnull,
-                                            NS_GET_IID(nsIURI),
-                                            (void**)&url);
-    if (NS_FAILED(rv)) return rv;
-    rv = url->SetSpec((char*)aSpec);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsFingerHandler::NewChannel(nsIURI* url, nsIChannel* *result)
-{
-    nsresult rv;
-    
-    nsFingerChannel* channel;
-    rv = nsFingerChannel::Create(nsnull, NS_GET_IID(nsIChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = channel->Init(url);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/extensions/finger/nsFingerHandler.h

@@ -1,52 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-// The finger protocol handler creates "finger" URIs of the form
-// "finger:user@host" or "finger:host".
-
-#ifndef nsFingerHandler_h___
-#define nsFingerHandler_h___
-
-#include "nsIProtocolHandler.h"
-
-#define FINGER_PORT 79
-
-// {0x76d6d5d8-1dd2-11b2-b361-850ddf15ef07}
-#define NS_FINGERHANDLER_CID     \
-{ 0x76d6d5d8, 0x1dd2, 0x11b2, \
-   {0xb3, 0x61, 0x85, 0x0d, 0xdf, 0x15, 0xef, 0x07} }
-
-class nsFingerHandler : public nsIProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsFingerHandler methods:
-    nsFingerHandler();
-    virtual ~nsFingerHandler();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD Create(nsISupports* aOuter, const nsIID& aIID, void* *aResult);
-};
-
-#endif /* nsFingerHandler_h___ */

mozilla/extensions/finger/nsFingerModule.cpp

@@ -1,34 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIGenericFactory.h"
-#include "nsFingerHandler.h"
-
-static nsModuleComponentInfo gResComponents[] = {
-    { "The Finger Protocol Handler", 
-      NS_FINGERHANDLER_CID,
-      NS_NETWORK_PROTOCOL_PROGID_PREFIX "finger",
-      nsFingerHandler::Create
-    }
-};
-
-NS_IMPL_NSGETMODULE("finger", gResComponents)

mozilla/extensions/psm-glue/Makefile.in

@@ -17,7 +17,7 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#
+# 
 
 DEPTH		= ../..
 topsrcdir	= @top_srcdir@
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+DIRS		= public src res
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/extensions/psm-glue/makefile.win

@@ -1,4 +1,4 @@
-#!gmake
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -19,12 +19,9 @@
 #
 # Contributor(s): 
 
-DEPTH = ..\..\..
+DEPTH=..\..
+include <$(DEPTH)/config/config.mak>
 
-MODULE = necko
-
-DIRS=      \
-    src    \
-    $(NULL)
+DIRS = public src res
 
 include <$(DEPTH)\config\rules.mak>

mozilla/extensions/psm-glue/public/MANIFEST

@@ -0,0 +1,4 @@
+nsIPSMComponent.idl
+nsIPSMUIHandler.idl
+nsISecureBrowserUI.idl
+nsISSLSocketProvider.idl

mozilla/extensions/psm-glue/public/Makefile.in

@@ -17,7 +17,12 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+#   Terry Hayes <thayes@netscape.com>
+# 
+
+MODULE = psmglue
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -26,13 +31,15 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
+XPIDLSRCS = \
+	nsIPSMComponent.idl \
+	nsIPSMUIHandler.idl \
+	nsISecureBrowserUI.idl \
+    nsIPSMSocketInfo.idl \
+	nsISSLSocketProvider.idl \
+	nsISecretDecoderRing.idl \
+	$(NULL)
 
-CPPSRCS		= nsDnsAsyncLookup.cpp
-
-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=)
+PREF_JS_EXPORTS	= $(srcdir)/psm-glue.js
 
 include $(topsrcdir)/config/rules.mk
-
-DEFINES		+= -D"GETHOSTBYNAME_DELAY=5" -DNO_SOCKS_NS_KLUDGE
-

mozilla/extensions/psm-glue/public/makefile.win

@@ -0,0 +1,53 @@
+#!nmake
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s):
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+#   Terry Hayes <thayes@netscape.com>
+#
+
+MODULE = psmglue
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+DLLNAME       = psmglue
+PDBFILE       = $(DLLNAME).pdb
+MAPFILE       = $(DLLNAME).map
+DLL           = .\$(OBJDIR)\$(DLLNAME).dll
+MAKE_OBJ_TYPE = DLL
+
+include <$(DEPTH)/config/config.mak>
+
+XPIDL_INCLUDES=-I$(DEPTH)\..\mozilla\dist\idl
+
+XPIDLSRCS= \
+    .\nsIPSMComponent.idl \
+    .\nsIPSMUIHandler.idl \
+    .\nsISecureBrowserUI.idl \
+    .\nsISSLSocketProvider.idl \
+    .\nsIPSMSocketInfo.idl \
+    .\nsISecretDecoderRing.idl \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install::
+    $(MAKE_INSTALL) .\psm-glue.js $(DIST)\bin\defaults\pref

mozilla/extensions/psm-glue/public/nsIPSMComponent.idl

@@ -0,0 +1,87 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Mitch Stoltz <mstoltz@netscape.com>
+*/
+
+#include "nsISupports.idl"
+interface nsIPrincipal;
+
+%{C++
+#include "cmtcmn.h"
+%}
+
+[ptr] native nsCMTControlStar(CMT_CONTROL);
+
+[scriptable, uuid(9e482670-5412-11d3-bbc8-0000861d1237)]
+interface nsIPSMComponent : nsISupports 
+{
+
+  [noscript] nsCMTControlStar getControlConnection( );
+
+  /**
+   *  Display the Security Advisor.  PickledStatus and hostName can be null. 
+   *  If they are, the "Selected Info" dialog will be empty.
+   */
+
+  void displaySecurityAdvisor(in string pickledStatus, in string hostName);
+
+  /**
+   *  This will send PSM all preferences that we know about.
+   */
+  void passPrefs();
+
+ /* Sig Verification Error Codes */
+  const long VERIFY_OK = 0;
+  const long VERIFY_NOSIG = -2;
+  const long VERIFY_ERROR_UNKNOWN_CA  = -8172;
+  
+  /* Hash Algorithms (based on cmtcmn.h) */ 
+  const short MD2  = 1;
+  const short MD5  = 2;
+  const short SHA1 = 3;
+  const unsigned long MD2_LENGTH  = 16;
+  const unsigned long MD5_LENGTH  = 16;
+  const unsigned long SHA1_LENGTH = 20;
+  const unsigned long MAX_HASH_LENGTH = SHA1_LENGTH;
+
+  /* Secure Hashing functions */
+  void hashBegin(in unsigned long alg, out unsigned long id);
+  void hashUpdate(in unsigned long id, in string buf, in unsigned long buflen);
+  void hashEnd(in unsigned long id, out string hash, out unsigned long hashlen,
+               in unsigned long maxLen);
+  
+  /* Signature Verification functions */
+  void verifyRSABegin(out unsigned long id);
+  void verifyRSAUpdate(in unsigned long id, in string buf, 
+                       in unsigned long buflen);
+  void verifyRSAEnd(in unsigned long id, in string plaintext,
+                    in unsigned long plaintextLen,
+                    in boolean keepCert, out nsIPrincipal principal, out long result);
+  nsIPrincipal CreatePrincipalFromCert(in unsigned long certID);
+};
+
+%{C++
+#define PSM_COMPONENT_PROGID "component://netscape/psm"
+#define PSM_COMPONENT_CLASSNAME "Mozilla PSM Component"
+%}
+

mozilla/extensions/psm-glue/public/nsIPSMSocketInfo.idl

@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Netscape Public
+ * 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/NPL/
+ * 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
@@ -17,23 +17,29 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
- */
+ * Contributor(s):
+ *   Doug Turner <dougt@netscape.com>
+*/
 
 #include "nsISupports.idl"
-interface nsIURI;
 
-[scriptable, uuid(e5cf0c64-1dd1-11b2-b704-c889f2be4793)]
-interface nsIHTTPEventSink : nsISupports
-{
-    /**
-      * Fired when all the headers have been parsed and are ready
-      * for a consumer to use. 
-      */
-    void onHeadersAvailable(in nsISupports i_Context);
+%{C++
+#include "cmtcmn.h"
+#include "nsPSMShimLayer.h"
+%}
 
-    /**
-      * Fired when a redirect occurs due to a HTTP response (like 302)
-      */
-    void onRedirect(in nsISupports i_Context, in nsIURI i_NewLocation);
+[ptr] native psmtControlStar(CMT_CONTROL);
+[ptr] native cmSocketStar(CMSocket);
+[ptr] native nsFileDescStar(PRFileDesc);
+
+[noscript, uuid(deeb8dfc-fb7a-11d3-ac84-00c04fa0d26b)]
+interface nsIPSMSocketInfo : nsISupports {
+    
+    readonly attribute string           hostName;
+    readonly attribute psmtControlStar  controlPtr;
+    readonly attribute cmSocketStar     socketPtr;
+    readonly attribute nsFileDescStar   fileDescPtr;
+
+    void getPickledStatus(out charStar pickledStatus);
 };
+

mozilla/extensions/psm-glue/public/nsIPSMUIHandler.idl

@@ -0,0 +1,36 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(d92be9b0-601b-11d3-8c4a-000064657374)]
+interface nsIPSMUIHandler : nsISupports
+{
+    void DisplayURI(in long width, in long height, in string urlStr);
+    void PromptForFile(in wstring prompt, in string fileRegEx, in boolean shouldFileExist, out string outFile);
+};
+
+%{C++
+#define PSM_UI_HANLDER_PROGID "component://netscape/psm/ui"
+#define PSM_UI_HANLDER_CLASSNAME "Mozilla PSM UI Handler"
+%}

mozilla/extensions/psm-glue/public/nsISSLSocketProvider.idl

@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Netscape Public
+ * 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/NPL/
+ * 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
@@ -17,14 +17,19 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
- */
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
 
-#include "nsISupports.idl"
+#include "nsISocketProvider.idl"
 
-[scriptable, uuid(fb65fd70-1881-11d3-9337-00104ba0fd40)]
-interface nsIEventSinkGetter : nsISupports
-{
-    nsISupports getEventSink(in string command, in nsIIDRef eventSinkIID);
+[noscript, uuid(856a93d0-5415-11d3-bbc8-0000861d1237)]
+interface nsISSLSocketProvider : nsISocketProvider {
 };
 
+%{C++
+#define NS_ISSLSOCKETPROVIDER_PROGID     NS_NETWORK_SOCKET_PROGID_PREFIX "ssl"
+#define NS_ISSLSOCKETPROVIDER_CLASSNAME  "Mozilla SSL Socket Provider Component"
+
+%}

mozilla/extensions/psm-glue/public/nsISecretDecoderRing.idl

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape 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/NPL/
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  thayes@netscape.com
+ *
+ */
+
+#include "nsISupports.idl"
+
+/* Buffer type - for storing 8-bit octet values */
+[ptr] native buffer(unsigned char);
+
+[scriptable, uuid(0EC80360-075C-11d4-9FD4-00C04F1B83D8)]
+interface nsISecretDecoderRing: nsISupports {
+
+  /* Encrypt a buffer - callable only from C++ */
+  [noscript] long encrypt(in buffer data, in long dataLen, out buffer result);
+
+  /* Decrypt a buffer - callable only from C++ */
+  [noscript] long decrypt(in buffer data, in long dataLen, out buffer result);
+
+  /* Encrypt nul-terminated string to BASE64 output */
+  string encryptString(in string text);
+
+  /* Decrypt BASE64 input to nul-terminated string output */
+  /* There is no check for embedded nul values in the decrypted output */
+  string decryptString(in string crypt);
+
+  /* Prompt the user to change the password on the SDR key */
+  void changePassword();
+
+  /* Logout of the security device that protects the SDR key */
+  void logout();
+};
+
+/*
+ * Configuration interface for the Secret Decoder Ring
+ *  - this interface allows setting the window that will be
+ *    used as parent for dialog windows (such as password prompts)
+ */
+[scriptable, uuid(01D8C0F0-0CCC-11d4-9FDD-000064657374)]
+interface nsISecretDecoderRingConfig: nsISupports {
+  void setWindow(in nsISupports w);
+};
+
+

mozilla/extensions/psm-glue/public/nsISecureBrowserUI.idl

@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Netscape Public
+ * 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/NPL/
+ * 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
@@ -17,28 +17,28 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
- */
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
 
 #include "nsISupports.idl"
 
-interface nsISocketProvider;
+interface nsIDOMWindow;
+interface nsIDOMElement;
 
-[noscript, uuid(8f8a23d0-5472-11d3-bbc8-0000861d1237)]
-interface nsISocketProviderService : nsISupports
+[scriptable, uuid(081e31e0-a144-11d3-8c7c-00609792278c)]
+interface nsSecureBrowserUI : nsISupports
 {
-  nsISocketProvider GetSocketProvider(in string socketType);
+	void init(in nsIDOMWindow window, in nsIDOMElement button);
+    void displayPageInfoUI();
 };
 
-
 %{C++
+#define NS_SECURE_BROWSER_UI_PROGID "component://netscape/secure_browser_ui"
+#define NS_SECURE_BROWSER_UI_CLASSNAME "Mozilla Secure Browser UI Handler"
 
-#define NS_SOCKETPROVIDERSERVICE_CID                 \
-{ /* ed394ba0-5472-11d3-bbc8-0000861d1237 */         \
-  0xed394ba0,                                        \
-  0x5472,                                            \
-  0x11d3,                                            \
-  {0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37}   \
-}
+#define NS_SECURE_BROWSER_UI_CID \
+{ 0x10fe7ea0, 0xa10a, 0x11d3, {0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
 
 %}

mozilla/extensions/psm-glue/public/psm-glue.js

@@ -0,0 +1,11 @@
+pref("general.useragent.security",       "U");
+
+pref("security.enable_ssl2",             true);
+pref("security.enable_ssl3",             true);
+pref("security.default_personal_cert",   "Select Automatically");
+pref("security.ask_for_password",        0);
+pref("security.password_lifetime",       30);
+pref("security.warn_entering_secure",    true);
+pref("security.warn_leaving_secure",     true);
+pref("security.warn_viewing_mixed",      true);
+pref("security.warn_submit_insecure",    true);

mozilla/extensions/psm-glue/res/Makefile.in

@@ -17,7 +17,7 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#
+# 
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -26,7 +26,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= public src
+DIRS		= content skin locale
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/extensions/psm-glue/res/content/MANIFEST_GLOBAL

@@ -0,0 +1 @@
+PSMTaskMenu.xul

mozilla/extensions/psm-glue/res/content/MANIFEST_NAV

@@ -0,0 +1,2 @@
+NavSecurityOverlay.xul
+NavSecurityUI.js

mozilla/extensions/psm-glue/res/content/Makefile.in

@@ -17,7 +17,7 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#
+# 
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -25,11 +25,19 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_about
-
-XPIDLSRCS	= nsIAboutModule.idl
-
 include $(topsrcdir)/config/rules.mk
 
+NAVIGATOR_CONTENT_DIR = $(DIST)/bin/chrome/navigator/content/
+NAVIGATOR_EXPORT_CONTENT = \
+  $(srcdir)/NavSecurityOverlay.xul \
+  $(srcdir)/NavSecurityUI.js       \
+  $(NULL)
+
+GLOBAL_CONTENT_DIR = $(DIST)/bin/chrome/global/content/
+GLOBAL_EXPORT_CONTENT = \
+  $(srcdir)/PSMTaskMenu.xul \
+  $(NULL)
+
+install::
+	$(INSTALL) $(NAVIGATOR_EXPORT_CONTENT) $(NAVIGATOR_CONTENT_DIR)
+	$(INSTALL) $(GLOBAL_EXPORT_CONTENT) $(GLOBAL_CONTENT_DIR)

mozilla/extensions/psm-glue/res/content/NavSecurityOverlay.xul

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<overlay id="NavSecurityOverlay"
+xmlns:html="http://www.w3.org/TR/REC-html40"
+xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<?xml-stylesheet href="chrome://navigator/skin/NavSecurityOverlay.css" type="text/css"?> 
+<html:script language="JavaScript" src="chrome://navigator/content/NavSecurityUI.js" />
+
+<box id="state-box">
+    <titledbutton id="security-button" class="borderless" align="left" onclick="displayPageInfo()"/>    
+</box>
+      
+</overlay>

mozilla/extensions/psm-glue/res/content/NavSecurityUI.js

@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Netscape Public
+ * 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/NPL/
+ * 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
@@ -17,24 +17,29 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
- */
+ * Contributor(s):
+*/
 
-#include "nsISupports.idl"
+window.addEventListener("load", SetSecurityButton, false);
 
-interface nsIInputStream;
-interface nsIOutputStream;
+var securityUI;
 
-[scriptable, uuid(818e1370-77c4-11d3-9395-00104ba0fd40)]
-interface nsIFileSystem : nsISupports
+function SetSecurityButton()
 {
-    void open(out string contentType,
-              out long contentLength);
+    dump("in SetSecurityButton\n");
 
-    void close(in nsresult status);
-    
-    readonly attribute nsIInputStream inputStream;
+    var ui = Components.classes["component://netscape/secure_browser_ui"].createInstance();
+    securityUI = ui.QueryInterface(Components.interfaces.nsSecureBrowserUI);
+
+    var button  = document.getElementById('security-button');
+	if (button && window.content)
+		securityUI.init(window.content, button);
+}
+
+function displayPageInfo()
+{
+   if (securityUI)
+     securityUI.displayPageInfoUI();
+}
 
-    readonly attribute nsIOutputStream outputStream;
-};
 

mozilla/extensions/psm-glue/res/content/PSMTaskMenu.xul

@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window SYSTEM "chrome://global/locale/PSMTaskMenu.dtd" >
+
+<overlay id="psmTaskMenuID"
+xmlns:html="http://www.w3.org/TR/REC-html40"
+xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<html:script language="JavaScript">
+
+function displaySecurityAdvisor()
+{
+    var psm = Components.classes["component://netscape/psm"].getService();
+    psm = psm.QueryInterface(Components.interfaces.nsIPSMComponent);
+    psm.displaySecurityAdvisor( null, null );
+}
+
+</html:script>
+
+<menupopup id="personalManagers">
+    <menuitem id="PSMMentItem" position="1" value="&PSMCmd.label;" oncommand="displaySecurityAdvisor()"/>
+</menupopup>
+
+</overlay>

mozilla/extensions/psm-glue/res/content/makefile.win

@@ -19,46 +19,19 @@
 #
 # Contributor(s): 
 
-MODULE = necko
-
-DEPTH=..\..\..
-
-
-MAKE_OBJ_TYPE	= DLL
-
+DEPTH=..\..\..\..
 include <$(DEPTH)/config/config.mak>
-
-LINCS = \
-	-I$(PUBLIC) \
-	$(NULL)
-
-LLIBS	= \
-	$(LIBNSPR) \
-	$(MOZ_DIST)\lib\xpcom.lib \
-	$(NULL)
-
-LIBRARY_NAME=neckosocket_s
-
-
-OBJS = \
-	.\$(OBJDIR)\nsSocketProviderService.obj \
-	$(NULL)
-
-
-XPIDL_INCLUDES=-I$(DEPTH)\..\mozilla\dist\idl
-
-XPIDLSRCS= \
-	.\nsISocketProvider.idl \
-	.\nsISocketProviderService.idl \
-	$(NULL)
-
-NO_GEN_XPT=1
-
-
 include <$(DEPTH)\config\rules.mak>
 
-install:: $(LIBRARY)
-	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+install:: $(DLL)
+    $(MAKE_INSTALL) NavSecurityOverlay.xul     $(DIST)\bin\chrome\navigator\content
+    $(MAKE_INSTALL) NavSecurityUI.js           $(DIST)\bin\chrome\navigator\content
 
+install:: $(DLL)
+    $(MAKE_INSTALL) PSMTaskMenu.xul	$(DIST)\bin\chrome\global\content
+    
 clobber::
-        rm -rf $(OBJDIR)
+    $(RM) $(DIST)\bin\chrome\navigator\content\NavSecurityOverlay.xul
+    $(RM) $(DIST)\bin\chrome\navigator\content\NavSecurityUI.js
+    $(RM) $(DIST)\bin\chrome\global\content\PSMTaskMenu.xul
+

mozilla/extensions/psm-glue/res/locale/Makefile.in

@@ -19,14 +19,14 @@
 # Contributor(s): 
 #
 
-DEPTH		= ../../..
+DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS		= src
+DIRS		= en-US
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/extensions/psm-glue/res/locale/en-US/MANIFEST

@@ -0,0 +1 @@
+PSMTaskMenu.dtd

mozilla/extensions/psm-glue/res/locale/en-US/MANIFEST_NAV

@@ -0,0 +1 @@
+security.properties

mozilla/extensions/psm-glue/res/locale/en-US/Makefile.in

@@ -19,30 +19,26 @@
 # Contributor(s): 
 #
 
-DEPTH		= ../../../..
+DEPTH		= ../../../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= necko
-LIBRARY_NAME	= necko_resource
-SHORT_LIBNAME	= neckorsc
-IS_COMPONENT	= 1
+EXPORT_RESOURCE_CONTENT = \
+	$(srcdir)/PSMTaskMenu.dtd \
+	$(NULL)
 
-REQUIRES	= xpcom necko
-
-CPPSRCS		= \
-		nsResourceProtocolHandler.cpp \
-		nsResourceProtocolModule.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+EXPORT_NAV_RESOURCE_CONTENT = \
+	$(srcdir)/security.properties \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(OS_ARCH), Linux)
-DEFINES		+= -D_BSD_SOURCE
-endif
+install:: 
+	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/locale
+	$(INSTALL) $(EXPORT_NAV_RESOURCE_CONTENT) $(DIST)/bin/chrome/navigator/locale
+
+
 

mozilla/extensions/psm-glue/res/locale/en-US/PSMTaskMenu.dtd

@@ -0,0 +1 @@
+<!ENTITY PSMCmd.label     "Security Manager">

mozilla/extensions/psm-glue/res/locale/en-US/makefile.win

@@ -1,4 +1,4 @@
-#!gmake
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -19,13 +19,18 @@
 #
 # Contributor(s): 
 
-DEPTH = ..\..
-
-MODULE = necko
-
-DIRS=          \
-	public \
-	src    \
-	$(NULL)
+DEPTH=..\..\..\..\..
 
 include <$(DEPTH)\config\rules.mak>
+
+GLOBAL_DIST=$(DIST)\bin\chrome\global\locale
+NAV_DIST=$(DIST)\bin\chrome\navigator\locale
+
+
+install::
+	$(MAKE_INSTALL) PSMTaskMenu.dtd $(GLOBAL_DIST)
+	$(MAKE_INSTALL) security.properties $(NAV_DIST)
+
+clobber::
+  $(RM) -f $(DIST)\bin\chrome\global\locale\PSMTaskMenu.dtd
+  $(RM) -f $(DIST)\bin\chrome\navigator\locale\security.properties

mozilla/extensions/psm-glue/res/locale/en-US/security.properties

@@ -0,0 +1,28 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+# 
+
+Title=Security Warning
+MixedContentMessage=You have requested a secure document that contains some insecure information.
+LeaveSiteMessage=You have requested an insecure document. The document and any information you send back could be observed by a third party while in transit.
+EnterSiteMessage=You have requested a secure document. The document and any information you send back are encrypted for privacy while in transit.
+PostToInsecure=Although this document is secure, the information you have submitted is insecure and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
+DontShowAgain=Show Me This Alert Next Time.
+FindText=Please find the Personal Security Manager application

mozilla/extensions/psm-glue/res/locale/makefile.win

@@ -1,4 +1,4 @@
-#!gmake
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -19,12 +19,9 @@
 #
 # Contributor(s): 
 
-DEPTH = ..\..
+DEPTH=..\..\..\..
 
-MODULE = necko
-
-DIRS=          \
-	base   \
-	$(NULL)
+DIRS=en-US
 
 include <$(DEPTH)\config\rules.mak>
+

mozilla/extensions/psm-glue/res/makefile.win

@@ -1,4 +1,4 @@
-#!gmake
+#!nmake
 #
 # The contents of this file are subject to the Netscape Public
 # License Version 1.1 (the "License"); you may not use this file
@@ -19,13 +19,9 @@
 #
 # Contributor(s): 
 
-DEPTH = ..\..
+DEPTH=..\..\..
+include <$(DEPTH)/config/config.mak>
 
-MODULE = necko
-
-DIRS=          \
-	public \
-	src    \
-	$(NULL)
+DIRS = skin content locale
 
 include <$(DEPTH)\config\rules.mak>

mozilla/extensions/psm-glue/res/skin/MANIFEST

@@ -0,0 +1,4 @@
+lock.gif
+unlock.gif
+broken.gif
+NavSecurityOverlay.css

mozilla/extensions/psm-glue/res/skin/Makefile.in

@@ -17,7 +17,7 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#
+# 
 
 DEPTH		= ../../../..
 topsrcdir	= @top_srcdir@
@@ -25,18 +25,15 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-LIBRARY_NAME	= necko_datetime
-SHORT_LIBNAME	= neckodtm
-IS_COMPONENT	= 1
-
-CPPSRCS		= \
-		nsDateTimeHandler.cpp \
-		nsDateTimeChannel.cpp \
-		nsDateTimeModule.cpp \
-		$(NULL)
-
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
-
 include $(topsrcdir)/config/rules.mk
+
+SKIN_DIR      = $(DIST)/bin/chrome/navigator/skin/
+EXPORT_SKINS  = \
+   $(srcdir)/broken.gif \
+   $(srcdir)/lock.gif   \
+   $(srcdir)/unlock.gif \
+   $(srcdir)/NavSecurityOverlay.css \
+   $(NULL)
+
+install::
+	$(INSTALL) $(EXPORT_SKINS) $(SKIN_DIR)

mozilla/extensions/psm-glue/res/skin/NavSecurityOverlay.css

@@ -0,0 +1,15 @@
+titledbutton#security-button {
+	list-style-image:url("chrome://navigator/skin/unlock.gif");
+}
+
+titledbutton#security-button[level="high"] {
+    list-style-image:url("chrome://navigator/skin/lock.gif");        
+}
+
+titledbutton#security-button[level="low"] {
+    list-style-image:url("chrome://navigator/skin/lock.gif");        
+}
+
+titledbutton#security-button[level="broken"] {
+    list-style-image:url("chrome://navigator/skin/broken.gif");        
+}

mozilla/extensions/psm-glue/res/skin/makefile.win

@@ -19,44 +19,23 @@
 #
 # Contributor(s): 
 
-INCS = $(INCS)                  \
-        -I$(DEPTH)\dist\include \
-        $(NULL)
-
-LLIBS=                  \
- $(DIST)\lib\xpcom.lib      \
- $(LIBNSPR)             \
- $(NULL)
-
-
-DEPTH=..\..\..
+DEPTH=..\..\..\..
 
 include <$(DEPTH)/config/config.mak>
 
-
-MAKE_OBJ_TYPE   = EXE
-PROGRAM = .\$(OBJDIR)\TestStreamConv.exe
-
-OBJS =                                      \
-	.\$(OBJDIR)\Converters.obj     \
-	.\$(OBJDIR)\TestStreamConv.obj     \
-	$(NULL)
-
-LLFLAGS=-SUBSYSTEM:CONSOLE
-
 include <$(DEPTH)\config\rules.mak>
 
-!ifdef MOZ_NO_DEBUG_RTL
-OS_CFLAGS = $(OS_CFLAGS) -DMOZ_NO_DEBUG_RTL
-!endif
-
-!if defined(NGPREFS)
-OS_CFLAGS = $(OS_CFLAGS) -DNGPREFS
-!endif
-
-install:: $(PROGRAM)
-	$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
-
+install::
+    $(MAKE_INSTALL) broken.gif                 $(DIST)\bin\chrome\navigator\skin
+    $(MAKE_INSTALL) lock.gif                   $(DIST)\bin\chrome\navigator\skin
+    $(MAKE_INSTALL) unlock.gif                 $(DIST)\bin\chrome\navigator\skin
+    $(MAKE_INSTALL) NavSecurityOverlay.css     $(DIST)\bin\chrome\navigator\skin
+    
 clobber::
-	rm -f $(DIST)\bin\TestStreamConv.exe
+    $(RM) $(DIST)\bin\chrome\navigator\skin\broken.gif
+    $(RM) $(DIST)\bin\chrome\navigator\skin\lock.gif
+    $(RM) $(DIST)\bin\chrome\navigator\skin\unlock.gif
+    $(RM) $(DIST)\bin\chrome\navigator\skin\NavSecurityOverlay.css
 
+    
+    

mozilla/extensions/psm-glue/src/Makefile.in

@@ -17,7 +17,9 @@
 # Rights Reserved.
 #
 # Contributor(s): 
-#
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+# 
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
@@ -26,20 +28,36 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-MODULE		= mimetype
-LIBRARY_NAME	= mimetype
+MODULE = psmglue
+
 IS_COMPONENT	= 1
+LIBRARY_NAME	= psmglue
 
-REQUIRES	= xpcom
 
-CPPSRCS		= \
-		nsMIMEInfoImpl.cpp \
-		nsMIMEService.cpp \
-		nsMIMEServiceModule.cpp \
-		nsXMLMIMEDataSource.cpp \
-		$(NULL)
+CPPSRCS	= \
+	nsPSMComponent.cpp \
+	nsPSMUICallbacks.cpp \
+	nsSSLSocketProvider.cpp \
+	nsPSMModule.cpp \
+	nsSSLIOLayer.cpp \
+	nsSecureBrowserUIImpl.cpp \
+	nsSDR.cpp \
+	$(NULL)
 
-EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
+CSRCS = \
+	nsPSMMutex.c	\
+	nsPSMShimLayer.c	\
+	$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+	$(MOZ_COMPONENT_LIBS) \
+	-lcmt \
+	-lprotocol \
+	-lmozjs \
+	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
+INCLUDES	+= \
+		-I$(srcdir) \
+		$(NULL)

mozilla/extensions/psm-glue/src/makefile.win

@@ -0,0 +1,68 @@
+#!nmake
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s):
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+#
+
+MODULE = psmglue
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+DLLNAME       = psmglue
+PDBFILE       = $(DLLNAME).pdb
+MAPFILE       = $(DLLNAME).map
+DLL           = .\$(OBJDIR)\$(DLLNAME).dll
+MAKE_OBJ_TYPE = DLL
+
+include <$(DEPTH)/config/config.mak>
+
+LINCS = $(LINCS)     \
+    -I$(PUBLIC)      \
+    -I$(PUBLIC)/security \
+    $(NULL)
+
+LLIBS   = \
+    $(LIBNSPR) \
+    $(DIST)\lib\neckobase_s.lib \
+    $(DIST)\lib\xpcom.lib \
+    $(DIST)\lib\js3250.lib \
+    $(DIST)\lib\cmt.lib       \
+    $(DIST)\lib\protocol.lib  \
+    $(DIST)\lib\mozreg.lib       \
+    $(NULL)
+
+OBJS = \
+    .\$(OBJDIR)\nsPSMMutex.obj \
+    .\$(OBJDIR)\nsPSMShimLayer.obj \
+    .\$(OBJDIR)\nsPSMComponent.obj \
+    .\$(OBJDIR)\nsPSMUICallbacks.obj \
+    .\$(OBJDIR)\nsPSMModule.obj \
+    .\$(OBJDIR)\nsSecureBrowserUIImpl.obj \
+    .\$(OBJDIR)\nsSSLIOLayer.obj \
+    .\$(OBJDIR)\nsSSLSocketProvider.obj \
+    .\$(OBJDIR)\nsSDR.obj \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components

mozilla/extensions/psm-glue/src/nsPSMComponent.cpp

@@ -0,0 +1,822 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Mitch Stoltz <mstoltz@netscape.com>
+*/
+
+#include "nsProxiedService.h"
+#include "nsPSMUICallbacks.h"
+#include "VerReg.h"
+
+#include "nspr.h"
+#include "nsPSMComponent.h"
+
+#include "nsCRT.h"
+
+#include "nsIPref.h"
+#include "nsIProfile.h"
+#include "nsILocalFile.h"
+#ifdef XP_MAC
+#include "nsILocalFileMac.h"
+#endif
+#include "nsSpecialSystemDirectory.h"
+
+#include "rsrcids.h"
+
+#include "nsPSMMutex.h"
+#include "nsPSMShimLayer.h"
+#include "nsPSMUICallbacks.h"
+
+#include "nsISecureBrowserUI.h"
+#include "nsIDocumentLoaderObserver.h"
+#include "nsIScriptSecurityManager.h"
+#include "nsICertificatePrincipal.h"
+
+#define PSM_VERSION_REG_KEY "/Netscape/Personal Security Manager"
+
+#ifdef WIN32
+#define PSM_FILE_NAME "psm.exe"
+#elif XP_UNIX
+#define PSM_FILE_NAME "start-psm"
+#define PSM_FILE_LOCATION "/opt/netscape/security/start-psm"
+#else
+#define PSM_FILE_NAME "psm"
+#endif
+
+
+static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
+static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+
+
+nsPSMComponent* nsPSMComponent::mInstance = nsnull;
+
+nsPSMComponent::nsPSMComponent()
+{
+    NS_INIT_REFCNT();
+    mControl = nsnull;
+}
+
+nsPSMComponent::~nsPSMComponent()
+{
+    if (mControl)
+    {
+        CMT_CloseControlConnection(mControl);
+        mControl = nsnull;
+    }
+}
+
+
+NS_IMETHODIMP      
+nsPSMComponent::CreatePSMComponent(nsISupports* aOuter, REFNSIID aIID, void **aResult)
+{                                                                  
+    if (!aResult) {                                                
+        return NS_ERROR_INVALID_POINTER;                           
+    }                                                              
+    if (aOuter) {                                                  
+        *aResult = nsnull;                                         
+        return NS_ERROR_NO_AGGREGATION;                              
+    }                                                                
+    
+    if (mInstance == nsnull) 
+    {
+        mInstance = new nsPSMComponent();
+    }
+
+    if (mInstance == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    
+    nsresult rv = mInstance->QueryInterface(aIID, aResult);                        
+    if (NS_FAILED(rv)) 
+    {                                             
+        *aResult = nsnull;                                           
+    }                                                                
+    return rv;                                                       
+}
+
+/* nsISupports Implementation for the class */
+NS_IMPL_THREADSAFE_ISUPPORTS1 (nsPSMComponent, nsIPSMComponent); 
+
+#define INIT_NUM_PREFS 100
+/* preference types */
+#define STRING_PREF 0
+#define BOOL_PREF 1
+#define INT_PREF 2
+
+
+/* resizable list struct that contains pref items */
+typedef struct CMSetPrefList {
+    int n; /* number of filled items */
+    int capacity; /* allocated memory */
+    CMTSetPrefElement* list; /* actual list */
+} CMSetPrefList;
+
+static void get_pack_bool_pref(nsIPref *prefManager, char* key, CMTSetPrefElement* list, int* n)
+{
+    PRBool boolpref;
+
+    list[*n].key = nsCRT::strdup(key);
+    list[*n].type = BOOL_PREF;
+
+    if ((prefManager->GetBoolPref(key, &boolpref) != 0) || boolpref) 
+    {
+        list[*n].value = nsCRT::strdup("true");
+    }
+    else 
+    {
+        list[*n].value = nsCRT::strdup("false");
+    }
+
+    (*n)++;    /* increment the counter after done packing */
+
+    return;
+}
+
+static void SaveAllPrefs(int number, CMTSetPrefElement* list)
+{
+    nsCOMPtr<nsIPref> prefManager;
+
+    nsresult res = nsServiceManager::GetService(kPrefCID, 
+                                                nsIPref::GetIID(), 
+                                                getter_AddRefs(prefManager));
+    
+    if (NS_FAILED(res)  || !prefManager)
+    {
+        return;
+    }
+
+
+    int i;
+    int intval;
+
+    for (i = 0; i < number; i++) 
+    {
+        if (list[i].key == nsnull) 
+        {
+            /* misconfigured item: next */
+            continue;
+        }
+
+        switch (list[i].type) 
+        {
+             case 0:    /* string type */
+                 prefManager->SetCharPref(list[i].key, list[i].value);
+                 break;
+             case 1:    /* boolean type */
+                 if (strcmp(list[i].value, "true") == 0) {
+                  prefManager->SetBoolPref(list[i].key, (PRBool)1);
+                 }
+                 else if (strcmp(list[i].value, "false") == 0) {
+                  prefManager->SetBoolPref(list[i].key, (PRBool)0);
+                 }
+                 break;
+             case 2:
+                 intval = atoi(list[i].value);
+                 prefManager->SetIntPref(list[i].key, intval);
+                 break;
+             default:
+                 break;
+         }
+    }
+
+    return;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::PassPrefs()
+{
+    // if we have not passed anything to psm yet, this function can just return.
+
+    if (!mControl)
+        return NS_OK;
+
+    int i;
+    nsresult rv = NS_ERROR_FAILURE;
+    char* strpref = NULL;
+    int intpref;
+    PRBool boolpref;
+    CMSetPrefList prefs = {0};
+    CMTSetPrefElement* list = NULL;
+
+    char* pickAuto = "Select Automatically";
+    char* alwaysAsk = "Ask Every Time";
+    
+    nsCOMPtr<nsIPref> prefManager;
+
+    nsresult res = nsServiceManager::GetService(kPrefCID, 
+                                                nsIPref::GetIID(), 
+                                                getter_AddRefs(prefManager));
+
+    if (NS_OK != res) 
+    {
+        return NS_ERROR_FAILURE;
+    }
+
+    /* allocate memory for list */
+    prefs.n = 0; /* counter */
+    prefs.capacity = INIT_NUM_PREFS;
+    prefs.list = (CMTSetPrefElement*) new char[(INIT_NUM_PREFS * sizeof(CMTSetPrefElement))];
+    
+    if (prefs.list == NULL) 
+    {
+         return rv;
+    }
+
+    /* shorthand */
+    list = prefs.list;
+
+    /* get preferences */
+    get_pack_bool_pref(prefManager, "security.enable_ssl2", (CMTSetPrefElement*)list, &(prefs.n));
+    get_pack_bool_pref(prefManager, "security.enable_ssl3", (CMTSetPrefElement*)list, &(prefs.n));
+
+    /* this pref is a boolean pref in nature but a string pref for 
+     * historical reason
+     */
+
+    list[prefs.n].key = nsCRT::strdup("security.default_personal_cert");
+    list[prefs.n].type = STRING_PREF;
+
+    if ((prefManager->CopyCharPref(list[prefs.n].key, &strpref) == 0) && (strcmp(strpref, pickAuto) == 0)) 
+    {
+         list[prefs.n].value = nsCRT::strdup(pickAuto);
+    }
+    else 
+    {
+         /* although one could choose a specific cert for client auth in
+          * Nova, that mode is deprecated with PSM and mapped to ASK
+          */
+         list[prefs.n].value = nsCRT::strdup(alwaysAsk);
+    }
+
+    prefs.n++;
+    if (strpref != NULL) 
+    {
+         nsCRT::free(strpref);
+    }
+
+    list[prefs.n].key = nsCRT::strdup("security.default_mail_cert");
+    list[prefs.n].type = STRING_PREF;
+    if (prefManager->CopyCharPref(list[prefs.n].key, &list[prefs.n].value) != 0) 
+    {
+         list[prefs.n].value = NULL;
+    }
+    prefs.n++;
+
+    list[prefs.n].key = nsCRT::strdup("security.ask_for_password");
+    list[prefs.n].type = INT_PREF;
+    if (prefManager->GetIntPref(list[prefs.n].key, &intpref) != 0) 
+    {
+         intpref = 0;    /* default */
+    }
+
+    list[prefs.n].value = PR_smprintf("%d", intpref);
+    prefs.n++;
+
+    list[prefs.n].key = nsCRT::strdup("security.password_lifetime");
+    list[prefs.n].type = INT_PREF;
+    if (prefManager->GetIntPref(list[prefs.n].key, &intpref) != 0) 
+    {
+         intpref = 30;    /* default */
+    }
+
+    list[prefs.n].value = PR_smprintf("%d", intpref);
+    prefs.n++;
+
+    /* OCSP preferences */
+    /* XXX since these are the new ones added by PSM, we will be more
+     *     error-tolerant in fetching them
+     */
+    if (prefManager->GetBoolPref("security.OCSP.enabled", &boolpref) == 0) 
+    {
+         if (boolpref) 
+        {
+             list[prefs.n].value = nsCRT::strdup("true");
+         }
+         else 
+        {
+             list[prefs.n].value = nsCRT::strdup("false");
+         }
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.enabled");
+         list[prefs.n].type = BOOL_PREF;
+         prefs.n++;
+    }
+
+    if (prefManager->GetBoolPref("security.OCSP.useDefaultResponder", &boolpref) == 0) 
+    {
+         if (boolpref) 
+        {
+             list[prefs.n].value = nsCRT::strdup("true");
+         }
+         else 
+        {
+             list[prefs.n].value = nsCRT::strdup("false");
+         }
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.useDefaultResponder");
+         list[prefs.n].type = BOOL_PREF;
+         prefs.n++;
+    }
+
+    if (prefManager->CopyCharPref("security.OCSP.URL", &strpref) == 0) 
+    {
+         list[prefs.n].value = strpref;
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.URL");
+         list[prefs.n].type = STRING_PREF;
+         prefs.n++;
+    }
+
+    if (prefManager->CopyCharPref("security.OCSP.signingCA", &strpref) == 0) 
+    {
+         list[prefs.n].value = strpref;
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.signingCA");
+         list[prefs.n].type = STRING_PREF;
+         prefs.n++;
+    }
+
+    /* now application-specific preferences */
+    /* get navigator preferences */
+    get_pack_bool_pref(prefManager, "security.warn_entering_secure", (CMTSetPrefElement*)list, &prefs.n);
+    get_pack_bool_pref(prefManager, "security.warn_leaving_secure",  (CMTSetPrefElement*)list, &prefs.n);
+    get_pack_bool_pref(prefManager, "security.warn_viewing_mixed",   (CMTSetPrefElement*)list, &prefs.n);
+    get_pack_bool_pref(prefManager, "security.warn_submit_insecure", (CMTSetPrefElement*)list, &prefs.n);
+
+    // Add any other prefs here such as ldap or mail/news.
+     
+     CMT_SetSavePrefsCallback(mControl, (savePrefsCallback_fn)SaveAllPrefs);
+
+    if (CMT_PassAllPrefs(mControl, prefs.n, (CMTSetPrefElement*)prefs.list) !=  CMTSuccess) 
+    {
+         goto loser;
+    }
+
+    rv = NS_OK; /* success */
+loser:
+    /* clean out memory for prefs */
+    for (i = 0; i < prefs.n; i++) 
+    {
+         if (prefs.list[i].key != NULL) 
+        {
+             nsCRT::free(prefs.list[i].key);
+         }
+         
+        if (prefs.list[i].value != NULL) 
+        {
+             nsCRT::free(prefs.list[i].value);
+         }
+    }
+
+    if (prefs.list != NULL) 
+    {
+         delete(prefs.list);
+    }
+    return rv;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval )
+{
+     nsresult rv;
+     *_retval = nsnull;
+    if (mControl) 
+    {
+        *_retval = mControl;
+        return NS_OK;
+    }
+    else      /* initialize mutex, sock table, etc. */
+    {
+            
+        if (nsPSMMutexInit() != PR_SUCCESS)
+            return NS_ERROR_FAILURE;
+
+        mControl = CMT_ControlConnect(&nsPSMMutexTbl, &nsPSMShimTbl);
+        
+        if (mControl == nsnull)
+        {
+            //Try to find it.
+            int err;
+            char filepath[MAXREGPATHLEN];
+
+            err = VR_GetPath(PSM_VERSION_REG_KEY, sizeof(filepath), filepath);
+            if ( err == REGERR_OK )
+            {
+                nsFileSpec psmSpec(filepath);
+                psmSpec += PSM_FILE_NAME;
+		
+                if (psmSpec.Exists())
+                {
+                    mControl = CMT_EstablishControlConnection((char *)psmSpec.GetNativePathCString(), &nsPSMShimTbl, &nsPSMMutexTbl);
+                }
+            }
+         }
+
+#ifndef XP_MAC
+        if (mControl == nsnull)
+        {
+            nsSpecialSystemDirectory sysDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
+            nsFileSpec spec = sysDir;
+
+            spec += "psm/";
+            spec += PSM_FILE_NAME;
+
+            if (spec.Exists())
+            {
+                mControl = CMT_EstablishControlConnection((char *)spec.GetNativePathCString(), &nsPSMShimTbl, &nsPSMMutexTbl);
+            }
+        }
+#else
+    if (mControl == nsnull)
+    {
+      // Attempt to locate "Personal Security Manager" in "Essential Files".
+      nsCOMPtr<nsILocalFile> aPSMApp = do_CreateInstance(NS_LOCAL_FILE_PROGID, &rv);
+      if (NS_SUCCEEDED(rv))
+      {
+        nsCOMPtr<nsILocalFileMac> psmAppMacFile = do_QueryInterface(aPSMApp, &rv);
+        if (NS_SUCCEEDED(rv))
+        {
+          rv = psmAppMacFile->InitFindingAppByCreatorCode('nPSM');
+          if (NS_SUCCEEDED(rv))
+          {
+            rv = psmAppMacFile->LaunchAppWithDoc(nsnull, PR_TRUE);
+            if (NS_SUCCEEDED(rv))
+            {
+                 const PRUint32 kMaxWaitTicks = 180;          // max 3 seconds
+              PRUint32 endTicks = ::TickCount() + kMaxWaitTicks;
+              
+              do
+              {
+                EventRecord theEvent;
+                    WaitNextEvent(0, &theEvent, 5, NULL);
+                mControl = CMT_ControlConnect(&nsPSMMutexTbl, &nsPSMShimTbl);
+              } while (!mControl && (::TickCount() < endTicks));
+
+            }
+          }
+        }
+      }
+      NS_ASSERTION(NS_SUCCEEDED(rv), "Launching Personal Security Manager failed");
+    }
+
+#endif
+
+#ifdef XP_UNIX
+        if (mControl == nsnull)
+        {
+            nsFileSpec psmSpec(PSM_FILE_LOCATION);
+            if (psmSpec.Exists())
+            {
+                mControl = CMT_EstablishControlConnection(PSM_FILE_LOCATION, &nsPSMShimTbl, &nsPSMMutexTbl);
+            }
+        }
+#endif
+
+        if (mControl == nsnull)
+        {
+            char* filePath = nsnull;
+            
+            NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
+            if(NS_SUCCEEDED(rv))
+            {
+                NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv);
+                if (NS_FAILED(rv)) return rv;
+            
+                nsILocale* locale = nsnull;
+                nsCOMPtr<nsIStringBundle> stringBundle;
+
+                rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, locale, getter_AddRefs(stringBundle));
+                if (NS_FAILED(rv)) return rv;
+
+                PRUnichar *ptrv = nsnull;
+                rv = stringBundle->GetStringFromName( NS_ConvertASCIItoUCS2("FindText").GetUnicode(), &ptrv);
+                if (NS_FAILED(rv)) return rv;                
+                
+                handler->PromptForFile(ptrv, PSM_FILE_NAME, PR_TRUE, &filePath);
+
+                nsAllocator::Free(ptrv);
+
+            }
+            if (! filePath)
+                return NS_ERROR_FAILURE;
+
+            mControl = CMT_EstablishControlConnection(filePath, &nsPSMShimTbl, &nsPSMMutexTbl);
+        }
+
+
+        if (!mControl || InitPSMUICallbacks(mControl) != PR_SUCCESS)
+            goto failure;
+
+        nsFileSpec profileSpec;
+        PRUnichar*      profileName;
+        
+        NS_WITH_SERVICE(nsIProfile, profile, kProfileCID, &rv);
+        if (NS_FAILED(rv)) goto failure;
+        
+        rv = profile->GetCurrentProfileDir(&profileSpec);
+        if (NS_FAILED(rv)) goto failure;;
+        
+        rv = profile->GetCurrentProfile(&profileName);
+        if (NS_FAILED(rv)) goto failure;
+          
+        CMTStatus psmStatus;
+        nsCAutoString profilenameC;
+        profilenameC.AssignWithConversion(profileName);
+        psmStatus = CMT_Hello( mControl, 
+                                   PROTOCOL_VERSION, 
+                                   profilenameC, 
+                                   (char*)profileSpec.GetNativePathCString());        
+
+        if (psmStatus == CMTFailure)
+        {  
+            PR_FREEIF(profileName);       
+            goto failure;
+        }
+        
+        if (NS_FAILED(PassPrefs()))
+        {  
+            PR_FREEIF(profileName);       
+            goto failure;
+        }
+
+        PR_FREEIF(profileName);
+        
+        *_retval = mControl;
+        return NS_OK;
+    }
+
+failure:
+#ifdef DEBUG
+    printf("*** Failure setting up Cartman! \n");
+#endif
+
+    if (mControl)
+    {
+        CMT_CloseControlConnection(mControl);
+        mControl = NULL;
+    }
+
+    // TODO we need to unregister our UI callback BEFORE destroying our mutex.
+    // nsPSMMutexDestroy();
+
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::DisplaySecurityAdvisor(const char *pickledStatus, const char *hostName)
+{
+    CMT_CONTROL *controlConnection;
+    GetControlConnection( &controlConnection );
+    if (DisplayPSMUIDialog(controlConnection, pickledStatus, hostName) == PR_SUCCESS)
+        return NS_OK;
+    return NS_ERROR_FAILURE;
+}
+
+//-----------------------------------------
+// Secure Hash Functions 
+//-----------------------------------------
+NS_IMETHODIMP
+nsPSMComponent::HashBegin(PRUint32 alg, PRUint32* id)
+{
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+
+  if(CMT_HashCreate(controlConnection, alg, (CMUint32*)id) != CMTSuccess)
+    return NS_ERROR_FAILURE;
+  if(CMT_HASH_Begin(controlConnection, *id) != CMTSuccess)
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;  
+}
+
+NS_IMETHODIMP
+nsPSMComponent::HashUpdate(PRUint32 id, const char* buf, PRUint32 buflen)
+{
+  CMT_CONTROL *controlConnection;
+
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+  if (CMT_HASH_Update(controlConnection, id, 
+      (const unsigned char*)buf, buflen) != CMTSuccess)    
+    return NS_ERROR_FAILURE;
+    
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::HashEnd(PRUint32 id, char** hash, PRUint32* hashlen,
+                        PRUint32 maxLen)
+{
+  if (!hash)
+    return NS_ERROR_ILLEGAL_VALUE;
+
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+ 
+  if(CMT_HASH_End(controlConnection, id, (unsigned char*)*hash,
+                        (CMUint32*)hashlen, maxLen) != CMTSuccess)
+    return NS_ERROR_FAILURE;
+  CMT_HASH_Destroy(controlConnection, id);
+  return NS_OK;
+}
+
+//-----------------------------------------
+// Signature Verification Functions
+//-----------------------------------------
+PR_STATIC_CALLBACK(void)
+UselessPK7DataSink(void* arg, const char* buf, CMUint32 len)
+{
+}
+
+NS_IMETHODIMP
+nsPSMComponent::VerifyRSABegin(PRUint32* id)
+{
+  if (!id)
+    return NS_ERROR_ILLEGAL_VALUE;
+
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+  
+  CMInt32* blah = nsnull;
+  CMTStatus result = CMT_PKCS7DecoderStart(controlConnection, nsnull,
+                                           (CMUint32*)id, blah,
+                                           UselessPK7DataSink, nsnull);
+  if (result == CMTSuccess)
+    return NS_OK;
+  else
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::VerifyRSAUpdate(PRUint32 id, const char* buf, PRUint32 buflen)
+{
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+
+  CMTStatus result = CMT_PKCS7DecoderUpdate(controlConnection, id, buf, buflen);
+  if (result == CMTSuccess)
+    return NS_OK;
+  else
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::VerifyRSAEnd(PRUint32 id, const char* plaintext,
+                             PRUint32 plaintextLen,
+                             PRBool aKeepCert, 
+                             nsIPrincipal** aPrincipal,
+                             PRInt32* aVerifyError)
+{
+  *aVerifyError = -1;
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+  
+  CMUint32 contentInfo;
+  CMTStatus result = CMT_PKCS7DecoderFinish(controlConnection, 
+                                            id, &contentInfo);
+  if (result != CMTSuccess)
+    return NS_ERROR_FAILURE;
+
+  //-- Make sure a signature is present
+  CMInt32 isSigned;
+  result = CMT_GetNumericAttribute(controlConnection, contentInfo,
+                                   SSM_FID_P7CINFO_IS_SIGNED, &isSigned);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+  if (!isSigned)
+  {
+    *aPrincipal = nsnull;
+    *aVerifyError = nsIPSMComponent::VERIFY_NOSIG;
+    return NS_OK;
+  }
+  // SHA1 hash the plaintext to compare it to the signature
+  CMUint32 hashId;
+  CMT_HashCreate(controlConnection, nsIPSMComponent::SHA1, &hashId);
+  CMT_HASH_Begin(controlConnection, hashId);
+  result = CMT_HASH_Update(controlConnection, hashId, 
+                           (const unsigned char*)plaintext, plaintextLen);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+
+  unsigned char* hash = (unsigned char*)PR_MALLOC(nsIPSMComponent::SHA1_LENGTH);
+  if (!hash) return NS_ERROR_OUT_OF_MEMORY;
+  CMUint32 hashLen;
+  result = CMT_HASH_End(controlConnection, hashId, hash,
+                        &hashLen, nsIPSMComponent::SHA1_LENGTH);
+  NS_ASSERTION(hashLen == nsIPSMComponent::SHA1_LENGTH,
+               "PSMComponent: Hash too short.");
+  CMT_HASH_Destroy(controlConnection, hashId);
+  if (result != CMTSuccess) 
+  {
+    PR_FREEIF(hash);
+    return NS_ERROR_FAILURE;
+  }
+  //-- Verify signature
+  CMTItemStr hashItem;
+  hashItem.data = hash;
+  hashItem.len = hashLen;
+  result = CMT_PKCS7VerifyDetachedSignature(controlConnection, contentInfo,
+                                            6 /* =Object Signing Cert */,
+                                            3 /* =SHA1 algorithm (MD5=2)*/,
+                                            (CMUint32)aKeepCert,
+                                            &hashItem, (CMInt32*)aVerifyError);
+  PR_FREEIF(hash);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+  //-- Did it verify?
+  
+  if (*aVerifyError != 0)
+    *aPrincipal = nsnull;
+  else
+    {
+      //-- Generate a principal from the cert
+      CMUint32 certID;
+      result = CMT_GetRIDAttribute(controlConnection, contentInfo,
+                                       SSM_FID_P7CINFO_SIGNER_CERT, &certID);
+      if (result != CMTSuccess) return NS_ERROR_FAILURE;
+      if (NS_FAILED(CreatePrincipalFromCert(certID, aPrincipal))) 
+        return NS_ERROR_FAILURE;
+    }
+
+  CMT_PKCS7DestroyContentInfo(controlConnection, contentInfo);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::CreatePrincipalFromCert(PRUint32 aCertID, nsIPrincipal** aPrincipal)
+{
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+
+  //-- Read cert ID
+  CMTStatus result;
+
+  CMTItem fingerprint;
+  result = CMT_GetStringAttribute(controlConnection, aCertID,
+                                  SSM_FID_CERT_FINGERPRINT, &fingerprint);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+
+  //-- Get a principal
+  nsresult rv;
+  NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
+                  NS_SCRIPTSECURITYMANAGER_PROGID, &rv)
+    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+  rv = secMan->GetCertificatePrincipal((char*)fingerprint.data,
+                                       aPrincipal);
+  if (NS_FAILED(rv)) return rv;
+
+  //-- Get common name and store it in the principal.
+  //   Using common name + organizational unit as the user-visible certificate name
+  nsCOMPtr<nsICertificatePrincipal> certificate = do_QueryInterface(*aPrincipal, &rv);
+  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+  CMTItem common;
+  result = CMT_GetStringAttribute(controlConnection, aCertID,
+                                  SSM_FID_CERT_COMMON_NAME, &common);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+  CMTItem subject;
+  result = CMT_GetStringAttribute(controlConnection, aCertID,
+                                  SSM_FID_CERT_SUBJECT_NAME, &subject);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+
+  nsCAutoString commonName;
+  commonName = (char*)common.data;
+  static const char orgUnitTag[] = " OU=";
+  char* orgUnitPos = PL_strstr((char*)subject.data, orgUnitTag);
+  if (orgUnitPos)
+  {
+    orgUnitPos += sizeof(orgUnitTag)-1;
+    char* orgUnitEnd = PL_strchr(orgUnitPos, ',');
+    PRInt32 orgUnitLen;
+    if(orgUnitEnd)
+      orgUnitLen = orgUnitEnd - orgUnitPos;
+    else
+      orgUnitLen = PL_strlen(orgUnitPos);
+    commonName.Append(' ');
+    commonName.Append(orgUnitPos, orgUnitLen);
+  }
+  char* commonChar = commonName.ToNewCString();
+  if (!commonChar) return NS_ERROR_OUT_OF_MEMORY;
+  rv = certificate->SetCommonName(commonChar);
+  Recycle(commonChar);
+  return rv;
+}
+ 

mozilla/extensions/psm-glue/src/nsPSMComponent.h

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nscore.h"
+#include "nsIPSMComponent.h"
+#include "nsIStringBundle.h"
+
+#define SECURITY_STRING_BUNDLE_URL "chrome://navigator/locale/security.properties"
+
+#define NS_PSMCOMPONENT_CID {0xddcae170, 0x5412, 0x11d3, {0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37}}
+
+// Implementation of the PSM component interface.
+class nsPSMComponent : public nsIPSMComponent
+{
+public:
+  NS_DEFINE_STATIC_CID_ACCESSOR( NS_PSMCOMPONENT_CID );
+
+  nsPSMComponent();
+  virtual ~nsPSMComponent();
+
+  NS_DECL_ISUPPORTS
+
+  NS_DECL_NSIPSMCOMPONENT
+
+  static NS_METHOD CreatePSMComponent(nsISupports* aOuter, REFNSIID aIID, void **aResult);
+
+private:
+  
+  PCMT_CONTROL mControl;
+  
+  nsCOMPtr<nsISupports> mSecureBrowserIU;
+  static nsPSMComponent* mInstance;
+}; 

mozilla/extensions/psm-glue/src/nsPSMModule.cpp

@@ -0,0 +1,86 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+
+#include "nsPSMUICallbacks.h"
+#include "nsPSMComponent.h"
+
+#include "nsISecureBrowserUI.h"
+#include "nsSecureBrowserUIImpl.h"
+
+#include "nsSSLSocketProvider.h"
+
+#include "nsSDR.h"
+
+// Define SDR object constructor
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSecretDecoderRing, init)
+
+static nsModuleComponentInfo components[] =
+{
+    { 
+        PSM_COMPONENT_CLASSNAME,  
+        NS_PSMCOMPONENT_CID, 
+        PSM_COMPONENT_PROGID,   
+        nsPSMComponent::CreatePSMComponent
+    },
+
+    { 
+        PSM_UI_HANLDER_CLASSNAME, 
+        NS_PSMUIHANDLER_CID, 
+        PSM_UI_HANLDER_PROGID,  
+        nsPSMUIHandlerImpl::CreatePSMUIHandler
+    },
+
+    { 
+        NS_SECURE_BROWSER_UI_CLASSNAME, 
+        NS_SECURE_BROWSER_UI_CID, 
+        NS_SECURE_BROWSER_UI_PROGID, 
+        nsSecureBrowserUIImpl::Create 
+    },
+
+    { 
+        NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME, 
+        NS_SECURE_BROWSER_DOCOBSERVER_CID, 
+        NS_SECURE_BROWSER_DOCOBSERVER_PROGID, 
+        nsSecureBrowserUIImpl::Create
+    },
+
+    { 
+        NS_ISSLSOCKETPROVIDER_CLASSNAME,
+        NS_SSLSOCKETPROVIDER_CID,
+        NS_ISSLSOCKETPROVIDER_PROGID,
+        nsSSLSocketProvider::Create 
+    },
+
+    {
+        NS_SDR_CLASSNAME,
+        NS_SDR_CID,
+        NS_SDR_PROGID,
+        nsSecretDecoderRingConstructor
+    }
+};
+
+NS_IMPL_NSGETMODULE("PSMComponent", components);

mozilla/extensions/psm-glue/src/nsPSMMutex.c

@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "prmon.h"
+#include "prtypes.h"
+
+#include "nsPSMMutex.h"
+
+static PRMonitor *_nsPSMMutexVar;
+
+PRStatus
+nsPSMMutexInit()
+{
+  if (!_nsPSMMutexVar)
+      _nsPSMMutexVar = PR_NewMonitor();
+
+  return _nsPSMMutexVar ? PR_SUCCESS : PR_FAILURE;
+}
+
+PRStatus
+nsPSMMutexDestroy()
+{
+    if (!_nsPSMMutexVar)
+        return PR_FAILURE;
+    
+    PR_Wait(_nsPSMMutexVar, PR_INTERVAL_NO_TIMEOUT);
+
+    PR_DestroyMonitor(_nsPSMMutexVar);
+    return PR_SUCCESS;
+}
+
+static void
+nsPSMMutexLock(CMTMutexPointer *p)
+{
+  PR_EnterMonitor(*(PRMonitor **)p);
+  return;
+}
+
+static void
+nsPSMMutexUnlock(CMTMutexPointer *p)
+{
+  PR_ExitMonitor(*(PRMonitor **)p);
+  return;
+}
+
+CMT_MUTEX nsPSMMutexTbl = 
+{
+  &_nsPSMMutexVar,
+  (CMTMutexFunction)nsPSMMutexLock,
+  (CMTMutexFunction)nsPSMMutexUnlock
+};

mozilla/extensions/psm-glue/src/nsPSMMutex.h

@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Netscape Public
+ * 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/NPL/
+ * 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
@@ -17,16 +17,23 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
- */
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
 
-#include "nsIChannel.idl"
+#ifndef _NSPSMMUTEX_H
+#define _NSPSMMUTEX_H
 
-interface nsISimpleEnumerator;
+#include "cmtcmn.h"
 
-[scriptable, uuid(97496eb6-9ef9-11d3-8cda-0060b0fc14a3)]
-interface nsIResChannel : nsIChannel
-{
+PR_BEGIN_EXTERN_C
 
-};
+PR_EXTERN(CMT_MUTEX) nsPSMMutexTbl;
 
+PR_EXTERN(PRStatus) nsPSMMutexInit(void);
+PR_EXTERN(PRStatus) nsPSMMutexDestroy(void);
+
+PR_END_EXTERN_C
+
+#endif

mozilla/extensions/psm-glue/src/nsPSMShimLayer.c

@@ -0,0 +1,284 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nspr.h"
+#include "nsPSMShimLayer.h"
+
+#ifdef XP_UNIX
+#include <sys/stat.h>
+#include <unistd.h>
+#endif
+
+
+#define NSPSMSHIMMAXFD 50
+
+CMT_SocketFuncs nsPSMShimTbl =
+{
+    nsPSMShimGetSocket,
+    nsPSMShimConnect,
+    nsPSMShimVerifyUnixSocket,
+    nsPSMShimSend,
+    nsPSMShimSelect,
+    nsPSMShimReceive,
+    nsPSMShimShutdown,
+    nsPSMShimClose
+};
+
+
+CMTSocket
+nsPSMShimGetSocket(int unixSock)
+{
+    PRStatus   rv;
+    PRFileDesc *fd;
+    CMSocket   *sock;
+
+
+    if (unixSock)
+    {
+#ifndef XP_UNIX        
+        return NULL;
+#else
+        fd = PR_OpenTCPSocket(AF_UNIX);
+        PR_ASSERT(fd);
+#endif
+    }
+    else
+    {
+        PRSocketOptionData sockopt;
+
+        fd = PR_NewTCPSocket();
+        PR_ASSERT(fd);
+
+        /* disable Nagle algorithm delay for control sockets */
+        sockopt.option = PR_SockOpt_NoDelay;
+        sockopt.value.no_delay = PR_TRUE;   
+
+        rv = PR_SetSocketOption(fd, &sockopt);
+        PR_ASSERT(PR_SUCCESS == rv);
+    }
+
+    sock = (CMSocket *)PR_Malloc(sizeof(CMSocket));
+
+    if (sock == NULL)
+      return sock;
+    
+    sock->fd     = fd;
+    sock->isUnix = unixSock;
+    
+    memset(&sock->netAddr, 0, sizeof(PRNetAddr));
+    
+    return (CMTSocket)sock;
+}
+
+CMTStatus
+nsPSMShimConnect(CMTSocket sock, short port, char *path)
+{
+    PRStatus    err;
+    PRErrorCode errcode;
+    CMTStatus   rv = CMTSuccess;
+    CMSocket    *cmSock = (CMSocket *)sock;
+    
+    if (!sock) return CMTFailure;
+
+    if (cmSock->isUnix)
+    {
+#ifndef XP_UNIX
+        return CMTFailure;
+#else
+        int pathLen;
+        if (!path)
+        {
+            return CMTFailure;
+        }
+
+        /* check buffer overrun */
+        pathLen = strlen(path)+1;
+        
+        pathLen = pathLen < sizeof(cmSock->netAddr.local.path)
+                ? pathLen : sizeof(cmSock->netAddr.local.path);
+  
+        memcpy(&cmSock->netAddr.local.path, path, pathLen);
+        cmSock->netAddr.local.family = PR_AF_LOCAL;
+#endif
+    }
+    else  /* cmSock->isUnix */
+    {
+        cmSock->netAddr.inet.family = PR_AF_INET;
+        cmSock->netAddr.inet.port   = PR_htons(port);
+        cmSock->netAddr.inet.ip     = PR_htonl(PR_INADDR_LOOPBACK);
+    }
+
+    err = PR_Connect( cmSock->fd, &cmSock->netAddr, PR_INTERVAL_MAX );
+    
+    if (err == PR_FAILURE)    
+    {
+        errcode = PR_GetError();
+        
+        /* TODO: verify PR_INVALID_ARGUMENT_ERROR continue with connect */
+        
+        switch (errcode)
+        {
+            case PR_IS_CONNECTED_ERROR:
+                rv = CMTSuccess;
+                break;
+
+            case PR_IN_PROGRESS_ERROR:
+            case PR_IO_TIMEOUT_ERROR:
+#ifdef WIN32
+            case PR_WOULD_BLOCK_ERROR:            
+            case PR_INVALID_ARGUMENT_ERROR:
+#endif
+            default:
+                rv = CMTFailure;
+                break;
+        }
+    }    
+
+    return rv;
+}
+
+CMTStatus
+nsPSMShimVerifyUnixSocket(CMTSocket sock)
+{
+#ifndef XP_UNIX
+    return CMTFailure;
+#else
+
+    int  rv;
+    CMSocket  *cmSock;
+    struct stat statbuf;
+
+    cmSock = (CMSocket *)sock;
+        
+    if (!cmSock || !cmSock->isUnix) 
+        return CMTFailure;
+ 
+    rv = stat(cmSock->netAddr.local.path, &statbuf);
+    if (rv < 0 || statbuf.st_uid != geteuid() )
+    {
+        PR_Close(cmSock->fd);
+        cmSock->fd = NULL;
+        PR_Free(cmSock);
+        return CMTFailure;
+    }
+    return CMTSuccess;   
+#endif
+}
+
+size_t
+nsPSMShimSend(CMTSocket sock, void *buffer, size_t length)
+{
+    PRInt32   total;
+    CMSocket *cmSock = (CMSocket *)sock;
+
+    if (!sock) return CMTFailure;
+
+    total = PR_Send(cmSock->fd, buffer, length, 0, PR_INTERVAL_NO_TIMEOUT);
+
+    /* TODO: for now, return 0 if there's an error */
+    return (total < 0) ? 0 : total;
+}
+
+
+CMTSocket
+nsPSMShimSelect(CMTSocket *socks, int numsocks, int poll)
+{
+    CMSocket       **sockArr = (CMSocket **)socks;
+    PRPollDesc       readPDs[NSPSMSHIMMAXFD];
+    PRIntervalTime   timeout;
+    PRInt32          cnt;
+    int              i;
+
+    if (!socks) return NULL;
+
+    memset(readPDs, 0, sizeof(readPDs));
+
+    PR_ASSERT(NSPSMSHIMMAXFD >= numsocks);
+
+    for (i=0; i<numsocks; i++)
+    {
+        readPDs[i].fd       = sockArr[i]->fd;
+        readPDs[i].in_flags = PR_POLL_READ;
+    }
+
+    timeout = poll ? PR_INTERVAL_NO_WAIT : PR_INTERVAL_NO_TIMEOUT;
+
+    cnt = PR_Poll(readPDs, numsocks, timeout);
+
+    /* Figure out which socket was selected */
+    if (cnt > 0)
+    {
+        for (i=0; i<numsocks; i++)
+        {
+            if (readPDs[i].out_flags & PR_POLL_READ)
+            {
+            return (CMTSocket)sockArr[i];
+            }
+        }
+    }
+    return NULL;
+}
+
+size_t
+nsPSMShimReceive(CMTSocket sock, void *buffer, size_t bufSize)
+{
+    PRInt32   total;
+    CMSocket *cmSock = (CMSocket *)sock;
+    
+    if (!sock) return CMTFailure;
+
+    total = PR_Recv(cmSock->fd, buffer, bufSize, 0, PR_INTERVAL_NO_TIMEOUT);
+
+    /* TODO: for now, return 0 if there's an error */
+    return (total < 0) ? 0 : total;
+}
+
+CMTStatus
+nsPSMShimShutdown(CMTSocket sock)
+{
+    CMSocket *cmSock = (CMSocket*)sock;
+    PRStatus rv;
+
+    if (!sock) return CMTFailure;
+
+    rv = PR_Shutdown(cmSock->fd, PR_SHUTDOWN_SEND);
+    return (PR_SUCCESS == rv) ? CMTSuccess : CMTFailure;
+}
+
+CMTStatus
+nsPSMShimClose(CMTSocket sock)
+{
+    CMSocket *cmSock = (CMSocket*)sock;
+    PRStatus rv      = PR_SUCCESS;
+    PR_ASSERT(cmSock);
+
+    if (!sock) return CMTFailure;
+
+    rv = PR_Close(cmSock->fd);
+    cmSock->fd = NULL;
+
+    PR_Free(cmSock);
+
+    return (PR_SUCCESS == rv) ? CMTSuccess : CMTFailure;
+}

mozilla/extensions/psm-glue/src/nsPSMShimLayer.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#ifndef _NSPSMSHIMLAYER_H_
+#define _NSPSMSHIMLAYER_H_
+
+#include "cmtcmn.h"
+#include "prio.h"
+
+PR_BEGIN_EXTERN_C
+
+typedef struct CMSocket {
+    PRFileDesc *fd;
+    PRBool      isUnix;
+    PRNetAddr   netAddr;
+} CMSocket; 
+
+PR_EXTERN(CMT_SocketFuncs) nsPSMShimTbl;
+
+PR_EXTERN(CMTSocket)
+nsPSMShimGetSocket(int unixSock);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimConnect(CMTSocket sock, short port, char *path);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimVerifyUnixSocket(CMTSocket sock);
+
+PR_EXTERN(size_t)
+nsPSMShimSend(CMTSocket sock, void *buffer, size_t length);
+
+PR_EXTERN(CMTSocket)
+nsPSMShimSelect(CMTSocket *socks, int numsocks, int poll);
+
+PR_EXTERN(size_t)
+nsPSMShimReceive(CMTSocket sock, void *buffer, size_t bufSize);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimShutdown(CMTSocket sock);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimClose(CMTSocket sock);
+
+PR_END_EXTERN_C
+
+#endif /* _NSPSMSHIMLAYER_H_ */

mozilla/extensions/psm-glue/src/nsPSMUICallbacks.cpp

@@ -0,0 +1,333 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nsProxiedService.h"
+#include "nsIEventQueueService.h"
+#include "nsPSMUICallbacks.h"
+#include "nsINetSupportDialogService.h"
+#include "nsIFilePicker.h"
+
+#include "nsAppShellCIDs.h"
+#include "prprf.h"
+#include "prmem.h"
+
+#include "nsSSLIOLayer.h" // for SSMSTRING_PADDED_LENGTH
+#include "ssmdefs.h"
+#include "rsrcids.h"
+
+// Interfaces Needed
+#include "nsIAppShellService.h"
+#include "nsIDocShell.h"
+#include "nsIDOMWindow.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIPrompt.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIURL.h"
+#include "nsIXULWindow.h"
+
+static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
+static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
+
+
+// Happy callbacks
+static char * PromptUserCallback(void *arg, char *prompt, int isPasswd);
+static char * FilePathPromptCallback(void *arg, char *prompt, char *fileRegEx, CMUint32 shouldFileExist);
+static void   ApplicationFreeCallback(char *userInput);
+static void * CartmanUIHandler(uint32 resourceID, void* clientContext, uint32 width, uint32 height, PRBool isModel,
+                 char* urlStr, void *data);
+extern "C" void CARTMAN_UIEventLoop(void *data);
+
+
+/* nsISupports Implementation for the class */
+NS_IMPL_ISUPPORTS1(nsPSMUIHandlerImpl, nsIPSMUIHandler)
+
+NS_METHOD
+nsPSMUIHandlerImpl::DisplayURI(PRInt32 width, PRInt32 height, const char *urlStr)
+{
+    nsresult rv;
+    nsCOMPtr<nsIDOMWindow> hiddenWindow;
+    JSContext *jsContext;
+
+    NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
+	if (NS_SUCCEEDED(rv))
+	{
+		rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs( hiddenWindow ),
+                                                    &jsContext );
+
+	     if ( NS_SUCCEEDED( rv ) ) 
+         {
+            // Set up arguments for "window.open"
+            void *stackPtr;
+
+            char buffer[256];
+            PR_snprintf(buffer,
+                        sizeof(buffer),
+                        "menubar=no,height=%d,width=%d",
+                        height,
+                        width );
+
+            jsval	*argv = JS_PushArguments(jsContext, &stackPtr, "sss", urlStr, "_blank", buffer);
+            if (argv)
+            {
+	            // open the window
+	            nsIDOMWindow	*newWindow;
+	            hiddenWindow->Open(jsContext, argv, 3, &newWindow);
+                newWindow->ResizeTo(width, height);
+	            JS_PopArguments(jsContext, stackPtr);
+            }
+        }
+    }
+    return rv;
+}
+
+NS_IMETHODIMP
+nsPSMUIHandlerImpl::PromptForFile(const PRUnichar *prompt, const char *fileRegEx, PRBool shouldFileExist, char **outFile)
+{
+    NS_ENSURE_ARG_POINTER(outFile);
+    nsCOMPtr<nsIFilePicker> fp = do_CreateInstance("component://mozilla/filepicker");
+    
+    if (!fp)
+        return NS_ERROR_NULL_POINTER;
+
+
+    fp->Init(nsnull, prompt, nsIFilePicker::modeOpen);
+    fp->SetFilters(nsIFilePicker::filterAll);
+    fp->AppendFilter(NS_ConvertASCIItoUCS2(fileRegEx).GetUnicode(), NS_ConvertASCIItoUCS2(fileRegEx).GetUnicode());  
+    PRInt16 mode;
+    nsresult rv = fp->Show(&mode);
+
+    if (NS_FAILED(rv) || (mode == nsIFilePicker::returnCancel))
+         return rv;
+
+    nsCOMPtr<nsILocalFile> file;
+    rv = fp->GetFile(getter_AddRefs(file));
+
+    if (file)
+      file->GetPath(outFile);
+
+    return rv;
+}
+
+NS_METHOD      
+nsPSMUIHandlerImpl::CreatePSMUIHandler(nsISupports* aOuter, REFNSIID aIID, void **aResult)
+{                                                                  
+    nsresult rv = NS_OK; 
+    if ( aResult ) 
+    { 
+        /* Allocate new find component object. */
+        nsPSMUIHandlerImpl *component = new nsPSMUIHandlerImpl(); 
+        if ( component ) 
+        { 
+            /* Allocated OK, do query interface to get proper */
+            /* pointer and increment refcount.                */
+            rv = component->QueryInterface( aIID, aResult ); 
+            if ( NS_FAILED( rv ) ) 
+            { 
+                /* refcount still at zero, delete it here. */
+                delete component; 
+            } 
+        } 
+        else 
+        { 
+            rv = NS_ERROR_OUT_OF_MEMORY; 
+        } 
+    } 
+    else 
+    { 
+        rv = NS_ERROR_NULL_POINTER; 
+    } 
+    return rv; 
+} 
+
+
+
+extern "C" void CARTMAN_UIEventLoop(void *data)
+{
+   CMT_EventLoop((PCMT_CONTROL)data);
+}
+
+PRStatus InitPSMUICallbacks(PCMT_CONTROL control)
+{
+    if (!control)
+        return PR_FAILURE;  
+    
+    CMT_SetPromptCallback(control, (promptCallback_fn)PromptUserCallback, nsnull);
+    CMT_SetAppFreeCallback(control, (applicationFreeCallback_fn) ApplicationFreeCallback);
+    CMT_SetFilePathPromptCallback(control, (filePathPromptCallback_fn) FilePathPromptCallback, nsnull);
+
+    if (CMT_SetUIHandlerCallback(control, (uiHandlerCallback_fn) CartmanUIHandler, NULL) != CMTSuccess) 
+            return PR_FAILURE;
+
+    PR_CreateThread(PR_USER_THREAD,
+                    CARTMAN_UIEventLoop,
+                    control, 
+                    PR_PRIORITY_NORMAL, 
+                    PR_GLOBAL_THREAD, 
+                    PR_UNJOINABLE_THREAD,
+                    0);  
+
+    return PR_SUCCESS;
+}
+
+PRStatus DisplayPSMUIDialog(PCMT_CONTROL control, const char *pickledStatus, const char *hostName)
+{
+    CMUint32 advRID = 0;
+    CMInt32 width = 0;
+    CMInt32 height = 0;
+    CMTItem urlItem = {0, NULL, 0};
+    CMTStatus rv = CMTSuccess;
+    CMTItem advisorContext = {0, NULL, 0};
+    void * pwin;
+
+    CMTSecurityAdvisorData data;
+    memset(&data, '\0', sizeof(CMTSecurityAdvisorData));
+    
+    if (hostName)
+    {
+        // if there is a hostName, than this request is about
+        // a webpage.  
+        data.hostname    = (char*) hostName;
+        data.infoContext = SSM_BROWSER;
+    
+        if (pickledStatus)
+        {
+            CMTItem pickledResource = {0, NULL, 0};
+            CMUint32 socketStatus = 0;
+    
+            pickledResource.len = *(int*)(pickledStatus);
+            pickledResource.data = (unsigned char*) PR_Malloc(SSMSTRING_PADDED_LENGTH(pickledResource.len));
+        
+            if (! pickledResource.data) return PR_FAILURE;
+
+            memcpy(pickledResource.data, pickledStatus+sizeof(int), pickledResource.len);
+        
+            /* Unpickle the SSL Socket Status */
+            if (CMT_UnpickleResource( control, 
+                                      SSM_RESTYPE_SSL_SOCKET_STATUS,
+                                      pickledResource, 
+                                      &socketStatus) == CMTSuccess)
+            {
+                data.infoContext = SSM_BROWSER;    
+                data.resID = socketStatus;
+            }
+
+            PR_FREEIF(pickledResource.data);
+        }
+    }
+
+    /* Create a Security Advisor context object. */
+    rv = CMT_SecurityAdvisor(control, &data, &advRID);
+
+    if (rv != CMTSuccess)
+        return PR_FAILURE;
+
+    /* Get the URL, width, height, etc. from the advisor context. */
+    rv = CMT_GetStringAttribute(control, 
+                                advRID, 
+                                SSM_FID_SECADVISOR_URL,
+                                &urlItem);
+
+    if ((rv != CMTSuccess) || (!urlItem.data))
+        return PR_FAILURE;
+
+    rv = CMT_GetNumericAttribute(control, 
+                                 advRID, 
+                                 SSM_FID_SECADVISOR_WIDTH,
+                                 &width);
+    if (rv != CMTSuccess)
+        return PR_FAILURE;
+
+    rv = CMT_GetNumericAttribute(control, 
+                                 advRID, 
+                                 SSM_FID_SECADVISOR_HEIGHT,
+                                 &height);
+    if (rv != CMTSuccess)
+        return PR_FAILURE;
+
+    /* Fire the URL up in a window of its own. */
+    pwin = CartmanUIHandler(advRID, nsnull, width, height, PR_FALSE, (char*)urlItem.data, NULL);
+    
+    //allocated by cmt, we can free with free:
+    free(urlItem.data);
+    
+    return PR_SUCCESS;
+}
+
+
+
+void* CartmanUIHandler(uint32 resourceID, void* clientContext, uint32 width, uint32 height, PRBool isModal, char* urlStr, void *data)
+{
+    nsresult rv = NS_OK;
+    
+    NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
+    
+    if(NS_SUCCEEDED(rv))
+	    handler->DisplayURI(width, height, urlStr);
+
+    return nsnull;
+}
+
+    
+    
+char * PromptUserCallback(void *arg, char *prompt, int isPasswd)
+{
+
+    nsresult rv = NS_OK;
+    PRUnichar *password;
+    PRInt32  value;
+
+    NS_WITH_PROXIED_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, NS_UI_THREAD_EVENTQ, &rv);
+    
+    if (NS_SUCCEEDED(rv)) {
+	    rv = dialog->PromptPassword(NS_ConvertASCIItoUCS2(prompt).GetUnicode(), NS_ConvertASCIItoUCS2(" ").GetUnicode(), &password, &value);
+
+        if (NS_SUCCEEDED(rv)) {
+            nsString a(password);
+            char* str = a.ToNewCString();
+            Recycle(password);
+            return str;
+        }
+    }
+
+    return nsnull;
+}
+
+void ApplicationFreeCallback(char *userInput)
+{
+    nsAllocator::Free(userInput);
+}
+
+char * FilePathPromptCallback(void *arg, char *prompt, char *fileRegEx, CMUint32 shouldFileExist)
+{
+    nsresult rv = NS_OK;
+    
+    char* filePath = nsnull;
+    
+    NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
+    
+    if(NS_SUCCEEDED(rv))
+	    handler->PromptForFile(NS_ConvertASCIItoUCS2(prompt).GetUnicode(), fileRegEx, (PRBool)shouldFileExist, &filePath);
+
+    return filePath;
+}

mozilla/extensions/psm-glue/src/nsPSMUICallbacks.h

@@ -0,0 +1,55 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#ifndef _NSPSMUICALLBACKS_H
+#define _NSPSMUICALLBACKS_H
+
+#include "prtypes.h"
+#include "cmtcmn.h"
+
+#include "nsIPSMUIHandler.h"
+
+PRStatus InitPSMUICallbacks(PCMT_CONTROL gControl);
+PRStatus DisplayPSMUIDialog(PCMT_CONTROL control, const char* pickledStatus, const char *hostName);
+
+
+#define NS_PSMUIHANDLER_CID {0x15944e30, 0x601e, 0x11d3, {0x8c, 0x4a, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74}}
+
+class nsPSMUIHandlerImpl : public nsIPSMUIHandler 
+{
+    public:
+
+        NS_DEFINE_STATIC_CID_ACCESSOR( NS_PSMUIHANDLER_CID );
+    
+        /* ctor/dtor */
+        nsPSMUIHandlerImpl() { NS_INIT_REFCNT(); }
+        virtual ~nsPSMUIHandlerImpl() { }
+
+        NS_DECL_ISUPPORTS
+        NS_DECL_NSIPSMUIHANDLER
+
+        static NS_METHOD CreatePSMUIHandler(nsISupports* aOuter, REFNSIID aIID, void **aResult);
+};
+
+#endif

mozilla/extensions/psm-glue/src/nsSDR.cpp

@@ -0,0 +1,310 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape 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/NPL/
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *  thayes@netscape.com
+ */
+
+#include "stdlib.h"
+#include "plstr.h"
+#include "nsIAllocator.h"
+#include "nsIServiceManager.h"
+
+#include "plbase64.h"
+
+#include "nsISecretDecoderRing.h"
+
+#include "cmtcmn.h"
+#include "nsIPSMComponent.h"
+
+#include "nsSDR.h"
+
+NS_IMPL_ISUPPORTS1(nsSecretDecoderRing, nsISecretDecoderRing)
+
+nsSecretDecoderRing::nsSecretDecoderRing()
+{
+  NS_INIT_ISUPPORTS();
+
+  mPSM = NULL;
+}
+
+nsSecretDecoderRing::~nsSecretDecoderRing()
+{
+  if (mPSM) mPSM->Release();
+}
+
+/* Init the new instance */
+nsresult nsSecretDecoderRing::
+init()
+{
+  nsresult rv;
+  nsISupports *psm;
+
+  rv = nsServiceManager::GetService(kPSMComponentProgID, NS_GET_IID(nsIPSMComponent),
+                                    &psm);
+  if (rv != NS_OK) goto loser;  /* Should promote error */
+
+  mPSM = (nsIPSMComponent *)psm;
+
+loser:
+  return rv;
+}
+
+/* [noscript] long encrypt (in buffer data, in long dataLen, out buffer result); */
+NS_IMETHODIMP nsSecretDecoderRing::
+Encrypt(unsigned char * data, PRInt32 dataLen, unsigned char * *result, PRInt32 *_retval)
+{
+    nsresult rv = NS_OK;
+    unsigned char *r = 0;
+    CMT_CONTROL *control;
+    CMTStatus status;
+    CMUint32 cLen;
+
+    if (data == nsnull || result == nsnull || _retval == nsnull) {
+       rv = NS_ERROR_INVALID_POINTER;
+       goto loser;
+    }
+
+    /* Check object initialization */
+    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
+    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
+
+    /* Get the control connect to use for the request */
+    rv = mPSM->GetControlConnection(&control);
+    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
+   
+    status = CMT_SDREncrypt(control, (const unsigned char *)0, 0, 
+               data, dataLen, result, &cLen);
+    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* XXX */
+
+    /* Copy returned data to nsAllocator buffer ? */
+    *_retval = cLen;
+
+loser:
+    return rv;
+}
+
+/* [noscript] long decrypt (in buffer data, in long dataLen, out buffer result); */
+NS_IMETHODIMP nsSecretDecoderRing::
+Decrypt(unsigned char * data, PRInt32 dataLen, unsigned char * *result, PRInt32 *_retval)
+{
+    nsresult rv = NS_OK;
+    CMTStatus status;
+    CMT_CONTROL *control;
+    CMUint32 len;
+
+    if (data == nsnull || result == nsnull || _retval == nsnull) {
+       rv = NS_ERROR_INVALID_POINTER;
+       goto loser;
+    }
+
+    /* Check object initialization */
+    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
+    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
+
+    /* Get the control connection */
+    rv = mPSM->GetControlConnection(&control);
+    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
+    
+    /* Call PSM to decrypt the value */
+    status = CMT_SDRDecrypt(control, data, dataLen, result, &len);
+    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* Promote? */
+
+    /* Copy returned data to nsAllocator buffer ? */
+    *_retval = len;
+
+loser:
+    return rv;
+}
+
+/* string encryptString (in string text); */
+NS_IMETHODIMP nsSecretDecoderRing::
+EncryptString(const char *text, char **_retval)
+{
+    nsresult rv = NS_OK;
+    unsigned char *encrypted = 0;
+    PRInt32 eLen;
+
+    if (text == nsnull || _retval == nsnull) {
+        rv = NS_ERROR_INVALID_POINTER;
+        goto loser;
+    }
+
+    rv = Encrypt((unsigned char *)text, PL_strlen(text), &encrypted, &eLen);
+    if (rv != NS_OK) { goto loser; }
+
+    rv = encode(encrypted, eLen, _retval);
+
+loser:
+    if (encrypted) nsAllocator::Free(encrypted);
+
+    return rv;
+}
+
+/* string decryptString (in string crypt); */
+NS_IMETHODIMP nsSecretDecoderRing::
+DecryptString(const char *crypt, char **_retval)
+{
+    nsresult rv = NS_OK;
+    char *r = 0;
+    unsigned char *decoded = 0;
+    PRInt32 decodedLen;
+    unsigned char *decrypted = 0;
+    PRInt32 decryptedLen;
+
+    if (crypt == nsnull || _retval == nsnull) {
+      rv = NS_ERROR_INVALID_POINTER;
+      goto loser;
+    }
+
+    rv = decode(crypt, &decoded, &decodedLen);
+    if (rv != NS_OK) goto loser;
+
+    rv = Decrypt(decoded, decodedLen, &decrypted, &decryptedLen);
+    if (rv != NS_OK) goto loser;
+
+    // Convert to NUL-terminated string
+    r = (char *)nsAllocator::Alloc(decryptedLen+1);
+    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+    memcpy(r, decrypted, decryptedLen);
+    r[decryptedLen] = 0;
+
+    *_retval = r;
+    r = 0;
+
+loser:
+    if (r) nsAllocator::Free(r);
+    if (decrypted) nsAllocator::Free(decrypted);
+    if (decoded) nsAllocator::Free(decoded);
+ 
+    return rv;
+}
+
+/* void changePassword(); */
+NS_IMETHODIMP nsSecretDecoderRing::
+ChangePassword()
+{
+  return NS_OK;
+}
+
+/* void logout(); */
+NS_IMETHODIMP nsSecretDecoderRing::
+Logout()
+{
+    nsresult rv = NS_OK;
+    CMTStatus status;
+    CMT_CONTROL *control;
+
+    /* Check object initialization */
+    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
+    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
+
+    /* Get the control connection */
+    rv = mPSM->GetControlConnection(&control);
+    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
+    
+    /* Call PSM to decrypt the value */
+    status = CMT_LogoutAllTokens(control);
+    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* Promote? */
+
+loser:
+    return rv;
+}
+
+
+// Support routines
+
+nsresult nsSecretDecoderRing::
+encode(const unsigned char *data, PRInt32 dataLen, char **_retval)
+{
+    nsresult rv = NS_OK;
+
+    *_retval = PL_Base64Encode((const char *)data, dataLen, NULL);
+    if (!*_retval) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+loser:
+    return rv;
+
+#if 0
+    nsresult rv = NS_OK;
+    char *r = 0;
+
+    // Allocate space for encoded string (with NUL)
+    r = (char *)nsAllocator::Alloc(dataLen+1);
+    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+    memcpy(r, data, dataLen);
+    r[dataLen] = 0;
+
+    *_retval = r;
+    r = 0;
+
+loser:
+    if (r) nsAllocator::Free(r);
+
+    return rv;
+#endif
+}
+
+nsresult nsSecretDecoderRing::
+decode(const char *data, unsigned char **result, PRInt32 * _retval)
+{
+    nsresult rv = NS_OK;
+    PRUint32 len = PL_strlen(data);
+    int adjust = 0;
+
+    /* Compute length adjustment */
+    if (data[len-1] == '=') {
+      adjust++;
+      if (data[len-2] == '=') adjust++;
+    }
+
+    *result = (unsigned char *)PL_Base64Decode(data, len, NULL);
+    if (!*result) { rv = NS_ERROR_ILLEGAL_VALUE; goto loser; }
+
+    *_retval = (len*3)/4 - adjust;
+
+loser:
+    return rv;
+
+#if 0
+    nsresult rv = NS_OK;
+    unsigned char *r = 0;
+    PRInt32 rLen;
+
+    // Allocate space for decoded string (missing NUL)
+    rLen = PL_strlen(data);
+    r = (unsigned char *)nsAllocator::Alloc(rLen);
+    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+    memcpy(r, data, rLen);
+
+    *result = r;
+    r = 0;
+    *_retval = rLen;
+
+loser:
+    if (r) nsAllocator::Free(r);
+
+    return rv;
+#endif
+}
+
+const char * nsSecretDecoderRing::kPSMComponentProgID = PSM_COMPONENT_PROGID;

mozilla/extensions/psm-glue/src/nsSDR.h

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Terry Hayes <thayes@netscape.com>
+ */
+
+#ifndef _NSSDR_H_
+#define _NSSDR_H_
+
+#include "nsISecretDecoderRing.h"
+
+// ===============================================
+// nsSecretDecoderRing - implementation of nsISecretDecoderRing
+// ===============================================
+
+#define NS_SDR_CLASSNAME "Secret Decoder Ring"
+#define NS_SDR_CID \
+  { 0xd9a0341, 0xce7, 0x11d4, { 0x9f, 0xdd, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
+#define NS_SDR_PROGID "netscape.security.sdr"
+
+class nsSecretDecoderRing : public nsISecretDecoderRing
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISECRETDECODERRING
+
+  nsSecretDecoderRing();
+  virtual ~nsSecretDecoderRing();
+
+  nsresult init();
+
+private:
+  nsIPSMComponent *mPSM;
+
+  static const char *kPSMComponentProgID;
+
+  nsresult encode(const unsigned char *data, PRInt32 dataLen, char **_retval);
+  nsresult decode(const char *data, unsigned char **result, PRInt32 * _retval);
+};
+
+#endif /* _NSSDR_H_ */

mozilla/extensions/psm-glue/src/nsSSLIOLayer.cpp

@@ -0,0 +1,432 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+#include "nspr.h"
+#include "nsString.h"
+#include "cmtcmn.h"
+
+#include "nsIPSMComponent.h"
+#include "nsIPSMSocketInfo.h"
+#include "nsIServiceManager.h"
+#include "nsPSMShimLayer.h"
+#include "nsSSLIOLayer.h"
+
+static PRDescIdentity  nsSSLIOLayerIdentity;
+static PRIOMethods     nsSSLIOLayerMethods;
+static nsIPSMComponent* gPSMService = nsnull;
+
+
+
+class nsPSMSocketInfo : public nsIPSMSocketInfo
+{
+public:
+    nsPSMSocketInfo();
+    ~nsPSMSocketInfo();
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIPSMSOCKETINFO
+
+    // internal functions to psm-glue.
+    nsresult SetSocketPtr(CMSocket *socketPtr);
+    nsresult SetControlPtr(CMT_CONTROL *aControlPtr);
+    nsresult SetFileDescPtr(PRFileDesc *aControlPtr);
+    nsresult SetHostName(char *aHostName);
+
+protected:
+    CMT_CONTROL* mControl;
+    CMSocket*    mSocket;
+    PRFileDesc*  mFd;
+    nsString     mHostName;
+};
+
+
+static PRStatus PR_CALLBACK
+nsSSLIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
+{
+    nsresult                result;
+    PRStatus                rv = PR_SUCCESS;
+    CMTStatus               status = CMTFailure;
+    char*                   hostName;
+
+    /* Set the error in case of failure. */
+
+    PR_SetError(PR_UNKNOWN_ERROR, status);
+
+    if (!fd || !addr || !fd->secret)
+        return PR_FAILURE;
+    
+    if (gPSMService == nsnull)
+    {
+        result = nsServiceManager::GetService( PSM_COMPONENT_PROGID,
+                                               NS_GET_IID(nsIPSMComponent), 
+                                               (nsISupports**)&gPSMService);  //FIX leak one per app run
+        if (NS_FAILED(result))
+            return PR_FAILURE;
+    }
+    
+    
+    // Make the socket non-blocking...
+    PRSocketOptionData opt;
+    opt.option = PR_SockOpt_Nonblocking;
+    opt.value.non_blocking = PR_FALSE;
+    rv = PR_SetSocketOption(fd->lower, &opt);
+    if (PR_SUCCESS != rv) 
+        return PR_FAILURE;
+
+    char ipBuffer[PR_NETDB_BUF_SIZE];
+    rv = PR_NetAddrToString(addr, (char*)&ipBuffer, PR_NETDB_BUF_SIZE);
+    if (rv != PR_SUCCESS)
+        return PR_FAILURE;
+    
+    if (addr->raw.family == PR_AF_INET6 && PR_IsNetAddrType(addr, PR_IpAddrV4Mapped)) 
+    {
+      /* Chop off the leading "::ffff:" */
+      strcpy(ipBuffer, ipBuffer + 7);
+    }
+
+
+    CMSocket* cmsock = (CMSocket *)PR_Malloc(sizeof(CMSocket));
+    if (!cmsock)
+        return PR_FAILURE;
+    
+    memset(cmsock, 0, sizeof(CMSocket));
+    
+    CMT_CONTROL *control;
+    result = gPSMService->GetControlConnection(&control);
+
+    if (result != PR_SUCCESS)
+    {
+        PR_FREEIF(cmsock)
+        return PR_FAILURE;
+    }
+    
+    cmsock->fd        = fd->lower;
+    cmsock->isUnix    = PR_FALSE;
+   
+    nsPSMSocketInfo *infoObject = (nsPSMSocketInfo *)fd->secret;
+    
+    infoObject->GetHostName(&hostName);
+    infoObject->SetControlPtr(control);
+    infoObject->SetSocketPtr(cmsock);
+    
+    status = CMT_OpenSSLConnection(control,
+                                   cmsock,
+                                   SSM_REQUEST_SSL_DATA_SSL,
+                                   PR_ntohs(addr->inet.port),
+                                   ipBuffer,
+                                   (hostName ? hostName : ipBuffer),
+                                   CM_FALSE, 
+                                   nsnull);
+    if (CMTSuccess == status)
+    {
+        // since our stuff can block, what we want to do is return PR_FAILURE,
+        // but set the nspr ERROR to BLOCK.  This will put us into a select
+        // q.
+        PR_SetError(PR_WOULD_BLOCK_ERROR, status);
+        return PR_FAILURE;
+    }
+
+    return PR_FAILURE;
+}
+
+  /* CMT_DestroyDataConnection(ctrl, sock); */
+  /*   need to strip our layer, pass result to DestroyDataConnection */
+  /*   which will clean up the CMT accounting of sock, then call our */
+  /*   shim layer to translate back to NSPR */
+
+static PRStatus PR_CALLBACK
+nsSSLIOLayerClose(PRFileDesc *fd)
+{
+  nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
+  PRDescIdentity          id     = PR_GetLayersIdentity(fd);
+   
+  if (infoObject && id == nsSSLIOLayerIdentity)
+  {
+    CMInt32 errorCode = PR_FAILURE;
+    CMT_CONTROL* control;
+    CMSocket*    socket;
+    
+    infoObject->GetControlPtr(&control);
+    infoObject->GetSocketPtr(&socket);
+
+    if (((PRStatus) CMT_GetSSLDataErrorCode(control, socket, &errorCode)) == PR_SUCCESS)
+    {
+        CMT_DestroyDataConnection(control, socket);
+        NS_RELEASE(infoObject);
+        fd->identity = PR_INVALID_IO_LAYER;
+    }
+    return (PRStatus)errorCode;
+  }
+
+  return PR_FAILURE;
+}
+ 
+static PRInt32 PR_CALLBACK
+nsSSLIOLayerRead( PRFileDesc *fd, void *buf, PRInt32 amount)
+{
+    if (!fd)
+        return PR_FAILURE;
+
+    PRInt32 result = PR_Recv(fd, buf, amount, 0, PR_INTERVAL_MIN);
+    
+    if (result > 0)
+        return result;
+    
+    if (result == -1)
+    {
+        PRErrorCode code = PR_GetError();
+
+        if (code == PR_IO_TIMEOUT_ERROR )
+            PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
+        return PR_FAILURE;
+    }
+    
+    if (result == 0)
+    {
+        nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
+        PRDescIdentity          id     = PR_GetLayersIdentity(fd);
+
+        if (infoObject && id == nsSSLIOLayerIdentity)
+        {
+            CMInt32 errorCode = PR_FAILURE;
+            
+            CMT_CONTROL* control;
+            CMSocket*    socket;
+    
+            infoObject->GetControlPtr(&control);
+            infoObject->GetSocketPtr(&socket);
+
+            CMT_GetSSLDataErrorCode(control, socket, &errorCode);
+
+			if (errorCode == PR_IO_TIMEOUT_ERROR)
+			{
+				PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
+				return PR_FAILURE;
+			}
+
+            PR_SetError(0, 0);
+            return errorCode;
+        }
+    }
+
+    return result;
+}
+
+static PRInt32 PR_CALLBACK
+nsSSLIOLayerWrite( PRFileDesc *fd, const void *buf, PRInt32 amount)
+{
+    if (!fd)
+        return PR_FAILURE;
+
+    PRInt32 result = PR_Send(fd, buf, amount, 0, PR_INTERVAL_MIN);
+    
+    if (result > 0)
+        return result;
+
+    if (result == -1)
+    {
+        PRErrorCode code = PR_GetError();
+
+        if (code == PR_IO_TIMEOUT_ERROR )
+            PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
+        return PR_FAILURE;
+    }
+
+    if (result == 0)
+    {
+        nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
+        PRDescIdentity          id     = PR_GetLayersIdentity(fd);
+
+        if (infoObject && id == nsSSLIOLayerIdentity)
+        {
+            CMInt32 errorCode = PR_FAILURE;
+            CMT_CONTROL* control;
+            CMSocket*    socket;
+    
+            infoObject->GetControlPtr(&control);
+            infoObject->GetSocketPtr(&socket);
+
+            CMT_GetSSLDataErrorCode(control, socket, &errorCode);
+            PR_SetError(0, 0);
+            return errorCode;
+        }
+    }
+    return result;
+}
+
+
+
+nsPSMSocketInfo::nsPSMSocketInfo()
+{ 
+    NS_INIT_REFCNT(); 
+    mControl = nsnull; 
+    mSocket = nsnull;
+}
+
+nsPSMSocketInfo::~nsPSMSocketInfo()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsPSMSocketInfo, nsIPSMSocketInfo);
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetControlPtr(CMT_CONTROL * *aControlPtr)
+{
+    *aControlPtr = mControl;
+    return NS_OK;
+}
+
+nsresult
+nsPSMSocketInfo::SetControlPtr(CMT_CONTROL *aControlPtr)
+{
+    mControl = aControlPtr;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetSocketPtr(CMSocket * *socketPtr)
+{
+    *socketPtr = mSocket;
+    return NS_OK;
+}
+
+nsresult
+nsPSMSocketInfo::SetSocketPtr(CMSocket *socketPtr)
+{
+    mSocket = socketPtr;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetFileDescPtr(PRFileDesc * *aFilePtr)
+{
+    *aFilePtr = mFd;
+    return NS_OK;
+}
+
+
+nsresult
+nsPSMSocketInfo::SetFileDescPtr(PRFileDesc *aFilePtr)
+{
+    mFd = aFilePtr;
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsPSMSocketInfo::GetHostName(char * *aHostName)
+{
+    *aHostName = mHostName.ToNewCString();
+    return NS_OK;
+}
+
+
+nsresult 
+nsPSMSocketInfo::SetHostName(char *aHostName)
+{
+    mHostName.AssignWithConversion(aHostName);
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetPickledStatus(char * *pickledStatusString)
+{
+    *pickledStatusString = nsnull;
+
+    if (mSocket && mControl)
+    {
+        long level;
+        CMTItem pickledStatus = {0, nsnull, 0};
+        unsigned char* ret    = nsnull;
+
+        if (CMT_GetSSLSocketStatus(mControl, mSocket, &pickledStatus, &level) == PR_FAILURE)
+            return nsnull;
+        
+        ret = (unsigned char*) PR_Malloc( (SSMSTRING_PADDED_LENGTH(pickledStatus.len) + sizeof(int)) );
+        if (!ret) 
+            return NS_ERROR_OUT_OF_MEMORY;
+
+        *(int*)ret = pickledStatus.len;
+        memcpy(ret+sizeof(int), pickledStatus.data, *(int*)ret);
+    
+        PR_FREEIF(pickledStatus.data);
+    
+        *pickledStatusString = (char*) ret;
+    }
+    return NS_OK;
+}
+
+nsresult
+nsSSLIOLayerNewSocket(const char* hostName, PRFileDesc **fd, nsISupports** info)
+{
+    static PRBool  firstTime = PR_TRUE;
+    if (firstTime)
+    {
+        nsSSLIOLayerIdentity        = PR_GetUniqueIdentity("Cartman layer");
+        nsSSLIOLayerMethods         = *PR_GetDefaultIOMethods();
+
+        nsSSLIOLayerMethods.connect = nsSSLIOLayerConnect;
+        nsSSLIOLayerMethods.close   = nsSSLIOLayerClose;
+        nsSSLIOLayerMethods.read    = nsSSLIOLayerRead;
+        nsSSLIOLayerMethods.write   = nsSSLIOLayerWrite;
+        firstTime                   = PR_FALSE;
+    }
+    
+
+    PRFileDesc *   sock;
+    PRFileDesc *   layer;
+    PRStatus       rv;
+
+    /* Get a normal NSPR socket */
+    sock = PR_NewTCPSocket();  
+    if (! sock) return NS_ERROR_OUT_OF_MEMORY;
+
+    layer = PR_CreateIOLayerStub(nsSSLIOLayerIdentity, &nsSSLIOLayerMethods);
+    if (! layer)
+    {
+        PR_Close(sock);
+        return NS_ERROR_FAILURE;
+    }
+        
+    nsPSMSocketInfo *infoObject = new nsPSMSocketInfo();
+    if (!infoObject)
+    {
+        PR_Close(sock);
+        // clean up IOLayerStub.
+        return NS_ERROR_FAILURE;
+    }
+    
+    NS_ADDREF(infoObject);
+    infoObject->SetHostName((char*)hostName);
+    layer->secret = (PRFilePrivate*) infoObject;
+    rv = PR_PushIOLayer(sock, PR_GetLayersIdentity(sock), layer);
+    
+    if (rv == PR_SUCCESS)
+    {
+        *fd   = sock;
+        *info = infoObject;
+        NS_ADDREF(*info);
+        return NS_OK;
+    }
+    
+    PR_Close(sock);
+    return NS_ERROR_FAILURE;
+}

mozilla/extensions/psm-glue/src/nsSSLIOLayer.h

@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Netscape Public
+ * 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/NPL/
+ * 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
@@ -17,20 +17,21 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
- */
+ * Contributor(s):
+*/
 
-#include "nsIChannel.idl"
+#ifndef _NSSSLIOLAYER_H
+#define _NSSSLIOLAYER_H
 
-interface nsIEventQueue;
+#include "prtypes.h"
+#include "prio.h"
+#include "nsIPSMSocketInfo.h"
 
-// this interface provides a way for the FTP connection to 
-// synchronize with the owning channel.
+// define taken from 4.x cartman glue code.  
+#define SSMSTRING_PADDED_LENGTH(x) ((((x)+3)/4)*4)
 
-[scriptable, uuid(64718e40-18c2-11d3-9337-00104ba0fd40)]
-interface nsPIFTPChannel : nsIChannel
-{
-	void SetContentLength(in long aLength);
-};
+nsresult nsSSLIOLayerNewSocket(const char* hostName, PRFileDesc **fd, nsISupports **securityInfo);
 
 
+
+#endif /* _NSSSLIOLAYER_H */

mozilla/extensions/psm-glue/src/nsSSLSocketProvider.cpp

@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsSSLSocketProvider.h"
+#include "nsSSLIOLayer.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsSSLSocketProvider::nsSSLSocketProvider()
+{
+  NS_INIT_REFCNT();
+}
+
+nsresult
+nsSSLSocketProvider::Init()
+{
+  nsresult rv = NS_OK;
+  return rv;
+}
+
+nsSSLSocketProvider::~nsSSLSocketProvider()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsSSLSocketProvider, nsISocketProvider, nsISSLSocketProvider);
+
+NS_METHOD
+nsSSLSocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{                                                                               
+    nsresult rv;                                                                
+                                                                                
+    nsSSLSocketProvider * inst;                                                      
+                                                                                
+    if (NULL == aResult) {                                                      
+        rv = NS_ERROR_NULL_POINTER;                                             
+        return rv;                                                              
+    }                                                                           
+    *aResult = NULL;                                                            
+    if (NULL != aOuter) {                                                       
+        rv = NS_ERROR_NO_AGGREGATION;                                           
+        return rv;                                                              
+    }                                                                           
+                                                                                
+    NS_NEWXPCOM(inst, nsSSLSocketProvider);                                          
+    if (NULL == inst) {                                                         
+        rv = NS_ERROR_OUT_OF_MEMORY;                                            
+        return rv;                                                              
+    }                                                                           
+    NS_ADDREF(inst);                                                            
+    rv = inst->QueryInterface(aIID, aResult);                                   
+    NS_RELEASE(inst);                                                           
+                                                                                
+    return rv;                                                                  
+}                                                                               
+
+
+NS_IMETHODIMP
+nsSSLSocketProvider::NewSocket(const char *hostName, PRFileDesc **_result, nsISupports **securityInfo)
+{
+  nsresult rv = nsSSLIOLayerNewSocket(hostName, _result, securityInfo);
+  return (NS_FAILED(rv)) ? NS_ERROR_SOCKET_CREATE_FAILED : NS_OK;
+}

mozilla/extensions/psm-glue/src/nsSSLSocketProvider.h

@@ -1,9 +1,9 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  *
- * The contents of this file are subject to the Netscape Public
+ * 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/NPL/
+ * 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
@@ -17,24 +17,31 @@
  * Copyright (C) 1998 Netscape Communications Corporation. All
  * Rights Reserved.
  *
- * Contributor(s): 
- */
+ * Contributor(s):
+*/
 
-#ifndef _NSSOCKETPROVIDERSERVICE_H_
-#define _NSSOCKETPROVIDERSERVICE_H_
+#ifndef _NSSSLSOCKETPROVIDER_H_
+#define _NSSSLSOCKETPROVIDER_H_
 
-#include "nsISocketProviderService.h"
+#include "nsISSLSocketProvider.h"
 
-class nsSocketProviderService : public nsISocketProviderService
+
+/* 274418d0-5437-11d3-bbc8-0000861d1237 */         
+#define NS_SSLSOCKETPROVIDER_CID   { 0x274418d0, 0x5437, 0x11d3, {0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37}}
+
+
+class nsSSLSocketProvider : public nsISSLSocketProvider
 {
 public:
   NS_DECL_ISUPPORTS
 
-  NS_DECL_NSISOCKETPROVIDERSERVICE
+  NS_DECL_NSISOCKETPROVIDER
 
-  // nsISocketProviderService methods:
-  nsSocketProviderService();
-  virtual ~nsSocketProviderService();
+  NS_DECL_NSISSLSOCKETPROVIDER
+
+  // nsSSLSocketProvider methods:
+  nsSSLSocketProvider();
+  virtual ~nsSSLSocketProvider();
 
   static NS_METHOD
   Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
@@ -44,4 +51,4 @@ public:
 protected:
 };
 
-#endif /* _NSSOCKETPROVIDERSERVICE_H */
+#endif /* _NSSSLSOCKETPROVIDER_H_ */

mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp

@@ -0,0 +1,619 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nspr.h"
+#include "prlog.h"
+
+#include "nsISecureBrowserUI.h"
+#include "nsSecureBrowserUIImpl.h"
+#include "nsIPSMComponent.h"
+#include "nsPSMComponent.h"
+#include "nsCOMPtr.h"
+#include "nsIServiceManager.h"
+
+#include "nsIScriptGlobalObject.h"
+#include "nsIObserverService.h"
+#include "nsIDocumentLoader.h"
+#include "nsCURILoader.h"
+#include "nsIDocShell.h"
+#include "nsIDocumentViewer.h"
+#include "nsCURILoader.h"
+#include "nsIDocument.h"
+#include "nsIDOMHTMLDocument.h"
+#include "nsIDOMXULDocument.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMWindow.h"
+#include "nsIWebProgress.h"
+#include "nsIChannel.h"
+#include "nsIPSMSocketInfo.h"
+
+#include "nsIURI.h"
+
+#include "prmem.h"
+
+#include "nsINetSupportDialogService.h"
+#include "nsIPrompt.h"
+#include "nsICommonDialogs.h"
+#include "nsIPref.h"
+
+#include "nsIFormSubmitObserver.h"
+
+static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
+static NS_DEFINE_CID(kCommonDialogsCID,         NS_CommonDialog_CID );
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+
+#define ENTER_SITE_PREF      "security.warn_entering_secure"
+#define LEAVE_SITE_PREF      "security.warn_leaving_secure"
+#define MIXEDCONTENT_PREF    "security.warn_viewing_mixed"
+#define INSECURE_SUBMIT_PREF "security.warn_submit_insecure"
+
+#if defined(PR_LOGGING)
+//
+// Log module for nsSecureBroswerUI logging...
+//
+// To enable logging (see prlog.h for full details):
+//
+//    set NSPR_LOG_MODULES=nsSecureBroswerUI:5
+//    set NSPR_LOG_FILE=nspr.log
+//
+// this enables PR_LOG_DEBUG level information and places all output in
+// the file nspr.log
+//
+PRLogModuleInfo* gSecureDocLog = nsnull;
+#endif /* PR_LOGGING */
+
+ 
+NS_IMETHODIMP                                                            
+nsSecureBrowserUIImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult) 
+{                                                                               
+    nsresult rv;                                                                
+                                                                                
+    nsSecureBrowserUIImpl * inst;                                                      
+                                                                                
+    if (NULL == aResult) {                                                      
+        rv = NS_ERROR_NULL_POINTER;                                             
+        return rv;                                                              
+    }                                                                           
+    *aResult = NULL;                                                            
+    if (NULL != aOuter) {                                                       
+        rv = NS_ERROR_NO_AGGREGATION;                                           
+        return rv;                                                              
+    }                                                                           
+                                                                                
+    NS_NEWXPCOM(inst, nsSecureBrowserUIImpl);                                          
+    if (NULL == inst) {                                                         
+        rv = NS_ERROR_OUT_OF_MEMORY;                                            
+        return rv;                                                              
+    }                                                                           
+    NS_ADDREF(inst);                                                            
+    rv = inst->QueryInterface(aIID, aResult);                                   
+    NS_RELEASE(inst);                                                           
+                                                                                
+    return rv;                                                                  
+}                                                                               
+
+nsSecureBrowserUIImpl::nsSecureBrowserUIImpl()
+{
+	NS_INIT_REFCNT();
+
+#if defined(PR_LOGGING)
+  if (nsnull == gSecureDocLog) {
+      gSecureDocLog = PR_NewLogModule("nsSecureBroswerUI");
+  }
+#endif /* PR_LOGGING */
+
+
+	mIsSecureDocument = mMixContentAlertShown = mIsDocumentBroken = PR_FALSE;
+    mLastPSMStatus    = nsnull;
+    mCurrentURI       = nsnull;
+    mSecurityButton   = nsnull;
+}
+
+nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl()
+{
+    PR_FREEIF(mLastPSMStatus);
+}
+
+NS_IMPL_ISUPPORTS4(nsSecureBrowserUIImpl, 
+                   nsSecureBrowserUI, 
+                   nsIWebProgressListener, 
+                   nsIFormSubmitObserver,
+                   nsIObserver); 
+
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::Init(nsIDOMWindow *window, nsIDOMElement *button)
+{
+    mSecurityButton = button;
+    mWindow         = window;
+    
+    nsresult rv = nsServiceManager::GetService( kPrefCID, 
+                                                NS_GET_IID(nsIPref), 
+                                                getter_AddRefs(mPref));  
+    if (NS_FAILED(rv)) return rv;
+    
+    NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+    
+    nsILocale* locale = nsnull;
+    rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, locale, getter_AddRefs(mStringBundle));
+    if (NS_FAILED(rv)) return rv;
+
+    // hook up to the form post notifications:
+    nsIObserverService *svc = 0;
+    rv = nsServiceManager::GetService(NS_OBSERVERSERVICE_PROGID, 
+                                      NS_GET_IID(nsIObserverService), 
+                                      (nsISupports**)&svc );
+    if ( NS_SUCCEEDED( rv ) && svc )
+    {
+        nsString  topic; topic.AssignWithConversion(NS_FORMSUBMIT_SUBJECT);
+        rv = svc->AddObserver( this, topic.GetUnicode());
+        nsServiceManager::ReleaseService( NS_OBSERVERSERVICE_PROGID, svc );
+    }
+
+    // hook up to the webprogress notifications.
+    nsCOMPtr<nsIDocShell> docShell;
+	
+    nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface(window);
+	if (!sgo) return NS_ERROR_NULL_POINTER;
+    
+    sgo->GetDocShell(getter_AddRefs(docShell));
+    if (!docShell) return NS_ERROR_NULL_POINTER;
+    
+    nsCOMPtr<nsIWebProgress> wp = do_QueryInterface(docShell);
+    if (!wp) return NS_ERROR_NULL_POINTER;
+
+    wp->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this));
+
+    // Set up stuff the first time the window loads:
+    docShell->GetCurrentURI(getter_AddRefs(mCurrentURI));
+
+    return IsURLHTTPS(mCurrentURI, &mIsSecureDocument);
+}
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::DisplayPageInfoUI()
+{
+    nsresult res;
+    NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
+	if (NS_FAILED(res)) 
+		return res;
+    
+    nsXPIDLCString temp;
+    mCurrentURI->GetHost(getter_Copies(temp));
+    return psm->DisplaySecurityAdvisor(mLastPSMStatus, temp);
+}
+
+
+
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::Observe(nsISupports*, const PRUnichar*, const PRUnichar*) 
+{
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL)
+{
+    // Return NS_OK unless we want to prevent this form from submitting.
+    if (!window || (mWindow.get() != window) || !actionURL) {
+      return NS_OK;
+    }
+    PRBool okayToPost;
+    nsresult res = CheckPost(actionURL, &okayToPost);
+
+    // Return NS_OK unless we want to prevent this form from submitting.
+    if (NS_SUCCEEDED(res) && okayToPost)
+        return NS_OK;
+    
+    return NS_ERROR_FAILURE;
+}
+
+//  nsIWebProgressListener
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnProgressChange(nsIChannel* aChannel, 
+                                        PRInt32 aCurSelfProgress, 
+                                        PRInt32 aMaxSelfProgress, 
+                                        PRInt32 aCurTotalProgress, 
+                                        PRInt32 aMaxTotalProgress)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnChildProgressChange(nsIChannel* aChannel, 
+                                             PRInt32 aCurSelfProgress, 
+                                             PRInt32 aMaxSelfProgress)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnStatusChange(nsIChannel* aChannel, 
+                                      PRInt32 aProgressStatusFlags)
+{
+    nsresult res;
+
+    if (aChannel == nsnull || !mSecurityButton || !mPref)
+        return NS_ERROR_NULL_POINTER;
+    
+    nsCOMPtr<nsIURI> loadingURI;
+    aChannel->GetURI(getter_AddRefs(loadingURI));
+    
+#if defined(DEBUG)
+        nsXPIDLCString temp;
+        loadingURI->GetSpec(getter_Copies(temp));
+        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: OnStatusChange: %x :%s\n", this, aProgressStatusFlags,(const char*)temp));
+#endif
+
+    if (aProgressStatusFlags & nsIWebProgress::flag_net_start)
+    {
+        // starting to load a webpage
+        PR_FREEIF(mLastPSMStatus); mLastPSMStatus = nsnull;
+
+        mIsSecureDocument = mMixContentAlertShown = mIsDocumentBroken = PR_FALSE;
+        
+        res = CheckProtocolContextSwitch( loadingURI, mCurrentURI);    
+
+    } 
+    else if ((aProgressStatusFlags & nsIWebProgress::flag_net_stop)  && mIsSecureDocument)
+    {
+        if (!mIsDocumentBroken) // and status is okay  FIX
+        {
+            // qi for the psm information about this channel load.
+            nsCOMPtr<nsISupports> info;
+	        aChannel->GetSecurityInfo(getter_AddRefs(info));
+	        nsCOMPtr<nsIPSMSocketInfo> psmInfo = do_QueryInterface(info);
+            if ( psmInfo )
+            {
+                // Everything looks okay.  Lets stash the picked status.
+                PR_FREEIF(mLastPSMStatus);
+                res = psmInfo->GetPickledStatus(&mLastPSMStatus);
+    
+                if (NS_SUCCEEDED(res))
+                {
+                    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Icon set to lock\n", this));
+                    res = mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("high") );
+                }
+	        }
+        }
+        else
+        {
+
+            PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Icon set to broken\n", this));
+            mIsDocumentBroken = PR_TRUE;
+            res = mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken") );
+        }
+    }
+    else // if (aProgressStatusFlags == nsIWebProgress::flag_net_redirecting)
+    {
+        res = NS_ERROR_NOT_IMPLEMENTED;
+        // xxx need to fix.
+    }
+
+    return res;
+}
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnChildStatusChange(nsIChannel* aChannel, PRInt32 aProgressStatusFlags)
+{
+    nsresult rv;
+    if (aChannel == nsnull || !mSecurityButton || !mPref)
+        return NS_ERROR_NULL_POINTER;
+    
+    nsCOMPtr<nsIURI> uri;
+    rv = aChannel->GetURI(getter_AddRefs(uri));
+    if (NS_FAILED(rv)) return rv;
+    
+#if defined(DEBUG)
+        nsXPIDLCString temp;
+        uri->GetSpec(getter_Copies(temp));
+        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: OnChildStatusChange: %x :%s\n", this, aProgressStatusFlags,(const char*)temp));
+#endif
+    
+    // don't need to do anything more if the page is broken or not secure...
+
+    if (!mIsSecureDocument || mIsDocumentBroken)
+        return NS_OK;
+
+    if (aProgressStatusFlags & nsIWebProgress::flag_net_start)
+    {   // check to see if we are going to mix content.
+        return CheckMixedContext(uri);
+    }
+    
+    if (aProgressStatusFlags & nsIWebProgress::flag_net_stop)
+    {
+        if (1)  // FIX status from the flag...
+        {
+            nsCOMPtr<nsISupports> info;
+	        aChannel->GetSecurityInfo(getter_AddRefs(info));
+	        nsCOMPtr<nsIPSMSocketInfo> psmInfo = do_QueryInterface(info, &rv);
+        
+            // qi for the psm information about this channel load.
+            if ( psmInfo )
+            {
+                return NS_OK;    
+	        }
+        }
+
+        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: OnChildStatusChange - Icon set to broken\n", this));
+        mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken") );
+	    mIsDocumentBroken = PR_TRUE;
+    }    
+    
+    
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnLocationChange(nsIURI* aLocation)
+{
+    mCurrentURI = aLocation;
+    return NS_OK;
+}
+
+
+nsresult
+nsSecureBrowserUIImpl::IsURLHTTPS(nsIURI* aURL, PRBool* value)
+{
+	*value = PR_FALSE;
+
+	if (!aURL)
+		return NS_OK;
+
+    char* scheme;
+	aURL->GetScheme(&scheme);
+
+	if (scheme == nsnull)
+		return NS_ERROR_NULL_POINTER;
+
+    if ( PL_strncasecmp(scheme, "https",  5) == 0 )
+		*value = PR_TRUE;
+	
+	nsAllocator::Free(scheme);
+	return NS_OK;
+}
+
+
+
+void nsSecureBrowserUIImpl::GetBundleString(const nsString& name, nsString &outString)
+{
+  if (mStringBundle && name.Length() > 0)
+  {
+    PRUnichar *ptrv = nsnull;
+    if (NS_SUCCEEDED(mStringBundle->GetStringFromName(name.GetUnicode(), &ptrv)))
+      outString = ptrv;
+    else
+      outString.SetLength(0);;
+    
+    nsAllocator::Free(ptrv);
+  }
+  else
+  {
+    outString.SetLength(0);;
+  }
+}
+
+nsresult 
+nsSecureBrowserUIImpl::CheckProtocolContextSwitch( nsIURI* newURI, nsIURI* oldURI)
+{
+    nsresult res;
+    PRBool isNewSchemeSecure, isOldSchemeSecure, boolpref;
+
+    res = IsURLHTTPS(oldURI, &isOldSchemeSecure);
+	if (NS_FAILED(res)) 
+		return res;
+    res = IsURLHTTPS(newURI, &isNewSchemeSecure);
+	if (NS_FAILED(res)) 
+		return res;
+    
+// Check to see if we are going from a secure page to and insecure page
+	if ( !isNewSchemeSecure && isOldSchemeSecure)
+	{
+		mSecurityButton->RemoveAttribute( NS_ConvertASCIItoUCS2("level") );
+	
+        if ((mPref->GetBoolPref(LEAVE_SITE_PREF, &boolpref) != 0))
+			boolpref = PR_TRUE;
+		
+		if (boolpref) 
+		{
+			NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &res);
+			if (NS_FAILED(res)) 
+				return res;
+            
+            nsAutoString windowTitle, message, dontShowAgain;
+            
+            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+            GetBundleString(NS_ConvertASCIItoUCS2("LeaveSiteMessage"), message);
+            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+            PRBool outCheckValue = PR_TRUE;
+			dialog->AlertCheck(mWindow, 
+                               windowTitle.GetUnicode(), 
+                               message.GetUnicode(), 
+                               dontShowAgain.GetUnicode(), 
+                               &outCheckValue);
+            
+            if (!outCheckValue)
+            {
+                mPref->SetBoolPref(LEAVE_SITE_PREF, PR_FALSE);
+		        NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
+            	if (NS_FAILED(res)) 
+		            return res;
+                psm->PassPrefs();
+            }
+        }
+	}
+	// check to see if we are going from an insecure page to a secure one.
+	else if (isNewSchemeSecure && !isOldSchemeSecure)
+	{
+    
+		if ((mPref->GetBoolPref(ENTER_SITE_PREF, &boolpref) != 0))
+			boolpref = PR_TRUE;
+		
+		if (boolpref) 
+		{
+            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &res);
+			if (NS_FAILED(res)) 
+				return res;
+            
+            nsAutoString windowTitle, message, dontShowAgain;
+            
+            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+            GetBundleString(NS_ConvertASCIItoUCS2("EnterSiteMessage"), message);
+            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+            PRBool outCheckValue = PR_TRUE;
+			dialog->AlertCheck(mWindow, 
+                               windowTitle.GetUnicode(), 
+                               message.GetUnicode(), 
+                               dontShowAgain.GetUnicode(), 
+                               &outCheckValue);
+            
+            if (!outCheckValue)
+            {
+                mPref->SetBoolPref(ENTER_SITE_PREF, PR_FALSE);
+                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
+            	if (NS_FAILED(res)) 
+		            return res;
+                psm->PassPrefs();
+            }
+		}
+    }
+
+    mIsSecureDocument = isNewSchemeSecure;
+    return NS_OK;
+}
+
+
+nsresult
+nsSecureBrowserUIImpl::CheckMixedContext(nsIURI* nextURI)
+{
+    PRBool secure;
+
+    nsresult rv = IsURLHTTPS(nextURI, &secure);
+    if (NS_FAILED(rv))
+	    return rv;
+    
+    if (!secure  && mIsSecureDocument)
+    {
+        mIsDocumentBroken = PR_TRUE;
+        mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken") );
+
+        if (!mPref) return NS_ERROR_NULL_POINTER;
+	    
+        PRBool boolpref;
+	    if ((mPref->GetBoolPref(MIXEDCONTENT_PREF, &boolpref) != 0))
+		    boolpref = PR_TRUE;
+
+	    if (boolpref && !mMixContentAlertShown) 
+	    {
+		    NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv);
+		    if (NS_FAILED(rv)) 
+			    return rv;
+        
+            nsAutoString windowTitle, message, dontShowAgain;
+
+            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+            GetBundleString(NS_ConvertASCIItoUCS2("MixedContentMessage"), message);
+            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+            PRBool outCheckValue = PR_TRUE;
+		    
+            dialog->AlertCheck(mWindow, 
+                               windowTitle.GetUnicode(), 
+                               message.GetUnicode(), 
+                               dontShowAgain.GetUnicode(), 
+                               &outCheckValue);
+        
+            if (!outCheckValue)
+            {
+                mPref->SetBoolPref(MIXEDCONTENT_PREF, PR_FALSE);
+                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &rv);
+                if (NS_FAILED(rv)) 
+		            return rv;
+                psm->PassPrefs();
+            }
+        
+        
+            mMixContentAlertShown = PR_TRUE;
+        }
+    }
+    
+    return NS_OK;
+}
+
+nsresult
+nsSecureBrowserUIImpl::CheckPost(nsIURI *actionURL, PRBool *okayToPost)
+{
+    PRBool secure;
+
+    nsresult rv = IsURLHTTPS(actionURL, &secure);
+    if (NS_FAILED(rv))
+	    return rv;
+    
+    if (!secure  && mIsSecureDocument)
+    {
+        PRBool boolpref;    
+
+        // posting to a non https URL.
+        if ((mPref->GetBoolPref(INSECURE_SUBMIT_PREF, &boolpref) != 0))
+			boolpref = PR_TRUE;
+		
+		if (boolpref) 
+		{
+            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv);
+			if (NS_FAILED(rv)) 
+				return rv;
+
+            nsAutoString windowTitle, message, dontShowAgain;
+            
+            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+            GetBundleString(NS_ConvertASCIItoUCS2("PostToInsecure"), message);
+            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+            PRBool outCheckValue = PR_TRUE;
+			dialog->ConfirmCheck(mWindow, 
+                                 windowTitle.GetUnicode(), 
+                                 message.GetUnicode(), 
+                                 dontShowAgain.GetUnicode(), 
+                                 &outCheckValue, 
+                                 okayToPost);
+            
+            if (!outCheckValue)
+            {
+                mPref->SetBoolPref(INSECURE_SUBMIT_PREF, PR_FALSE);
+                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &rv);
+            	if (NS_FAILED(rv)) 
+		            return rv;
+                psm->PassPrefs();
+            }
+        }
+    }
+    return NS_OK;
+}
+
+
+

mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.h

@@ -0,0 +1,99 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * 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 Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#ifndef nsSecureBrowserUIImpl_h_
+#define nsSecureBrowserUIImpl_h_
+
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+#include "nsString.h"
+#include "nsIObserver.h"
+#include "nsIDocumentLoaderObserver.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMWindow.h"
+#include "nsIStringBundle.h"
+#include "nsISecureBrowserUI.h"
+#include "nsIDocShell.h"
+#include "nsIPref.h"
+#include "nsIWebProgressListener.h"
+#include "nsIFormSubmitObserver.h"
+#include "nsIURI.h"
+
+#define NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME "Mozilla Secure Browser Doc Observer"
+
+#define NS_SECURE_BROWSER_DOCOBSERVER_CID \
+{0x97c06c30, 0xa145, 0x11d3, \
+{0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
+
+#define NS_SECURE_BROWSER_DOCOBSERVER_PROGID "component://netscape/secure_browser_docobserver"
+
+
+class nsSecureBrowserUIImpl : public nsSecureBrowserUI, 
+                              public nsIWebProgressListener, 
+                              public nsIFormSubmitObserver,
+                              public nsIObserver
+{
+public:
+
+	nsSecureBrowserUIImpl();
+	virtual ~nsSecureBrowserUIImpl();
+    
+    static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+	NS_DECL_ISUPPORTS    
+    NS_DECL_NSIWEBPROGRESSLISTENER
+    NS_DECL_NSSECUREBROWSERUI
+
+
+    // nsIObserver
+    NS_DECL_NSIOBSERVER
+    NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI *actionURL);
+
+protected:
+
+	nsCOMPtr<nsIDOMWindow>              mWindow;
+    nsCOMPtr<nsIDOMElement>             mSecurityButton;
+	nsCOMPtr<nsIDocumentLoaderObserver> mOldWebShellObserver;
+    nsCOMPtr<nsIPref>                   mPref;
+    nsCOMPtr<nsIStringBundle>           mStringBundle;
+    
+    nsCOMPtr<nsIURI>                    mCurrentURI;
+
+	PRBool					mIsSecureDocument;  // is https loaded
+	PRBool					mIsDocumentBroken;  // 
+	PRBool					mMixContentAlertShown;
+    
+    char*                   mLastPSMStatus;
+    
+
+    void GetBundleString(const nsString& name, nsString &outString);
+    
+    nsresult CheckProtocolContextSwitch( nsIURI* newURI, nsIURI* oldURI);
+    nsresult CheckMixedContext(nsIURI* nextURI);
+    nsresult CheckPost(nsIURI *actionURL, PRBool *okayToPost);
+    nsresult IsURLHTTPS(nsIURI* aURL, PRBool *value);
+};
+
+
+#endif /* nsSecureBrowserUIImpl_h_ */

mozilla/modules/libjar/nsIJARChannel.idl

@@ -1,39 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIChannel.idl"
-
-interface nsISimpleEnumerator;
-
-[scriptable, uuid(c7e410d1-85f2-11d3-9f63-006008a6efe9)]
-interface nsIJARChannel : nsIChannel 
-{
-
-    /**
-     * Enumerates all the entries in the JAR (the root URI).
-     * ARGUMENTS:
-     *  aRoot - a string representing the root dir to enumerate from
-     *    or null to enumerate the whole thing.
-     */
-    nsISimpleEnumerator EnumerateEntries(in string aRoot);
-
-};

mozilla/modules/libjar/nsIJARProtocolHandler.idl

@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIProtocolHandler.idl"
-
-[scriptable, uuid(92c3b42c-98c4-11d3-8cd9-0060b0fc14a3)]
-interface nsIJARProtocolHandler : nsIProtocolHandler {
-
-    /**
-     * Add any jar-specific methods here later.
-     */
-    
-};

mozilla/modules/libjar/nsIJARURI.idl

@@ -1,42 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsIURI.idl"
-
-/**
- * JAR URLs have the following syntax
- *
- * jar:<jar-file-uri>!/<jar-entry>
- *
- * EXAMPLE: jar:http://www.big.com/blue.jar!/ocean.html
- */
-[scriptable, uuid(c7e410d3-85f2-11d3-9f63-006008a6efe9)]
-interface nsIJARURI : nsIURI {
-
-    /**
-     * Returns the root URI (the one for the actual JAR file) for this JAR.
-     * eg http://www.big.com/blue.jar
-     */
-    attribute nsIURI JARFile;
-
-    /**
-     * Returns the entry specified for this JAR URI.
-     * eg ocean.html
-     */
-	attribute string JAREntry;
-};

mozilla/modules/libjar/nsJARChannel.cpp

@@ -1,978 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL. You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All Rights
- * Reserved.
- *
- */
-
-#include "nsNetUtil.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsSpecialSystemDirectory.h" 
-#include "nsJARChannel.h"
-#include "nsCRT.h"
-#include "nsIFileTransportService.h"
-#include "nsIURL.h"
-#include "nsIMIMEService.h"
-#include "nsAutoLock.h"
-#include "nsIFileStreams.h"
-#include "nsMimeTypes.h"
-#include "nsScriptSecurityManager.h"
-#include "nsIAggregatePrincipal.h"
-
-static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID);
-static NS_DEFINE_CID(kMIMEServiceCID, NS_MIMESERVICE_CID);
-static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
-static NS_DEFINE_CID(kScriptSecurityManagerCID, NS_SCRIPTSECURITYMANAGER_CID);
-
-#if defined(PR_LOGGING)
-#include "nsXPIDLString.h"
-//
-// Log module for SocketTransport logging...
-//
-// To enable logging (see prlog.h for full details):
-//
-//    set NSPR_LOG_MODULES=nsJarProtocol:5
-//    set NSPR_LOG_FILE=nspr.log
-//
-// this enables PR_LOG_DEBUG level information and places all output in
-// the file nspr.log
-//
-PRLogModuleInfo* gJarProtocolLog = nsnull;
-
-#endif /* PR_LOGGING */
-
-////////////////////////////////////////////////////////////////////////////////
-
-class nsJARDownloadObserver : public nsIStreamObserver 
-{
-public:
-    NS_DECL_ISUPPORTS
-    
-    NS_IMETHOD OnStartRequest(nsIChannel* jarCacheTransport,
-                              nsISupports* context) {
-        return NS_OK;
-    }
-
-    NS_IMETHOD OnStopRequest(nsIChannel* jarCacheTransport, 
-                             nsISupports* context, 
-                             nsresult status, 
-                             const PRUnichar* aMsg) {
-        nsresult rv = NS_OK;
-        nsAutoMonitor monitor(mJARChannel->mMonitor);
-
-#ifdef PR_LOGGING
-        nsCOMPtr<nsIURI> jarURI;
-        rv = jarCacheTransport->GetURI(getter_AddRefs(jarURI));
-        if (NS_SUCCEEDED(rv)) {
-            nsXPIDLCString jarURLStr;
-            rv = jarURI->GetSpec(getter_Copies(jarURLStr));
-            if (NS_SUCCEEDED(rv)) {
-                PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-                       ("nsJarProtocol: jar download complete %s status=%x",
-                        (const char*)jarURLStr, status));
-            }
-        }
-#endif
-        if (NS_SUCCEEDED(status) && mJARChannel->mJarCacheTransport) {
-            NS_ASSERTION(jarCacheTransport == (mJARChannel->mJarCacheTransport).get(),
-                         "wrong transport");
-            // after successfully downloading the jar file to the cache,
-            // start the extraction process:
-            nsCOMPtr<nsIFileChannel> jarCacheFile;
-            rv = NS_NewLocalFileChannel(getter_AddRefs(jarCacheFile),
-                                        mJarCacheFile, 
-                                        PR_RDONLY,
-                                        0);
-            if (NS_FAILED(rv)) return rv;
-            rv = jarCacheFile->SetLoadGroup(mJARChannel->mLoadGroup);
-            if (NS_FAILED(rv)) return rv;
-            rv = jarCacheFile->SetBufferSegmentSize(mJARChannel->mBufferSegmentSize);
-            if (NS_FAILED(rv)) return rv;
-            rv = jarCacheFile->SetBufferMaxSize(mJARChannel->mBufferMaxSize);
-            if (NS_FAILED(rv)) return rv;
-            rv = jarCacheFile->SetLoadAttributes(mJARChannel->mLoadAttributes);
-            if (NS_FAILED(rv)) return rv;
-            rv = jarCacheFile->SetNotificationCallbacks(mJARChannel->mCallbacks);
-            if (NS_FAILED(rv)) return rv;
-
-            mJARChannel->SetJARBaseFile(jarCacheFile);
-            rv = mOnJARFileAvailable(mJARChannel, mClosure);
-        }
-        mJARChannel->mJarCacheTransport = nsnull;
-        return rv;
-    }
-
-    nsJARDownloadObserver(nsIFile* jarCacheFile, nsJARChannel* jarChannel,
-                          OnJARFileAvailableFun onJARFileAvailable, 
-                          void* closure)
-        : mJarCacheFile(jarCacheFile),
-          mJARChannel(jarChannel),
-          mOnJARFileAvailable(onJARFileAvailable),
-          mClosure(closure)
-    {
-        NS_INIT_REFCNT();
-        NS_ADDREF(mJARChannel);
-    }
-
-    virtual ~nsJARDownloadObserver() {
-        NS_RELEASE(mJARChannel);
-    }
-
-protected:
-    nsCOMPtr<nsIFile>           mJarCacheFile;
-    nsJARChannel*               mJARChannel;
-    OnJARFileAvailableFun       mOnJARFileAvailable;
-    void*                       mClosure;
-};
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsJARDownloadObserver, nsIStreamObserver)
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsJARChannel::nsJARChannel()
-    : mContentType(nsnull),
-      mContentLength(-1),
-      mLoadAttributes(LOAD_NORMAL),
-      mStartPosition(0),
-      mReadCount(-1),
-      mJAREntry(nsnull),
-      mMonitor(nsnull),
-      mStatus(NS_OK)
-{
-    NS_INIT_REFCNT();
-
-#if defined(PR_LOGGING)
-    //
-    // Initialize the global PRLogModule for socket transport logging
-    // if necessary...
-    //
-    if (nsnull == gJarProtocolLog) {
-        gJarProtocolLog = PR_NewLogModule("nsJarProtocol");
-    }
-#endif /* PR_LOGGING */
-}
-
-nsJARChannel::~nsJARChannel()
-{
-    if (mContentType)
-        nsCRT::free(mContentType);
-    if (mJAREntry)
-        nsCRT::free(mJAREntry);
-    if (mMonitor)
-        PR_DestroyMonitor(mMonitor);
-}
-
-NS_IMPL_ISUPPORTS6(nsJARChannel,
-                   nsIJARChannel,
-                   nsIChannel,
-                   nsIRequest,
-                   nsIStreamObserver,
-                   nsIStreamListener,
-                   nsIFileSystem)
-
-NS_METHOD
-nsJARChannel::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-	nsresult rv;
-
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARChannel* jarChannel = new nsJARChannel();
-    if (jarChannel == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(jarChannel);
-	rv = jarChannel->QueryInterface(aIID, aResult);
-    NS_RELEASE(jarChannel);
-	return rv;
-}
- 
-nsresult 
-nsJARChannel::Init(nsIJARProtocolHandler* aHandler, nsIURI* uri)
-{
-    nsresult rv;
-	mURI = do_QueryInterface(uri, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    mMonitor = PR_NewMonitor();
-    if (mMonitor == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-	return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIRequest methods
-
-NS_IMETHODIMP
-nsJARChannel::IsPending(PRBool* result)
-{
-	NS_NOTREACHED("nsJARChannel::IsPending");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetStatus(nsresult *status)
-{
-    *status = mStatus;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Cancel(nsresult status)
-{
-    nsresult rv;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarCacheTransport) {
-        rv = mJarCacheTransport->Cancel(status);
-        if (NS_FAILED(rv)) return rv;
-        mJarCacheTransport = nsnull;
-    }
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Cancel(status);
-        if (NS_FAILED(rv)) return rv;
-        mJarExtractionTransport = nsnull;
-    }
-    mStatus = status;
-	return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Suspend()
-{
-    nsresult rv;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarCacheTransport) {
-        rv = mJarCacheTransport->Suspend();
-        if (NS_FAILED(rv)) return rv;
-    }
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Suspend();
-        if (NS_FAILED(rv)) return rv;
-    }
-
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::Resume()
-{
-    nsresult rv;
-    nsAutoMonitor monitor(mMonitor);
-
-    if (mJarCacheTransport) {
-        rv = mJarCacheTransport->Resume();
-        if (NS_FAILED(rv)) return rv;
-    }
-    if (mJarExtractionTransport) {
-        rv = mJarExtractionTransport->Resume();
-        if (NS_FAILED(rv)) return rv;
-    }
-
-	return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIChannel methods
-
-NS_IMETHODIMP
-nsJARChannel::GetOriginalURI(nsIURI* *aOriginalURI)
-{
-    *aOriginalURI = mOriginalURI ? mOriginalURI : nsCOMPtr<nsIURI>(mURI);
-    NS_ADDREF(*aOriginalURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetOriginalURI(nsIURI* aOriginalURI)
-{
-    mOriginalURI = aOriginalURI;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetURI(nsIURI* *aURI)
-{
-    *aURI = mURI;
-    NS_ADDREF(*aURI);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetURI(nsIURI* aURI)
-{
-    nsresult rv;
-    mURI = do_QueryInterface(aURI, &rv);
-    return rv;
-}
-
-static nsresult
-OpenJARElement(nsJARChannel* channel, void* closure)
-{
-    nsresult rv;
-    nsIInputStream* *result = (nsIInputStream**)closure;
-    nsAutoCMonitor mon(channel);
-    rv = channel->Open(nsnull, nsnull);
-    if (NS_FAILED(rv)) return rv;
-    rv = channel->GetInputStream(result);
-    mon.Notify();       // wake up OpenInputStream
-	return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::OpenInputStream(nsIInputStream* *result)
-{
-    nsAutoCMonitor mon(this);
-    nsresult rv;
-    *result = nsnull;
-    rv = EnsureJARFileAvailable(OpenJARElement, result);
-    if (NS_FAILED(rv)) return rv;
-    if (*result == nsnull)
-        mon.Wait();
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::OpenOutputStream(nsIOutputStream* *result)
-{
-	NS_NOTREACHED("nsJARChannel::OpenOutputStream");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncOpen(nsIStreamObserver* observer, nsISupports* ctxt)
-{
-	NS_NOTREACHED("nsJARChannel::AsyncOpen");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-static nsresult
-ReadJARElement(nsJARChannel* channel, void* closure)
-{
-    nsresult rv;
-    rv = channel->AsyncReadJARElement();
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncRead(nsIStreamListener* listener, nsISupports* ctxt)
-{
-    mUserContext = ctxt;
-    mUserListener = listener;
-    return EnsureJARFileAvailable(ReadJARElement, nsnull);
-}
-
-nsresult
-nsJARChannel::EnsureJARFileAvailable(OnJARFileAvailableFun onJARFileAvailable, 
-                                     void* closure)
-{
-    nsresult rv;
-
-#ifdef PR_LOGGING
-    nsXPIDLCString jarURLStr;
-    mURI->GetSpec(getter_Copies(jarURLStr));
-    PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-           ("nsJarProtocol: EnsureJARFileAvailable %s", (const char*)jarURLStr));
-#endif
-
-    rv = mURI->GetJARFile(getter_AddRefs(mJARBaseURI));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = mURI->GetJAREntry(&mJAREntry);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIChannel> jarBaseChannel;
-    rv = NS_OpenURI(getter_AddRefs(jarBaseChannel), mJARBaseURI, nsnull);
-    if (NS_FAILED(rv)) return rv;
-    rv = jarBaseChannel->SetLoadGroup(mLoadGroup);
-    if (NS_FAILED(rv)) return rv;
-    rv = jarBaseChannel->SetLoadAttributes(mLoadAttributes);
-    if (NS_FAILED(rv)) return rv;
-    rv = jarBaseChannel->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-    if (mLoadGroup)
-        (void)mLoadGroup->AddChannel(this, nsnull);
-
-//    mJARBaseFile = do_QueryInterface(jarBaseChannel, &rv);
-
-    PRBool shouldCache;
-    rv = jarBaseChannel->GetShouldCache(&shouldCache);
-
-    if (NS_SUCCEEDED(rv) && !shouldCache) {
-        // then we've already got a local jar file -- no need to download it
-        PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-               ("nsJarProtocol: extracting local jar file %s", (const char*)jarURLStr));
-        rv = onJARFileAvailable(this, closure);
-    }
-    else {
-        // otherwise, we need to download the jar file
-
-        nsCOMPtr<nsIFile> jarCacheFile;
-        rv = GetCacheFile(getter_AddRefs(jarCacheFile));
-        if (NS_FAILED(rv)) return rv;
-        
-        PRBool filePresent;
-        
-		rv = jarCacheFile->IsFile(&filePresent);
-        
-        if (NS_SUCCEEDED(rv) && filePresent)
-        {
-	        // then we've already got the file in the local cache -- no need to download it
-            rv = NS_NewLocalFileChannel(getter_AddRefs(mJARBaseFile),
-                                        jarCacheFile, 
-                                        PR_RDONLY,
-                                        0);
-            if (NS_FAILED(rv)) return rv;
-            rv = mJARBaseFile->SetBufferSegmentSize(mBufferSegmentSize);
-            if (NS_FAILED(rv)) return rv;
-            rv = mJARBaseFile->SetBufferMaxSize(mBufferMaxSize);
-            if (NS_FAILED(rv)) return rv;
-
-            PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-                   ("nsJarProtocol: jar file already in cache %s", (const char*)jarURLStr));
-            rv = onJARFileAvailable(this, closure);
-			return rv;
-		}
-
-        NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-        if (NS_FAILED(rv)) return rv;
-
-        nsAutoMonitor monitor(mMonitor);
-
-        // use a file transport to serve as a data pump for the download (done
-        // on some other thread)
-        nsCOMPtr<nsIChannel> jarCacheTransport;
-        rv = fts->CreateTransport(jarCacheFile, PR_RDONLY, 0, 
-                                  getter_AddRefs(mJarCacheTransport));
-        if (NS_FAILED(rv)) return rv;
-        rv = mJarCacheTransport->SetBufferSegmentSize(mBufferSegmentSize);
-        if (NS_FAILED(rv)) return rv;
-        rv = mJarCacheTransport->SetBufferMaxSize(mBufferMaxSize);
-        if (NS_FAILED(rv)) return rv;
-
-        rv = mJarCacheTransport->SetNotificationCallbacks(mCallbacks);
-        if (NS_FAILED(rv)) return rv;
-
-        nsCOMPtr<nsIStreamObserver> downloadObserver = 
-            new nsJARDownloadObserver(jarCacheFile, this, onJARFileAvailable, closure);
-        if (downloadObserver == nsnull)
-            return NS_ERROR_OUT_OF_MEMORY;
-
-        PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-               ("nsJarProtocol: downloading jar file %s", (const char*)jarURLStr));
-        nsCOMPtr<nsIInputStream> jarBaseIn;
-        rv = jarBaseChannel->OpenInputStream(getter_AddRefs(jarBaseIn));
-        if (NS_FAILED(rv)) return rv;
-
-        rv = mJarCacheTransport->AsyncWrite(jarBaseIn, nsnull, downloadObserver);
-    }
-    return rv;
-}
-
-nsresult 
-nsJARChannel::GetCacheFile(nsIFile* *cacheFile)
-{
-    // XXX change later to use the real network cache
-    nsresult rv;
-
-    nsCOMPtr<nsIFile> jarCacheFile;
-    rv = NS_GetSpecialDirectory("xpcom.currentProcess.componentDirectory",
-                                getter_AddRefs(jarCacheFile));
-    if (NS_FAILED(rv)) return rv;
-
-    jarCacheFile->Append("jarCache");
-
-    PRBool exists;
-    rv = jarCacheFile->Exists(&exists);
-    if (NS_FAILED(rv)) return rv;
-    if (!exists) {
-        rv = jarCacheFile->Create(nsIFile::DIRECTORY_TYPE, 0664);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    nsCOMPtr<nsIURL> jarBaseURL = do_QueryInterface(mJARBaseURI, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    char* jarFileName;
-    rv = jarBaseURL->GetFileName(&jarFileName);
-    if (NS_FAILED(rv)) return rv;
-    rv = jarCacheFile->Append(jarFileName);
-    nsCRT::free(jarFileName);
-    if (NS_FAILED(rv)) return rv;
-    
-    *cacheFile = jarCacheFile;
-    NS_ADDREF(*cacheFile);
-    return rv;
-}
-
-nsresult
-nsJARChannel::AsyncReadJARElement()
-{
-    nsresult rv;
-
-    nsAutoMonitor monitor(mMonitor);
-
-    NS_ASSERTION(mJARBaseFile, "mJARBaseFile is null");
-
-    if (mLoadGroup) {
-        nsCOMPtr<nsILoadGroupListenerFactory> factory;
-        //
-        // Create a load group "proxy" listener...
-        //
-        rv = mLoadGroup->GetGroupListenerFactory(getter_AddRefs(factory));
-        if (factory) {
-            nsIStreamListener *newListener;
-            rv = factory->CreateLoadGroupListener(mUserListener, &newListener);
-            if (NS_SUCCEEDED(rv)) {
-                mUserListener = newListener;
-                NS_RELEASE(newListener);
-            }
-        }
-
-        rv = mLoadGroup->AddChannel(this, nsnull);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    NS_WITH_SERVICE(nsIFileTransportService, fts, kFileTransportServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = fts->CreateTransportFromFileSystem(this, 
-                                            getter_AddRefs(mJarExtractionTransport));
-    if (NS_FAILED(rv)) return rv;
-    rv = mJarExtractionTransport->SetBufferSegmentSize(mBufferSegmentSize);
-    if (NS_FAILED(rv)) return rv;
-    rv = mJarExtractionTransport->SetBufferMaxSize(mBufferMaxSize);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = mJarExtractionTransport->SetNotificationCallbacks(mCallbacks);
-    if (NS_FAILED(rv)) return rv;
-
-#ifdef PR_LOGGING
-    nsXPIDLCString jarURLStr;
-    mURI->GetSpec(getter_Copies(jarURLStr));
-    PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-           ("nsJarProtocol: AsyncRead jar entry %s", (const char*)jarURLStr));
-#endif
-    rv = mJarExtractionTransport->SetTransferOffset(mStartPosition);
-    if (NS_FAILED(rv)) return rv;
-    rv = mJarExtractionTransport->SetTransferCount(mReadCount);
-    if (NS_FAILED(rv)) return rv;
-    rv = mJarExtractionTransport->AsyncRead(this, nsnull);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::AsyncWrite(nsIInputStream* fromStream, 
-						 nsIStreamObserver* observer, 
-						 nsISupports* ctxt)
-{
-	NS_NOTREACHED("nsJARChannel::AsyncWrite");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetLoadAttributes(PRUint32* aLoadFlags)
-{
-    *aLoadFlags = mLoadAttributes;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetLoadAttributes(PRUint32 aLoadFlags)
-{
-    mLoadAttributes = aLoadFlags;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetContentType(char* *aContentType)
-{
-    nsresult rv = NS_OK;
-    if (mContentType == nsnull) {
-        char* fileName = new char[PL_strlen(mJAREntry)+1];
-        PL_strcpy(fileName, mJAREntry);
-
-        if (fileName != nsnull) {
-            PRInt32 len = nsCRT::strlen(fileName);
-            const char* ext = nsnull;
-            for (PRInt32 i = len; i >= 0; i--) {
-                if (fileName[i] == '.') {
-                    ext = &fileName[i + 1];
-                    break;
-                }
-            }
-
-            if (ext) {
-                NS_WITH_SERVICE(nsIMIMEService, mimeServ, kMIMEServiceCID, &rv);
-                if (NS_SUCCEEDED(rv)) {
-                    rv = mimeServ->GetTypeFromExtension(ext, &mContentType);
-                }
-            }
-            else 
-                rv = NS_ERROR_FAILURE;
-		
-            nsCRT::free(fileName);
-        } 
-        else {
-            rv = NS_ERROR_FAILURE;
-        }
-
-        if (NS_FAILED(rv)) {
-            mContentType = nsCRT::strdup(UNKNOWN_CONTENT_TYPE);
-            if (mContentType == nsnull)
-                rv = NS_ERROR_OUT_OF_MEMORY;
-            else
-                rv = NS_OK;
-        }
-    }
-    if (NS_SUCCEEDED(rv)) {
-        *aContentType = nsCRT::strdup(mContentType);
-        if (*aContentType == nsnull)
-            rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetContentType(const char *aContentType)
-{
-    if (mContentType) {
-        nsCRT::free(mContentType);
-    }
-
-    mContentType = nsCRT::strdup(aContentType);
-    if (!mContentType) return NS_ERROR_OUT_OF_MEMORY;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetContentLength(PRInt32* aContentLength)
-{
-    if (mContentLength == -1)
-        return NS_ERROR_FAILURE;
-    *aContentLength = mContentLength;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetContentLength(PRInt32 aContentLength)
-{
-    NS_NOTREACHED("nsJARChannel::SetContentLength");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetTransferOffset(PRUint32 *aTransferOffset)
-{
-    *aTransferOffset = mStartPosition;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetTransferOffset(PRUint32 aTransferOffset)
-{
-    mStartPosition = aTransferOffset;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetTransferCount(PRInt32 *aTransferCount)
-{
-    *aTransferCount = mReadCount;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetTransferCount(PRInt32 aTransferCount)
-{
-    mReadCount = aTransferCount;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetBufferSegmentSize(PRUint32 *aBufferSegmentSize)
-{
-    *aBufferSegmentSize = mBufferSegmentSize;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetBufferSegmentSize(PRUint32 aBufferSegmentSize)
-{
-    mBufferSegmentSize = aBufferSegmentSize;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetBufferMaxSize(PRUint32 *aBufferMaxSize)
-{
-    *aBufferMaxSize = mBufferMaxSize;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetBufferMaxSize(PRUint32 aBufferMaxSize)
-{
-    mBufferMaxSize = aBufferMaxSize;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetShouldCache(PRBool *aShouldCache)
-{
-    // Jar files report that you shouldn't cache them because this is really
-    // a question about the jar entry, and the jar entry is always in a jar
-    // file on disk.
-    *aShouldCache = PR_FALSE;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetPipeliningAllowed(PRBool *aPipeliningAllowed)
-{
-    *aPipeliningAllowed = PR_FALSE;
-    return NS_OK;
-}
- 
-NS_IMETHODIMP
-nsJARChannel::SetPipeliningAllowed(PRBool aPipeliningAllowed)
-{
-    NS_NOTREACHED("SetPipeliningAllowed");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetLoadGroup(nsILoadGroup* *aLoadGroup)
-{
-    *aLoadGroup = mLoadGroup;
-    NS_IF_ADDREF(*aLoadGroup);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetLoadGroup(nsILoadGroup* aLoadGroup)
-{
-    mLoadGroup = aLoadGroup;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetOwner(nsISupports* *aOwner)
-{
-    if (!mOwner)
-    {
-        nsCOMPtr<nsIPrincipal> certificate;
-        PRInt16 result;
-        nsresult rv = mJAR->GetCertificatePrincipal(mJAREntry, 
-                                                    getter_AddRefs(certificate),
-                                                    &result);
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-        if (certificate)
-        {   // Get the codebase principal
-            NS_WITH_SERVICE(nsIScriptSecurityManager, secMan, 
-                            kScriptSecurityManagerCID, &rv);
-            if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-            nsCOMPtr<nsIPrincipal> codebase;
-            rv = secMan->GetCodebasePrincipal(mJARBaseURI, 
-                                              getter_AddRefs(codebase));
-            if (NS_FAILED(rv)) return rv;
-            
-            // Join the certificate and the codebase
-            nsCOMPtr<nsIAggregatePrincipal> agg;
-            agg = do_QueryInterface(certificate, &rv);
-            NS_ASSERTION(NS_SUCCEEDED(rv), 
-                         "Certificate principal is not an aggregate");
-            rv = agg->SetCodebase(codebase);
-            if (NS_FAILED(rv)) return rv;
-            mOwner = do_QueryInterface(agg, &rv);
-            if (NS_FAILED(rv)) return rv;
-        }
-    }
-    *aOwner = mOwner;
-    NS_IF_ADDREF(*aOwner);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetOwner(nsISupports* aOwner)
-{
-    mOwner = aOwner;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetNotificationCallbacks(nsIInterfaceRequestor* *aNotificationCallbacks)
-{
-    *aNotificationCallbacks = mCallbacks.get();
-    NS_IF_ADDREF(*aNotificationCallbacks);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::SetNotificationCallbacks(nsIInterfaceRequestor* aNotificationCallbacks)
-{
-    mCallbacks = aNotificationCallbacks;
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsJARChannel::GetSecurityInfo(nsISupports * *aSecurityInfo)
-{
-    *aSecurityInfo = nsnull;
-    return NS_OK;
-}
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamObserver methods:
-
-NS_IMETHODIMP
-nsJARChannel::OnStartRequest(nsIChannel* jarExtractionTransport,
-                             nsISupports* context)
-{
-    return mUserListener->OnStartRequest(this, mUserContext);
-}
-
-NS_IMETHODIMP
-nsJARChannel::OnStopRequest(nsIChannel* jarExtractionTransport,
-                            nsISupports* context, 
-                            nsresult status, 
-                            const PRUnichar* aMsg)
-{
-    nsresult rv;
-#ifdef PR_LOGGING
-    nsCOMPtr<nsIURI> jarURI;
-    nsXPIDLCString jarURLStr;
-    rv = mURI->GetSpec(getter_Copies(jarURLStr));
-    if (NS_SUCCEEDED(rv)) {
-        PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-               ("nsJarProtocol: jar extraction complete %s status=%x",
-                (const char*)jarURLStr, status));
-    }
-#endif
-    rv = mUserListener->OnStopRequest(this, mUserContext, status, aMsg);
-
-    if (mLoadGroup) {
-        if (NS_SUCCEEDED(rv)) {
-            mLoadGroup->RemoveChannel(this, context, status, aMsg);
-        }
-    }
-
-    mUserListener = nsnull;
-    mUserContext = nsnull;
-    mJarExtractionTransport = nsnull;
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIStreamListener methods:
-
-NS_IMETHODIMP
-nsJARChannel::OnDataAvailable(nsIChannel* jarCacheTransport, 
-                              nsISupports* context, 
-                              nsIInputStream *inStr, 
-                              PRUint32 sourceOffset, 
-                              PRUint32 count)
-{
-    return mUserListener->OnDataAvailable(this, mUserContext, 
-                                          inStr, sourceOffset, count);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIFileSystem methods:
-
-NS_IMETHODIMP
-nsJARChannel::Open(char* *contentType, PRInt32 *contentLength) 
-{
-	nsresult rv;
-    NS_ASSERTION(mJARBaseFile, "mJARBaseFile is null");
-
-	rv = nsComponentManager::CreateInstance(kZipReaderCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIZipReader),
-                                            getter_AddRefs(mJAR));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIFile> fs;
-    rv = mJARBaseFile->GetFile(getter_AddRefs(fs));
-    if (NS_FAILED(rv)) return rv; 
-
-	rv = mJAR->Init(fs);
-    if (NS_FAILED(rv)) return rv; 
-
-	rv = mJAR->Open();
-    if (NS_FAILED(rv)) return rv; 
-
-    // If this fails, GetOwner will fail, but otherwise we can continue.
-	mJAR->ParseManifest();
-
-    nsCOMPtr<nsIZipEntry> entry;
-	rv = mJAR->GetEntry(mJAREntry, getter_AddRefs(entry));
-    if (NS_FAILED(rv)) return rv;
-
-    if (contentLength) {
-        rv = entry->GetRealSize((PRUint32*)contentLength);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    if (contentType) {
-        rv = GetContentType(contentType);
-        if (NS_FAILED(rv)) return rv;
-    }
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsJARChannel::Close(nsresult status) 
-{
-    mJAR = null_nsCOMPtr();
-	return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARChannel::GetInputStream(nsIInputStream* *aInputStream) 
-{
-#ifdef PR_LOGGING
-    nsXPIDLCString jarURLStr;
-    mURI->GetSpec(getter_Copies(jarURLStr));
-    PR_LOG(gJarProtocolLog, PR_LOG_DEBUG,
-           ("nsJarProtocol: GetInputStream jar entry %s", (const char*)jarURLStr));
-#endif
-	return mJAR->GetInputStream(mJAREntry, aInputStream);
-}
- 
-NS_IMETHODIMP
-nsJARChannel::GetOutputStream(nsIOutputStream* *aOutputStream) 
-{
-	NS_NOTREACHED("nsJARChannel::GetOutputStream");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIJARChannel methods:
-
-NS_IMETHODIMP
-nsJARChannel::EnumerateEntries(const char *aRoot, nsISimpleEnumerator **_retval)
-{
-	NS_NOTREACHED("nsJARChannel::EnumerateEntries");
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARChannel.h

@@ -1,115 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsJARChannel_h__
-#define nsJARChannel_h__
-
-#include "nsIJARChannel.h"
-#include "nsIStreamListener.h"
-#include "nsIJARProtocolHandler.h"
-#include "nsIJARURI.h"
-#include "nsIFileSystem.h"
-#include "nsIChannel.h"
-#include "nsIZipReader.h"
-#include "nsIChannel.h"
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsIFile.h"
-#include "prmon.h"
-
-class nsIFileChannel;
-class nsJARChannel;
-
-#define NS_JARCHANNEL_CID							 \
-{ /* 0xc7e410d5-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d5,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-#define JAR_DIRECTORY "jarCache"
-
-typedef nsresult
-(*OnJARFileAvailableFun)(nsJARChannel* channel, void* closure);
-
-class nsJARChannel : public nsIJARChannel, 
-                     public nsIStreamListener,
-                     public nsIFileSystem
-{
-public:
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIREQUEST
-    NS_DECL_NSICHANNEL
-    NS_DECL_NSIJARCHANNEL
-    NS_DECL_NSISTREAMOBSERVER
-    NS_DECL_NSISTREAMLISTENER
-    NS_DECL_NSIFILESYSTEM
-
-    nsJARChannel();
-    virtual ~nsJARChannel();
-
-    // Define a Create method to be used with a factory:
-    static NS_METHOD
-    Create(nsISupports* aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init(nsIJARProtocolHandler* aHandler, nsIURI* uri);
-    nsresult EnsureJARFileAvailable(OnJARFileAvailableFun fun,
-                                    void* closure);
-    nsresult AsyncReadJARElement();
-    nsresult GetCacheFile(nsIFile* *cacheFile);
-
-    void SetJARBaseFile(nsIFileChannel* channel) { mJARBaseFile = channel; }
-
-    friend class nsJARDownloadObserver;
-
-protected:
-	nsCOMPtr<nsIJARURI>                 mURI;
-	nsCOMPtr<nsILoadGroup>              mLoadGroup;
-	nsCOMPtr<nsIInterfaceRequestor>     mCallbacks;
-	nsCOMPtr<nsIURI>                    mOriginalURI;
-    nsLoadFlags                         mLoadAttributes;
-    nsCOMPtr<nsISupports>               mOwner;
-
-    PRUint32                            mStartPosition;
-    PRInt32                             mReadCount;
-    nsCOMPtr<nsISupports>               mUserContext;
-    nsCOMPtr<nsIStreamListener>         mUserListener;
-
-    char*                               mContentType;
-    PRInt32                             mContentLength;
-    nsCOMPtr<nsIURI>                    mJARBaseURI;
-    nsCOMPtr<nsIFileChannel>            mJARBaseFile;
-    char*                               mJAREntry;
-    nsCOMPtr<nsIZipReader>              mJAR;
-    PRUint32                            mBufferSegmentSize;
-    PRUint32                            mBufferMaxSize;
-    nsresult                            mStatus;
-
-    PRMonitor*                          mMonitor;
-    nsCOMPtr<nsIChannel>                mJarCacheTransport;
-    nsCOMPtr<nsIChannel>                mJarExtractionTransport;
-
-};
-
-#endif // nsJARChannel_h__

mozilla/modules/libjar/nsJARProtocolHandler.cpp

@@ -1,138 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsJARProtocolHandler.h"
-#include "nsIIOService.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsJARURI.h"
-#include "nsIURL.h"
-#include "nsJARChannel.h"
-
-static NS_DEFINE_CID(kIOServiceCID,     NS_IOSERVICE_CID);
-static NS_DEFINE_CID(kJARUriCID,        NS_JARURI_CID);
-
-////////////////////////////////////////////////////////////////////////////////
-
-nsJARProtocolHandler::nsJARProtocolHandler()
-{
-    NS_INIT_REFCNT();
-}
-
-nsresult
-nsJARProtocolHandler::Init()
-{
-    return NS_OK;
-}
-
-nsJARProtocolHandler::~nsJARProtocolHandler()
-{
-}
-
-NS_IMPL_ISUPPORTS2(nsJARProtocolHandler, 
-                   nsIJARProtocolHandler, 
-                   nsIProtocolHandler)
-
-NS_METHOD
-nsJARProtocolHandler::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARProtocolHandler* ph = new nsJARProtocolHandler();
-    if (ph == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    NS_ADDREF(ph);
-    nsresult rv = ph->Init();
-    if (NS_SUCCEEDED(rv)) {
-        rv = ph->QueryInterface(aIID, aResult);
-    }
-    NS_RELEASE(ph);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIProtocolHandler methods:
-
-NS_IMETHODIMP
-nsJARProtocolHandler::GetScheme(char* *result)
-{
-    *result = nsCRT::strdup("jar");
-    if (*result == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::GetDefaultPort(PRInt32 *result)
-{
-    *result = -1;        // no port for JAR: URLs
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::NewURI(const char *aSpec, nsIURI *aBaseURI,
-                             nsIURI **result)
-{
-    nsresult rv;
-    nsIURI* url;
-    if (aBaseURI) {
-        rv = aBaseURI->Clone(&url);
-        if (NS_FAILED(rv)) return rv;
-        rv = url->SetRelativePath(aSpec);
-    }
-    else {
-        rv = nsJARURI::Create(nsnull, NS_GET_IID(nsIJARURI), (void**)&url);
-        if (NS_FAILED(rv)) return rv;
-        rv = url->SetSpec((char*)aSpec);
-    }
-
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(url);
-        return rv;
-    }
-
-    *result = url;
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARProtocolHandler::NewChannel(nsIURI* uri, nsIChannel* *result)
-{
-    nsresult rv;
-    
-	nsJARChannel* channel;
-    rv = nsJARChannel::Create(nsnull, NS_GET_IID(nsIJARChannel), (void**)&channel);
-    if (NS_FAILED(rv)) return rv;
-
-	rv = channel->Init(this, uri);
-    if (NS_FAILED(rv)) {
-        NS_RELEASE(channel);
-        return rv;
-    }
-
-    *result = channel;
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARProtocolHandler.h

@@ -1,57 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef nsJARProtocolHandler_h___
-#define nsJARProtocolHandler_h___
-
-#include "nsIJARProtocolHandler.h"
-#include "nsIProtocolHandler.h"
-#include "nsIJARURI.h"
-
-#define NS_JARPROTOCOLHANDLER_CID					 \
-{ /* 0xc7e410d4-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d4,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-
-class nsJARProtocolHandler : public nsIJARProtocolHandler
-{
-public:
-    NS_DECL_ISUPPORTS
-	NS_DECL_NSIPROTOCOLHANDLER
-
-    // nsJARProtocolHandler methods:
-    nsJARProtocolHandler();
-    virtual ~nsJARProtocolHandler();
-
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-
-protected:
-};
-
-#endif /* nsJARProtocolHandler_h___ */

mozilla/modules/libjar/nsJARProtocolModule.cpp

@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-#include "nsIModule.h"
-#include "nsIGenericFactory.h"
-#include "nsJARProtocolHandler.h"
-
-
-static nsModuleComponentInfo components[] = 
-{
-    { "JAR Protocol Handler", 
-       NS_JARPROTOCOLHANDLER_CID,
-       NS_NETWORK_PROTOCOL_PROGID_PREFIX "jar", 
-       nsJARProtocolHandler::Create
-    },
-};
-
-NS_IMPL_NSGETMODULE("nsJarProtocolModule", components);
-
-

mozilla/modules/libjar/nsJARURI.cpp

@@ -1,384 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#include "nsJARURI.h"
-#include "nsNetUtil.h"
-#include "nsIIOService.h"
-#include "nsFileSpec.h"
-#include "nsCRT.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsIZipReader.h"
-
-static NS_DEFINE_CID(kIOServiceCID,     NS_IOSERVICE_CID);
- 
-////////////////////////////////////////////////////////////////////////////////
- 
-nsJARURI::nsJARURI()
-    : mJAREntry(nsnull)
-{
-    NS_INIT_REFCNT();
-}
- 
-nsJARURI::~nsJARURI()
-{
-}
-
-NS_IMPL_ISUPPORTS2(nsJARURI, nsIJARURI, nsIURI)
-
-NS_METHOD
-nsJARURI::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsJARURI* uri = new nsJARURI();
-
-    if (uri == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(uri);
-    nsresult rv = uri->Init();
-
-    if (NS_SUCCEEDED(rv)) {
-        rv = uri->QueryInterface(aIID, aResult);
-    }
-    NS_RELEASE(uri);
-
-    return rv;
-}
- 
-nsresult
-nsJARURI::Init()
-{
-    return NS_OK;
-}
-
-#define NS_JAR_SCHEME           "jar:"
-#define NS_JAR_DELIMITER        "!/"
-
-nsresult
-nsJARURI::FormatSpec(const char* entryPath, char* *result)
-{
-    nsresult rv;
-    char* jarFileSpec;
-    rv = mJARFile->GetSpec(&jarFileSpec);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCString spec(NS_JAR_SCHEME);
-    spec += jarFileSpec;
-    nsCRT::free(jarFileSpec);
-    spec += NS_JAR_DELIMITER;
-    spec += entryPath;
-    
-    *result = nsCRT::strdup(spec);
-    return *result ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsURI methods:
-
-NS_IMETHODIMP
-nsJARURI::GetSpec(char* *aSpec)
-{
-    return FormatSpec(mJAREntry, aSpec);
-}
-
-NS_IMETHODIMP
-nsJARURI::SetSpec(const char * aSpec)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    PRUint32 startPos, endPos;
-    rv = serv->ExtractScheme(aSpec, &startPos, &endPos, nsnull);
-    if (NS_FAILED(rv)) return rv;
-
-    if (nsCRT::strncmp("jar", &aSpec[startPos], endPos - startPos - 1) != 0)
-        return NS_ERROR_MALFORMED_URI;
-
-    // Search backward from the end for the "!/" delimiter. Remember, jar URLs
-    // can nest, e.g.:
-    //    jar:jar:http://www.foo.com/bar.jar!/a.jar!/b.html
-    // This gets the b.html document from out of the a.jar file, that's 
-    // contained within the bar.jar file.
-
-    nsCAutoString jarPath(aSpec);
-    PRInt32 pos = jarPath.RFind(NS_JAR_DELIMITER);
-    if (pos == -1 || endPos + 1 > (PRUint32)pos)
-        return NS_ERROR_MALFORMED_URI;
-
-    jarPath.Cut(pos, jarPath.Length());
-    jarPath.Cut(0, endPos);
-
-    rv = serv->NewURI(jarPath, nsnull, getter_AddRefs(mJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    nsCAutoString entry(aSpec);
-    entry.Cut(0, pos + 2);      // 2 == strlen(NS_JAR_DELIMITER)
-
-    rv = serv->ResolveRelativePath(entry, nsnull, &mJAREntry);
-    return rv;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetScheme(char * *aScheme)
-{
-    *aScheme = nsCRT::strdup("jar");
-    return *aScheme ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetScheme(const char * aScheme)
-{
-    // doesn't make sense to set the scheme of a jar: URL
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetUsername(char * *aUsername)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetUsername(const char * aUsername)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPassword(char * *aPassword)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPassword(const char * aPassword)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPreHost(char * *aPreHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPreHost(const char * aPreHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetHost(char * *aHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetHost(const char * aHost)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPort(PRInt32 *aPort)
-{
-    return NS_ERROR_FAILURE;
-}
- 
-NS_IMETHODIMP
-nsJARURI::SetPort(PRInt32 aPort)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetPath(char * *aPath)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetPath(const char * aPath)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetURLParser(nsIURLParser * *aURLParser)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetURLParser(nsIURLParser * aURLParser)
-{
-    return NS_ERROR_FAILURE;
-}
-
-NS_IMETHODIMP
-nsJARURI::Equals(nsIURI *other, PRBool *result)
-{
-    nsresult rv;
-    *result = PR_FALSE;
-
-    nsJARURI* otherJAR;
-    rv = other->QueryInterface(NS_GET_IID(nsIJARURI), (void**)&otherJAR);
-    if (NS_FAILED(rv))
-        return NS_OK;   // not equal
-
-    nsCOMPtr<nsIURI> otherJARFile;
-    rv = otherJAR->GetJARFile(getter_AddRefs(otherJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    PRBool equal;
-    rv = mJARFile->Equals(otherJARFile, &equal);
-    if (NS_FAILED(rv)) return rv;
-    if (!equal)
-        return NS_OK;   // not equal
-
-    char* otherJAREntry;
-    rv = otherJAR->GetJAREntry(&otherJAREntry);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = nsCRT::strcmp(mJAREntry, otherJAREntry) == 0;
-    nsCRT::free(otherJAREntry);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::Clone(nsIURI **result)
-{
-    nsresult rv;
-
-    nsCOMPtr<nsIURI> newJARFile;
-    rv = mJARFile->Clone(getter_AddRefs(newJARFile));
-    if (NS_FAILED(rv)) return rv;
-
-    char* newJAREntry = nsCRT::strdup(mJAREntry);
-    if (newJAREntry == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    nsJARURI* uri = new nsJARURI();
-    if (uri == nsnull)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(uri);
-    uri->mJARFile = newJARFile;
-    uri->mJAREntry = newJAREntry;
-    *result = uri;
-
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetRelativePath(const char *relativePath)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCAutoString path(mJAREntry);
-    PRInt32 pos = path.RFind("/");
-    if (pos >= 0)
-        path.Truncate(pos + 1);
-    else
-        path = "";
-
-    char* resolvedEntry;
-    rv = serv->ResolveRelativePath(relativePath, path.GetBuffer(),
-                                   &resolvedEntry);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCRT::free(mJAREntry);
-    mJAREntry = resolvedEntry;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::Resolve(const char *relativePath, char **result)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCAutoString path(mJAREntry);
-    PRInt32 pos = path.RFind("/");
-    if (pos >= 0)
-        path.Truncate(pos + 1);
-    else
-        path = "";
-
-    char* resolvedEntry;
-    rv = serv->ResolveRelativePath(relativePath, path.GetBuffer(),
-                                   &resolvedEntry);
-    if (NS_FAILED(rv)) return rv;
-
-    rv = FormatSpec(resolvedEntry, result);
-    nsCRT::free(resolvedEntry);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// nsIJARUri methods:
-
-NS_IMETHODIMP
-nsJARURI::GetJARFile(nsIURI* *jarFile)
-{
-    *jarFile = mJARFile;
-    NS_ADDREF(*jarFile);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetJARFile(nsIURI* jarFile)
-{
-    mJARFile = jarFile;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsJARURI::GetJAREntry(char* *entryPath)
-{
-    nsCAutoString entry(mJAREntry);
-    PRInt32 pos = entry.RFindCharInSet("#?;");
-    if (pos >= 0)
-        entry.Truncate(pos);
-    *entryPath = entry.ToNewCString();
-    return *entryPath ? NS_OK : NS_ERROR_OUT_OF_MEMORY;
-}
-
-NS_IMETHODIMP
-nsJARURI::SetJAREntry(const char* entryPath)
-{
-    nsresult rv;
-    NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    if (mJAREntry)
-        nsCRT::free(mJAREntry);
-
-    rv = serv->ResolveRelativePath(entryPath, nsnull, &mJAREntry);
-    return rv;
-}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/modules/libjar/nsJARURI.h

@@ -1,55 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef nsJARURI_h__
-#define nsJARURI_h__
-
-#include "nsIJARURI.h"
-#include "nsCOMPtr.h"
-
-#define NS_JARURI_CID					 \
-{ /* 0xc7e410d7-0x85f2-11d3-9f63-006008a6efe9 */     \
-    0xc7e410d7,                                      \
-    0x85f2,                                          \
-    0x11d3,                                          \
-    {0x9f, 0x63, 0x00, 0x60, 0x08, 0xa6, 0xef, 0xe9} \
-}
-
-class nsJARURI : public nsIJARURI
-{
-public:    
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIURI
-    NS_DECL_NSIJARURI
-
-    // nsJARURI
-    nsJARURI();
-    virtual ~nsJARURI();
-   
-    static NS_METHOD
-    Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
-
-    nsresult Init();
-    nsresult FormatSpec(const char* entryPath, char* *result);
-
-protected:
-    nsCOMPtr<nsIURI> mJARFile;
-    char *mJAREntry;
-};
-
-#endif // nsJARURI_h__

mozilla/netwerk/Makefile.in

@@ -1,45 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= \
-		cache \
-		base \
-		dns \
-		socket \
-		build \
-		protocol \
-		mime \
-		streamconv \
-		$(NULL)
-
-ifdef ENABLE_TESTS
-DIRS		+= test
-endif
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/base/Makefile.in

@@ -1,32 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS		= public src
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/base/public/MANIFEST

@@ -1,7 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-netCore.h
-nsNetUtil.h
-nsUnixColorPrintf.h

mozilla/netwerk/base/public/MANIFEST_IDL

@@ -1,17 +0,0 @@
-#
-# This is a list of local files which get copied to the mozilla:dist directory
-#
-
-nsIStreamListener.idl
-nsIStreamObserver.idl
-nsIURI.idl
-nsIURL.idl
-nsIChannel.idl
-nsIRequest.idl
-nsISocketTransportService.idl
-nsIFileTransportService.idl
-nsIFileSystem.idl
-nsIPrompt.idl
-nsIStreamLoader.idl
-nsIURLParser.idl
-nsIProtocolProxyService.idl

mozilla/netwerk/base/public/Makefile.in

@@ -1,67 +0,0 @@
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= necko
-XPIDL_MODULE	= necko_base
-
-XPIDLSRCS	= \
-		nsIFileStreams.idl \
-		nsIRequest.idl \
-		nsIChannel.idl \
-		nsIURI.idl \
-		nsIURL.idl \
-		nsIStreamObserver.idl \
-		nsIStreamListener.idl \
-		nsIIOService.idl \
-		nsIPrompt.idl \
-		nsIProtocolHandler.idl \
-		nsIProgressEventSink.idl \
-		nsINetModRegEntry.idl \
-		nsINetModuleMgr.idl \
-		nsINetNotify.idl \
-		nsILoadGroup.idl \
-		nsIFileTransportService.idl \
-		nsISocketTransportService.idl \
-		nsIStatusCodeEventSink.idl \
-		nsIFileSystem.idl \
-		nsIStreamLoader.idl \
-		nsINetPrompt.idl \
-		nsISocketTransport.idl \
-		nsIURLParser.idl \
-		nsIProxy.idl \
-		nsIProtocolProxyService.idl \
-		$(NULL)
-
-EXPORTS		= \
-		netCore.h \
-		nsNetUtil.h \
-        nsUnixColorPrintf.h \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk
-

mozilla/netwerk/base/public/makefile.win

@@ -1,66 +0,0 @@
-#!gmake
-#
-# The contents of this file are subject to the Netscape 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/NPL/
-#
-# 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 Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-
-MODULE = necko
-
-DEPTH = ..\..\..
-include <$(DEPTH)/config/config.mak>
-
-EXPORTS =                           \
-        netCore.h                   \
-        nsNetUtil.h                 \
-        nsUnixColorPrintf.h         \
-        $(NULL)
-
-XPIDLSRCS =                             \
-        .\nsIFileStreams.idl            \
-        .\nsIRequest.idl                \
-        .\nsIChannel.idl                \
-        .\nsIURI.idl                    \
-        .\nsIURL.idl                    \
-        .\nsIStreamObserver.idl         \
-        .\nsIStreamListener.idl         \
-        .\nsIIOService.idl              \
-        .\nsIPrompt.idl                 \
-        .\nsIProtocolHandler.idl        \
-        .\nsIProgressEventSink.idl      \
-        .\nsINetModRegEntry.idl         \
-        .\nsINetModuleMgr.idl           \
-        .\nsINetNotify.idl              \
-        .\nsILoadGroup.idl              \
-        .\nsISocketTransportService.idl \
-        .\nsIFileTransportService.idl   \
-        .\nsIStatusCodeEventSink.idl    \
-        .\nsIFileSystem.idl             \
-        .\nsIStreamLoader.idl           \
-        .\nsINetPrompt.idl    		\
-        .\nsISocketTransport.idl        \
-	    .\nsIURLParser.idl              \
-        .\nsIProxy.idl                  \
-        .\nsIProtocolProxyService.idl   \
-        $(NULL)
-
-include <$(DEPTH)/config/rules.mak>
-
-$(DEPTH)\netwerk\dist\include: 
-        -mkdir $(DEPTH)\netwerk\dist
-        -mkdir $(DEPTH)\netwerk\dist\include
-

mozilla/netwerk/base/public/netCore.h

@@ -1,64 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#ifndef __netCore_h__
-#define __netCore_h__
-
-#include "nsError.h"
-
- /* networking error codes */
-
-// NET RANGE:   1 -20
-// FTP RANGE:   21-30
-// HTTP RANGE:  31-40
-// DNS RANGE:   41-50 
-
-#define NS_ERROR_ALREADY_CONNECTED \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 11)
-
-#define NS_ERROR_NOT_CONNECTED \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 12)
-
-/* NS_ERROR_CONNECTION_REFUSED and NS_ERROR_NET_TIMEOUT moved to nsISocketTransportService.idl */
-
-#define NS_ERROR_IN_PROGRESS \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 15)
-
-#define NS_ERROR_OFFLINE \
-    NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 16)
-
-#undef NS_NET
-#ifdef _IMPL_NS_NET
-#ifdef XP_PC
-#define NS_NET _declspec(dllexport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#else  /* !_IMPL_NS_NET */
-#ifdef XP_PC
-#define NS_NET _declspec(dllimport)
-#else  /* !XP_PC */
-#define NS_NET
-#endif /* !XP_PC */
-#endif /* !_IMPL_NS_NET */
-
-#endif // __netCore_h__

mozilla/netwerk/base/public/nsIChannel.idl

@@ -1,403 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIRequest.idl"
-
-interface nsIURI;
-interface nsIInputStream;
-interface nsIOutputStream;
-interface nsIStreamObserver;
-interface nsIStreamListener;
-interface nsILoadGroup;
-interface nsIInterfaceRequestor;
-interface nsIFile;
-
-typedef unsigned long nsLoadFlags;
-
-/**
- * The nsIChannel interface allows the user to construct I/O requests for
- * specific protocols, and manage them in a uniform way. Once a channel
- * is created (via nsIIOService::NewChannel), parameters for that request
- * may be set by using the channel attributes, or by QueryInterfacing to a
- * subclass of nsIChannel for protocol-specific parameters. Then the actual
- * request can be issued in one of several ways:
- *
- *      - AsyncRead and AsyncWrite allow for asynchronous requests, calling
- *        back the user's stream listener or observer,
- *      - OpenInputStream and OpenOutputStream allow for synchronous reads
- *        and writes on the underlying channel.
- *
- * After a request has been completed, the channel is still valid for
- * accessing protocol-specific results. For example, QueryInterfacing to 
- * nsIHTTPChannel allows response headers to be retrieved that result from
- * http transactions. 
- *
- * Note that a channel is really only valid for one request. Reusing a channel
- * after a request has completed for a subsequent request may have undefined
- * results, depending on the channel implementation.
- *
- * Also of note are a special kind of channel called "transports." Transports
- * also implement the nsIChannel interface, but operate at a lower level from
- * protocol channels. The socket and file transports are notable implementations
- * of transports and allow higher level channels to be implemented. The cache
- * may also behave as a transport, and possibly things like sound playing services
- * etc. Transports usually operate in a separate thread and often multiplex
- * multiple requests for the same kind of service or resources. 
- */
-[scriptable, uuid(1788e79e-f947-11d3-8cda-0060b0fc14a3)]
-interface nsIChannel : nsIRequest
-{
-    ////////////////////////////////////////////////////////////////////////////
-    // nsIChannel accessors
-    ////////////////////////////////////////////////////////////////////////////
-    
-    /**
-     * Returns the original URL used to construct the channel.
-     * This is used in the case of a redirect or URI "resolution" (e.g. 
-     * resolving a resource: URI to a file: URI) so that the original
-     * pre-redirect URI can still be obtained. 
-     *
-     * Note that this is distinctly different from the http referrer
-     * (referring URI) which is typically the page that contained the 
-     * original URI (accessible from nsIHTTPChannel).
-     */
-    attribute nsIURI originalURI;
-
-    /**
-     * Returns the URL to which the channel currently refers. If a redirect
-     * or URI resolution occurs, this accessor returns the current location
-     * to which the channel is referring.
-     */
-    attribute nsIURI URI;
-
-    /**
-     * Accesses the start offset from the beginning of the data from/to which
-     * reads/writes will occur. Users may set the transferOffset before making
-     * any of the following requests: asyncOpen, asyncRead, asyncWrite,
-     * openInputStream, openOutputstream.
-     */
-    attribute unsigned long transferOffset;
-
-    /**
-     * Accesses the count of bytes to be transfered. For openInputStream and
-     * asyncRead, this specifies the amount to read, for asyncWrite, this
-     * specifies the amount to write (note that for openOutputStream, the
-     * end of the data can be signified simply by closing the stream). 
-     * If the transferCount is set after reading has been initiated, the
-     * amount specified will become the current remaining amount to read
-     * before the channel is closed (this can be useful if the content
-     * length is encoded at the start of the stream).
-     *
-     * A transferCount value of -1 means the amount is unspecified, i.e. 
-     * read or write all the data that is available.
-     */
-    attribute long transferCount;
-
-    /**
-     * Accesses the load attributes for the channel. E.g. setting the load 
-     * attributes with the LOAD_QUIET bit set causes the loading process to
-     * not deliver status notifications to the program performing the load,
-     * and to not contribute to keeping any nsILoadGroup it may be contained
-     * in from firing its OnLoadComplete notification.
-     */
-    attribute nsLoadFlags loadAttributes;
-
-    /**
-     * Returns the content MIME type of the channel if available. Note that the 
-     * content type can often be wrongly specified (wrong file extension, wrong
-     * MIME type, wrong document type stored on a server, etc.) and the caller
-     * most likely wants to verify with the actual data. 
-     */
-    attribute string contentType;
-
-    /**
-     * Returns the length of the data associated with the channel if available.
-     * If the length is unknown then -1 is returned.
-     */
-    attribute long contentLength;
-
-    /**
-     * Accesses the owner corresponding to the entity that is 
-     * responsible for this channel. Used by security code to grant
-     * or deny privileges to mobile code loaded from this channel. 
-     *
-     * Note: This is a strong reference to the owner, so if the owner is also
-     * holding a pointer to the channel, care must be taken to explicitly drop
-     * its reference to the channel -- otherwise a leak will result.
-     */
-    attribute nsISupports owner;
-
-    /**
-     * Accesses the load group in which the channel is a currently a member.
-     */
-    attribute nsILoadGroup loadGroup;
-
-    /**
-     * Accesses the capabilities callbacks of the channel. This is set by clients
-     * who wish to provide a means to receive progress, status and protocol-specific 
-     * notifications.
-     */
-    attribute nsIInterfaceRequestor notificationCallbacks;
-
-    /** 
-     * Any security information about this channel.  This can be null.
-     */
-    readonly attribute nsISupports securityInfo;
-
-    /**
-     * Accesses the buffer segment size. The buffer segment size is used as
-     * the initial size for any transfer buffers, and the increment size for
-     * whenever the buffer space needs to be grown.
-     * (Note this parameter is passed along to any underlying nsIPipe objects.)
-     * If unspecified, the channel implementation picks a default.
-     */
-    attribute unsigned long bufferSegmentSize;
-
-    /**
-     * Accesses the buffer maximum size. The buffer maximum size is the limit
-     * size that buffer will be grown to before suspending the channel.
-     * (Note this parameter is passed along to any underlying nsIPipe objects.)
-     * If unspecified, the channel implementation picks a default.
-     */
-    attribute unsigned long bufferMaxSize;
-
-    /**
-     * Returns true if the data from this channel should be cached. Local files
-     * report false because they exist on the local disk and need not be cached.
-     * Input stream channels, data protocol, datetime protocol and finger 
-     * protocol channels also should not be cached. Http and ftp on the other 
-     * hand should. Note that the value of this attribute doesn't reflect any
-     * http headers that may specify that this channel should not be cached.
-     */
-    readonly attribute boolean shouldCache;
-
-    /**
-     * Setting pipeliningAllowed causes the load of a URL (issued via asyncOpen,
-     * asyncRead or asyncWrite) to be deferred in order to allow the request to
-     * be pipelined for greater throughput efficiency. Pipelined requests will
-     * be forced to load when the first non-pipelined request is issued.
-     */
-    attribute boolean pipeliningAllowed;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // Load attribute flags. These may be or'd together.
-    ////////////////////////////////////////////////////////////////////////////
-    /**
-     * Note that more will follow for each protocol's implementation of a channel, 
-     * although channel writers have to be careful to not let the flag bits 
-     * overlap. Otherwise, users won't be able to create a single flag word
-     * of load attributes that applies to a number of different channel types.
-     */
-
-    /**
-     * No special load attributes -- use defaults:
-     */
-    const unsigned long LOAD_NORMAL     = 0;
-
-
-    /** 
-     * Don't deliver status notifications to the nsIProgressEventSink, or keep 
-     * this load from completing the nsILoadGroup it may belong to:
-     */
-    const unsigned long LOAD_BACKGROUND = 1 << 0; 
-
-    const unsigned long LOAD_DOCUMENT_URI = 1 << 1;
-
-    /** 
-     * If the end consumer for this load has been retargeted after discovering 
-     * it's content, this flag will be set:
-     */
-    const unsigned long LOAD_RETARGETED_DOCUMENT_URI = 1 << 2;
-
-    ////////////////////////////////////////////////////////////////////////////
-    /**
-     * The following flags control caching behavior.  Not all protocols pay
-     * attention to all these flags, but they are applicable to more than one
-     * protocol, so they are defined here.
-     */
-
-    /**
-     * Don't store data in the disk cache.  This can be used to preserve
-     * privacy, e.g. so that no https transactions are recorded, or to avoid
-     * caching a stream to disk that is already stored in a local file,
-     * e.g. the mailbox: protocol.
-     */
-    const unsigned long INHIBIT_PERSISTENT_CACHING = 1 <<  8;
-
-    /**
-     * Force an end-to-end download of content data from the origin server (and
-     * any intervening proxies that sit between it and the client), e.g. this
-     * flag is used for a shift-reload.
-     */
-    const unsigned long FORCE_RELOAD               = 1 <<  9;
-
-    /**
-     * Force revalidation with server (or proxy) to verify that cached content
-     * is up-to-date, e.g. by comparing last-modified date on server with that
-     * of the cached version.  For example, this flag is used when the reload
-     * button is pressed.
-     */
-    const unsigned long FORCE_VALIDATION           = 1 << 10;
-
-    /**
-     * If the CACHE_AS_FILE flag is set, any stream content is stored in the
-     * cache as a single disk file.  Content will not be cached in the memory
-     * cache nor will it be stored in any other type of cache, e.g. a flat-file
-     * cache database.  This is used to implement the jar protocol handler and
-     * to provide the stream-as-file semantics required by the classic browser
-     * plugin API.
-     */
-    const unsigned long CACHE_AS_FILE              = 1 << 11;
-
-    /**
-     * When cache data is potentially out of date, it can be revalidated with
-     * the origin server to see if the content needs to be reloaded.  The
-     * following four flags control how often this validation occurs.
-     * These flags are commonly used for "normal" loading.  Note that
-     * the VALIDATE_HEURISTICALLY and VALIDATE_ONCE_PER_SESSION flags can be
-     * combined to validate heuristically but no more than once per session.
-     */
-    const unsigned long VALIDATE_NEVER             = 1 << 12;
-    const unsigned long VALIDATE_ALWAYS            = 1 << 13;
-    const unsigned long VALIDATE_ONCE_PER_SESSION  = 1 << 14;
-    const unsigned long VALIDATE_HEURISTICALLY     = 1 << 15;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // nsIChannel operations
-    ////////////////////////////////////////////////////////////////////////////
-    
-    /**
-     * Opens a blocking input stream to the URL's specified source.
-     * @param startPosition - The offset from the start of the data
-     *   from which to read.
-     * @param readCount - The number of bytes to read. If -1, everything
-     *   up to the end of the data is read. If greater than the end of 
-     *   the data, the amount available is returned in the stream.
-     */
-    nsIInputStream openInputStream();
-
-    /**
-     * Opens a blocking output stream to the URL's specified destination.
-     * @param startPosition - The offset from the start of the data
-     *   from which to begin writing.
-     */
-    nsIOutputStream openOutputStream();
-
-    /**
-     * Opens the channel asynchronously. The nsIStreamObserver's OnStartRequest
-     * method is called back when the channel actually becomes open, providing 
-     * the content type. Its OnStopRequest method is called when the channel
-     * becomes closed.
-     */
-    void asyncOpen(in nsIStreamObserver observer, 
-                   in nsISupports ctxt);
-
-    /**
-     * Reads asynchronously from the URL's specified source. Notifications
-     * are provided to the stream listener on the thread of the specified
-     * event queue.
-     * The startPosition argument designates the offset in the source where
-     * the data will be read.
-     * If the readCount == -1 then all the available data is delivered to
-     * the stream listener.
-     */
-    void asyncRead(in nsIStreamListener listener,
-                   in nsISupports ctxt);
-
-    /**
-     * Writes asynchronously to the URL's specified destination. Notifications
-     * are provided to the stream observer on the thread of the specified
-     * event queue.
-     * The startPosition argument designates the offset in the destination where
-     * the data will be written.
-     * If the writeCount == -1, then all the available data in the input
-     * stream is written.
-     */
-    void asyncWrite(in nsIInputStream fromStream,
-                    in nsIStreamObserver observer,
-                    in nsISupports ctxt);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * nsIInputStreamChannel is an interface that allows for the initialization
- * of a simple nsIChannel that is constructed from a single input stream and
- * associated content type. Input stream channels only allow the input stream
- * to be accessed, not the output stream.
- */
-[scriptable, uuid(43070d6a-f947-11d3-8cda-0060b0fc14a3)]
-interface nsIInputStreamChannel : nsIChannel
-{
-    void init(in nsIURI uri,
-              in nsIInputStream inStr,
-              in string contentType, 
-              in long contentLength);
-};
-
-%{C++
-
-#define NS_INPUTSTREAMCHANNEL_CID                    \
-{ /* 54d0d8e6-f947-11d3-8cda-0060b0fc14a3 */         \
-    0x54d0d8e6,                                      \
-    0xf947,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}
-
-////////////////////////////////////////////////////////////////////////////////
-
-/**
- * nsIFileChannel is an interface that allows for the initialization
- * of a simple nsIChannel that is constructed from a single nsIFile and
- * associated content type. 
- */
-[scriptable, uuid(68a26506-f947-11d3-8cda-0060b0fc14a3)]
-interface nsIFileChannel : nsIChannel
-{
-    void init(in nsIFile file,
-              in long ioFlags,
-              in long perm);
-    
-    readonly attribute nsIFile file;
-    attribute long ioFlags;
-    attribute long permissions;
-};
-
-%{C++
-
-#define NS_LOCALFILECHANNEL_CLASSNAME "Local File Channel"
-#define NS_LOCALFILECHANNEL_PROGID "component://netscape/network/local-file-channel"
-
-#define NS_LOCALFILECHANNEL_CID                      \
-{ /* 6d5b2d44-f947-11d3-8cda-0060b0fc14a3 */         \
-    0x6d5b2d44,                                      \
-    0xf947,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}
-
-////////////////////////////////////////////////////////////////////////////////

mozilla/netwerk/base/public/nsIFileStreams.idl

@@ -1,241 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIInputStream.idl"
-#include "nsIOutputStream.idl"
-#include "nsILocalFile.idl"
-
-[scriptable, uuid(e3d56a20-c7ec-11d3-8cda-0060b0fc14a3)]
-interface nsIFileInputStream : nsIInputStream
-{
-    void init(in nsIFile file, in long ioFlags, in long perm);
-};
-
-[scriptable, uuid(e6f68040-c7ec-11d3-8cda-0060b0fc14a3)]
-interface nsIFileOutputStream : nsIOutputStream
-{
-    void init(in nsIFile file, in long ioFlags, in long perm);
-};
-
-[scriptable, uuid(e9de5df0-c7ec-11d3-8cda-0060b0fc14a3)]
-interface nsISeekableStream : nsISupports
-{
-    // correspond to PRSeekWhence values
-    const long NS_SEEK_SET = 0;
-    const long NS_SEEK_CUR = 1;
-    const long NS_SEEK_END = 2;
-    
-    void seek(in long whence, in long offset);
-    unsigned long tell();
-};
-
-[scriptable, uuid(616f5b48-da09-11d3-8cda-0060b0fc14a3)]
-interface nsIBufferedInputStream : nsIInputStream
-{
-    void init(in nsIInputStream fillFromStream,
-              in unsigned long bufferSize);
-};
-
-[scriptable, uuid(6476378a-da09-11d3-8cda-0060b0fc14a3)]
-interface nsIBufferedOutputStream : nsIOutputStream
-{
-    void init(in nsIOutputStream sinkToStream,
-              in unsigned long bufferSize);
-};
-
-%{C++
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_LOCALFILEINPUTSTREAM_CLASSNAME "Local File Input Stream"
-#define NS_LOCALFILEINPUTSTREAM_PROGID "component://netscape/network/file-input-stream"
-
-#define NS_LOCALFILEINPUTSTREAM_CID                  \
-{ /* be9a53ae-c7e9-11d3-8cda-0060b0fc14a3 */         \
-    0xbe9a53ae,                                      \
-    0xc7e9,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-#define NS_LOCALFILEOUTPUTSTREAM_CLASSNAME "Local File Output Stream"
-#define NS_LOCALFILEOUTPUTSTREAM_PROGID "component://netscape/network/file-output-stream"
-
-#define NS_LOCALFILEOUTPUTSTREAM_CID                 \
-{ /* c272fee0-c7e9-11d3-8cda-0060b0fc14a3 */         \
-    0xc272fee0,                                      \
-    0xc7e9,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-#define NS_BUFFEREDINPUTSTREAM_CLASSNAME "Buffered Input Stream"
-#define NS_BUFFEREDINPUTSTREAM_PROGID "component://netscape/network/buffered-input-stream"
-
-#define NS_BUFFEREDINPUTSTREAM_CID                   \
-{ /* 9226888e-da08-11d3-8cda-0060b0fc14a3 */         \
-    0x9226888e,                                      \
-    0xda08,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-#define NS_BUFFEREDOUTPUTSTREAM_CLASSNAME "Buffered Output Stream"
-#define NS_BUFFEREDOUTPUTSTREAM_PROGID "component://netscape/network/buffered-output-stream"
-
-#define NS_BUFFEREDOUTPUTSTREAM_CID                  \
-{ /* 9868b4ce-da08-11d3-8cda-0060b0fc14a3 */         \
-    0x9868b4ce,                                      \
-    0xda08,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xda, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// move to nsNetUtil.h later...
-
-#include "nsILoadGroup.h"
-#include "nsIInterfaceRequestor.h"
-#include "nsCOMPtr.h"
-#include "nsIServiceManager.h"
-#include "nsIChannel.h"
-#include "nsILocalFile.h"
-#include "nsIInputStream.h"
-#include "nsIOutputStream.h"
-#include "prio.h"       // for read/write flags, permissions, etc.
-
-// This will QI the file argument to an nsILocalFile in the Init method.
-inline nsresult
-NS_NewLocalFileChannel(nsIFileChannel **result,
-                       nsIFile* file,
-                       PRInt32 ioFlags = -1,
-                       PRInt32 perm = -1)
-{
-    nsresult rv;
-    nsCOMPtr<nsIFileChannel> channel;
-    static NS_DEFINE_CID(kLocalFileChannelCID, NS_LOCALFILECHANNEL_CID);
-    rv = nsComponentManager::CreateInstance(kLocalFileChannelCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIFileChannel),
-                                            getter_AddRefs(channel));
-    if (NS_FAILED(rv)) return rv;
-    rv = channel->Init(file, ioFlags, perm);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = channel;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-// This will QI the file argument to an nsILocalFile in the Init method.
-inline nsresult
-NS_NewLocalFileInputStream(nsIInputStream* *result,
-                           nsIFile* file, 
-                           PRInt32 ioFlags = -1,
-                           PRInt32 perm = -1)
-{
-    nsresult rv;
-    nsCOMPtr<nsIFileInputStream> in;
-    static NS_DEFINE_CID(kLocalFileInputStreamCID, NS_LOCALFILEINPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kLocalFileInputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIFileInputStream),
-                                            getter_AddRefs(in));
-    if (NS_FAILED(rv)) return rv;
-    rv = in->Init(file, ioFlags, perm);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = in;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-// This will QI the file argument to an nsILocalFile in the Init method.
-inline nsresult
-NS_NewLocalFileOutputStream(nsIOutputStream* *result,
-                            nsIFile* file,
-                            PRInt32 ioFlags = -1,
-                            PRInt32 perm = -1)
-{
-    nsresult rv;
-    nsCOMPtr<nsIFileOutputStream> out;
-    static NS_DEFINE_CID(kLocalFileOutputStreamCID, NS_LOCALFILEOUTPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kLocalFileOutputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIFileOutputStream),
-                                            getter_AddRefs(out));
-    if (NS_FAILED(rv)) return rv;
-    rv = out->Init(file, ioFlags, perm);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = out;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-inline nsresult
-NS_NewBufferedInputStream(nsIInputStream* *result,
-                          nsIInputStream* str,
-                          PRUint32 bufferSize)
-{
-    nsresult rv;
-    nsCOMPtr<nsIBufferedInputStream> in;
-    static NS_DEFINE_CID(kBufferedInputStreamCID, NS_BUFFEREDINPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kBufferedInputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIBufferedInputStream),
-                                            getter_AddRefs(in));
-    if (NS_FAILED(rv)) return rv;
-    rv = in->Init(str, bufferSize);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = in;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-inline nsresult
-NS_NewBufferedOutputStream(nsIOutputStream* *result,
-                           nsIOutputStream* str,
-                           PRUint32 bufferSize)
-{
-    nsresult rv;
-    nsCOMPtr<nsIBufferedOutputStream> out;
-    static NS_DEFINE_CID(kBufferedOutputStreamCID, NS_BUFFEREDOUTPUTSTREAM_CID);
-    rv = nsComponentManager::CreateInstance(kBufferedOutputStreamCID,
-                                            nsnull, 
-                                            NS_GET_IID(nsIBufferedOutputStream),
-                                            getter_AddRefs(out));
-    if (NS_FAILED(rv)) return rv;
-    rv = out->Init(str, bufferSize);
-    if (NS_FAILED(rv)) return rv;
-
-    *result = out;
-    NS_ADDREF(*result);
-    return NS_OK;
-}
-
-%}

mozilla/netwerk/base/public/nsIFileTransportService.idl

@@ -1,65 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-%{C++
-#include "nsFileSpec.h"
-%}
-
-interface nsIChannel;
-interface nsIFileSystem;
-interface nsIEventSinkGetter;
-interface nsIInputStream;
-interface nsIRunnable;
-interface nsIFile;
-
-[scriptable, uuid(57211a60-8c45-11d3-93ac-00104ba0fd40)]
-interface nsIFileTransportService : nsISupports
-{
-    nsIChannel createTransport(in nsIFile file,
-                               in long ioFlags,
-                               in long perm);
-
-    // This version can be used with an existing input stream to serve
-    // as a data pump:
-    nsIChannel createTransportFromStream(in nsIInputStream fromStream,
-                                         in string contentType,
-                                         in long contentLength);
-
-    nsIChannel createTransportFromFileSystem(in nsIFileSystem fsObj);
-
-    void dispatchRequest(in nsIRunnable runnable);
-    void suspend(in nsIRunnable trans);
-    void resume(in nsIRunnable trans);
-    void processPendingRequests();
-    void shutdown();
-};
-
-%{C++
-#define NS_FILETRANSPORTSERVICE_CID                  \
-{ /* 2bb2b250-ea35-11d2-931b-00104ba0fd40 */         \
-    0x2bb2b250,                                      \
-    0xea35,                                          \
-    0x11d2,                                          \
-    {0x93, 0x1b, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-%}

mozilla/netwerk/base/public/nsIIOService.idl

@@ -1,169 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIChannel.idl"
-
-interface nsIProtocolHandler;
-interface nsIURI;
-interface nsIInterfaceRequestor;
-interface nsIStreamObserver;
-interface nsIStreamListener;
-interface nsIEventQueue;
-interface nsIBufferInputStream;
-interface nsIInputStream;
-interface nsIBufferOutputStream;
-interface nsIFileChannel;
-interface nsILoadGroup;
-interface nsILoadGroupObserver;
-interface nsIFile;
-interface nsIInputStream;
-interface nsIOutputStream;
-
-[scriptable, uuid(ab7c3a84-d488-11d3-8cda-0060b0fc14a3)]
-interface nsIIOService : nsISupports
-{
-    /**
-     * Returns a protocol handler for a given URI scheme.
-     */
-    nsIProtocolHandler getProtocolHandler(in string scheme);
-
-    /**
-     * This method constructs a new URI by first determining the scheme
-     * of the URI spec, and then delegating the construction of the URI
-     * to the protocol handler for that scheme. QueryInterface can be used
-     * on the resulting URI object to obtain a more specific type of URI.
-     */
-    nsIURI newURI(in string aSpec, in nsIURI aBaseURI);
-
-    /**
-     * Creates a channel for a given URI. The notificationCallbacks argument
-     * is used to obtain the appropriate callbacks for the URI's protocol from the
-     * application.
-     *
-     * @param originalURI - Specifies the original URI which caused the creation
-     * of this channel. This can occur when the construction of one channel
-     * (e.g. for resource:) causes another channel to be created on its behalf
-     * (e.g. a file: channel), or if a redirect occurs, causing the current
-     * URL to become different from the original URL. If NULL, the aURI parameter
-     * will be used as the originalURI instead.
-     */
-    nsIChannel newChannelFromURI(in nsIURI aURI);
-
-    /**
-     * Convenience routine that first creates a URI by calling NewURI, and
-     * then passes the URI to NewChannelFromURI. 
-     *
-     * @param originalURI - Specifies the original URI which caused the creation
-     * of this channel. This can occur when the construction of one channel
-     * (e.g. for resource:) causes another channel to be created on its behalf
-     * (e.g. a file: channel), or if a redirect occurs, causing the current
-     * URL to become different from the original URL. If NULL, the aURI parameter
-     * will be used as the originalURI instead.
-     */
-    nsIChannel newChannel(in string aSpec, in nsIURI aBaseURI);
-
-    /**
-     * Returns true if networking is in "offline" mode. When in offline mode, attempts
-     * to access the network will fail (although this is not necessarily corrolated with
-     * whether there is actually a network available -- that's hard to detect without
-     * causing the dialer to come up).
-     */
-    attribute boolean offline;
-
-    ////////////////////////////////////////////////////////////////////////////
-    // URL parsing utilities
-
-    /**
-     * Utility for protocol implementors -- extracts the scheme from a URL 
-     * string, consistently and according to spec.
-     * @param urlString - the URL string to parse
-     * @param schemeStartPos - the resulting starting position of the scheme substring
-     *        (may skip over whitespace)
-     * @param schemeEndPos - the resulting ending position of the scheme substring
-     *        (the position of the colon)
-     * @param scheme - an allocated substring containing the scheme. If this parameter
-     *        is null going into the routine, then the scheme is not allocated and
-     *        returned. Free with nsCRT::free.
-     *
-     * @return NS_OK - if successful
-     * @return NS_ERROR_MALFORMED_URI - if the urlString is not of the right form
-     */
-    void extractScheme(in string urlString,
-                       out unsigned long schemeStartPos,
-                       out unsigned long schemeEndPos,
-                       out string scheme);
-
-    /**
-     * Constants for the mask in the call to Escape
-     */
-    const short url_Scheme        = (1<<0);
-    const short url_Username      = (1<<1);
-    const short url_Password      = (1<<2);
-    const short url_Host          = (1<<3);
-    const short url_Directory     = (1<<4);
-    const short url_FileBaseName  = (1<<5);
-    const short url_FileExtension = (1<<6);
-    const short url_Param         = (1<<7);
-    const short url_Query         = (1<<8);
-    const short url_Ref           = (1<<9);
-    const short url_Forced        = (1<<10);
-
-    /**
-     * Encode characters into % escaped hexcodes.
-     */
-    string escape(in string str, in short mask);
-
-    /**
-     * Decode % escaped hex codes into character values.
-     */
-    string unescape(in string str);
-
-    /**
-     * Get port from string.
-     */
-    long extractPort(in string str);
-
-    /**
-     * Resolves a relative path string containing "." and ".."
-     * with respect to a base path (assumed to already be resolved). 
-     * For example, resolving "../../foo/./bar/../baz.html" w.r.t.
-     * "/a/b/c/d/e/" yields "/a/b/c/foo/baz.html". Attempting to 
-     * ascend above the base results in the NS_ERROR_MALFORMED_URI
-     * exception. If basePath is null, it treats it as "/".
-     */
-    string resolveRelativePath(in string relativePath,
-                               in string basePath);
-};
-
-%{C++
-
-#define NS_IOSERVICE_CID                             \
-{ /* 9ac9e770-18bc-11d3-9337-00104ba0fd40 */         \
-    0x9ac9e770,                                      \
-    0x18bc,                                          \
-    0x11d3,                                          \
-    {0x93, 0x37, 0x00, 0x10, 0x4b, 0xa0, 0xfd, 0x40} \
-}
-
-#define DUD 3.14
-%}

mozilla/netwerk/base/public/nsILoadGroup.idl

@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsIRequest.idl"
-
-interface nsIChannel;
-interface nsISimpleEnumerator;
-interface nsIStreamObserver;
-interface nsIStreamListener;
-interface nsIInputStream;
-
-
-[scriptable, uuid(60fdf550-5392-11d3-9a97-0080c7cb1080)]
-interface nsILoadGroupListenerFactory : nsISupports
-{
-    nsIStreamListener createLoadGroupListener(in nsIStreamListener alistener);
-};
-
-
-/**
- * A load group maintains a collection of active URL requests. 
- */
-[scriptable, uuid(19845248-29ab-11d3-8cce-0060b0fc14a3)]
-interface nsILoadGroup : nsIRequest
-{
-    void init(in nsIStreamObserver observer);
-
-    /**
-     * Accesses the default load attributes for the group, returned as
-     * a flag word. Setting the default load attributes will cause them
-     * to be applied to each new channel inserted into the group.
-     */
-    attribute unsigned long defaultLoadAttributes;
-
-    /**
-     * Accesses the default load channel for the group.  Each time a number
-     * of channels are added to a group, the DefaultLoadChannel may be set
-     * to indicate that all of the channels are related to a particular URL.
-     */
-    attribute nsIChannel defaultLoadChannel;
-
-    /**
-     * Adds a new channel to the group. This will cause the default load
-     * attributes to be applied to that channel. If the channel added is 
-     * the first channel in the group, the group's observer's OnStartRequest
-     * method is called.
-     */
-    void addChannel(in nsIChannel channel,
-                    in nsISupports ctxt);
-
-    /**
-     * Removes a channel from the group. If the channel removed is 
-     * the last channel in the group, the group's observer's OnStopRequest
-     * method is called.
-     */
-    void removeChannel(in nsIChannel channel, 
-                       in nsISupports ctxt,
-                       in nsresult status,
-                       in wstring errorMsg);
-
-    /**
-     * Returns the channels contained directly in this group.
-     * Enumerator element type: nsIChannel.
-     */
-    readonly attribute nsISimpleEnumerator channels;
-
-    attribute nsIStreamObserver groupObserver;
-
-    attribute nsILoadGroupListenerFactory groupListenerFactory;
-
-
-	readonly attribute unsigned long activeCount;
-};
-
-%{C++
-
-#define NS_LOADGROUP_CID                             \
-{ /* e1c61582-2a84-11d3-8cce-0060b0fc14a3 */         \
-    0xe1c61582,                                      \
-    0x2a84,                                          \
-    0x11d3,                                          \
-    {0x8c, 0xce, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
-}
-
-%}

mozilla/netwerk/base/public/nsINetModRegEntry.idl

@@ -1,47 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* This interface defines a registry entry for the networking libraries
- * external module registry. */
- 
-#include "nsISupports.idl"
-#include "nsINetNotify.idl"
-
-interface nsIEventQueue;
-interface nsINetModRegEntry;
-interface nsINetNotify;
-
-%{ C++
-// {F126BD90-1472-11d3-A15A-0050041CAF44}
-#define NS_NETMODREGENTRY_CID \
-{ 0xf126bd90, 0x1472, 0x11d3, { 0xa1, 0x5a, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-%}
-
-[scriptable, uuid(9F482BD0-1476-11d3-A15A-0050041CAF44)]
-interface nsINetModRegEntry : nsISupports 
-{
-    readonly attribute nsINetNotify      syncProxy;
-    readonly attribute nsINetNotify      asyncProxy;
-    readonly attribute string            topic;
-
-	boolean equals(in nsINetModRegEntry aEntry);
-};

mozilla/netwerk/base/public/nsINetModuleMgr.idl

@@ -1,80 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-/* The nsINetModuleMgr singleton service allows external module to register
- * themselves with the networking library to receive events they want to
- * receive.
- *
- * An external module that is interested in being notified when a particular 
- * networking level event occurs would register with this service, and 
- * implement the appropriate interface(s) that correspond to the events they
- * want to receive. These interfaces are defined by networking internal
- * components (for example, http would define a notification interface that
- * the external cookies module would implement).
- */
-
-#include "nsISupports.idl"
-#include "nsIEnumerator.idl"
-#include "nsINetNotify.idl"
-
-interface nsIEventQueue;
-
-%{ C++
-
-// {4EBDAFE0-13BA-11d3-A15A-0050041CAF44}
-#define NS_NETMODULEMGR_CID \
-{ 0x4ebdafe0, 0x13ba, 0x11d3, { 0xa1, 0x5a, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-
-// The list of available PROGIDS to register for notification on.
-#define NS_NETWORK_MODULE_MANAGER_HTTP_REQUEST_PROGID          "component://netscape/network/moduleMgr/http/request"
-#define NS_NETWORK_MODULE_MANAGER_HTTP_RESPONSE_PROGID         "component://netscape/network/moduleMgr/http/response"
-%}
-
-[scriptable, uuid(ff9ead40-0ef2-11d3-9de6-0010a4053fd0)]
-interface nsINetModuleMgr : nsISupports {
-	
-    // Register the external module to receive notifications.
-    // 
-    // ARGUMENTS:
-    // aTopic: The internal component that the external module wants to monitor.
-    // aNotify: The external module interface methods to be called when an event is fired.
-    //
-    // RETURNS: nsresult
-	void registerModule(in string aTopic, in nsINetNotify aNotify);
-
-    // Unregister the external module. Removes the nsINetModuleMgr binding between
-    // internal component and external module.
-    //
-    // ARGUMENTS:
-    // aTopic: The internal component being monitored.
-    // aNotify: The external modules notification module.
-    //
-    // RETURNS: nsresult
-    void unregisterModule(in string aTopic, in nsINetNotify aNotify);
-
-    // Enumerates all the registered modules for the specified topic.
-    //
-    // ARGUMENTS:
-    // aTopic: the component to get all the notifiers for.
-    // aEnumerator: the array of notifiers.
-    void enumerateModules(in string aTopic, out nsISimpleEnumerator aEnumerator);
-};

mozilla/netwerk/base/public/nsINetNotify.idl

@@ -1,28 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[uuid(4A3019E0-1CF3-11d3-A15B-0050041CAF44)]
-interface nsINetNotify : nsISupports {
-
-};

mozilla/netwerk/base/public/nsINetPrompt.idl

@@ -1,76 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-
-
-[scriptable, uuid(edd8be01-8e0d-11d3-b7a0-c46e946292bc)]
-interface nsINetPrompt : nsISupports
-{
-    /**
-     * Puts up an alert dialog with an OK button.
-     */
-    void alert( in string url, in boolean stripurl, in wstring title, in wstring text);
-
-    /**
-     * Puts up a dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean confirm( in string url, in boolean stripurl, in wstring title, in wstring text);
-
-    /**
-     * Puts up a username/password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptUsernameAndPassword(
-    								in string url,
-                                    in boolean stripurl,
-    								 in wstring title,
-    								   in wstring text,
-                                      out wstring user, 
-                                      out wstring pwd);
-
-    /**
-     * Puts up a password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptPassword(
-    						in string url,
-                            in boolean stripurl,
-    						in wstring title,
-    					   in wstring text, 
-                           out wstring pwd);
-
-    /**
-     * Puts up a prompt dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean prompt(
-    						in string url,
-                            in boolean stripurl,
-    						in wstring title,
-    					   in wstring text, 
-                           out wstring pwd);
-};
-
-

mozilla/netwerk/base/public/nsIProgressEventSink.idl

@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-interface nsIURI;
-interface nsIChannel;
-
-/**
- * An instance of nsIFfpEventSink should be passed as the eventSink
- * argument of nsINetService::NewConnection for ftp URLs. It defines
- * the callbacks to the application program (the html parser).
- */
-[scriptable, uuid(dd47ee00-18c2-11d3-9337-00104ba0fd40)]
-interface nsIProgressEventSink : nsISupports
-{
-    /**
-     * Notify the EventSink that progress as occurred for the URL load.<BR>
-     */
-    void onProgress(in nsIChannel channel,
-                    in nsISupports ctxt,
-                    in unsigned long aProgress,
-                    in unsigned long aProgressMax);
-
-    /**
-     * Notify the EventSink with a status message for the URL load.<BR>
-     */
-    void onStatus(in nsIChannel channel,
-                  in nsISupports ctxt,
-                  in wstring aMsg);
-
-};

mozilla/netwerk/base/public/nsIPrompt.idl

@@ -1,102 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(a63f70c0-148b-11d3-9333-00104ba0fd40)]
-interface nsIPrompt : nsISupports
-{
-    /**
-     * Puts up an alert dialog with an OK button.
-     */
-    void alert(in wstring text);
-
-    /**
-     * Puts up a dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean confirm(in wstring text);
-
-    /**
-     * Puts up a dialog with OK and Cancel buttons, and
-     * a message with a single checkbox.
-     * @return true for OK, false for Cancel
-     */
-    boolean confirmCheck(in wstring text,
-                         in wstring checkMsg,
-                         out boolean checkValue);
-
-    /**
-     * Puts up a text input dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean prompt(in wstring text,
-                   in wstring defaultText, 
-                   out wstring result);
-
-    /**
-     * Puts up a username/password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptUsernameAndPassword(in wstring text,
-                                      out wstring user, 
-                                      out wstring pwd);
-
-    /**
-     * Puts up a password dialog with OK and Cancel buttons.
-     * @return true for OK, false for Cancel
-     */
-    boolean promptPassword(in wstring text, 
-                           in wstring title,
-                           out wstring pwd);
-    
-    /**
-     * Puts up a dialog box which has a list box of strings
-     */                                               
-    boolean select(in wstring inDialogTitle,
-                   in wstring inMsg,
-                   in  PRUint32 inCount,
-                   [array, size_is(inCount)] in wstring inList,
-                   out long outSelection);
-
-    /**
-     * Put up a universal dialog
-     */
-    void universalDialog(in wstring inTitleMessage,
-                         in wstring inDialogTitle, /* e.g., alert, confirm, prompt, prompt password */
-                         in wstring inMsg, /* main message for dialog */
-                         in wstring inCheckboxMsg, /* message for checkbox */
-                         in wstring inButton0Text, /* text for first button */
-                         in wstring inButton1Text, /* text for second button */
-                         in wstring inButton2Text, /* text for third button */
-                         in wstring inButton3Text, /* text for fourth button */
-                         in wstring inEditfield1Msg, /*message for first edit field */
-                         in wstring inEditfield2Msg, /* message for second edit field */
-                         inout wstring inoutEditfield1Value, /* initial and final value for first edit field */
-                         inout wstring inoutEditfield2Value, /* initial and final value for second edit field */
-                         in wstring inIConURL, /* url of icon to be displayed in dialog */
-                         inout boolean inoutCheckboxState, /* initial and final state of checkbox */
-                         in PRInt32 inNumberButtons, /* total number of buttons (0 to 4) */
-                         in PRInt32 inNumberEditfields, /* total number of edit fields (0 to 2) */
-                         in PRInt32 inEditField1Password, /* ??? */
-                         out PRInt32 outButtonPressed); /* number of button that was pressed (0 to 3) */
-};

mozilla/netwerk/base/public/nsIProtocolHandler.idl

@@ -1,67 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIChannel.idl"
-
-interface nsIURI;
-interface nsIInterfaceRequestor;
-interface nsILoadGroup;
-
-[scriptable, uuid(15fd6940-8ea7-11d3-93ad-00104ba0fd40)]
-interface nsIProtocolHandler : nsISupports
-{
-    readonly attribute string scheme;
-
-    readonly attribute long defaultPort;
-
-    /**
-     * Makes a URI object that is suitable for loading by this protocol.
-     * In the usual case (when only the accessors provided by nsIURI are 
-     * needed), this method just constructs a standard URI using the
-     * component manager with kStandardURLCID.
-     */
-    nsIURI newURI(in string aSpec, in nsIURI aBaseURI);
-
-    /**
-     * Constructs a new channel for this protocol handler. 
-     *
-     * @param originalURI - Specifies the original URI which caused the creation
-     * of this channel. This can occur when the construction of one channel
-     * (e.g. for resource:) causes another channel to be created on its behalf
-     * (e.g. a file: channel), or if a redirect occurs, causing the current
-     * URL to become different from the original URL. If NULL, the aURI parameter
-     * will be used as the originalURI instead.
-     */
-    nsIChannel newChannel(in nsIURI aURI);
-};
-
-%{C++
-
-#define NS_NETWORK_PROTOCOL_PROGID               "component://netscape/network/protocol"
-#define NS_NETWORK_PROTOCOL_PROGID_PREFIX        NS_NETWORK_PROTOCOL_PROGID "?name="
-#define NS_NETWORK_PROTOCOL_PROGID_PREFIX_LENGTH 43     // nsCRT::strlen(NS_NETWORK_PROTOCOL_PROGID_PREFIX)
-
-// Unknown Protocol Error
-#define NS_ERROR_UNKNOWN_PROTOCOL  NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 18)
-
-%}

mozilla/netwerk/base/public/nsIProtocolProxyService.idl

@@ -1,40 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-#include "nsIURI.idl"
-#include "nsIProxy.idl"
-
-%{C++
-#define NS_PROTOCOLPROXYSERVICE_CID                             \
-{ /* E9B301C0-E0E4-11d3-A1A8-0050041CAF44 */                    \
-0xe9b301c0, 0xe0e4, 0x11d3, { 0xa1, 0xa8, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44 } }
-%}
-
-[scriptable, uuid(495CC980-E0D4-11d3-A1A8-0050041CAF44)]
-interface nsIProtocolProxyService : nsISupports
-{
-    readonly attribute PRBool proxyEnabled;
-
-    void examineForProxy(in nsIURI aURI, in nsIProxy aProxy);
-};
-

mozilla/netwerk/base/public/nsIProxy.idl

@@ -1,41 +0,0 @@
-/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
- /* 
-    The nsIProxy interface allows setting and getting of proxy host and port. 
-    This is for use by protocol handlers. If you are writing a protocol handler
-    and would like to support proxy behaviour then derive from this as well as
-    the nsIProtocolHandler class.
-
-    -Gagan Saksena 02/25/99
-*/
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(0492D011-CD2F-11d2-B013-006097BFC036)]
-interface nsIProxy : nsISupports
-{
-    attribute string proxyHost;
-
-    /* -1 on Set call indicates switch to default port */
-    attribute long proxyPort;
-};

mozilla/netwerk/base/public/nsIRequest.idl

@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-#include "nsISupports.idl"
-
-[scriptable, uuid(F2CAABA0-2F25-11d3-A164-0050041CAF44)]
-interface nsIRequest : nsISupports
-{
-    /**
-     * Returns true if the request is pending (active). Returns false 
-     * after completion or successful calling Cancel. Suspended requests
-     * are still considered pending.
-     */
-    boolean isPending();
-
-    /**
-     * Returns any error status associated with the request.
-     */
-    readonly attribute nsresult status;
-
-    /**
-     * Cancels the current request. This will close any open input or
-     * output streams and terminate any async requests. Users should 
-     * normally pass NS_BINDING_ABORTED, although other errors may also
-     * be passed. The error passed in will become the value of the 
-     * status attribute.
-     */
-    void cancel(in nsresult status);
-
-    /**
-     * Suspends the current requests. This may have the effect of closing
-     * any underlying transport (in order to free up resources), although
-     * any open streams remain logically opened and will continue delivering
-     * data when the transport is resumed. 
-     */
-    void suspend();
-
-    /**
-     * Resumes the current request. This may have the effect of re-opening
-     * any underlying transport and will resume the delivery of data to 
-     * any open streams. 
-     */
-    void resume();
-};