diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2007-09-12 23:24:34 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2007-09-12 23:24:34 +0000 |
| commit | 548b11c0b42eb3a9399291aa1b033c4880df2392 (patch) | |
| tree | 0271192f338fb7b466e4245df9fee40b0badfd43 /kde-base/konqueror/files | |
| parent | Added an upstream patch to correct a potential login issue. (diff) | |
| download | historical-548b11c0b42eb3a9399291aa1b033c4880df2392.tar.gz historical-548b11c0b42eb3a9399291aa1b033c4880df2392.tar.bz2 historical-548b11c0b42eb3a9399291aa1b033c4880df2392.zip | |
Added two security patches for konqueror. Fixes bug 185603.
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'kde-base/konqueror/files')
| -rw-r--r-- | kde-base/konqueror/files/digest-konqueror-3.5.7-r3 | 6 | ||||
| -rw-r--r-- | kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff | 49 |
2 files changed, 55 insertions, 0 deletions
diff --git a/kde-base/konqueror/files/digest-konqueror-3.5.7-r3 b/kde-base/konqueror/files/digest-konqueror-3.5.7-r3 new file mode 100644 index 000000000000..ce2d5ae895f7 --- /dev/null +++ b/kde-base/konqueror/files/digest-konqueror-3.5.7-r3 @@ -0,0 +1,6 @@ +MD5 f6f2574fc332dd1123144bb6a00e5e26 kdebase-3.5-patchset-06.tar.bz2 19825 +RMD160 ab7358b635e912ed9912cb95e48e3187064abae7 kdebase-3.5-patchset-06.tar.bz2 19825 +SHA256 c9ab23f648f84ebc66054f4db48685cbed3d99e9c87fa3df2c0d8a282b9a2394 kdebase-3.5-patchset-06.tar.bz2 19825 +MD5 b421e01b3ee712549ee967f58ed24de0 kdebase-3.5.7.tar.bz2 24395088 +RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 kdebase-3.5.7.tar.bz2 24395088 +SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d kdebase-3.5.7.tar.bz2 24395088 diff --git a/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff b/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff new file mode 100644 index 000000000000..0d6e44ef4f82 --- /dev/null +++ b/kde-base/konqueror/files/konqueror-3.5.7-185603-spoofing.diff @@ -0,0 +1,49 @@ +--- konqueror/konq_combo.cc ++++ konqueror/konq_combo.cc +@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u + kapp->dcopClient()->send( "konqueror*", "KonquerorIface", + "addToCombo(QString,QCString)", data); + } ++ // important security consideration: always display the beginning ++ // of the url rather than its end to prevent spoofing attempts. ++ lineEdit()->setCursorPosition( 0 ); + } + + void KonqCombo::setTemporary( const QString& text ) +--- konqueror/konq_mainwindow.cc ++++ konqueror/konq_mainwindow.cc +@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView * + } + else // no known serviceType, use KonqRun + { +- if ( ( view && view == m_currentView ) || +- ( !view && !req.newTab ) ) // startup with argument ++ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup with argument + { + // Show it for now in the location bar, but we'll need to store it in the view + // later on (can't do it yet since either view == 0 or updateHistoryEntry will be called). +- kdDebug(1202) << "setLocationBarURL : url = " << url << endl; ++ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url << endl; + setLocationBarURL( url ); + } + +@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s + if ( childView ) + { + enableAllActions( true ); +- +- m_pViewManager->setActivePart( childView->part() ); + m_currentView = childView; + } + } +--- konqueror/konq_viewmgr.cc ++++ konqueror/konq_viewmgr.cc +@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan + + void KonqViewManager::emitActivePartChanged() + { ++ // prevent unnecessary multiple calls to slotPartActivated: ++ m_activePartChangedTimer->stop(); + m_pMainWindow->slotPartActivated( activePart() ); + } + |