* clean up nsScriptSecurityManager
* remove nsJSSecurityManager * save principals in nsIChannels and nsIDocuments git-svn-id: svn://10.0.0.236/trunk@45080 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -64,9 +64,6 @@ nsCapsNewPrincipal(PRInt16 * principalType, void * key,
|
||||
PR_EXTERN(const char *)
|
||||
nsCapsPrincipalToString(nsIPrincipal * principal);
|
||||
|
||||
PR_EXTERN(PRBool)
|
||||
nsCapsIsCodebaseExact(nsIPrincipal * principal);
|
||||
|
||||
PR_EXTERN(const char *)
|
||||
nsCapsPrincipalGetVendor(nsIPrincipal * principal);
|
||||
|
||||
|
||||
@@ -30,25 +30,23 @@
|
||||
|
||||
class nsCodebasePrincipal : public nsICodebasePrincipal {
|
||||
public:
|
||||
|
||||
NS_DEFINE_STATIC_CID_ACCESSOR(NS_CODEBASEPRINCIPAL_CID)
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIPRINCIPAL
|
||||
NS_DECL_NSICODEBASEPRINCIPAL
|
||||
|
||||
nsCodebasePrincipal();
|
||||
|
||||
NS_IMETHOD
|
||||
Init(nsIURI *uri);
|
||||
|
||||
NS_DEFINE_STATIC_CID_ACCESSOR(NS_CODEBASEPRINCIPAL_CID)
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSIPRINCIPAL
|
||||
NS_DECL_NSICODEBASEPRINCIPAL
|
||||
|
||||
nsCodebasePrincipal();
|
||||
|
||||
NS_IMETHOD
|
||||
Init(PRInt16 type, nsIURI * uri);
|
||||
|
||||
virtual ~nsCodebasePrincipal(void);
|
||||
|
||||
virtual ~nsCodebasePrincipal(void);
|
||||
|
||||
protected:
|
||||
nsIURI * itsURL;
|
||||
PRInt16 itsType;
|
||||
nsJSPrincipals itsJSPrincipals;
|
||||
|
||||
nsIURI *itsURI;
|
||||
nsJSPrincipals itsJSPrincipals;
|
||||
};
|
||||
|
||||
#endif // _NS_CODEBASE_PRINCIPAL_H_
|
||||
|
||||
@@ -25,7 +25,7 @@ struct nsJSPrincipals : JSPrincipals {
|
||||
|
||||
public:
|
||||
nsJSPrincipals();
|
||||
nsresult Init(nsIPrincipal * prin);
|
||||
nsresult Init(char *prin);
|
||||
~nsJSPrincipals(void);
|
||||
|
||||
nsIPrincipal *nsIPrincipalPtr;
|
||||
|
||||
@@ -57,8 +57,8 @@ public:
|
||||
|
||||
PRUint32 HashValue(void) const {
|
||||
PRUint32 * code = 0;
|
||||
itsPrincipal->HashCode(code);
|
||||
return *code;
|
||||
//itsPrincipal->HashCode(code);
|
||||
return 0;
|
||||
}
|
||||
|
||||
PRBool Equals(const nsHashKey * aKey) const {
|
||||
|
||||
@@ -31,24 +31,35 @@
|
||||
|
||||
class nsScriptSecurityManager : public nsIScriptSecurityManager {
|
||||
public:
|
||||
nsScriptSecurityManager();
|
||||
virtual ~nsScriptSecurityManager();
|
||||
|
||||
NS_DEFINE_STATIC_CID_ACCESSOR(NS_SCRIPTSECURITYMANAGER_CID)
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSISCRIPTSECURITYMANAGER
|
||||
|
||||
static nsScriptSecurityManager *
|
||||
GetScriptSecurityManager();
|
||||
|
||||
nsScriptSecurityManager();
|
||||
virtual ~nsScriptSecurityManager();
|
||||
|
||||
NS_DEFINE_STATIC_CID_ACCESSOR(NS_SCRIPTSECURITYMANAGER_CID)
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSISCRIPTSECURITYMANAGER
|
||||
|
||||
static nsScriptSecurityManager *
|
||||
GetScriptSecurityManager();
|
||||
|
||||
private:
|
||||
char * GetCanonicalizedOrigin(JSContext *cx, const char* aUrlString);
|
||||
NS_IMETHOD GetOriginFromSourceURL(nsIURI * origin, char * * result);
|
||||
PRBool SameOrigins(JSContext *aCx, const char* aOrigin1, const char* aOrigin2);
|
||||
PRInt32 CheckForPrivilege(JSContext *cx, char *prop_name, int priv_code);
|
||||
char* FindOriginURL(JSContext *aCx, JSObject *aGlobal);
|
||||
char* AddSecPolicyPrefix(JSContext *cx, char *pref_str);
|
||||
char* GetSitePolicy(const char *org);
|
||||
NS_IMETHOD
|
||||
GetSubjectPrincipal(JSContext *aCx, nsIPrincipal **result);
|
||||
|
||||
NS_IMETHOD
|
||||
GetObjectPrincipal(JSContext *aCx, JSObject *aObj, nsIPrincipal **result);
|
||||
|
||||
NS_IMETHOD
|
||||
CheckPermissions(JSContext *aCx, JSObject *aObj, PRInt16 aTarget,
|
||||
PRBool* result);
|
||||
PRInt32
|
||||
GetSecurityLevel(JSContext *cx, char *prop_name, int priv_code);
|
||||
|
||||
char *
|
||||
AddSecPolicyPrefix(JSContext *cx, char *pref_str);
|
||||
|
||||
char *
|
||||
GetSitePolicy(const char *org);
|
||||
};
|
||||
|
||||
#endif /*_NS_SCRIPT_SECURITY_MANAGER_H_*/
|
||||
|
||||
Reference in New Issue
Block a user