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

Check for correct permissions on chosen install directory by calling access()

Browse Source 
instead of just looking to see if the user rwx bits are set (this fails if
you are installing to a directory you do not own). r=samir, ssu, sr=dveditz.
Fixes bug number 89436.


git-svn-id: svn://10.0.0.236/trunk@111468 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
syd%netscape.com
2002-01-07 00:33:55 +00:00
parent 7432d9b145
commit a94513b02e
1 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
mozilla/xpinstall/wizard/unix/src2/nsSetupTypeDlg.cpp
View File

@@ -661,12 +661,15 @@ nsSetupTypeDlg::SelectFolderOK(GtkWidget *aWidget, GtkFileSelection *aFileSel)
struct stat destStat;
char *selDir = gtk_file_selection_get_filename(
GTK_FILE_SELECTION(aFileSel));
if (0 == stat(selDir, &destStat))
if (!S_ISDIR(destStat.st_mode)) /* not a directory so don't tear down */
return;
// put the candidate file name in the global variable, then verify it
strcpy(gCtx->opt->mDestination, selDir);
if (0 == stat(selDir, &destStat))
if (!S_ISDIR(destStat.st_mode) || VerifyDestination() != OK ) /* not a directory, or we don't have access permissions, so don't tear down */
return;
// update folder path displayed
gtk_label_set_text(GTK_LABEL(sFolder), gCtx->opt->mDestination);
gtk_widget_show(sFolder);
@@ -703,45 +706,41 @@ nsSetupTypeDlg::VerifyDestination()
GtkWidget *yesButton, *noButton, *label;
GtkWidget *noPermsDlg, *okButton;
char message[MAXPATHLEN];
stat_err = stat(gCtx->opt->mDestination, &stbuf);
if (stat_err == 0)
{
// check perms on dir: we need rwx for user
if ( !(stbuf.st_mode & S_IREAD) ||
!(stbuf.st_mode & S_IWRITE) ||
!(stbuf.st_mode & S_IEXEC) )
if (access(gCtx->opt->mDestination, R_OK | W_OK | X_OK ) != 0)
{
sprintf(message, gCtx->Res("NO_PERMS"), gCtx->opt->mDestination);
noPermsDlg = gtk_dialog_new();
label = gtk_label_new(message);
okButton = gtk_button_new_with_label(gCtx->Res("OK_LABEL"));
if (noPermsDlg && label && okButton)
{
sprintf(message, gCtx->Res("NO_PERMS"), gCtx->opt->mDestination);
gtk_window_set_title(GTK_WINDOW(noPermsDlg), gCtx->opt->mTitle);
gtk_window_set_position(GTK_WINDOW(noPermsDlg),
GTK_WIN_POS_CENTER);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(
GTK_DIALOG(noPermsDlg)->action_area), okButton, FALSE, FALSE, 10);
gtk_signal_connect(GTK_OBJECT(okButton), "clicked",
GTK_SIGNAL_FUNC(NoPermsOK), noPermsDlg);
gtk_box_pack_start(GTK_BOX(
GTK_DIALOG(noPermsDlg)->vbox), label, FALSE, FALSE, 10);
noPermsDlg = gtk_dialog_new();
label = gtk_label_new(message);
okButton = gtk_button_new_with_label(gCtx->Res("OK_LABEL"));
if (noPermsDlg && label && okButton)
{
gtk_window_set_title(GTK_WINDOW(noPermsDlg), gCtx->opt->mTitle);
gtk_window_set_position(GTK_WINDOW(noPermsDlg),
GTK_WIN_POS_CENTER);
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
gtk_box_pack_start(GTK_BOX(
GTK_DIALOG(noPermsDlg)->action_area), okButton,
FALSE, FALSE, 10);
gtk_signal_connect(GTK_OBJECT(okButton), "clicked",
GTK_SIGNAL_FUNC(NoPermsOK), noPermsDlg);
gtk_box_pack_start(GTK_BOX(
GTK_DIALOG(noPermsDlg)->vbox), label, FALSE, FALSE, 10);
gtk_widget_show_all(noPermsDlg);
}
return E_NO_PERMS;
}
else
{
// perms OK, we can proceed
return OK;
gtk_widget_show_all(noPermsDlg);
}
return E_NO_PERMS;
}
else
{
// perms OK, we can proceed
return OK;
}
}
// destination doesn't exist so ask user if we should create it