Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

[AutoFill] Initial rewrite to support multi-users for one site.

Browse Source
This commit is contained in:
nowrep 2013-02-08 13:02:53 +01:00
parent 0a9f2ec4d6
commit 8988f9c86e
4 changed files with 46 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/lib/autofill/autofill.cpp
View File

@ -97,7 +97,7 @@ bool AutoFill::isStoringEnabled(const QUrl &url)
return true;
}
void AutoFill::blockStoringfor(const QUrl &url)
void AutoFill::blockStoringforUrl(const QUrl &url)
{
QString server = url.host();
if (server.isEmpty()) {
@ -110,36 +110,44 @@ void AutoFill::blockStoringfor(const QUrl &url)
mApp->dbWriter()->executeQuery(query);
}
QString AutoFill::getUsername(const QUrl &url)
QList<AutoFillData> AutoFill::getFormData(const QUrl &url)
{
QList<AutoFillData> list;
QString server = url.host();
if (server.isEmpty()) {
server = url.toString();
}
QSqlQuery query;
query.prepare("SELECT username FROM autofill WHERE server=?");
query.prepare("SELECT id, username, password, data FROM autofill "
"WHERE server=? ORDER BY last_used DESC");
query.addBindValue(server);
query.exec();
query.next();
return query.value(0).toString();
while (query.next()) {
AutoFillData data;
data.id = query.value(0).toInt();
data.username = query.value(1).toString();
data.password = query.value(2).toString();
data.postData = query.value(3).toByteArray();
list.append(data);
}
return list;
}
QString AutoFill::getPassword(const QUrl &url)
void AutoFill::updateLastUsed(int id)
{
QString server = url.host();
if (server.isEmpty()) {
server = url.toString();
if (id < 0) {
return;
}
QSqlQuery query;
query.prepare("SELECT password FROM autofill WHERE server=?");
query.addBindValue(server);
query.prepare("UPDATE autofill SET last_used=strftime('%s', 'now') WHERE id=?");
query.addBindValue(id);
query.exec();
query.next();
return query.value(0).toString();
}
///HTTP Authorization
@ -159,7 +167,8 @@ void AutoFill::addEntry(const QUrl &url, const QString &name, const QString &pas
return;
}
query.prepare("INSERT INTO autofill (server, username, password) VALUES (?,?,?)");
query.prepare("INSERT INTO autofill (server, username, password, last_used) "
"VALUES (?,?,?,strftime('%s', 'now'))");
query.bindValue(0, server);
query.bindValue(1, name);
query.bindValue(2, pass);
@ -183,7 +192,8 @@ void AutoFill::addEntry(const QUrl &url, const PageFormData &formData)
return;
}
query.prepare("INSERT INTO autofill (server, data, username, password) VALUES (?,?,?,?)");
query.prepare("INSERT INTO autofill (server, data, username, password, last_used) "
"VALUES (?,?,?,?,strftime('%s', 'now'))");
query.bindValue(0, server);
query.bindValue(1, formData.postData);
query.bindValue(2, formData.username);
@ -300,10 +310,10 @@ void AutoFill::post(const QNetworkRequest &request, const QByteArray &outgoingDa
bool updateData = false;
if (isStored(siteUrl)) {
const QString &user = getUsername(siteUrl);
const QString &pass = getPassword(siteUrl);
const AutoFillData data = getFormData(siteUrl).first();
if (user == formData.username && pass == formData.password) {
if (data.username == formData.username && data.password == formData.password) {
updateLastUsed(data.id);
return;
}

15
src/lib/autofill/autofill.h
View File

@ -19,7 +19,7 @@
#define AUTOFILLMODEL_H
#include <QObject>
#include <QPair>
#include <QList>
#include "qz_namespace.h"
@ -31,6 +31,13 @@ class QupZilla;
class WebPage;
struct PageFormData;
struct AutoFillData {
int id;
QString username;
QString password;
QByteArray postData;
};
class QT_QUPZILLA_EXPORT AutoFill : public QObject
{
public:
@ -40,10 +47,10 @@ public:
bool isStored(const QUrl &url);
bool isStoringEnabled(const QUrl &url);
void blockStoringfor(const QUrl &url);
void blockStoringforUrl(const QUrl &url);
QString getUsername(const QUrl &url);
QString getPassword(const QUrl &url);
QList<AutoFillData> getFormData(const QUrl &url);
void updateLastUsed(int id);
void addEntry(const QUrl &url, const QString &name, const QString &pass);
void addEntry(const QUrl &url, const PageFormData &formData);

2
src/lib/autofill/autofillnotification.cpp
View File

@ -73,7 +73,7 @@ void AutoFillNotification::update()
void AutoFillNotification::never()
{
mApp->autoFill()->blockStoringfor(m_url);
mApp->autoFill()->blockStoringforUrl(m_url);
hide();
}

7
src/lib/network/networkmanager.cpp
View File

@ -284,14 +284,17 @@ void NetworkManager::authentication(QNetworkReply* reply, QAuthenticator* auth)
formLa->addWidget(box);
bool shouldUpdateEntry = false;
AutoFill* fill = mApp->autoFill();
QString storedUser;
QString storedPassword;
if (fill->isStored(reply->url())) {
const AutoFillData &data = fill->getFormData(reply->url()).first();
save->setChecked(true);
shouldUpdateEntry = true;
storedUser = fill->getUsername(reply->url());
storedPassword = fill->getPassword(reply->url());
storedUser = data.username;
storedPassword = data.password;
user->setText(storedUser);
pass->setText(storedPassword);
}