Attachment 34473 Details for Bug 77944

[patch] post-3.4-kdewebdev.diff

post-3.4-kdewebdev.diff (text/plain), 2.60 KB, created by Marcus Meissner on 2005-04-14 13:22:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcus Meissner

Created: 2005-04-14 13:22:16 UTC

Size: 2.60 KB

patch

obsolete

>Index: instance.cpp
>===================================================================
>RCS file: /home/kde/kdewebdev/kommander/executor/instance.cpp,v
>retrieving revision 1.49
>diff -u -3 -d -p -r1.49 instance.cpp
>--- instance.cpp	29 Dec 2004 09:58:46 -0000	1.49
>+++ instance.cpp	13 Apr 2005 19:18:57 -0000
>@@ -131,6 +131,35 @@ bool Instance::build(QFile *a_file)
> 
> bool Instance::run(QFile *a_file)
> {
>+ // Check whether extension is *.kmdr
>+ if (!m_uiFileName.fileName().endsWith(".kmdr")) {
>+ KMessageBox::error(0, i18n("<qt>This file does not have a .kmdr extension. As a security precaution "
>+ "Kommander will only run Kommander scripts with a clear identity.</qt>"),
>+ i18n("Wrong Extension"));
>+ return false;
>+ }
>+ 
>+ // Check whether file is not in some temporary directory.
>+ QStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp");
>+ tmpDirs += KGlobal::dirs()->resourceDirs("cache");
>+ tmpDirs.append("/tmp/");
>+ tmpDirs.append("/var/tmp/");
>+ 
>+ bool inTemp = false;
>+ for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I)
>+ if (m_uiFileName.directory().startsWith(*I))
>+ inTemp = true;
>+ 
>+ if (inTemp)
>+ {
>+ if (KMessageBox::warningYesNo(0, i18n("<qt>This dialog is running from your /tmp directory. "
>+ " This may mean that it was run from a KMail attachment or from a webpage. "
>+ "Any script contained in this dialog will have write access to all of your home directory; "
>+ "running such dialogs may be dangerous: "
>+ "are you sure you want to continue?</qt>")) == KMessageBox::No)
>+ return false;
>+ }
>+ 
> /* add runtime arguments */
> if (m_cmdArguments) {
> QString args;
>@@ -143,18 +172,7 @@ bool Instance::run(QFile *a_file)
> KommanderWidget::setGlobal("ARGS", args);
> }
> KommanderWidget::setGlobal("ARGCOUNT", QString("%1").arg(m_cmdArguments));
>- 
>- if (m_uiFileName.directory().startsWith(locateLocal("tmp", "") + "/") ||
>- m_uiFileName.directory().startsWith("/tmp/"))
>- {
>- if (KMessageBox::warningYesNo(0, i18n("<qt>This dialog is running from your /tmp directory. "
>- " This may mean that it was run from a KMail attachment or from a webpage. "
>- "Any script contained in this dialog will have write access to all of your home directory; "
>- "running such dialogs may be dangerous: "
>- "are you sure you want to continue?</qt>")) == KMessageBox::No)
>- return false;
>- }
>- 
>+ 
> if (!m_uiFileName.isEmpty()) 
> {
> KommanderWidget::setGlobal("_KDDIR", m_uiFileName.directory());

Actions: View | Diff

Attachments on bug 77944: 34473