From b88bfd46c78f06765aaf8ccc59c7a6d7d053a994 Mon Sep 17 00:00:00 2001 From: nowrep Date: Sun, 20 Nov 2011 17:09:10 +0100 Subject: [PATCH] Password manager now detects also username - username is detected as first input type="text" in form - it should work on almost every page This is last requirements to implement saving multiple users on one page. --- bin/locale/cs_CZ.qm | Bin 82852 -> 82958 bytes src/autofill/autofillmodel.cpp | 95 ++++++++++++++---- src/autofill/autofillmodel.h | 9 +- src/autofill/autofillnotification.cpp | 7 +- src/autofill/autofillnotification.h | 3 +- .../desktopnotificationsfactory.cpp | 36 +++---- src/preferences/autofillmanager.cpp | 12 +-- src/preferences/autofillmanager.ui | 18 +++- translations/cs_CZ.ts | 31 +++--- translations/de_DE.ts | 31 +++--- translations/es.ts | 31 +++--- translations/it_IT.ts | 31 +++--- translations/nl_NL.ts | 31 +++--- translations/sk_SK.ts | 31 +++--- translations/zh_CN.ts | 31 +++--- 15 files changed, 254 insertions(+), 143 deletions(-) diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm index f06ef23178a3c8ada492e9ea2c535c16c8668d47..0392bf58bd9eb9a3e706cddc0769d35de2d71d81 100644 GIT binary patch delta 6599 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 diff --git a/src/autofill/autofillmodel.cpp b/src/autofill/autofillmodel.cpp index f0ec3b225..6f8693b37 100644 --- a/src/autofill/autofillmodel.cpp +++ b/src/autofill/autofillmodel.cpp @@ -110,7 +110,7 @@ bool AutoFillModel::addEntry(const QUrl &url, const QString &name, const QString } ///WEB Form -bool AutoFillModel::addEntry(const QUrl &url, const QByteArray &data, const QString &pass) +bool AutoFillModel::addEntry(const QUrl &url, const QByteArray &data, const QString &user, const QString &pass) { QSqlQuery query; query.exec("SELECT data FROM autofill WHERE server='" + url.host() + "'"); @@ -118,10 +118,11 @@ bool AutoFillModel::addEntry(const QUrl &url, const QByteArray &data, const QStr return false; } - query.prepare("INSERT INTO autofill (server, data, password) VALUES (?,?,?)"); + query.prepare("INSERT INTO autofill (server, data, username, password) VALUES (?,?,?,?)"); query.bindValue(0, url.host()); query.bindValue(1, data); - query.bindValue(2, pass); + query.bindValue(2, user); + query.bindValue(3, pass); return query.exec(); } @@ -192,37 +193,95 @@ void AutoFillModel::post(const QNetworkRequest &request, const QByteArray &outgo return; } - QString passwordName = ""; - QString passwordValue = ""; + QString usernameName; + QString usernameValue; + QString passwordName; + QString passwordValue; QUrl siteUrl = webView->url(); - QWebElementCollection inputs; + if (!isStoringEnabled(siteUrl)) { + return; + } + + QWebElementCollection allForms; // All form elements on page + QWebElement foundForm; // Sent form element + QList frames; - frames.append(webPage->mainFrame()); + frames.append(webPage->mainFrame()); // Find all form elements while (!frames.isEmpty()) { QWebFrame* frame = frames.takeFirst(); - inputs.append(frame->findAllElements("input[type=\"password\"]")); + allForms.append(frame->findAllElements("form")); frames += frame->childFrames(); } - foreach(QWebElement element, inputs) { - passwordName = element.attribute("name"); - passwordValue = element.evaluateJavaScript("this.value").toString(); - if (!passwordValue.isEmpty()) { + foreach(QWebElement formElement, allForms) { + foreach(QWebElement inputElement, formElement.findAll("input[type=\"password\"]")) { + passwordName = inputElement.attribute("name"); + passwordValue = getValueFromData(outgoingData, inputElement); + + if (!passwordValue.isEmpty() && dataContains(outgoingData, passwordName)) { + foundForm = formElement; + break; + } + } + + if (!foundForm.isNull()) { break; } } - //Return if storing is not enabled, data for this page is already stored, no password element found in sent data - if (passwordName.isEmpty() || !isStoringEnabled(siteUrl) || isStored(siteUrl)) { + // Return if data for this page is already stored or no password element found in sent data + if (foundForm.isNull() || isStored(siteUrl)) { return; } - //Return if no password form has been sent - if (!outgoingData.contains((QUrl(passwordName).toEncoded() + "=")) || passwordValue.isEmpty()) { - return; + // We need to find username, we suppose that username is first not empty input[type=text] in form + // Tell me better solution. Maybe first try to find name="user", name="username" ? + + foreach(QWebElement element, foundForm.findAll("input[type=\"text\"]")) { + usernameName = element.attribute("name"); + usernameValue = getValueFromData(outgoingData, element); + if (!usernameName.isEmpty() && !usernameValue.isEmpty()) { + break; + } } - AutoFillNotification* aWidget = new AutoFillNotification(siteUrl, outgoingData, passwordValue); + AutoFillNotification* aWidget = new AutoFillNotification(siteUrl, outgoingData, usernameValue, passwordValue); webView->addNotification(aWidget); } + +QString AutoFillModel::getValueFromData(const QByteArray &data, QWebElement element) +{ + QString name = element.attribute("name"); + if (name.isEmpty()) { + return ""; + } + + QString value = element.evaluateJavaScript("this.value").toString(); + if (value.isEmpty()) { + QueryItems queryItems = QUrl("http://a.b/?" + data).queryItems(); + for (int i = 0; i < queryItems.count(); i++) { + QueryItem item = queryItems.at(i); + + if (item.first == name) { + value = item.second; + } + } + } + + return value; +} + +bool AutoFillModel::dataContains(const QByteArray &data, const QString &attributeName) +{ + QueryItems queryItems = QUrl("http://a.b/?" + data).queryItems(); + for (int i = 0; i < queryItems.count(); i++) { + QueryItem item = queryItems.at(i); + + if (item.first == attributeName) { + return !item.second.isEmpty(); + } + } + + return false; +} diff --git a/src/autofill/autofillmodel.h b/src/autofill/autofillmodel.h index 077c442f8..2a4ef7958 100644 --- a/src/autofill/autofillmodel.h +++ b/src/autofill/autofillmodel.h @@ -21,6 +21,7 @@ #include #include #include +#include class QupZilla; class WebView; @@ -28,6 +29,9 @@ class AutoFillModel : public QObject { Q_OBJECT public: + typedef QList > QueryItems; + typedef QPair QueryItem; + explicit AutoFillModel(QupZilla* mainClass, QObject* parent = 0); void completePage(WebView* view); @@ -38,7 +42,7 @@ public: QString getUsername(const QUrl &url); QString getPassword(const QUrl &url); bool addEntry(const QUrl &url, const QString &name, const QString &pass); - bool addEntry(const QUrl &url, const QByteArray &data, const QString &pass); + bool addEntry(const QUrl &url, const QByteArray &data, const QString &user, const QString &pass); void post(const QNetworkRequest &request, const QByteArray &outgoingData); @@ -48,6 +52,9 @@ public slots: void loadSettings(); private: + bool dataContains(const QByteArray &data, const QString &attributeName); + QString getValueFromData(const QByteArray &data, QWebElement element); + QupZilla* p_QupZilla; QByteArray m_lastOutgoingData; bool m_isStoring; diff --git a/src/autofill/autofillnotification.cpp b/src/autofill/autofillnotification.cpp index 355de1ef7..0f7eb5c20 100644 --- a/src/autofill/autofillnotification.cpp +++ b/src/autofill/autofillnotification.cpp @@ -22,16 +22,17 @@ #include "animatedwidget.h" #include "iconprovider.h" -AutoFillNotification::AutoFillNotification(QUrl url, QByteArray data, QString pass, QWidget* parent) +AutoFillNotification::AutoFillNotification(const QUrl &url, const QByteArray &data, const QString &user, const QString &pass, QWidget* parent) : AnimatedWidget(AnimatedWidget::Down, 300, parent) , ui(new Ui::AutoFillWidget) , m_url(url) , m_data(data) + , m_user(user) , m_pass(pass) { setAttribute(Qt::WA_DeleteOnClose); ui->setupUi(widget()); - ui->label->setText(tr("Do you want QupZilla to remember password on %1?").arg(url.host())); + ui->label->setText(tr("Do you want QupZilla to remember password for %1 on %2?").arg(user, url.host())); ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton)); connect(ui->remember, SIGNAL(clicked()), this, SLOT(remember())); @@ -50,7 +51,7 @@ void AutoFillNotification::never() void AutoFillNotification::remember() { - mApp->autoFill()->addEntry(m_url, m_data, m_pass); + mApp->autoFill()->addEntry(m_url, m_data, m_user, m_pass); hide(); } diff --git a/src/autofill/autofillnotification.h b/src/autofill/autofillnotification.h index edd3a47f0..38b5f1810 100644 --- a/src/autofill/autofillnotification.h +++ b/src/autofill/autofillnotification.h @@ -35,7 +35,7 @@ class AutoFillNotification : public AnimatedWidget Q_OBJECT public: - explicit AutoFillNotification(QUrl url, QByteArray data, QString pass, QWidget* parent = 0); + explicit AutoFillNotification(const QUrl &url, const QByteArray &data, const QString &user, const QString &pass, QWidget* parent = 0); ~AutoFillNotification(); private slots: @@ -46,6 +46,7 @@ private: Ui::AutoFillWidget* ui; QUrl m_url; QByteArray m_data; + QString m_user; QString m_pass; }; diff --git a/src/desktopnotifications/desktopnotificationsfactory.cpp b/src/desktopnotifications/desktopnotificationsfactory.cpp index 2460829f7..9f81df3c2 100644 --- a/src/desktopnotifications/desktopnotificationsfactory.cpp +++ b/src/desktopnotifications/desktopnotificationsfactory.cpp @@ -88,24 +88,24 @@ void DesktopNotificationsFactory::notify(const QPixmap &icon, const QString &hea void DesktopNotificationsFactory::nativeNotificationPreview() { #ifdef Q_WS_X11 - QFile tmp(QDir::tempPath() + "/qupzilla_notif.png"); - tmp.open(QFile::WriteOnly); - QPixmap(":icons/preferences/stock_dialog-question.png").save(tmp.fileName()); + QFile tmp(QDir::tempPath() + "/qupzilla_notif.png"); + tmp.open(QFile::WriteOnly); + QPixmap(":icons/preferences/stock_dialog-question.png").save(tmp.fileName()); - QDBusInterface dbus("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", QDBusConnection::sessionBus()); - QVariantList args; - args.append("qupzilla"); - args.append(m_uint); - args.append(tmp.fileName()); - args.append(tr("Native System Notification")); - args.append(""); - args.append(QStringList()); - args.append(QVariantMap()); - args.append(m_timeout); - QDBusMessage message = dbus.callWithArgumentList(QDBus::Block, "Notify", args); - QVariantList list = message.arguments(); - if (list.count() > 0) { - m_uint = list.at(0).toInt(); - } + QDBusInterface dbus("org.freedesktop.Notifications", "/org/freedesktop/Notifications", "org.freedesktop.Notifications", QDBusConnection::sessionBus()); + QVariantList args; + args.append("qupzilla"); + args.append(m_uint); + args.append(tmp.fileName()); + args.append(tr("Native System Notification")); + args.append(""); + args.append(QStringList()); + args.append(QVariantMap()); + args.append(m_timeout); + QDBusMessage message = dbus.callWithArgumentList(QDBus::Block, "Notify", args); + QVariantList list = message.arguments(); + if (list.count() > 0) { + m_uint = list.at(0).toInt(); + } #endif } diff --git a/src/preferences/autofillmanager.cpp b/src/preferences/autofillmanager.cpp index 81f453b59..61e1f8f6b 100644 --- a/src/preferences/autofillmanager.cpp +++ b/src/preferences/autofillmanager.cpp @@ -39,15 +39,15 @@ AutoFillManager::AutoFillManager(QWidget* parent) void AutoFillManager::loadPasswords() { QSqlQuery query; - query.exec("SELECT server, password, id FROM autofill"); + query.exec("SELECT server, username, password, id FROM autofill"); ui->treePass->clear(); while (query.next()) { QTreeWidgetItem* item = new QTreeWidgetItem(ui->treePass); item->setText(0, query.value(0).toString()); -// item->setText(1, query.value(1).toString()); - item->setText(1, "*****"); - item->setWhatsThis(0, query.value(2).toString()); - item->setWhatsThis(1, query.value(1).toString()); + item->setText(1, query.value(1).toString()); + item->setText(2, "*****"); + item->setWhatsThis(0, query.value(3).toString()); + item->setWhatsThis(1, query.value(2).toString()); ui->treePass->addTopLevelItem(item); } @@ -79,7 +79,7 @@ void AutoFillManager::showPasswords() if (!item) { continue; } - item->setText(1, item->whatsThis(1)); + item->setText(2, item->whatsThis(1)); } ui->showPasswords->hide(); diff --git a/src/preferences/autofillmanager.ui b/src/preferences/autofillmanager.ui index d4367db31..65d581bb4 100644 --- a/src/preferences/autofillmanager.ui +++ b/src/preferences/autofillmanager.ui @@ -29,14 +29,22 @@ + + 0 + - 170 + 100 Server + + + Username + + Password @@ -47,16 +55,16 @@ - + - Remove + Edit - + - Edit + Remove diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts index dccad00c4..ea11abdb9 100644 --- a/translations/cs_CZ.ts +++ b/translations/cs_CZ.ts @@ -228,41 +228,46 @@ Hesla - - + + Server Server - + + Username + Uživatel + + + Password Heslo - - + + Remove Odstranit - + Edit Upravit - - + + Remove All Odstranit vše - + Show Passwords Zobrazit hesla - + Exceptions Vyjímky @@ -295,9 +300,9 @@ AutoFillNotification - - Do you want QupZilla to remember password on %1? - Chcete aby si QupZilla zapamatovala heslo pro %1? + + Do you want QupZilla to remember password for <b>%1</b> on %2? + Chcete aby si QupZilla zapamatovala heslo pro <b>%1<b> na %2? diff --git a/translations/de_DE.ts b/translations/de_DE.ts index 76d96df2d..b1adf1d83 100644 --- a/translations/de_DE.ts +++ b/translations/de_DE.ts @@ -228,41 +228,46 @@ Passwörter - - + + Server Server - + + Username + + + + Password Passwort - - + + Remove Entfernen - + Edit Bearbeiten - - + + Remove All Alle entfernen - + Show Passwords Passwörter im Klartext anzeigen - + Exceptions Ausnahmen @@ -295,9 +300,9 @@ AutoFillNotification - - Do you want QupZilla to remember password on %1? - Möchten Sie das Passwort für %1 speichern? + + Do you want QupZilla to remember password for <b>%1</b> on %2? + diff --git a/translations/es.ts b/translations/es.ts index 0792df9f0..b774f94f4 100644 --- a/translations/es.ts +++ b/translations/es.ts @@ -228,41 +228,46 @@ Contraseñas - - + + Server Servidor - + + Username + + + + Password Contraseña - - + + Remove Quitar - + Edit Editar - - + + Remove All Quitar todo - + Show Passwords Mostras contraseñas - + Exceptions Excepciones @@ -295,9 +300,9 @@ AutoFillNotification - - Do you want QupZilla to remember password on %1? - ¿Desea que QupZilla recuerde la contraseña en %1? + + Do you want QupZilla to remember password for <b>%1</b> on %2? + diff --git a/translations/it_IT.ts b/translations/it_IT.ts index 364395f93..072a1d261 100644 --- a/translations/it_IT.ts +++ b/translations/it_IT.ts @@ -228,41 +228,46 @@ Passwords - - + + Server Server - + + Username + + + + Password Password - - + + Remove Elimina - + Edit Modifica - - + + Remove All Elimina Tutto - + Show Passwords Mostra le password - + Exceptions Eccezioni @@ -295,9 +300,9 @@ AutoFillNotification - - Do you want QupZilla to remember password on %1? - Vuoi che QupZilla ricordi la password per %1? + + Do you want QupZilla to remember password for <b>%1</b> on %2? + diff --git a/translations/nl_NL.ts b/translations/nl_NL.ts index ebba89eeb..d7dc32eba 100644 --- a/translations/nl_NL.ts +++ b/translations/nl_NL.ts @@ -228,41 +228,46 @@ Wachtwoorden - - + + Server Server - + + Username + + + + Password Wachtwoord - - + + Remove Verwijder - + Edit Bewerk - - + + Remove All Verwijder alles - + Show Passwords Toon wachtwoorden - + Exceptions Uitzonderingen @@ -295,9 +300,9 @@ AutoFillNotification - - Do you want QupZilla to remember password on %1? - Wilt u dat QupZilla uw wachtwoord onthoudt voor %1? + + Do you want QupZilla to remember password for <b>%1</b> on %2? + diff --git a/translations/sk_SK.ts b/translations/sk_SK.ts index b14e94779..05681bab7 100644 --- a/translations/sk_SK.ts +++ b/translations/sk_SK.ts @@ -228,41 +228,46 @@ Heslá - - + + Server Server - + + Username + + + + Password Heslo - - + + Remove Odstrániť - + Edit Upraviť - - + + Remove All Odstrániť všetko - + Show Passwords Zobraziť heslo - + Exceptions Výnimky @@ -295,9 +300,9 @@ AutoFillNotification - - Do you want QupZilla to remember password on %1? - Chcete aby si QupZilla zapamätala heslo pre %1? + + Do you want QupZilla to remember password for <b>%1</b> on %2? + diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 1b7007423..f266c7f92 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -228,41 +228,46 @@ 密码 - - + + Server 服务器 - + + Username + + + + Password 密码 - - + + Remove 删除 - + Edit 编辑 - - + + Remove All 全部删除 - + Show Passwords 显示密码 - + Exceptions 例外 @@ -295,9 +300,9 @@ AutoFillNotification - - Do you want QupZilla to remember password on %1? - 需要QupZilla记住%1密码？ + + Do you want QupZilla to remember password for <b>%1</b> on %2? +