Remove some duplicated code. Bug 397651, r=kaie, sr=jst, a=schrep

security/manager/ssl/src/nsCrypto.cpp

@@ -68,6 +68,7 @@
 #include "nsIFilePicker.h"
 #include "nsJSPrincipals.h"
 #include "nsIPrincipal.h"
+#include "nsIScriptSecurityManager.h"
 #include "nsXPIDLString.h"
 #include "nsIGenKeypairInfoDlg.h"
 #include "nsIDOMCryptoDialogs.h"
@@ -305,132 +306,6 @@ nsCrypto::GetEnableSmartCardEvents(PRBool *aEnable)
   return NS_OK;
 }
 
-//These next few functions are based on implementation in
-//the script security manager to get the principals from
-//a JSContext.  We need that to successfully run the 
-//callback parameter passed to crypto.generateCRMFRequest
-static nsresult
-cryptojs_GetScriptPrincipal(JSContext *cx, JSScript *script,
-                            nsIPrincipal **result)
-{
-  if (!script) {
-    *result = nsnull;
-    return NS_OK;
-  }
-  JSPrincipals *jsp = JS_GetScriptPrincipals(cx, script);
-  if (!jsp) {
-    return NS_ERROR_FAILURE;
-  }
-  nsJSPrincipals *nsJSPrin = static_cast<nsJSPrincipals *>(jsp);
-  *result = nsJSPrin->nsIPrincipalPtr;
-  if (!*result) {
-    return NS_ERROR_FAILURE;
-  }
-  NS_ADDREF(*result);
-  return NS_OK;
-}
-
-static nsresult
-cryptojs_GetObjectPrincipal(JSContext *aCx, JSObject *aObj,
-                            nsIPrincipal **result)
-{
-  JSObject *parent = aObj;
-  do
-  {
-    JSClass *jsClass = JS_GetClass(aCx, parent);
-    const uint32 privateNsISupports = JSCLASS_HAS_PRIVATE | 
-                                      JSCLASS_PRIVATE_IS_NSISUPPORTS;
-    if (jsClass && (jsClass->flags & (privateNsISupports)) == 
-                    privateNsISupports)
-    {
-      nsISupports *supports = (nsISupports *) JS_GetPrivate(aCx, parent);
-      nsCOMPtr<nsIScriptObjectPrincipal> objPrin = do_QueryInterface(supports);
-              
-      if (!objPrin)
-      {
-        /*
-         * If it's a wrapped native, check the underlying native
-         * instead.
-         */
-        nsCOMPtr<nsIXPConnectWrappedNative> xpcNative = 
-                                            do_QueryInterface(supports);
-
-        if (xpcNative) {
-          objPrin = do_QueryWrappedNative(xpcNative);
-        }
-      }
-
-      if (objPrin && ((*result = objPrin->GetPrincipal()))) {
-        NS_ADDREF(*result);
-        return NS_OK;
-      }
-    }
-    parent = JS_GetParent(aCx, parent);
-  } while (parent);
-
-  // Couldn't find a principal for this object.
-  return NS_ERROR_FAILURE;
-}
-
-static nsresult
-cryptojs_GetFunctionObjectPrincipal(JSContext *cx, JSObject *obj,
-                                    nsIPrincipal **result)
-{
-  JSFunction *fun = (JSFunction *) JS_GetPrivate(cx, obj);
-
-  JSScript *script = JS_GetFunctionScript(cx, fun);
-  if (script && JS_GetFunctionObject(fun) != obj)
-  {
-    // Scripted function has been cloned; get principals from obj's
-    // parent-linked scope chain.  We do not get object principals for a
-    // cloned *native* function, because the subject in that case is a
-    // script or function further down the stack who is calling us.
-    return cryptojs_GetObjectPrincipal(cx, obj, result);
-  }
-  return cryptojs_GetScriptPrincipal(cx, script, result);
-}
-
-static nsresult
-cryptojs_GetFramePrincipal(JSContext *cx, JSStackFrame *fp,
-                           nsIPrincipal **principal)
-{
-  JSObject *obj = JS_GetFrameFunctionObject(cx, fp);
-  if (!obj) {
-    JSScript *script = JS_GetFrameScript(cx, fp);
-    return cryptojs_GetScriptPrincipal(cx, script, principal);
-  }
-  return cryptojs_GetFunctionObjectPrincipal(cx, obj, principal);
-}
-
-already_AddRefed<nsIPrincipal>
-nsCrypto::GetScriptPrincipal(JSContext *cx)
-{
-  JSStackFrame *fp = nsnull;
-  nsIPrincipal *principal=nsnull;
-
-  for (fp = JS_FrameIterator(cx, &fp); fp; fp = JS_FrameIterator(cx, &fp)) {
-    cryptojs_GetFramePrincipal(cx, fp, &principal);
-    if (principal != nsnull) {
-      break;
-    }
-  }
-
-  if (principal)
-    return principal;
-
-  nsIScriptContext *scriptContext = GetScriptContextFromJSContext(cx);
-
-  if (scriptContext)
-  {
-    nsCOMPtr<nsIScriptObjectPrincipal> globalData =
-      do_QueryInterface(scriptContext->GetGlobalObject());
-    NS_ENSURE_TRUE(globalData, nsnull);
-    NS_IF_ADDREF(principal = globalData->GetPrincipal());
-  }
-
-  return principal;
-}
-
 //A quick function to let us know if the key we're trying to generate
 //can be escrowed.
 static PRBool
@@ -2116,9 +1991,14 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMFObject** aReturn)
   //
 
 
-  nsCOMPtr<nsIPrincipal>principals;
-  principals = GetScriptPrincipal(cx);
-  NS_ASSERTION(principals, "Couldn't get the principals");
+  nsCOMPtr<nsIScriptSecurityManager> secMan =
+    do_GetService(NS_SCRIPTSECURITYMANAGER_CONTRACTID);
+  NS_ENSURE_TRUE(secMan, NS_ERROR_UNEXPECTED);
+  
+  nsCOMPtr<nsIPrincipal> principals;
+  secMan->GetSubjectPrincipal(getter_AddRefs(principals));
+  NS_ENSURE_TRUE(principals, NS_ERROR_UNEXPECTED);
+  
   nsCryptoRunArgs *args = new nsCryptoRunArgs();
   if (!args)
     return NS_ERROR_OUT_OF_MEMORY;