mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 05:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Refactor browser Access Control Dialog (#9607)

Browse source
This commit is contained in:
Sami Vänttinen 2023-07-09 21:33:05 +03:00 • committed by GitHub
parent 35baeaff79
commit 190a1fa10c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 253 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/browser/BrowserService.cpp
View file

@ -452,25 +452,48 @@ QList<Entry*> BrowserService::confirmEntries(QList<Entry*>& entriesToConfirm,
denyEntry(entry, siteHost, formUrl, entryParameters.realm);
});
accessControlDialog.setItems(entriesToConfirm, entryParameters.siteUrl, httpAuth);
accessControlDialog.setEntries(entriesToConfirm, entryParameters.siteUrl, httpAuth);
QList<Entry*> allowedEntries;
auto ret = accessControlDialog.exec();
for (auto item : accessControlDialog.getSelectedEntries()) {
auto entry = entriesToConfirm[item->row()];
if (accessControlDialog.remember()) {
if (ret == QDialog::Accepted) {
auto remember = accessControlDialog.remember();
// All are denied
if (ret == QDialog::Rejected && remember) {
for (auto& entry : entriesToConfirm) {
denyEntry(entry, siteHost, formUrl, entryParameters.realm);
}
}
// Some/all are accepted
if (ret == QDialog::Accepted) {
auto selectedEntries = accessControlDialog.getEntries(SelectionType::Selected);
for (auto& item : selectedEntries) {
auto entry = entriesToConfirm[item->row()];
allowedEntries.append(entry);
if (remember) {
allowEntry(entry, siteHost, formUrl, entryParameters.realm);
} else {
denyEntry(entry, siteHost, formUrl, entryParameters.realm);
}
}
if (ret == QDialog::Accepted) {
allowedEntries.append(entry);
// Remembered non-selected entries must be denied
if (remember) {
auto nonSelectedEntries = accessControlDialog.getEntries(SelectionType::NonSelected);
for (auto& item : nonSelectedEntries) {
auto entry = entriesToConfirm[item->row()];
denyEntry(entry, siteHost, formUrl, entryParameters.realm);
}
}
}
// Handle disabled entries (returned Accept/Reject status does not matter)
auto disabledEntries = accessControlDialog.getEntries(SelectionType::Disabled);
for (auto& item : disabledEntries) {
auto entry = entriesToConfirm[item->row()];
denyEntry(entry, siteHost, formUrl, entryParameters.realm);
}
// Re-hide the application if it wasn't visible before
hideWindow();
m_dialogActive = false;