diff --git a/mozilla/caps/include/nsTarget.h b/mozilla/caps/include/nsTarget.h index 2d469868c6c..37ec37dece3 100755 --- a/mozilla/caps/include/nsTarget.h +++ b/mozilla/caps/include/nsTarget.h @@ -37,9 +37,17 @@ PR_BEGIN_EXTERN_C PR_PUBLIC_API(void) java_netscape_security_getTargetDetails(const char *charSetName, char* targetName, char** details, char **risk); +/* XXXXXXXX Begin oF HACK */ + +#ifdef XXX +extern int CAPS_TARGET_RISK_COLOR_HIGH; +#endif + +extern char* capsGetString(int id); +/* XXXXXXXX end oF HACK */ + PR_END_EXTERN_C -extern int CAPS_TARGET_RISK_COLOR_HIGH; extern PRBool CreateSystemTargets(nsPrincipal *sysPrin); @@ -53,7 +61,8 @@ public: nsTarget(char *name, nsPrincipal *prin, PRInt32 risk = JavaSecUI_targetRiskHigh(), - char *riskColor = JavaSecUI_getString(CAPS_TARGET_RISK_COLOR_HIGH), + /* XXX: char *riskColor = JavaSecUI_getString(CAPS_TARGET_RISK_COLOR_HIGH), */ + char *riskColor = "High", char *description = NULL, char *detailDescription = NULL, char *url = NULL, @@ -65,7 +74,8 @@ public: nsTarget(char *name, nsPrincipal *prin, PRInt32 risk = JavaSecUI_targetRiskHigh(), - char *riskColor = JavaSecUI_getString(CAPS_TARGET_RISK_COLOR_HIGH), + /* XXX: char *riskColor = JavaSecUI_getString(CAPS_TARGET_RISK_COLOR_HIGH), */ + char *riskColor = "High", int desc_id = 0, int detail_desc_id = 0, int help_url_id = 0, diff --git a/mozilla/caps/src/jpermission.c b/mozilla/caps/src/jpermission.c index c6da6e90224..fde5eb96c27 100644 --- a/mozilla/caps/src/jpermission.c +++ b/mozilla/caps/src/jpermission.c @@ -65,9 +65,10 @@ java_netscape_security_getCert(char *prinStr) PR_PUBLIC_API(nsPermState) nsJSJavaDisplayDialog(char *prinStr, char *targetStr, char *riskStr, PRBool isCert, void*cert) { + nsPermState ret_val=nsPermState_NotSet; +#ifdef MOZ_SECURITY void * context = XP_FindSomeContext(); PRIntervalTime sleep = (PRIntervalTime)PR_INTERVAL_NO_TIMEOUT; - nsPermState ret_val=nsPermState_NotSet; PR_CEnterMonitor((void *)&gPermState); /* XXX: The following is a hack, we should passs gPrincipalCert to SECNAV_... code, @@ -82,5 +83,6 @@ nsJSJavaDisplayDialog(char *prinStr, char *targetStr, char *riskStr, PRBool isCe PR_CExitMonitor((void *)&gPermState); PR_Sleep(500000); +#endif /* MOZ_SECURITY */ return ret_val; } diff --git a/mozilla/caps/src/makefile.win b/mozilla/caps/src/makefile.win index f56ac0d1cbf..323af419d74 100755 --- a/mozilla/caps/src/makefile.win +++ b/mozilla/caps/src/makefile.win @@ -16,6 +16,8 @@ # Reserved. IGNORE_MANIFEST=1 + + #//------------------------------------------------------------------------ #// #// Makefile to build @@ -31,17 +33,16 @@ IGNORE_MANIFEST=1 #//------------------------------------------------------------------------ DEPTH= ..\.. -!ifndef MAKE_OBJ_TYPE -MAKE_OBJ_TYPE=DLL -!endif - #//------------------------------------------------------------------------ #// #// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...) #// #//------------------------------------------------------------------------ -LIBNAME=libcaps -PDBFILE=$(LIBNAME).pdb + +MAKE_OBJ_TYPE=DLL + +DLLNAME=caps +DLL=.\$(OBJDIR)\$(DLLNAME).dll #//------------------------------------------------------------------------ #// @@ -49,18 +50,22 @@ PDBFILE=$(LIBNAME).pdb #// #//------------------------------------------------------------------------ -OBJS= \ +C_OBJS= \ .\$(OBJDIR)\nsZip.obj \ + .\$(OBJDIR)\nsLoadZig.obj \ + .\$(OBJDIR)\jpermission.obj \ + $(NULL) + + +CPP_OBJS= \ .\$(OBJDIR)\nsUserDialogHelper.obj \ .\$(OBJDIR)\nsZig.obj \ - .\$(OBJDIR)\nsLoadZig.obj \ .\$(OBJDIR)\nsPrincipal.obj \ .\$(OBJDIR)\nsPrivilege.obj \ .\$(OBJDIR)\nsPrivilegeManager.obj \ .\$(OBJDIR)\nsPrivilegeTable.obj \ .\$(OBJDIR)\nsSystemPrivilegeTable.obj \ .\$(OBJDIR)\nsTarget.obj \ - .\$(OBJDIR)\jpermission.obj \ .\$(OBJDIR)\nsUserTarget.obj \ .\$(OBJDIR)\admin.obj \ .\$(OBJDIR)\nsCaps.obj \ @@ -79,7 +84,6 @@ OBJS= \ #// #//------------------------------------------------------------------------ -LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib #//------------------------------------------------------------------------ #// @@ -88,17 +92,11 @@ LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib #// #//------------------------------------------------------------------------ LINCS= $(LINCS) \ -# -# For Win16 the following include directories are copied into -# ns/dist/public/win16 -# -!if "$(MOZ_BITS)" == "32" -I$(PUBLIC)\js \ -I$(PUBLIC)\nspr \ -I$(PUBLIC)\xpcom \ -I$(PUBLIC)\security \ -I$(PUBLIC)\libimg \ -!endif -I$(PUBLIC)\jar \ -I$(PUBLIC)\zlib \ -I$(PUBLIC)\pref \ @@ -109,6 +107,15 @@ LINCS= $(LINCS) \ # -I$(PUBLIC)\rdf \ $(NULL) +LLIBS = \ + $(LIBNSPR) \ + $(DIST)\lib\libplc21.lib \ + $(DIST)\lib\xpcom32.lib \ + $(DIST)\lib\xplib.lib \ + $(ZIPLIB) \ + $(NULL) + + #//------------------------------------------------------------------------ #// #// Include the common makefile rules @@ -116,12 +123,7 @@ LINCS= $(LINCS) \ #//------------------------------------------------------------------------ include <$(DEPTH)/config/rules.mak> -libs::$(LIBRARY) - $(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib - -export:: - -install:: export libs - -clobber:: +install:: $(DLL) + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin + $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).lib $(DIST)\lib diff --git a/mozilla/caps/src/nsLoadZig.c b/mozilla/caps/src/nsLoadZig.c index a91c927e507..4679dcf07d6 100644 --- a/mozilla/caps/src/nsLoadZig.c +++ b/mozilla/caps/src/nsLoadZig.c @@ -20,6 +20,7 @@ #include "nsZip.h" #include "nsLoadZig.h" #include "prmem.h" +#include "plstr.h" #define MANIFEST_SUFFIX_STR ".mf" #define META_INF_STR "META-INF" @@ -33,6 +34,8 @@ PR_BEGIN_EXTERN_C #include /* for MAXPATHLEN */ #endif +#ifdef MOZ_SECURITY + static PRInt32 load_files(ns_zip_t* zip, ZIG* zig, char *fn_suffix, int (*callbackFnName) (int status, ZIG *zig, const char *metafile, @@ -94,14 +97,14 @@ load_files(ns_zip_t* zip, ZIG* zig, char *fn_suffix, HUGE_STRNCPY(fn, dataPtr, MAXPATHLEN); fn[MAXPATHLEN] ='\0'; #endif - if (XP_STRNCASECMP (fn, META_INF_STR, META_INF_STR_LEN)) { + if (PL_strncasecmp (fn, META_INF_STR, META_INF_STR_LEN)) { continue; } if ((fn[META_INF_STR_LEN] != '/') && (fn[META_INF_STR_LEN] != '\\')) { continue; } - if ((!XP_STRCASECMP(fn_suffix, MANIFEST_SUFFIX_STR)) && - (XP_STRNCASECMP(&fn[META_INF_STR_LEN+1], MANIFEST_MF_STR, MANIFEST_STR_LEN))) { + if ((!PL_strcasecmp(fn_suffix, MANIFEST_SUFFIX_STR)) && + (PL_strncasecmp(&fn[META_INF_STR_LEN+1], MANIFEST_MF_STR, MANIFEST_STR_LEN))) { continue; } if (!ns_zip_stat(zip, fn, &st)) { @@ -155,6 +158,7 @@ loadSignatures(ns_zip_t* zip, ZIG *zig, return noOfSigs; } +#endif /* MOZ_SECURITY */ PR_PUBLIC_API(void *) nsInitializeZig(ns_zip_t *zip, @@ -162,7 +166,8 @@ nsInitializeZig(ns_zip_t *zip, const char *metafile, char *pathname, char *errortext)) { - ZIG *zig; + ZIG *zig = NULL; +#ifdef MOZ_SECURITY zig = SOB_new(); if (zig == NULL) { @@ -184,6 +189,7 @@ nsInitializeZig(ns_zip_t *zip, SOB_destroy(zig); return NULL; } +#endif /* MOZ_SECURITY */ return (void *)zig; } diff --git a/mozilla/caps/src/nsPrincipal.cpp b/mozilla/caps/src/nsPrincipal.cpp index 937a3e34297..9c4128e3691 100755 --- a/mozilla/caps/src/nsPrincipal.cpp +++ b/mozilla/caps/src/nsPrincipal.cpp @@ -58,6 +58,7 @@ PR_PUBLIC_API(int) nsPrintZigError(int status, ZIG *zig, const char *metafile, char *pathname, char *errortext) { +#ifdef MOZ_SECURITY char* data; char* error_fmt = "# Error: %s (%d)\n#\tjar file: %s\n#\tpath: %s\n"; char* zig_name = NULL; @@ -89,6 +90,7 @@ nsPrintZigError(int status, ZIG *zig, const char *metafile, char *pathname, MWContext* someRandomContext = XP_FindSomeContext(); FE_Alert(someRandomContext, data); PR_DELETE(data); +#endif /* MOZ_SECURITY */ return 0; } @@ -96,6 +98,9 @@ nsPrintZigError(int status, ZIG *zig, const char *metafile, char *pathname, nsPrincipal * CreateSystemPrincipal(char* zip_file_name, char *pathname) { + nsPrincipal *sysPrin = NULL; + +#ifdef MOZ_SECURITY ZIG* zig; ZIG_Context * context; SOBITEM *item; @@ -103,7 +108,6 @@ CreateSystemPrincipal(char* zip_file_name, char *pathname) int size=0; int slot=0; ns_zip_t *zip; - nsPrincipal *sysPrin = NULL; if (!pathname) return NULL; @@ -144,6 +148,7 @@ CreateSystemPrincipal(char* zip_file_name, char *pathname) done: ns_zip_close(zip); +#endif /* MOZ_SECURITY */ return sysPrin; } @@ -155,6 +160,7 @@ PR_END_EXTERN_C static void destroyCertificates(nsVector* certArray) { +#ifdef MOZ_SECURITY if (certArray == NULL) return; @@ -166,6 +172,7 @@ static void destroyCertificates(nsVector* certArray) } } delete certArray; +#endif /* MOZ_SECURITY */ } @@ -598,6 +605,9 @@ char * nsPrincipal::savePrincipalPermanently(void) /* The following used to be LJ_GetCertificates */ nsPrincipalArray* nsPrincipal::getSigners(void* zigPtr, char* pathname) { + nsPrincipalArray *result = NULL; + +#ifdef MOZ_SECURITY SOBITEM *item; ZIG *zig = (ZIG *)zigPtr; struct nsPrincipal *principal; @@ -622,7 +632,7 @@ nsPrincipalArray* nsPrincipal::getSigners(void* zigPtr, char* pathname) SOB_find_end(context); /* Now allocate the array */ - nsPrincipalArray *result = new nsPrincipalArray(); + result = new nsPrincipalArray(); result->SetSize(size, 1); if (result == NULL) { return NULL; @@ -644,6 +654,7 @@ nsPrincipalArray* nsPrincipal::getSigners(void* zigPtr, char* pathname) } SOB_find_end(context); +#endif /* MOZ_SECURITY */ return result; } @@ -726,10 +737,13 @@ char * nsPrincipal::saveCert(void) return NULL; } +#ifdef MOZ_SECURITY result = SOB_stash_cert((ZIG *)itsZig, itsKeyLen, itsKey); if (result < 0) { return SOB_get_error(result); } +#endif /* MOZ_SECURITY */ + return NULL; } @@ -739,7 +753,7 @@ nsPrincipal::getCertAttribute(int attrib) { void *result; unsigned long length; - char *attrStr; + char *attrStr = "Untrusted certificate (unknown attributes)"; ZIG *zig = NULL; if (itsZig != NULL) { @@ -780,12 +794,11 @@ nsPrincipal::getCertAttribute(int attrib) attrStr = new char[strlen(attributeStr)+1]; XP_STRCPY(attrStr, attributeStr); PR_FREEIF(attributeStr); - return attrStr; - } else { - return "Untrusted certificate (unknown attributes)"; } + return attrStr; } +#ifdef MOZ_SECURITY if (SOB_cert_attribute(attrib, zig, itsKeyLen, itsKey, &result, &length) < 0) { @@ -797,6 +810,7 @@ nsPrincipal::getCertAttribute(int attrib) attrStr[length] = '\0'; /* Should be SOB_FREE(result); */ XP_FREE(result); +#endif /* MOZ_SECURITY */ return attrStr; } diff --git a/mozilla/caps/src/nsPrivilegeManager.cpp b/mozilla/caps/src/nsPrivilegeManager.cpp index 0c81605a5c3..10c24202677 100755 --- a/mozilla/caps/src/nsPrivilegeManager.cpp +++ b/mozilla/caps/src/nsPrivilegeManager.cpp @@ -23,6 +23,7 @@ #include "prlog.h" #include "prprf.h" #include "plbase64.h" +#include "plstr.h" #include "jpermission.h" #ifdef ENABLE_RDF @@ -70,11 +71,13 @@ PR_BEGIN_EXTERN_C PRBool CMGetBoolPref(char * pref_name) { +#ifdef MOZ_SECURITY XP_Bool pref; if (PREF_GetBoolPref(pref_name, &pref) >=0) { return pref; } +#endif /* MOZ_SECURITY */ return FALSE; } PR_END_EXTERN_C @@ -328,7 +331,6 @@ PRBool nsPrivilegeManager::enablePrincipalPrivilegeHelper(void *context, { nsPrincipalArray* callerPrinArray; nsPrincipal *useThisPrin = NULL; - char *err; /* Get the registered target */ nsTarget *targ = nsTarget::findTarget(target); @@ -819,7 +821,7 @@ const char * nsPrivilegeManager::getAllPrincipalsString(void) itsPrinNameToPrincipalTable->Enumerate(getPrincipalString); if (gListOfPrincipals) { /* Make a copy of the principals and return it */ - principalStrings = XP_AppendStr(principalStrings, gListOfPrincipals); + principalStrings = PL_strdup(gListOfPrincipals); PR_Free(gListOfPrincipals); } gListOfPrincipals = NULL; diff --git a/mozilla/caps/src/nsTarget.cpp b/mozilla/caps/src/nsTarget.cpp index a9e6ecae576..ac29985b447 100755 --- a/mozilla/caps/src/nsTarget.cpp +++ b/mozilla/caps/src/nsTarget.cpp @@ -25,209 +25,374 @@ #include "xpgetstr.h" #include "plhash.h" -extern int CAPS_TARGET_RISK_COLOR_HIGH; -extern int CAPS_TARGET_RISK_COLOR_LOW; -extern int CAPS_TARGET_RISK_COLOR_MEDIUM; -extern int CAPS_TARGET_DESC_THREAD_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_THREAD_ACCESS; -extern int CAPS_TARGET_URL_THREAD_ACCESS; -extern int CAPS_TARGET_DESC_THREAD_GROUP_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_THREAD_GROUP_ACCESS; -extern int CAPS_TARGET_URL_THREAD_GROUP_ACCESS; -extern int CAPS_TARGET_DESC_EXEC_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_EXEC_ACCESS; -extern int CAPS_TARGET_URL_EXEC_ACCESS; -extern int CAPS_TARGET_DESC_EXIT_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_EXIT_ACCESS; -extern int CAPS_TARGET_URL_EXIT_ACCESS; -extern int CAPS_TARGET_DESC_LINK_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_LINK_ACCESS; -extern int CAPS_TARGET_URL_LINK_ACCESS; -extern int CAPS_TARGET_DESC_PROPERTY_WRITE; -extern int CAPS_TARGET_DETAIL_DESC_PROPERTY_WRITE; -extern int CAPS_TARGET_URL_PROPERTY_WRITE; -extern int CAPS_TARGET_DESC_PROPERTY_READ; -extern int CAPS_TARGET_DETAIL_DESC_PROPERTY_READ; -extern int CAPS_TARGET_URL_PROPERTY_READ; -extern int CAPS_TARGET_DESC_FILE_READ; -extern int CAPS_TARGET_DETAIL_DESC_FILE_READ; -extern int CAPS_TARGET_URL_FILE_READ; -extern int CAPS_TARGET_DESC_FILE_WRITE; -extern int CAPS_TARGET_DETAIL_DESC_FILE_WRITE; -extern int CAPS_TARGET_URL_FILE_WRITE; -extern int CAPS_TARGET_DESC_FILE_DELETE; -extern int CAPS_TARGET_DETAIL_DESC_FILE_DELETE; -extern int CAPS_TARGET_URL_FILE_DELETE; -extern int CAPS_TARGET_DESC_FD_READ; -extern int CAPS_TARGET_DETAIL_DESC_FD_READ; -extern int CAPS_TARGET_URL_FD_READ; -extern int CAPS_TARGET_DESC_FD_WRITE; -extern int CAPS_TARGET_DETAIL_DESC_FD_WRITE; -extern int CAPS_TARGET_URL_FD_WRITE; -extern int CAPS_TARGET_DESC_LISTEN; -extern int CAPS_TARGET_DETAIL_DESC_LISTEN; -extern int CAPS_TARGET_URL_LISTEN; -extern int CAPS_TARGET_DESC_ACCEPT; -extern int CAPS_TARGET_DETAIL_DESC_ACCEPT; -extern int CAPS_TARGET_URL_ACCEPT; -extern int CAPS_TARGET_DESC_MULTICAST; -extern int CAPS_TARGET_DETAIL_DESC_MULTICAST; -extern int CAPS_TARGET_URL_MULTICAST; -extern int CAPS_TARGET_DESC_TOP_LEVEL_WINDOW; -extern int CAPS_TARGET_DETAIL_DESC_TOP_LEVEL_WINDOW; -extern int CAPS_TARGET_URL_TOP_LEVEL_WINDOW; -extern int CAPS_TARGET_DESC_DIALOG_MODALITY; -extern int CAPS_TARGET_DETAIL_DESC_DIALOG_MODALITY; -extern int CAPS_TARGET_URL_DIALOG_MODALITY; -extern int CAPS_TARGET_DESC_PACKAGE_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_PACKAGE_ACCESS; -extern int CAPS_TARGET_URL_PACKAGE_ACCESS; -extern int CAPS_TARGET_DESC_PACKAGE_DEFINITION; -extern int CAPS_TARGET_DETAIL_DESC_PACKAGE_DEFINITION; -extern int CAPS_TARGET_URL_PACKAGE_DEFINITION; -extern int CAPS_TARGET_DESC_SET_FACTORY; -extern int CAPS_TARGET_DETAIL_DESC_SET_FACTORY; -extern int CAPS_TARGET_URL_SET_FACTORY; -extern int CAPS_TARGET_DESC_MEMBER_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_MEMBER_ACCESS; -extern int CAPS_TARGET_URL_MEMBER_ACCESS; -extern int CAPS_TARGET_DESC_PRINT_JOB_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_PRINT_JOB_ACCESS; -extern int CAPS_TARGET_URL_PRINT_JOB_ACCESS; -extern int CAPS_TARGET_DESC_SYSTEM_CLIPBOARD_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_SYSTEM_CLIPBOARD_ACCESS; -extern int CAPS_TARGET_URL_SYSTEM_CLIPBOARD_ACCESS; -extern int CAPS_TARGET_DESC_AWT_EVENT_QUEUE_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_AWT_EVENT_QUEUE_ACCESS; -extern int CAPS_TARGET_URL_AWT_EVENT_QUEUE_ACCESS; -extern int CAPS_TARGET_DESC_SECURITY_PROVIDER; -extern int CAPS_TARGET_DETAIL_DESC_SECURITY_PROVIDER; -extern int CAPS_TARGET_URL_SECURITY_PROVIDER; -extern int CAPS_TARGET_DESC_CREATE_SECURITY_MANAGER; -extern int CAPS_TARGET_DETAIL_DESC_CREATE_SECURITY_MANAGER; -extern int CAPS_TARGET_URL_CREATE_SECURITY_MANAGER; -extern int CAPS_TARGET_DESC_IMPERSONATOR; -extern int CAPS_TARGET_DETAIL_DESC_IMPERSONATOR; -extern int CAPS_TARGET_URL_IMPERSONATOR; -extern int CAPS_TARGET_DESC_BROWSER_READ; -extern int CAPS_TARGET_DETAIL_DESC_BROWSER_READ; -extern int CAPS_TARGET_URL_BROWSER_READ; -extern int CAPS_TARGET_DESC_BROWSER_WRITE; -extern int CAPS_TARGET_DETAIL_DESC_BROWSER_WRITE; -extern int CAPS_TARGET_URL_BROWSER_WRITE; -extern int CAPS_TARGET_DESC_PREFS_READ; -extern int CAPS_TARGET_DETAIL_DESC_PREFS_READ; -extern int CAPS_TARGET_URL_PREFS_READ; -extern int CAPS_TARGET_DESC_PREFS_WRITE; -extern int CAPS_TARGET_DETAIL_DESC_PREFS_WRITE; -extern int CAPS_TARGET_URL_PREFS_WRITE; -extern int CAPS_TARGET_DESC_SEND_MAIL; -extern int CAPS_TARGET_DETAIL_DESC_SEND_MAIL; -extern int CAPS_TARGET_URL_SEND_MAIL; -extern int CAPS_TARGET_DESC_REG_PRIVATE; -extern int CAPS_TARGET_DETAIL_DESC_REG_PRIVATE; -extern int CAPS_TARGET_URL_REG_PRIVATE; -extern int CAPS_TARGET_DESC_REG_STANDARD; -extern int CAPS_TARGET_DETAIL_DESC_REG_STANDARD; -extern int CAPS_TARGET_URL_REG_STANDARD; -extern int CAPS_TARGET_DESC_REG_ADMIN; -extern int CAPS_TARGET_DETAIL_DESC_REG_ADMIN; -extern int CAPS_TARGET_URL_REG_ADMIN; -extern int CAPS_TARGET_DESC_UNINSTALL; -extern int CAPS_TARGET_DETAIL_DESC_UNINSTALL; -extern int CAPS_TARGET_URL_UNINSTALL; -extern int CAPS_TARGET_DESC_SOFTWAREINSTALL; -extern int CAPS_TARGET_DETAIL_DESC_SOFTWAREINSTALL; -extern int CAPS_TARGET_URL_SOFTWAREINSTALL; -extern int CAPS_TARGET_DESC_SILENTINSTALL; -extern int CAPS_TARGET_DETAIL_DESC_SILENTINSTALL; -extern int CAPS_TARGET_URL_SILENTINSTALL; -extern int CAPS_TARGET_DESC_CONNECT; -extern int CAPS_TARGET_DETAIL_DESC_CONNECT; -extern int CAPS_TARGET_URL_CONNECT; -extern int CAPS_TARGET_DESC_CLIENT_AUTH; -extern int CAPS_TARGET_DETAIL_DESC_CLIENT_AUTH; -extern int CAPS_TARGET_URL_CLIENT_AUTH; -extern int CAPS_TARGET_DESC_REDIRECT; -extern int CAPS_TARGET_DETAIL_DESC_REDIRECT; -extern int CAPS_TARGET_URL_REDIRECT; -extern int CAPS_TARGET_DESC_CONNECT_WITH_REDIRECT; -extern int CAPS_TARGET_DETAIL_DESC_CONNECT_WITH_REDIRECT; -extern int CAPS_TARGET_URL_CONNECT_WITH_REDIRECT; -extern int CAPS_TARGET_DESC_CODEBASE_ENV; -extern int CAPS_TARGET_DETAIL_DESC_CODEBASE_ENV; -extern int CAPS_TARGET_URL_CODEBASE_ENV; -extern int CAPS_TARGET_DESC_SUPER_USER; -extern int CAPS_TARGET_DETAIL_DESC_SUPER_USER; -extern int CAPS_TARGET_URL_SUPER_USER; -extern int CAPS_TARGET_DESC_SAR; -extern int CAPS_TARGET_DETAIL_DESC_SAR; -extern int CAPS_TARGET_URL_SAR; -extern int CAPS_TARGET_DESC_30_CAPABILITIES; -extern int CAPS_TARGET_DETAIL_DESC_30_CAPABILITIES; -extern int CAPS_TARGET_URL_30_CAPABILITIES; -extern int CAPS_TARGET_DESC_MARIMBA; -extern int CAPS_TARGET_DETAIL_DESC_MARIMBA; -extern int CAPS_TARGET_URL_MARIMBA; -extern int CAPS_TARGET_DESC_MARIMBA; -extern int CAPS_TARGET_DETAIL_DESC_MARIMBA; -extern int CAPS_TARGET_URL_MARIMBA; -extern int CAPS_TARGET_DESC_IIOP; -extern int CAPS_TARGET_DETAIL_DESC_IIOP; -extern int CAPS_TARGET_URL_IIOP; -extern int CAPS_TARGET_DESC_DEBUGGER; -extern int CAPS_TARGET_DETAIL_DESC_DEBUGGER; -extern int CAPS_TARGET_URL_DEBUGGER; -extern int CAPS_TARGET_DESC_CANVAS_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_CANVAS_ACCESS; -extern int CAPS_TARGET_URL_CANVAS_ACCESS; -extern int CAPS_TARGET_DESC_FILE_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_FILE_ACCESS; -extern int CAPS_TARGET_URL_FILE_ACCESS; -extern int CAPS_TARGET_DESC_BROWSER_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_BROWSER_ACCESS; -extern int CAPS_TARGET_URL_BROWSER_ACCESS; -extern int CAPS_TARGET_DESC_LIMITED_FILE_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_LIMITED_FILE_ACCESS; -extern int CAPS_TARGET_URL_LIMITED_FILE_ACCESS; -extern int CAPS_TARGET_DESC_GAMES_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_GAMES_ACCESS; -extern int CAPS_TARGET_URL_GAMES_ACCESS; -extern int CAPS_TARGET_DESC_WORD_PROCESSOR_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_WORD_PROCESSOR_ACCESS; -extern int CAPS_TARGET_URL_WORD_PROCESSOR_ACCESS; -extern int CAPS_TARGET_DESC_SPREADSHEET_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_SPREADSHEET_ACCESS; -extern int CAPS_TARGET_URL_SPREADSHEET_ACCESS; -extern int CAPS_TARGET_DESC_PRESENTATION_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_PRESENTATION_ACCESS; -extern int CAPS_TARGET_URL_PRESENTATION_ACCESS; -extern int CAPS_TARGET_DESC_DATABASE_ACCESS; -extern int CAPS_TARGET_DETAIL_DESC_DATABASE_ACCESS; -extern int CAPS_TARGET_URL_DATABASE_ACCESS; -extern int CAPS_TARGET_DESC_TERMINAL_EMULATOR; -extern int CAPS_TARGET_DETAIL_DESC_TERMINAL_EMULATOR; -extern int CAPS_TARGET_URL_TERMINAL_EMULATOR; -extern int CAPS_TARGET_DESC_JAR_PACKAGER; -extern int CAPS_TARGET_DETAIL_DESC_JAR_PACKAGER; -extern int CAPS_TARGET_URL_JAR_PACKAGER; -extern int CAPS_TARGET_DESC_ACCOUNT_SETUP; -extern int CAPS_TARGET_DETAIL_DESC_ACCOUNT_SETUP; -extern int CAPS_TARGET_URL_ACCOUNT_SETUP; -extern int CAPS_TARGET_DESC_CONSTELLATION; -extern int CAPS_TARGET_DETAIL_DESC_CONSTELLATION; -extern int CAPS_TARGET_URL_CONSTELLATION; +/* XXXXXXXX Begin oF HACK */ -extern int CAPS_TARGET_DESC_ALL_JAVA_PERMISSION; -extern int CAPS_TARGET_DETAIL_DESC_ALL_JAVA_PERMISSION; -extern int CAPS_TARGET_URL_ALL_JAVA_PERMISSION; +/* XXX: This array must be kept in sync with the allxpstr.h. + * The following is hack until we have a design on removal of allxpstr.h + */ +char *capsTargetStrings[] = { + "low", -extern int CAPS_TARGET_DESC_ALL_JS_PERMISSION; -extern int CAPS_TARGET_DETAIL_DESC_ALL_JS_PERMISSION; -extern int CAPS_TARGET_URL_ALL_JS_PERMISSION; + "medium", -extern int CAPS_TARGET_RISK_COLOR_HIGH; -extern int CAPS_TARGET_RISK_COLOR_HIGH; + "high", + + "#aaffaa", + + "#ffffaa", + + "#ffaaaa", + + "http://home.netscape.com/eng/mozilla/4.0/handbook/", + + "Reading files stored in your computer", + + "Reading any files stored on hard disks or other storage media connected to your computer.", + + "#FileRead", + + "Modifying files stored in your computer", + + "Modifying any files stored on hard disks or other storage media connected to you computer.", + + "#FileWrite", + + "Deleting files stored in your computer", + + "Deletion of any files stored on hard disks or other storage media connected to your computer.", + + "#FileDelete" + + "Access to impersonate as another application", + + "Access to impersonate as another application", + + "#Impersonator", + + "Access to browser data", + + "Access to browser data that may be considered private, such as a list of web sites visited or the contents of web page forms you may have filled in.", + + "#BrowserRead", + + "Modifying the browser", + + "Modifying the browser in a potentially dangerous way, such as creating windows that may look like they belong to another program or positioning windows anywhere on the screen.", + + "#BrowserWrite", + + "Reading or modifying browser data", + + "Reading or modifying browser data that may be considered private, such as a list of web sites visited or the contents of web forms you may have filled in. Modifications may also include creating windows that look like they belong to another program or positioning windowsanywhere on the screen.", + + "#BrowserAccess", + + "Reading preferences settings", + + "Access to read the current settings of your preferences.", + + "#PrefsRead", + + "Modifying preferences settings", + + "Modifying the current settings of your preferences.", + + "#PrefsWrite", + + "Sending email messages on your behalf", + + "Sending email messages on your behalf", + + "#SendMail", + + "Access to the vendor's portion of your computer's registry of installed software", + + "Most computers store information about installed software, such as version numbers, in a registry file. When you install new software, the installation program sometimes needs to read or change entries in the portion of the" + "registry that describes the software vendor's products. You should grant " +"this form of access only if you are installing new software from a reliable " +"vendor. The entity that signs the software can access only that entity's " +"portion of the registry.", + + "#RegPrivate", + + "Access to shared information in the computer's registry of installed software", + +"Most computers store information about installed software, such as version " +"numbers, in a registry file. This file also includes information shared by " +"all programs installed on your computer, including information about the user " +"or the system. Programs that have access to shared registry information can " +"obtain information about other programs that have the same access. This allows " +"programs that work closely together to get information about each other. " +"You should grant this form of access only if you know that the program " +"requesting it is designed to work with other programs on your hard disk.", + + + "#RegStandard", + + "Access to any part of your computer's registry of installed software", + + "Most computers store information about installed software, such as version " +"numbers, in a registry file. System administrators sometimes need to change " +"entries in the registry for software from a variety of vendors. You should " +"grant this form of access only if you are running software provided by your " +"system administrator.", + + + "#RegAdmin", + + "Access required to setup and configure your browser", + + "Access to, and modification of, browser data, preferences, files, networking " +"and modem configuration. This access is commonly granted to the main setup " +"program for your browser.", + + "#AccountSetup", + + "Access to the site archive file", + + "Access required to add, modify, or delete site archive files and make " +"arbitrary network connections in the process. This form of access is required " +"only by netcasting applications such as Netscape Netcaster, which request it " +"in combination with several other kinds of access. Applications should not " +"normally request this access by itself, and you should not normally grant it.", + + + "#SiteArchive", + + "Displaying text or graphics anywhere on the screen", + + "Displaying HTML text or graphics on any part of the screen, without window " +"borders, toolbars, or menus. Typically granted to invoke canvas mode, screen " +"savers, and so on.", + + "#CanvasAccess", + + "Reading, modification, or deletion of any of your files", + + "This form of access is typically required by a program such as a word " +"processor or a debugger that needs to create, read, modify, or delete files " +"on hard disks or other storage media connected to your computer.", + + "#FileAccess", + + "Uninstall software", + + "Access required for automatic removal of previously installed software.", + + "#Uninstall", + + "Installing and running software on your computer", + + "Installing software on your computer's hard disk. An installation " +"program can also execute or delete any software on your computer. " +"You should not grant this form of access unless you are installing or " +"updating software from a reliable source.", + + "#SoftwareInstall", + + "Installing and running software without warning you", + + "Installing software on your computer's main hard disk without giving you any " +"warning, potentially deleting other files on the hard disk. Any software on the " +"hard disk may be executed in the process. This is an extremely dangerous form " +"of access. It should be granted by system administrators only.", + + "#SilentInstall", + + "Complete access to your computer for java programs", + + "Complete access required by java programs to your computer, such as Java " +"Virtual machine reading, writing, deleting information from your disk, " +"and to send receive and send information to any computer on the Internet.", + + "#AllJavaPermission", + + "Access to all Privileged JavaScript operations", + + "Access to all Privileged JavaScript operations.", + + "#AllJavaScriptPermission", + +}; + +typedef enum CAPS_TARGET { + CAPS_TARGET_RISK_STR_LOW, + CAPS_TARGET_RISK_STR_MEDIUM, + CAPS_TARGET_RISK_STR_HIGH, + CAPS_TARGET_RISK_COLOR_LOW, + CAPS_TARGET_RISK_COLOR_MEDIUM, + CAPS_TARGET_RISK_COLOR_HIGH, + CAPS_TARGET_HELP_URL, + CAPS_TARGET_DESC_FILE_READ, + CAPS_TARGET_DETAIL_DESC_FILE_READ, + CAPS_TARGET_URL_FILE_READ, + CAPS_TARGET_DESC_FILE_WRITE, + CAPS_TARGET_DETAIL_DESC_FILE_WRITE, + CAPS_TARGET_URL_FILE_WRITE, + CAPS_TARGET_DESC_FILE_DELETE, + CAPS_TARGET_DETAIL_DESC_FILE_DELETE, + CAPS_TARGET_URL_FILE_DELETE, + CAPS_TARGET_DESC_IMPERSONATOR, + CAPS_TARGET_DETAIL_DESC_IMPERSONATOR, + CAPS_TARGET_URL_IMPERSONATOR, + CAPS_TARGET_DESC_BROWSER_READ, + CAPS_TARGET_DETAIL_DESC_BROWSER_READ, + CAPS_TARGET_URL_BROWSER_READ, + CAPS_TARGET_DESC_BROWSER_WRITE, + CAPS_TARGET_DETAIL_DESC_BROWSER_WRITE, + CAPS_TARGET_URL_BROWSER_WRITE, + CAPS_TARGET_DESC_BROWSER_ACCESS, + CAPS_TARGET_DETAIL_DESC_BROWSER_ACCESS, + CAPS_TARGET_URL_BROWSER_ACCESS, + CAPS_TARGET_DESC_PREFS_READ, + CAPS_TARGET_DETAIL_DESC_PREFS_READ, + CAPS_TARGET_URL_PREFS_READ, + CAPS_TARGET_DESC_PREFS_WRITE, + CAPS_TARGET_DETAIL_DESC_PREFS_WRITE, + CAPS_TARGET_URL_PREFS_WRITE, + CAPS_TARGET_DESC_SEND_MAIL, + CAPS_TARGET_DETAIL_DESC_SEND_MAIL, + CAPS_TARGET_URL_SEND_MAIL, + CAPS_TARGET_DESC_REG_PRIVATE, + CAPS_TARGET_DETAIL_DESC_REG_PRIVATE, + CAPS_TARGET_DETAIL_DESC_REG_PRIVATE_1, + CAPS_TARGET_URL_REG_PRIVATE, + CAPS_TARGET_DESC_REG_STANDARD, + CAPS_TARGET_DETAIL_DESC_REG_STANDARD, + CAPS_TARGET_DETAIL_DESC_REG_STANDARD_1, + CAPS_TARGET_DETAIL_DESC_REG_STANDARD_2, + CAPS_TARGET_URL_REG_STANDARD, + CAPS_TARGET_DESC_REG_ADMIN, + CAPS_TARGET_DETAIL_DESC_REG_ADMIN, + CAPS_TARGET_DETAIL_DESC_REG_ADMIN_1, + CAPS_TARGET_URL_REG_ADMIN, + CAPS_TARGET_DESC_ACCOUNT_SETUP, + CAPS_TARGET_DETAIL_DESC_ACCOUNT_SETUP, + CAPS_TARGET_URL_ACCOUNT_SETUP, + CAPS_TARGET_DESC_SAR, + CAPS_TARGET_DETAIL_DESC_SAR, + CAPS_TARGET_DETAIL_DESC_SAR_1, + CAPS_TARGET_URL_SAR, + CAPS_TARGET_DESC_CANVAS_ACCESS, + CAPS_TARGET_DETAIL_DESC_CANVAS_ACCESS, + CAPS_TARGET_URL_CANVAS_ACCESS, + CAPS_TARGET_DESC_FILE_ACCESS, + CAPS_TARGET_DETAIL_DESC_FILE_ACCESS, + CAPS_TARGET_URL_FILE_ACCESS, + CAPS_TARGET_DESC_UNINSTALL, + CAPS_TARGET_DETAIL_DESC_UNINSTALL, + CAPS_TARGET_URL_UNINSTALL, + CAPS_TARGET_DESC_SOFTWAREINSTALL, + CAPS_TARGET_DETAIL_DESC_SOFTWAREINSTALL, + CAPS_TARGET_URL_SOFTWAREINSTALL, + CAPS_TARGET_DESC_SILENTINSTALL, + CAPS_TARGET_DETAIL_DESC_SILENTINSTALL, + CAPS_TARGET_URL_SILENTINSTALL, + CAPS_TARGET_DESC_ALL_JAVA_PERMISSION, + CAPS_TARGET_DETAIL_DESC_ALL_JAVA_PERMISSION, + CAPS_TARGET_URL_ALL_JAVA_PERMISSION, + CAPS_TARGET_DESC_ALL_JS_PERMISSION, + CAPS_TARGET_DETAIL_DESC_ALL_JS_PERMISSION, + CAPS_TARGET_URL_ALL_JS_PERMISSION, + CAPS_TARGET_MAXIMUM +} CAPS_TARGET; + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +char* capsGetString(int id) +{ + PR_ASSERT(id <= CAPS_TARGET_MAXIMUM); + return capsTargetStrings[id]; +} + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* __cplusplus */ + +#ifdef XXX +extern int CAPS_TARGET_RISK_STR_LOW; +extern int CAPS_TARGET_RISK_STR_MEDIUM; +extern int CAPS_TARGET_RISK_STR_HIGH; +extern int CAPS_TARGET_RISK_COLOR_LOW; +extern int CAPS_TARGET_RISK_COLOR_MEDIUM; +extern int CAPS_TARGET_RISK_COLOR_HIGH; +extern int CAPS_TARGET_HELP_URL; +extern int CAPS_TARGET_DESC_FILE_READ; +extern int CAPS_TARGET_DETAIL_DESC_FILE_READ; +extern int CAPS_TARGET_URL_FILE_READ; +extern int CAPS_TARGET_DESC_FILE_WRITE; +extern int CAPS_TARGET_DETAIL_DESC_FILE_WRITE; +extern int CAPS_TARGET_URL_FILE_WRITE; +extern int CAPS_TARGET_DESC_FILE_DELETE; +extern int CAPS_TARGET_DETAIL_DESC_FILE_DELETE; +extern int CAPS_TARGET_URL_FILE_DELETE; +extern int CAPS_TARGET_DESC_IMPERSONATOR; +extern int CAPS_TARGET_DETAIL_DESC_IMPERSONATOR; +extern int CAPS_TARGET_URL_IMPERSONATOR; +extern int CAPS_TARGET_DESC_BROWSER_READ; +extern int CAPS_TARGET_DETAIL_DESC_BROWSER_READ; +extern int CAPS_TARGET_URL_BROWSER_READ; +extern int CAPS_TARGET_DESC_BROWSER_WRITE; +extern int CAPS_TARGET_DETAIL_DESC_BROWSER_WRITE; +extern int CAPS_TARGET_URL_BROWSER_WRITE; +extern int CAPS_TARGET_DESC_BROWSER_ACCESS; +extern int CAPS_TARGET_DETAIL_DESC_BROWSER_ACCESS; +extern int CAPS_TARGET_URL_BROWSER_ACCESS; +extern int CAPS_TARGET_DESC_PREFS_READ; +extern int CAPS_TARGET_DETAIL_DESC_PREFS_READ; +extern int CAPS_TARGET_URL_PREFS_READ; +extern int CAPS_TARGET_DESC_PREFS_WRITE; +extern int CAPS_TARGET_DETAIL_DESC_PREFS_WRITE; +extern int CAPS_TARGET_URL_PREFS_WRITE; +extern int CAPS_TARGET_DESC_SEND_MAIL; +extern int CAPS_TARGET_DETAIL_DESC_SEND_MAIL; +extern int CAPS_TARGET_URL_SEND_MAIL; +extern int CAPS_TARGET_DESC_REG_PRIVATE; +extern int CAPS_TARGET_DETAIL_DESC_REG_PRIVATE; +extern int CAPS_TARGET_DETAIL_DESC_REG_PRIVATE_1; +extern int CAPS_TARGET_URL_REG_PRIVATE; +extern int CAPS_TARGET_DESC_REG_STANDARD; +extern int CAPS_TARGET_DETAIL_DESC_REG_STANDARD; +extern int CAPS_TARGET_DETAIL_DESC_REG_STANDARD_1; +extern int CAPS_TARGET_DETAIL_DESC_REG_STANDARD_2; +extern int CAPS_TARGET_URL_REG_STANDARD; +extern int CAPS_TARGET_DESC_REG_ADMIN; +extern int CAPS_TARGET_DETAIL_DESC_REG_ADMIN; +extern int CAPS_TARGET_DETAIL_DESC_REG_ADMIN_1; +extern int CAPS_TARGET_URL_REG_ADMIN; +extern int CAPS_TARGET_DESC_ACCOUNT_SETUP; +extern int CAPS_TARGET_DETAIL_DESC_ACCOUNT_SETUP; +extern int CAPS_TARGET_URL_ACCOUNT_SETUP; +extern int CAPS_TARGET_DESC_SAR; +extern int CAPS_TARGET_DETAIL_DESC_SAR; +extern int CAPS_TARGET_DETAIL_DESC_SAR_1; +extern int CAPS_TARGET_URL_SAR; +extern int CAPS_TARGET_DESC_CANVAS_ACCESS; +extern int CAPS_TARGET_DETAIL_DESC_CANVAS_ACCESS; +extern int CAPS_TARGET_URL_CANVAS_ACCESS; +extern int CAPS_TARGET_DESC_FILE_ACCESS; +extern int CAPS_TARGET_DETAIL_DESC_FILE_ACCESS; +extern int CAPS_TARGET_URL_FILE_ACCESS; +extern int CAPS_TARGET_DESC_UNINSTALL; +extern int CAPS_TARGET_DETAIL_DESC_UNINSTALL; +extern int CAPS_TARGET_URL_UNINSTALL; +extern int CAPS_TARGET_DESC_SOFTWAREINSTALL; +extern int CAPS_TARGET_DETAIL_DESC_SOFTWAREINSTALL; +extern int CAPS_TARGET_URL_SOFTWAREINSTALL; +extern int CAPS_TARGET_DESC_SILENTINSTALL; +extern int CAPS_TARGET_DETAIL_DESC_SILENTINSTALL; +extern int CAPS_TARGET_URL_SILENTINSTALL; +extern int CAPS_TARGET_DESC_ALL_JAVA_PERMISSION; +extern int CAPS_TARGET_DETAIL_DESC_ALL_JAVA_PERMISSION; +extern int CAPS_TARGET_URL_ALL_JAVA_PERMISSION; +extern int CAPS_TARGET_DESC_ALL_JS_PERMISSION; +extern int CAPS_TARGET_DETAIL_DESC_ALL_JS_PERMISSION; +extern int CAPS_TARGET_URL_ALL_JS_PERMISSION; +#endif /* XXX */ + +/* XXXXXXXX END oF HACK */ #define TARGET_STR " Target: " #define PRIN_STR " Principal: " @@ -296,33 +461,9 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) nsUserTarget *userTarg; nsTarget *target; PRUint32 i=0; - nsUserTarget *ThreadAccessTarg; - nsUserTarget *ThreadGroupAccessTarg; - nsUserTarget *ExecAccessTarg; - nsUserTarget *ExitAccessTarg; - nsUserTarget *LinkAccessTarg; - nsUserTarget *PropertyWriteTarg; - nsUserTarget *PropertyReadTarg; nsUserTarget *FileReadTarg; nsUserTarget *FileWriteTarg; nsUserTarget *FileDeleteTarg; - nsUserTarget *ListenTarg; - nsUserTarget *AcceptTarg; - nsUserTarget *ConnectTarg; - nsTarget *RedirectTarg; - nsUserTarget *ConnectWithRedirectTarg; - nsUserTarget *MulticastTarg; - nsUserTarget *TopLevelWindowTarg; - nsUserTarget *DialogModalityTarg; - nsTarget *PackageAccessTarg; - nsTarget *PackageDefinitionTarg; - nsUserTarget *SetFactoryTarg; - nsTarget *MemberAccessTarg; - nsUserTarget *PrintJobAccessTarg; - nsUserTarget *SystemClipboardAccessTarg; - nsUserTarget *AwtEventQueueAccessTarg; - nsTarget *SecurityProviderTarg; - nsTarget *CreateSecurityManagerTarg; nsUserTarget *BrowserReadTarg; nsUserTarget *BrowserWriteTarg; nsUserTarget *UniversalPreferencesReadTarg; @@ -335,17 +476,11 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) nsUserTarget *SoftwareInstallTarg; nsUserTarget *UninstallTarg; - nsUserTarget *LimitedFileAccessTarg; nsUserTarget *UniversalFileAccessTarg; nsUserTarget *UniversalBrowserAccessTarg; nsTarget *ImpersonatorTarg; - nsUserTarget *FdReadTarg; - nsUserTarget *FdWriteTarg; - nsTarget *CodebaseEnvTarg; - nsUserTarget *ClientAuthTarg; - int targetRiskHigh = JavaSecUI_targetRiskHigh(); int targetRiskLow = JavaSecUI_targetRiskLow(); int targetRiskMedium = JavaSecUI_targetRiskMedium(); @@ -358,63 +493,6 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) // nsTargetArray *targetPtrArray; - ThreadAccessTarg = new nsUserTarget("UniversalThreadAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_THREAD_ACCESS, - CAPS_TARGET_DETAIL_DESC_THREAD_ACCESS, - CAPS_TARGET_URL_THREAD_ACCESS); - ThreadAccessTarg->registerTarget(); - - ThreadGroupAccessTarg = new nsUserTarget("UniversalThreadGroupAccess", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_THREAD_GROUP_ACCESS, - CAPS_TARGET_DETAIL_DESC_THREAD_GROUP_ACCESS, - CAPS_TARGET_URL_THREAD_GROUP_ACCESS); - ThreadGroupAccessTarg->registerTarget(); - - ExecAccessTarg = new nsUserTarget("UniversalExecAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_EXEC_ACCESS, - CAPS_TARGET_DETAIL_DESC_EXEC_ACCESS, - CAPS_TARGET_URL_EXEC_ACCESS); - ExecAccessTarg->registerTarget(); - - ExitAccessTarg = new nsUserTarget("UniversalExitAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_EXIT_ACCESS, - CAPS_TARGET_DETAIL_DESC_EXIT_ACCESS, - CAPS_TARGET_URL_EXIT_ACCESS); - ExitAccessTarg->registerTarget(); - - LinkAccessTarg = new nsUserTarget("UniversalLinkAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_LINK_ACCESS, - CAPS_TARGET_DETAIL_DESC_LINK_ACCESS, - CAPS_TARGET_URL_LINK_ACCESS); - LinkAccessTarg->registerTarget(); - - PropertyWriteTarg = new nsUserTarget("UniversalPropertyWrite", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_PROPERTY_WRITE, - CAPS_TARGET_DETAIL_DESC_PROPERTY_WRITE, - CAPS_TARGET_URL_PROPERTY_WRITE); - PropertyWriteTarg->registerTarget(); - - PropertyReadTarg = new nsUserTarget("UniversalPropertyRead", sysPrin, - targetRiskLow, - targetRiskColorLow, - CAPS_TARGET_DESC_PROPERTY_READ, - CAPS_TARGET_DETAIL_DESC_PROPERTY_READ, - CAPS_TARGET_URL_PROPERTY_READ); - PropertyReadTarg->registerTarget(); - FileReadTarg = new nsUserTarget("UniversalFileRead", sysPrin, targetRiskHigh, targetRiskColorHigh, @@ -439,142 +517,6 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) CAPS_TARGET_URL_FILE_DELETE); FileDeleteTarg->registerTarget(); - FdReadTarg = new nsUserTarget("UniversalFdRead", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_FD_READ, - CAPS_TARGET_DETAIL_DESC_FD_READ, - CAPS_TARGET_URL_FD_READ); - FdReadTarg->registerTarget(); - - FdWriteTarg = new nsUserTarget("UniversalFdWrite", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_FD_WRITE, - CAPS_TARGET_DETAIL_DESC_FD_WRITE, - CAPS_TARGET_URL_FD_WRITE); - FdWriteTarg->registerTarget(); - - ListenTarg = new nsUserTarget("UniversalListen", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_LISTEN, - CAPS_TARGET_DETAIL_DESC_LISTEN, - CAPS_TARGET_URL_LISTEN); - ListenTarg->registerTarget(); - - AcceptTarg = new nsUserTarget("UniversalAccept", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_ACCEPT, - CAPS_TARGET_DETAIL_DESC_ACCEPT, - CAPS_TARGET_URL_ACCEPT); - AcceptTarg->registerTarget(); - - MulticastTarg = new nsUserTarget("UniversalMulticast", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_MULTICAST, - CAPS_TARGET_DETAIL_DESC_MULTICAST, - CAPS_TARGET_URL_MULTICAST); - MulticastTarg->registerTarget(); - - TopLevelWindowTarg = new nsUserTarget("UniversalTopLevelWindow", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_TOP_LEVEL_WINDOW, - CAPS_TARGET_DETAIL_DESC_TOP_LEVEL_WINDOW, - CAPS_TARGET_URL_TOP_LEVEL_WINDOW); - TopLevelWindowTarg->registerTarget(); - - DialogModalityTarg = new nsUserTarget("UniversalDialogModality", sysPrin, - targetRiskMedium, - targetRiskColorMedium, - CAPS_TARGET_DESC_DIALOG_MODALITY, - CAPS_TARGET_DETAIL_DESC_DIALOG_MODALITY, - CAPS_TARGET_URL_DIALOG_MODALITY); - DialogModalityTarg->registerTarget(); - - PackageAccessTarg = new nsTarget("UniversalPackageAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_PACKAGE_ACCESS, - CAPS_TARGET_DETAIL_DESC_PACKAGE_ACCESS, - CAPS_TARGET_URL_PACKAGE_ACCESS); - PackageAccessTarg->registerTarget(); - - PackageDefinitionTarg = new nsTarget("UniversalPackageDefinition", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_PACKAGE_DEFINITION, - CAPS_TARGET_DETAIL_DESC_PACKAGE_DEFINITION, - CAPS_TARGET_URL_PACKAGE_DEFINITION); - PackageDefinitionTarg->registerTarget(); - - SetFactoryTarg = new nsUserTarget("UniversalSetFactory", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_SET_FACTORY, - CAPS_TARGET_DETAIL_DESC_SET_FACTORY, - CAPS_TARGET_URL_SET_FACTORY); - SetFactoryTarg->registerTarget(); - - MemberAccessTarg = new nsTarget("UniversalMemberAccess", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_MEMBER_ACCESS, - CAPS_TARGET_DETAIL_DESC_MEMBER_ACCESS, - CAPS_TARGET_URL_MEMBER_ACCESS); - MemberAccessTarg->registerTarget(); - - PrintJobAccessTarg = new nsUserTarget("UniversalPrintJobAccess", - sysPrin, - targetRiskLow, - targetRiskColorLow, - CAPS_TARGET_DESC_PRINT_JOB_ACCESS, - CAPS_TARGET_DETAIL_DESC_PRINT_JOB_ACCESS, - CAPS_TARGET_URL_PRINT_JOB_ACCESS); - PrintJobAccessTarg->registerTarget(); - - SystemClipboardAccessTarg = new nsUserTarget("UniversalSystemClipboardAccess", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_SYSTEM_CLIPBOARD_ACCESS, - CAPS_TARGET_DETAIL_DESC_SYSTEM_CLIPBOARD_ACCESS, - CAPS_TARGET_URL_SYSTEM_CLIPBOARD_ACCESS); - SystemClipboardAccessTarg->registerTarget(); - - AwtEventQueueAccessTarg = new nsUserTarget("UniversalAwtEventQueueAccess", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_AWT_EVENT_QUEUE_ACCESS, - CAPS_TARGET_DETAIL_DESC_AWT_EVENT_QUEUE_ACCESS, - CAPS_TARGET_URL_AWT_EVENT_QUEUE_ACCESS); - AwtEventQueueAccessTarg->registerTarget(); - - SecurityProviderTarg = new nsTarget("UniversalSecurityProvider", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_SECURITY_PROVIDER, - CAPS_TARGET_DETAIL_DESC_SECURITY_PROVIDER, - CAPS_TARGET_URL_SECURITY_PROVIDER); - SecurityProviderTarg->registerTarget(); - - CreateSecurityManagerTarg = new nsTarget("CreateSecurityManager", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_CREATE_SECURITY_MANAGER, - CAPS_TARGET_DETAIL_DESC_CREATE_SECURITY_MANAGER, - CAPS_TARGET_URL_CREATE_SECURITY_MANAGER); - CreateSecurityManagerTarg->registerTarget(); - ImpersonatorTarg = new nsTarget("Impersonator", sysPrin, targetRiskHigh, targetRiskColorHigh, @@ -700,108 +642,6 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) targetPtrArray); SilentInstallTarg->registerTarget(); - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(2, 1); - i=0; - targetPtrArray->Set(i++, (void *)FdReadTarg); - targetPtrArray->Set(i++, (void *)FdWriteTarg); - ConnectTarg = new nsUserTarget("UniversalConnect", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_CONNECT, - CAPS_TARGET_DETAIL_DESC_CONNECT, - CAPS_TARGET_URL_CONNECT, - targetPtrArray); - ConnectTarg->registerTarget(); - - ClientAuthTarg = new nsUserTarget("ClientAuth", sysPrin, - targetRiskMedium, - targetRiskColorMedium, - CAPS_TARGET_DESC_CLIENT_AUTH, - CAPS_TARGET_DETAIL_DESC_CLIENT_AUTH, - CAPS_TARGET_URL_CLIENT_AUTH); - ClientAuthTarg->registerTarget(); - - RedirectTarg = new nsTarget("UniversalRedirect", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_REDIRECT, - CAPS_TARGET_DETAIL_DESC_REDIRECT, - CAPS_TARGET_URL_REDIRECT); - RedirectTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(2, 1); - i=0; - targetPtrArray->Set(i++, (void *)ConnectTarg); - targetPtrArray->Set(i++, (void *)RedirectTarg); - ConnectWithRedirectTarg = new nsUserTarget("UniversalConnectWithRedirect", - sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_CONNECT_WITH_REDIRECT, - CAPS_TARGET_DETAIL_DESC_CONNECT_WITH_REDIRECT, - CAPS_TARGET_URL_CONNECT_WITH_REDIRECT, - targetPtrArray); - ConnectWithRedirectTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(2, 1); - i=0; - targetPtrArray->Set(i++, (void *)FdReadTarg); - targetPtrArray->Set(i++, (void *)FdWriteTarg); - CodebaseEnvTarg = new nsTarget("CodebaseEnvironment", sysPrin, - targetRiskLow, - targetRiskColorLow, - CAPS_TARGET_DESC_CODEBASE_ENV, - CAPS_TARGET_DETAIL_DESC_CODEBASE_ENV, - CAPS_TARGET_URL_CODEBASE_ENV, - targetPtrArray); - CodebaseEnvTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(31, 1); - i=0; - targetPtrArray->Set(i++, (void *)ThreadAccessTarg); - targetPtrArray->Set(i++, (void *)ThreadGroupAccessTarg); - targetPtrArray->Set(i++, (void *)ExecAccessTarg); - targetPtrArray->Set(i++, (void *)ExitAccessTarg); - targetPtrArray->Set(i++, (void *)LinkAccessTarg); - targetPtrArray->Set(i++, (void *)PropertyWriteTarg); - targetPtrArray->Set(i++, (void *)PropertyReadTarg); - targetPtrArray->Set(i++, (void *)FileReadTarg); - targetPtrArray->Set(i++, (void *)FileWriteTarg); - targetPtrArray->Set(i++, (void *)FileDeleteTarg); - targetPtrArray->Set(i++, (void *)FdReadTarg); - targetPtrArray->Set(i++, (void *)FdWriteTarg); - targetPtrArray->Set(i++, (void *)ListenTarg); - targetPtrArray->Set(i++, (void *)AcceptTarg); - targetPtrArray->Set(i++, (void *)ConnectTarg); - targetPtrArray->Set(i++, (void *)MulticastTarg); - targetPtrArray->Set(i++, (void *)TopLevelWindowTarg); - targetPtrArray->Set(i++, (void *)PackageAccessTarg); - targetPtrArray->Set(i++, (void *)PackageDefinitionTarg); - targetPtrArray->Set(i++, (void *)SetFactoryTarg); - targetPtrArray->Set(i++, (void *)MemberAccessTarg); - targetPtrArray->Set(i++, (void *)PrintJobAccessTarg); - targetPtrArray->Set(i++, (void *)SystemClipboardAccessTarg); - targetPtrArray->Set(i++, (void *)AwtEventQueueAccessTarg); - targetPtrArray->Set(i++, (void *)SecurityProviderTarg); - targetPtrArray->Set(i++, (void *)CreateSecurityManagerTarg); - targetPtrArray->Set(i++, (void *)ImpersonatorTarg); - targetPtrArray->Set(i++, (void *)BrowserReadTarg); - targetPtrArray->Set(i++, (void *)BrowserWriteTarg); - targetPtrArray->Set(i++, (void *)SendMailTarg); - targetPtrArray->Set(i++, (void *)CodebaseEnvTarg); - target = new nsTarget("SuperUser", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_SUPER_USER, - CAPS_TARGET_DETAIL_DESC_SUPER_USER, - CAPS_TARGET_URL_SUPER_USER, - targetPtrArray); - target->registerTarget(); - // // targets used by Constellation group // @@ -815,112 +655,7 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) CAPS_TARGET_URL_SAR); SiteArchiveTarget->registerTarget(); - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(11, 1); - i=0; - targetPtrArray->Set(i++, (void *)ThreadAccessTarg); - targetPtrArray->Set(i++, (void *)ThreadGroupAccessTarg); - targetPtrArray->Set(i++, (void *)LinkAccessTarg); - targetPtrArray->Set(i++, (void *)PropertyWriteTarg); - targetPtrArray->Set(i++, (void *)PropertyReadTarg); - targetPtrArray->Set(i++, (void *)ListenTarg); - targetPtrArray->Set(i++, (void *)AcceptTarg); - targetPtrArray->Set(i++, (void *)ConnectTarg); - targetPtrArray->Set(i++, (void *)TopLevelWindowTarg); - targetPtrArray->Set(i++, (void *)PackageAccessTarg); - targetPtrArray->Set(i++, (void *)PackageDefinitionTarg); - target = new nsUserTarget("30Capabilities", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_30_CAPABILITIES, - CAPS_TARGET_DETAIL_DESC_30_CAPABILITIES, - CAPS_TARGET_URL_30_CAPABILITIES, - targetPtrArray); - target->registerTarget(); - // - // targets used by Marimba - // - - // access to this target only enables file operations below the - // root of the castanet channel cache. - nsTarget *mappTarget = new nsTarget("MarimbaAppContextTarget", sysPrin, - targetRiskMedium, - targetRiskColorMedium, - CAPS_TARGET_DESC_MARIMBA, - CAPS_TARGET_DETAIL_DESC_MARIMBA, - CAPS_TARGET_URL_MARIMBA); - mappTarget->registerTarget(); - - // - // Internal target used by Marimba code - // - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(10, 1); - i=0; - targetPtrArray->Set(i++, (void *)FileReadTarg); - targetPtrArray->Set(i++, (void *)FileWriteTarg); - targetPtrArray->Set(i++, (void *)FileDeleteTarg); - targetPtrArray->Set(i++, (void *)PropertyReadTarg); - targetPtrArray->Set(i++, (void *)ConnectTarg); - targetPtrArray->Set(i++, (void *)TopLevelWindowTarg); - targetPtrArray->Set(i++, (void *)PackageAccessTarg); - targetPtrArray->Set(i++, (void *)ThreadAccessTarg); - targetPtrArray->Set(i++, (void *)ThreadGroupAccessTarg); - targetPtrArray->Set(i++, (void *)mappTarget); - target = new nsUserTarget("MarimbaInternalTarget", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_MARIMBA, - CAPS_TARGET_DETAIL_DESC_MARIMBA, - CAPS_TARGET_URL_MARIMBA, - targetPtrArray); - target->registerTarget(); - - // - // internal target used by the netscape IIOP runtime - // - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(4, 1); - i = 0; - targetPtrArray->Set(i++, (void *)ListenTarg); - targetPtrArray->Set(i++, (void *)AcceptTarg); - targetPtrArray->Set(i++, (void *)ConnectTarg); - targetPtrArray->Set(i++, (void *)CodebaseEnvTarg); - nsTarget *iiopTarget = new nsUserTarget("IIOPRuntime", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_IIOP, - CAPS_TARGET_DETAIL_DESC_IIOP, - CAPS_TARGET_URL_IIOP, - targetPtrArray); - iiopTarget->registerTarget(); - - - // - // targets used for internal testing/debugging - // - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(10, 1); - i=0; - targetPtrArray->Set(i++, (void *)ExecAccessTarg); - targetPtrArray->Set(i++, (void *)PropertyWriteTarg); - targetPtrArray->Set(i++, (void *)PropertyReadTarg); - targetPtrArray->Set(i++, (void *)FileReadTarg); - targetPtrArray->Set(i++, (void *)ListenTarg); - targetPtrArray->Set(i++, (void *)AcceptTarg); - targetPtrArray->Set(i++, (void *)ConnectTarg); - targetPtrArray->Set(i++, (void *)ThreadAccessTarg); - targetPtrArray->Set(i++, (void *)ThreadGroupAccessTarg); - targetPtrArray->Set(i++, (void *)SetFactoryTarg); - userTarg = new nsUserTarget("Debugger", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_DEBUGGER, - CAPS_TARGET_DETAIL_DESC_DEBUGGER, - CAPS_TARGET_URL_DEBUGGER, - targetPtrArray); - userTarg->registerTarget(); - + targetPtrArray = new nsTargetArray(); targetPtrArray->SetSize(1, 1); i=0; @@ -935,10 +670,8 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) userTarg->registerTarget(); targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(5, 1); + targetPtrArray->SetSize(3, 1); i=0; - targetPtrArray->Set(i++, (void *)LinkAccessTarg); - targetPtrArray->Set(i++, (void *)PropertyReadTarg); targetPtrArray->Set(i++, (void *)FileReadTarg); targetPtrArray->Set(i++, (void *)FileWriteTarg); targetPtrArray->Set(i++, (void *)FileDeleteTarg); @@ -968,128 +701,6 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) targetPtrArray); UniversalBrowserAccessTarg->registerTarget(); - LimitedFileAccessTarg = - new nsUserTarget("LimitedFileAccess", sysPrin, - targetRiskLow, - targetRiskColorLow, - CAPS_TARGET_DESC_LIMITED_FILE_ACCESS, - CAPS_TARGET_DETAIL_DESC_LIMITED_FILE_ACCESS, - CAPS_TARGET_URL_LIMITED_FILE_ACCESS); - LimitedFileAccessTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(1, 1); - i=0; - targetPtrArray->Set(i++, (void *)RegistryPrivateTarg); - userTarg = new nsUserTarget("GamesAccess", sysPrin, - targetRiskLow, - targetRiskColorLow, - CAPS_TARGET_DESC_GAMES_ACCESS, - CAPS_TARGET_DETAIL_DESC_GAMES_ACCESS, - CAPS_TARGET_URL_GAMES_ACCESS, - targetPtrArray); - userTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(4, 1); - i=0; - targetPtrArray->Set(i++, (void *)UniversalFileAccessTarg); - targetPtrArray->Set(i++, (void *)RegistryStandardTarg); - targetPtrArray->Set(i++, (void *)PrintJobAccessTarg); - targetPtrArray->Set(i++, (void *)SystemClipboardAccessTarg); - userTarg = new nsUserTarget("WordProcessorAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_WORD_PROCESSOR_ACCESS, - CAPS_TARGET_DETAIL_DESC_WORD_PROCESSOR_ACCESS, - CAPS_TARGET_URL_WORD_PROCESSOR_ACCESS, - targetPtrArray); - userTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(4, 1); - i=0; - targetPtrArray->Set(i++, (void *)UniversalFileAccessTarg); - targetPtrArray->Set(i++, (void *)RegistryStandardTarg); - targetPtrArray->Set(i++, (void *)PrintJobAccessTarg); - targetPtrArray->Set(i++, (void *)SystemClipboardAccessTarg); - userTarg = new nsUserTarget("SpreadsheetAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_SPREADSHEET_ACCESS, - CAPS_TARGET_DETAIL_DESC_SPREADSHEET_ACCESS, - CAPS_TARGET_URL_SPREADSHEET_ACCESS, - targetPtrArray); - userTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(4, 1); - i=0; - targetPtrArray->Set(i++, (void *)UniversalFileAccessTarg); - targetPtrArray->Set(i++, (void *)RegistryStandardTarg); - targetPtrArray->Set(i++, (void *)PrintJobAccessTarg); - targetPtrArray->Set(i++, (void *)SystemClipboardAccessTarg); - userTarg = new nsUserTarget("PresentationAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_PRESENTATION_ACCESS, - CAPS_TARGET_DETAIL_DESC_PRESENTATION_ACCESS, - CAPS_TARGET_URL_PRESENTATION_ACCESS, - targetPtrArray); - userTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(4, 1); - i=0; - targetPtrArray->Set(i++, (void *)UniversalFileAccessTarg); - targetPtrArray->Set(i++, (void *)RegistryStandardTarg); - targetPtrArray->Set(i++, (void *)PrintJobAccessTarg); - targetPtrArray->Set(i++, (void *)SystemClipboardAccessTarg); - userTarg = new nsUserTarget("DatabaseAccess", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_DATABASE_ACCESS, - CAPS_TARGET_DETAIL_DESC_DATABASE_ACCESS, - CAPS_TARGET_URL_DATABASE_ACCESS, - targetPtrArray); - userTarg->registerTarget(); - - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(7, 1); - i=0; - targetPtrArray->Set(i++, (void *)LinkAccessTarg); - targetPtrArray->Set(i++, (void *)PropertyReadTarg); - targetPtrArray->Set(i++, (void *)ListenTarg); - targetPtrArray->Set(i++, (void *)AcceptTarg); - targetPtrArray->Set(i++, (void *)ConnectTarg); - targetPtrArray->Set(i++, (void *)PrintJobAccessTarg); - targetPtrArray->Set(i++, (void *)SystemClipboardAccessTarg); - userTarg = new nsUserTarget("TerminalEmulator", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_TERMINAL_EMULATOR, - CAPS_TARGET_DETAIL_DESC_TERMINAL_EMULATOR, - CAPS_TARGET_URL_TERMINAL_EMULATOR, - targetPtrArray); - userTarg->registerTarget(); - - - // JAR packager Target - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(3, 1); - i=0; - targetPtrArray->Set(i++, (void *)UniversalFileAccessTarg); - targetPtrArray->Set(i++, (void *)RegistryStandardTarg); - targetPtrArray->Set(i++, (void *)TopLevelWindowTarg); - userTarg = new nsUserTarget("JARPackager", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_JAR_PACKAGER, - CAPS_TARGET_DETAIL_DESC_JAR_PACKAGER, - CAPS_TARGET_URL_JAR_PACKAGER, - targetPtrArray); - userTarg->registerTarget(); - // a macro Target for PE targetPtrArray = new nsTargetArray(); targetPtrArray->SetSize(7, 1); @@ -1098,8 +709,6 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) targetPtrArray->Set(i++, (void *)BrowserWriteTarg); targetPtrArray->Set(i++, (void *)UniversalPreferencesReadTarg); targetPtrArray->Set(i++, (void *)UniversalPreferencesWriteTarg); - targetPtrArray->Set(i++, (void *)TopLevelWindowTarg); - targetPtrArray->Set(i++, (void *)ConnectTarg); targetPtrArray->Set(i++, (void *)UniversalFileAccessTarg); userTarg = new nsUserTarget("AccountSetup", sysPrin, targetRiskHigh, @@ -1110,32 +719,6 @@ PRBool CreateSystemTargets(nsPrincipal *sysPrin) targetPtrArray); userTarg->registerTarget(); - - // Netcaster Target - targetPtrArray = new nsTargetArray(); - targetPtrArray->SetSize(12, 1); - i=0; - targetPtrArray->Set(i++, (void *)BrowserReadTarg); - targetPtrArray->Set(i++, (void *)BrowserWriteTarg); - targetPtrArray->Set(i++, (void *)FileReadTarg); - targetPtrArray->Set(i++, (void *)FileWriteTarg); - targetPtrArray->Set(i++, (void *)SiteArchiveTarget); - targetPtrArray->Set(i++, (void *)UniversalFileAccessTarg); - targetPtrArray->Set(i++, (void *)UniversalPreferencesReadTarg); - targetPtrArray->Set(i++, (void *)UniversalPreferencesWriteTarg); - targetPtrArray->Set(i++, (void *)ConnectWithRedirectTarg); - targetPtrArray->Set(i++, (void *)ThreadAccessTarg); - targetPtrArray->Set(i++, (void *)ThreadGroupAccessTarg); - targetPtrArray->Set(i++, (void *)LinkAccessTarg); - target = new nsUserTarget("Netcaster", sysPrin, - targetRiskHigh, - targetRiskColorHigh, - CAPS_TARGET_DESC_CONSTELLATION, - CAPS_TARGET_DETAIL_DESC_CONSTELLATION, - CAPS_TARGET_URL_CONSTELLATION, - targetPtrArray); - target->registerTarget(); - /* Permission to All privileges in Java */ target = new nsUserTarget("AllJavaPermission", sysPrin, diff --git a/mozilla/caps/src/nsUserDialogHelper.cpp b/mozilla/caps/src/nsUserDialogHelper.cpp index c795cd509e6..eb02ab2fb18 100644 --- a/mozilla/caps/src/nsUserDialogHelper.cpp +++ b/mozilla/caps/src/nsUserDialogHelper.cpp @@ -24,11 +24,14 @@ extern "C" { #include "xp.h" #include "xpgetstr.h" #include "prprf.h" +#include "nsTarget.h" +#ifdef XXX extern int CAPS_TARGET_RISK_STR_LOW; extern int CAPS_TARGET_RISK_STR_MEDIUM; extern int CAPS_TARGET_RISK_STR_HIGH; extern int CAPS_TARGET_HELP_URL; +#endif // // resources for user targets @@ -36,6 +39,7 @@ extern int CAPS_TARGET_HELP_URL; char * JavaSecUI_targetRiskStr(int risk) { char * str; +#ifdef XXX if (risk <= nsRiskType_LowRisk) { str = XP_GetString(CAPS_TARGET_RISK_STR_LOW); } else if (risk <= nsRiskType_MediumRisk) { @@ -44,6 +48,9 @@ char * JavaSecUI_targetRiskStr(int risk) str = XP_GetString(CAPS_TARGET_RISK_STR_HIGH); } return str; +#else + return "High"; +#endif } int JavaSecUI_targetRiskLow(void) @@ -63,8 +70,12 @@ int JavaSecUI_targetRiskHigh(void) char * JavaSecUI_getHelpURL(int id) { - char * tag = XP_GetString(id); - char * java_sec_help_url = XP_GetString(CAPS_TARGET_HELP_URL); + char * java_sec_help_url = ""; + char * tag = JavaSecUI_getString(id); +#ifdef XXX + java_sec_help_url = XP_GetString(CAPS_TARGET_HELP_URL); +#endif + PR_ASSERT(tag != NULL); PR_ASSERT(java_sec_help_url != NULL); @@ -76,7 +87,10 @@ char * JavaSecUI_getHelpURL(int id) char * JavaSecUI_getString(int id) { +#ifdef XXX char *str = XP_GetString(id); +#endif + char *str = capsGetString(id); PR_ASSERT(str != NULL); return str; }