[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-devel
Subject: [PATCH] Add multiple account saving support to KHTML/Konqueror (BUG
From: Filip Brcic <brcha () gna ! org>
Date: 2010-07-22 18:54:06
Message-ID: 201007222054.11466.brcha () gna ! org
[Download RAW message or body]
[Attachment #2 (multipart/signed)]
[Attachment #4 (multipart/mixed)]
This is a repost of my comment for the bug #72317
(https://bugs.kde.org/show_bug.cgi?id=72317)
Hi,
I tried to add support for multiple accounts and it seams I succeeded. By that
I mean I successfully recompiled KDE trunk and KDE 4.3.3 (my desktop's
version)
with this patch and tried multiple accounts in konqueror and it works. Also,
accounts are saved for the whole site, not just for the specific URL like it
was the practice before.
Key features of my approach are the following:
Login page is identified by having 2 form input fields, one that is plain text
field, and the other that is the password field. All other form types are
dropped to old behaviour.
Login on one site is universal on that site. That means if you can login using
multiple URLs (like on bugs.kde.org), the login data will be stored only once
and used on all login pages.
All account usernames on the site are stored as PASSWORD value in the FormData
folder of Network KWallet with the key:
accounts_SITE
All passwords are stored as PASSWORD value in the FormData folder of the
Network KWallet with the key:
account_SITE_USERNAME
When you come to the SITE's login page, the system offers you to autocomplete
username. When you select some username from the autocomplete list, the system
autofills the correct password.
No username if prefilled, but that could be easily done (for example, by
selecting the first username from the accounts list or by keeping record which
username was last used).
I made this patch from the current kdelibs trunk checkout, yet I tested it
also on kdelibs 4.3.3 and it applies correctly (actually it doesn't since the
copyright comments don't apply correctly, but if you ignore that one error as
it is only related to comments, the patch does apply). Therefore, it is safe
to assume this patch works on all versions of kdelibs from 4.3.3 to trunk
(possibly with some older versions, but I didn't check that).
It is worth noting that I marked all changes I made with
// BEGIN CHANGE [BRCHA]
...
// END CHANGE [BRCHA]
comments, so that the changes are easily visible and searchable on the kdelibs
checkout with the applied patch.
Also, I didn't add support for KHTMLWalletQueue and marked the point with //
TODO [BRCHA]. I will investigate KHTMLWalletQueue implementation and add
support for that in some near future. Luckily I still didn't get to the point
where WalletQueue is used, but it is probably useful to add support for that
as well ;). KHTMLWalletQueue supports only Maps (as maps were the only thing
used in the old approach), so I'll have to add support for Password storing.
Cheers,
Filip
--
Filip Brcic <brcha@gna.org>
WWWeb: http://www.brcha.iz.rs
Jabber : brcha@kdetalk.net
GPG 0x2537C379
Fingerprint: 287D 5F24 50AA A36C 977F AC9A F1FD C7EB 2537 C379
["kdelibs--khtml--enable_multiaccount_saving.diff" (text/x-patch)]
Index: khtml/khtml_part.h
===================================================================
--- khtml/khtml_part.h (revision 1152611)
+++ khtml/khtml_part.h (working copy)
@@ -7,6 +7,7 @@
* 2000-2001 Simon Hausmann <hausmann@kde.org>
* 2000-2001 Dirk Mueller <mueller@kde.org>
* 2000 Stefan Schimanski <1Stein@gmx.de>
+ * 2010 Filip Brcic <brcha@gna.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -1676,8 +1677,14 @@ private Q_SLOTS:
void openWallet(DOM::HTMLFormElementImpl*);
void saveToWallet(const QString& key, const QMap<QString,QString>& data);
+ // BEGIN CHANGE [BRCHA]: Save/get password to/from wallet
+ void savePasswordToWallet(const QString& key, const QString& password);
+ QString getPasswordFromWallet(const QString& key);
+ // END CHANGE [BRCHA]
void dequeueWallet(DOM::HTMLFormElementImpl*);
void saveLoginInformation(const QString& host, const QString& key, const \
QMap<QString, QString>& walletMap); + // BEGIN CHANGE [BRCHA]: Save username & \
password to wallet + void saveAccount(const QString& host, const QString& \
accountKey, const QString& accountsKey, const QString& username, const QString& \
password);
void enableFindAheadActions(bool);
Index: khtml/khtml_part.cpp
===================================================================
--- khtml/khtml_part.cpp (revision 1152611)
+++ khtml/khtml_part.cpp (working copy)
@@ -10,6 +10,7 @@
* 2000-2005 David Faure <faure@kde.org>
* 2002 Apple Computer, Inc.
* 2010 Maksim Orlovich (maksim@kde.org)
+ * 2010 Filip Brcic <brcha@gna.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -7071,7 +7072,90 @@ void KHTMLPart::saveToWallet(const QString& key, c
#endif // KHTML_NO_WALLET
}
+// BEGIN CHANGE [BRCHA]: Save/get password to/from the wallet
+void KHTMLPart::savePasswordToWallet(const QString& key, const QString& password)
+{
+#ifndef KHTML_NO_WALLET
+ KHTMLPart *p;
+ for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
+ }
+
+ if (p) {
+ p->savePasswordToWallet(key, password);
+ return;
+ }
+
+ if (d->m_wallet) {
+ if (d->m_bWalletOpened) {
+ if (d->m_wallet->isOpen()) {
+ if (!d->m_wallet->hasFolder(KWallet::Wallet::FormDataFolder())) {
+ d->m_wallet->createFolder(KWallet::Wallet::FormDataFolder());
+ }
+ d->m_wallet->setFolder(KWallet::Wallet::FormDataFolder());
+ d->m_wallet->writePassword(key, password);
+ return;
+ }
+ d->m_wallet->deleteLater();
+ d->m_wallet = 0L;
+ d->m_bWalletOpened = false;
+ }
+ }
+
+ // TODO [BRCHA]: Add support for wallet queue
+ if (!d->m_wq) {
+ KWallet::Wallet *wallet = \
KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? \
widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + d->m_wq \
= new KHTMLWalletQueue(this); + d->m_wq->wallet = wallet;
+ connect(wallet, SIGNAL(walletOpened(bool)), d->m_wq, SLOT(walletOpened(bool)));
+ connect(d->m_wq, SIGNAL(walletOpened(KWallet::Wallet*)), this, \
SLOT(walletOpened(KWallet::Wallet*))); + }
+// d->m_wq->savers.append(qMakePair(key, password));
+#endif // KHTML_NO_WALLET
+}
+
+QString KHTMLPart::getPasswordFromWallet(const QString& key)
+{
+#ifndef KHTML_NO_WALLET
+ KHTMLPart *p;
+
+ for (p = parentPart(); p && p->parentPart(); p = p->parentPart()) {
+ }
+
+ if (p) {
+ return p->getPasswordFromWallet(key);
+ }
+
+ if (d->m_wallet) {
+ if (d->m_bWalletOpened) {
+ if (d->m_wallet->isOpen()) {
+ if (!d->m_wallet->hasFolder(KWallet::Wallet::FormDataFolder()))
+ return QString( "" );
+ d->m_wallet->setFolder(KWallet::Wallet::FormDataFolder());
+ QString password;
+ if ( d->m_wallet->readPassword(key, password) == 0 )
+ return password;
+ return QString( "" );
+ }
+ d->m_wallet->deleteLater();
+ d->m_wallet = 0L;
+ d->m_bWalletOpened = false;
+ }
+ }
+
+ // TODO [BRCHA]: Add support for wallet queue
+ if (!d->m_wq) {
+ KWallet::Wallet *wallet = \
KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), widget() ? \
widget()->topLevelWidget()->winId() : 0, KWallet::Wallet::Asynchronous); + d->m_wq \
= new KHTMLWalletQueue(this); + d->m_wq->wallet = wallet;
+ connect(wallet, SIGNAL(walletOpened(bool)), d->m_wq, SLOT(walletOpened(bool)));
+ connect(d->m_wq, SIGNAL(walletOpened(KWallet::Wallet*)), this, \
SLOT(walletOpened(KWallet::Wallet*))); + }
+// d->m_wq->savers.append(qMakePair(key, password));
+#endif // KHTML_NO_WALLET
+}
+// END CHANGE [BRCHA]
+
void KHTMLPart::dequeueWallet(DOM::HTMLFormElementImpl *form) {
#ifndef KHTML_NO_WALLET
KHTMLPart *p;
@@ -7252,6 +7336,15 @@ void KHTMLPart::saveLoginInformation(const QString
#endif // KHTML_NO_WALLET
}
+// BEGIN CHANGE [BRCHA]: Save username & password to kwallet
+void KHTMLPart::saveAccount(const QString& host, const QString& accountKey, const \
QString& accountsKey, const QString& username, const QString& password ) +{
+#ifndef KHTML_NO_WALLET
+ d->m_storePass.saveAccount(host, accountKey, accountsKey, username, password);
+#endif // KHTML_NO_WALLET
+}
+// END CHANGE [BRCHA]
+
void KHTMLPart::slotToggleCaretMode()
{
setCaretMode(d->m_paToggleCaretMode->isChecked());
Index: khtml/html/html_formimpl.cpp
===================================================================
--- khtml/html/html_formimpl.cpp (revision 1152611)
+++ khtml/html/html_formimpl.cpp (working copy)
@@ -5,6 +5,7 @@
* (C) 1999 Antti Koivisto (koivisto@kde.org)
* (C) 2001 Dirk Mueller (mueller@kde.org)
* (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * (C) 2010 Filip Brcic (brcha@gna.org)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -495,11 +496,19 @@ void HTMLFormElementImpl::doAutoFill()
{
#ifndef KHTML_NO_WALLET
const QString key = calculateAutoFillKey(*this);
+ // BEGIN CHANGE [BRCHA]: Auto fill with new data model
+ const KUrl formUrl( document()->URL() );
+ const QString accountsKey = QString( "accounts_" ) + formUrl.host();
if (KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(),
KWallet::Wallet::FormDataFolder(),
- key))
+ key) &&
+ KWallet::Wallet::keyDoesNotExist( KWallet::Wallet::NetworkWallet(),
+ KWallet::Wallet::FormDataFolder(),
+ accountsKey )
+ )
return;
+ // END CHANGE [BRCHA]
// assert(view())
document()->view()->part()->openWallet(this);
@@ -511,22 +520,88 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wa
#ifndef KHTML_NO_WALLET
assert(w);
const QString key = calculateAutoFillKey(*this);
+ // BEGIN CHANGE [BRCHA]: Autofill with new data model
+ const KUrl formUrl( document()->URL() );
+ const QString accountKeyTmpl = QString( "account_" ) + formUrl.host() + "_%1";
+ const QString accountsKey = QString( "accounts_" ) + formUrl.host();
+ // END CHANGE [BRCHA]
if (!w->hasFolder(KWallet::Wallet::FormDataFolder())) {
return; // failed
}
w->setFolder(KWallet::Wallet::FormDataFolder());
+ // BEGIN CHANGE [BRCHA]
QMap<QString, QString> map;
- if (w->readMap(key, map))
+ bool isAccountSaved = false;
+ QStringList accounts;
+ if ( w->hasEntry( accountsKey ) ) {
+ isAccountSaved = true;
+ QString accountsStr;
+ if ( w->readPassword( accountsKey, accountsStr ) )
return; // failed, abort
+ accounts = accountsStr.split( "\n" );
+ for ( int i = 0; i < accounts.size(); i++ ) {
+ QString password;
+ if ( ! w->readPassword( accountKeyTmpl.arg( accounts[i] ), password ) )
+ map[accounts[i]] = password;
+ }
+ }
+ else if (w->readMap(key, map))
+ return; // failed, abort
+ // END CHANGE [BRCHA]
+
if(document()->view())
{
document()->view()->part()->addWalletFormKey(key);
}
+ // BEGIN CHANGE [BRCHA]: Possible username
+ QString possibleUsername;
+ // Doesn't have multiple password & username fields
+ // The new way
+ if ( isAccountSaved ) {
+ HTMLInputElementImpl* usernameField = NULL;
+ HTMLInputElementImpl* passwordField = NULL;
+ bool fill = true;
+ // Find username and password fields
for (QListIterator<HTMLGenericFormElementImpl*> it(formElements); it.hasNext();) \
{ HTMLGenericFormElementImpl* const cur = it.next();
if (cur->id() == ID_INPUT) {
HTMLInputElementImpl* const current = \
static_cast<HTMLInputElementImpl*>(cur); + if ( ( current->inputType() \
== HTMLInputElementImpl::TEXT ) && + ! current->readOnly() &&
+ fill ) {
+ if ( usernameField == NULL )
+ usernameField = current;
+ else
+ fill = false;
+ }
+ else if ( ( current->inputType() == HTMLInputElementImpl::PASSWORD ) \
&& + ! current->readOnly() &&
+ fill ) {
+ if ( passwordField == NULL )
+ passwordField = current;
+ else
+ fill = false;
+ }
+ }
+ }
+
+ // Ok, now check if we found username and password fields
+ if ( fill &&
+ ( usernameField != NULL ) &&
+ ( passwordField != NULL ) ) {
+ // I guess so, now fill this up
+ usernameField->setPasswordCompanion( passwordField );
+ usernameField->setAccounts( map );
+ document()->setFocusNode( usernameField );
+ }
+ }
+ else {
+ // The old way (just copied)
+ for (QListIterator<HTMLGenericFormElementImpl*> it(formElements); \
it.hasNext();) { + HTMLGenericFormElementImpl* const cur = it.next();
+ if (cur->id() == ID_INPUT) {
+ HTMLInputElementImpl* const current = \
static_cast<HTMLInputElementImpl*>(cur);
if ((current->inputType() == HTMLInputElementImpl::PASSWORD ||
current->inputType() == HTMLInputElementImpl::TEXT) &&
!current->readOnly() &&
@@ -536,6 +611,8 @@ void HTMLFormElementImpl::walletOpened(KWallet::Wa
}
}
}
+ }
+ // END CHANGE [BRCHA]
#endif // KHTML_NO_WALLET
}
@@ -587,10 +664,34 @@ void HTMLFormElementImpl::gatherWalletData()
m_haveTextarea = false;
const KUrl formUrl(document()->URL());
if (view && !view->nonPasswordStorableSite(formUrl.host())) {
+ // BEGIN CHANGE [BRCHA]: initialize store as password variables
+ m_hasMultipleNonPasswordFields = false;
+ m_hasMultiplePasswordFields = false;
+ m_username.clear();
+ m_password.clear();
+ // END CHANGE [BRCHA]
for (QListIterator<HTMLGenericFormElementImpl*> it(formElements); \
it.hasNext();) { HTMLGenericFormElementImpl* const cur = it.next();
if (cur->id() == ID_INPUT) {
HTMLInputElementImpl* const c = static_cast<HTMLInputElementImpl*> \
(cur); + // BEGIN CHANGE [BRCHA]: Store username & password
+ if (!m_hasMultipleNonPasswordFields &&
+ c->inputType() == HTMLInputElementImpl::TEXT &&
+ !c->readOnly()) {
+ if (m_username.isEmpty())
+ m_username = c->value().string();
+ else
+ m_hasMultipleNonPasswordFields = true;
+ }
+ if (!m_hasMultipleNonPasswordFields &&
+ c->inputType() == HTMLInputElementImpl::PASSWORD &&
+ !c->readOnly()) {
+ if (m_password.isEmpty())
+ m_password = c->value().string();
+ else
+ m_hasMultiplePasswordFields = true;
+ }
+ // END CHANGE [BRCHA]
if ((c->inputType() == HTMLInputElementImpl::TEXT ||
c->inputType() == HTMLInputElementImpl::PASSWORD) &&
!c->readOnly()) {
@@ -653,7 +754,22 @@ void HTMLFormElementImpl::submit( )
gatherWalletData();
}
#ifndef KHTML_NO_WALLET
- if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) {
+ // BEGIN CHANGE [BRCHA]: Add support for password storing first
+ if ( !m_hasMultipleNonPasswordFields && !m_hasMultiplePasswordFields &&
+ !m_username.isEmpty() && !m_password.isEmpty() ) {
+ // Store as username/password pair instead of form data
+ // Now key should be account_HOSTNAME_USERNAME and value=password
+ // Also, save "password" accounts_HOSTNAME with value=\n separated \
username list + const QString accountKey = QString( "account_" ) + \
formUrl.host() + "_" + m_username; + const QString accountsKey = QString( \
"accounts_" ) + formUrl.host(); + view->part()->saveAccount( \
formUrl.host(), + accountKey,
+ accountsKey,
+ m_username,
+ m_password );
+ }
+ else if (m_havePassword && !m_haveTextarea && KWallet::Wallet::isEnabled()) \
{ + // END CHANGE [BRCHA]
const QString key = calculateAutoFillKey(*this);
const bool doesnotexist = \
KWallet::Wallet::keyDoesNotExist(KWallet::Wallet::NetworkWallet(), \
KWallet::Wallet::FormDataFolder(), key); KWallet::Wallet* const w = \
view->part()->wallet(); @@ -706,6 +822,11 @@ void HTMLFormElementImpl::submit( )
m_walletMap.clear(); // done with it
m_havePassword = m_haveTextarea= false;
m_doingsubmit = m_insubmit = false;
+ // BEGIN CHANGE [BRCHA]: Clear additional data
+ m_hasMultiplePasswordFields = m_hasMultipleNonPasswordFields = false;
+ m_username.clear();
+ m_password.clear();
+ // END CHANGE [BRCHA]
}
void HTMLFormElementImpl::reset( )
@@ -1292,6 +1413,9 @@ HTMLInputElementImpl::HTMLInputElementImpl(Documen
xPos = 0;
yPos = 0;
+ m_passwordField = 0;
+ m_accounts.clear();
+
if ( m_form )
m_autocomplete = f->autoComplete();
}
@@ -1388,7 +1512,17 @@ QString HTMLInputElementImpl::state( )
case RADIO:
return QLatin1String(checked() ? "on" : "off");
case TEXT:
- if (autoComplete() && value() != getAttribute(ATTR_VALUE) && \
document()->view()) + // BEGIN CHANGE [BRCHA]: New account autocomplete method
+ if ( autoComplete() && !m_accounts.isEmpty() ) {
+ QMap<QString, QString>::const_iterator accIterator;
+ for ( accIterator = m_accounts.constBegin();
+ accIterator != m_accounts.constEnd();
+ ++accIterator )
+ document()->view()->addFormCompletionItem( name().string(),
+ accIterator.key() );
+ }
+ // END CHANGE [BRCHA]
+ else if (autoComplete() && value() != getAttribute(ATTR_VALUE) && \
document()->view())
document()->view()->addFormCompletionItem(name().string(), \
value().string()); /* nobreak */
default:
@@ -2009,6 +2143,42 @@ void HTMLInputElementImpl::setSelectionRange(long
static_cast<RenderLineEdit*>(m_render)->setSelectionRange(start, end);
}
+// BEGIN CHANGE [BRCHA]: Add password companion field & account completion
+void HTMLInputElementImpl::setPasswordCompanion( HTMLInputElementImpl* passwordField \
) +{
+ if ( m_type != TEXT )
+ return;
+ if ( passwordField->m_type != PASSWORD )
+ return;
+ m_passwordField = passwordField;
+}
+
+void HTMLInputElementImpl::setAccounts( QMap<QString, QString> & accounts )
+{
+ if ( m_type != TEXT )
+ return;
+ m_accounts = accounts;
+}
+
+bool HTMLInputElementImpl::hasPasswordCompanion()
+{
+ if ( m_type == TEXT &&
+ !m_accounts.isEmpty() &&
+ m_passwordField )
+ return true;
+ return false;
+}
+
+void HTMLInputElementImpl::completePassword()
+{
+ if ( !hasPasswordCompanion() )
+ return;
+
+ m_passwordField->m_value = m_accounts[m_value.string()];
+}
+
+// END CHANGE [BRCHA]
+
// -------------------------------------------------------------------------
HTMLLabelElementImpl::HTMLLabelElementImpl(DocumentImpl *doc)
Index: khtml/html/html_formimpl.h
===================================================================
--- khtml/html/html_formimpl.h (revision 1152611)
+++ khtml/html/html_formimpl.h (working copy)
@@ -5,6 +5,7 @@
* (C) 1999 Antti Koivisto (koivisto@kde.org)
* (C) 2000 Dirk Mueller (mueller@kde.org)
* (C) 2004, 2005, 2006 Apple Computer, Inc.
+ * (C) 2010 Filip Brcic <brcha@gna.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -130,6 +131,12 @@ class HTMLFormElementImpl : public HTMLElementImpl
bool m_malformed : 1;
bool m_haveTextarea : 1; // for wallet storage
bool m_havePassword : 1; // for wallet storage
+ // BEGIN CHANGE [BRCHA]: Add username/password pair + \
hasMultiple{,Non}PasswordFields bools + bool m_hasMultipleNonPasswordFields : 1; \
// for wallet storage + bool m_hasMultiplePasswordFields : 1; // for wallet \
storage + QString m_username; // for wallet storage
+ QString m_password; // for wallet storage
+ // END CHANGE [BRCHA]:
DOMString m_name; // our name
QMap<QString, QString> m_walletMap; // for wallet storage
};
@@ -293,6 +300,13 @@ class HTMLInputElementImpl : public HTMLGenericFor
DOMString value() const;
void setValue(DOMString val);
+ // BEGIN CHANGE [BRCHA]: Add support for companion password field & account \
completion + void setPasswordCompanion(HTMLInputElementImpl* passwordField);
+ void setAccounts(QMap<QString, QString> & accounts);
+ bool hasPasswordCompanion();
+ void completePassword(); // called from the renderer to do the completion
+ // END CHANGE [BRCHA]
+
DOMString valueWithDefault() const;
virtual bool maintainsState() { return true; }
@@ -351,6 +365,10 @@ class HTMLInputElementImpl : public HTMLGenericFor
bool m_autocomplete : 1;
bool m_inited : 1;
bool m_unsubmittedFormChange : 1;
+ // BEGIN CHANGE [BRCHA]: Add password companion and accounts list
+ HTMLInputElementImpl * m_passwordField;
+ QMap<QString, QString> m_accounts;
+ // END CHANGE [BRCHA]
};
// -------------------------------------------------------------------------
Index: khtml/rendering/render_form.cpp
===================================================================
--- khtml/rendering/render_form.cpp (revision 1152611)
+++ khtml/rendering/render_form.cpp (working copy)
@@ -8,6 +8,7 @@
* (C) 2007-2009 Germain Garand (germain@ebooksfrance.org)
* (C) 2007 Mitz Pettel (mitz@webkit.org)
* (C) 2007 Charles Samuels (charles@kde.org)
+ * (C) 2010 Filip Brcic (brcha@gna.org)
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -1156,6 +1157,10 @@ void RenderLineEdit::slotTextEdited(const QString
// don't use setValue here!
element()->m_value = string;
element()->m_unsubmittedFormChange = true;
+ // BEGIN CHANGE [BRCHA]: Enable multi-account user-pass completion
+ if ( element()->hasPasswordCompanion() )
+ element()->completePassword();
+ // END CHANGE [BRCHA]
}
void RenderLineEdit::select()
Index: khtml/ui/passwordbar/storepassbar.cpp
===================================================================
--- khtml/ui/passwordbar/storepassbar.cpp (revision 1152611)
+++ khtml/ui/passwordbar/storepassbar.cpp (working copy)
@@ -1,6 +1,7 @@
/* This file is part of the KDE project
*
* Copyright (C) 2009 Eduardo Robles Elvira <edulix at gmail dot com>
+ * (C) 2010 Filip Brcic <brcha@gna.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -24,6 +25,7 @@
#include "khtml_part.h"
#include "khtmlview.h"
#include <kcolorscheme.h>
+#include <kwallet.h>
#include <QPalette>
StorePassBar::StorePassBar( QWidget *parent ) :
@@ -84,22 +86,70 @@ void StorePass::saveLoginInformation(const QString
m_key = key;
m_walletMap = walletMap;
m_storePassBar.setHost(host);
+ // BEGIN CHANGE [BRCHA]: Save as map
+ m_saveAsAccount = false;
+ // END CHANGE [BRCHA]
m_part->pTopViewBar()->addBarWidget( &m_storePassBar );
m_part->pTopViewBar()->showBarWidget( &m_storePassBar );
}
+// BEGIN CHANGE [BRCHA]: Save username & password to kwallet
+void StorePass::saveAccount(const QString& host,
+ const QString& accountKey,
+ const QString& accountsKey,
+ const QString& username,
+ const QString& password )
+{
+ m_host = host;
+ m_accountKey = accountKey;
+ m_accountsKey = accountsKey;
+ m_username = username;
+ m_password = password;
+ m_saveAsAccount = true;
+ m_storePassBar.setHost(host);
+
+ m_part->pTopViewBar()->addBarWidget( &m_storePassBar );
+ m_part->pTopViewBar()->showBarWidget( &m_storePassBar );
+}
+// END CHANGE [BRCHA]
+
void StorePass::removeBar()
{
m_part->pTopViewBar()->hideCurrentBarWidget();
m_walletMap.clear();
+ // BEGIN CHANGE [BRCHA]
+ m_username.clear();
+ m_password.clear();
+ m_accountKey.clear();
+ m_accountsKey.clear();
+ m_saveAsAccount = false;
+ // END CHANGE [BRCHA]
m_host = m_key = "";
m_storePassBar.setHost(m_host);
}
void StorePass::slotStoreClicked()
{
+ // BEGIN CHANGE [BRCHA]: Save as u-p pair or as std. wallet map
+ if ( m_saveAsAccount ) {
+ // First check if there are existing accounts on the site
+ QStringList accounts;
+ if ( ! KWallet::Wallet::keyDoesNotExist( KWallet::Wallet::NetworkWallet(),
+ KWallet::Wallet::FormDataFolder(),
+ m_accountsKey ) ) {
+ accounts = m_part->getPasswordFromWallet( m_accountsKey ).split( "\n" );
+ }
+ if ( !accounts.contains( m_username ) )
+ {
+ accounts.append( m_username );
+ m_part->savePasswordToWallet( m_accountsKey, accounts.join( "\n" ) );
+ }
+ m_part->savePasswordToWallet( m_accountKey, m_password );
+ }
+ else
m_part->saveToWallet(m_key, m_walletMap);
+ // END CHANGE [BRCHA]
removeBar();
}
Index: khtml/ui/passwordbar/storepassbar.h
===================================================================
--- khtml/ui/passwordbar/storepassbar.h (revision 1152611)
+++ khtml/ui/passwordbar/storepassbar.h (working copy)
@@ -1,6 +1,7 @@
/* This file is part of the KDE project
*
* Copyright (C) 2009 Eduardo Robles Elvira <edulix at gmail dot com>
+ * (C) 2010 Filip Brcic <brcha@gna.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -51,6 +52,13 @@ class StorePass : public QObject
void saveLoginInformation(const QString& host, const QString& key,
const QMap<QString, QString>& walletMap);
+ // BEGIN CHANGE [BRCHA]: Save username & password to kwallet
+ void saveAccount(const QString& host,
+ const QString& accountKey,
+ const QString& accountsKey,
+ const QString& username,
+ const QString& password);
+ // END CHANGE [BRCHA]
void removeBar();
private slots:
@@ -65,5 +73,12 @@ private slots:
QString m_host;
QString m_key;
QMap<QString, QString> m_walletMap;
+ // BEGIN CHANGE [BRCHA]: Save password to wallet
+ QString m_accountKey;
+ QString m_accountsKey;
+ QString m_username;
+ QString m_password;
+ bool m_saveAsAccount : 1;
+ // END CHANGE [BRCHA]
};
#endif
["signature.asc" (application/pgp-signature)]
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic