Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding -reg_mode flag related changes

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@12080 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
racham%netscape.com
1998-10-06 21:04:19 +00:00
parent e369b01490
commit 89e6132658
2 changed files with 43 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/caps/src/nsPrivilegeManager.cpp
View File

@@ -1110,6 +1110,9 @@ nsPrivilegeManager::checkPrivilegeEnabled(void *context,
PRInt32 noOfTargets;
PRInt32 idx;
char *errMsg = NULL;
nsPrincipal *principal;
PRInt32 noOfPrincipals;
PRBool saw_dangerous_code = PR_FALSE;
if (targetArray == NULL) {
return "internal error - null target array";
@@ -1144,7 +1147,29 @@ nsPrivilegeManager::checkPrivilegeEnabled(void *context,
(nsPrivilegeTable *) (*nsCapsGetAnnotationCallback)(wrapper);
prinArray =
(nsPrincipalArray *) (*nsCapsGetPrincipalArrayCallback)(wrapper);
/*
/*
* When the Registration Mode flag is enabled, we allow secure
* operations if and only iff the principal codebase is 'file:'.
* That means we load files only after recognizing that they
* reside on local harddrive. Any other code is considered as
* dangerous and an exception will be thrown in such cases.
*/
if ((nsCapsGetRegistrationModeFlag()) && (prinArray != NULL)){
noOfPrincipals = prinArray->GetSize();
for (idx=0; idx < noOfPrincipals; idx++){
principal = (nsPrincipal *) prinArray->Get(idx);
if (!(principal->isFileCodeBase())){
saw_dangerous_code = PR_TRUE;
errMsg = "access to target Forbidden - Illegal url code base is detected";
goto done;
}
}
}
/*
* frame->annotation holds a PrivilegeTable, describing
* the scope privileges of this frame. We'll check
* if it permits the target, and if so, we just return.
@@ -1219,6 +1244,13 @@ nsPrivilegeManager::checkPrivilegeEnabled(void *context,
errMsg = "access to target forbidden. Target was not enabled on stack (stack included only system code)";
done:
/*
* If the Registration Mode flag is set and principals have
* 'file:' code base, we set the error message to NULL.
*/
if ((nsCapsGetRegistrationModeFlag()) && !(saw_dangerous_code)){
errMsg = NULL;
}
(*nsCapsFreeNSJSJavaFrameWrapperCallback)(wrapper);
return errMsg;
}

12
mozilla/caps/src/nsUserTarget.cpp
View File

@@ -62,8 +62,16 @@ nsPrivilege * nsUserTarget::enablePrivilege(nsPrincipal *prin, void *data)
PRBool isCert = (prin->isCodebase()) ? PR_FALSE : PR_TRUE;
nsPermState permState = nsPermState_AllowedSession;
/* set displayUI to TRUE, to enable UI */
if (displayUI) {
/*
* Check Registration Mode flag and the url code base
* to set permission state
*/
if ((nsCapsGetRegistrationModeFlag()) && (prin != NULL)) {
if (prin->isFileCodeBase()) {
permState = nsPermState_AllowedSession;
}
} else if (displayUI) {
/* set displayUI to TRUE, to enable UI */
nsCaps_lock();
permState = displayPermissionDialog(prinStr, targetStr, riskStr, isCert);
nsCaps_unlock();