Skip to content

Commit

Permalink
Merge pull request #1125 from rsrdesarrollo/master
Browse files Browse the repository at this point in the history
add disable TLD check option
  • Loading branch information
limpkin authored Jan 27, 2023
2 parents ed65010 + ff93200 commit c55121c
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 4 deletions.
8 changes: 5 additions & 3 deletions src/CredentialsManagement.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ void CredentialsManagement::checkLinkingOnLoginSelected(const QModelIndex &srcIn
}
}

QString CredentialsManagement::processMultipleDomainsInput(const QString& service, const QString &domains)
QString CredentialsManagement::processMultipleDomainsInput(const QString& service, const QString &domains, const bool disable_tld_check)
{
#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
auto splitBehavior = QString::SkipEmptyParts;
Expand All @@ -1439,7 +1439,7 @@ QString CredentialsManagement::processMultipleDomainsInput(const QString& servic
domain.prepend('.');
}
ParseDomain dom(serviceDomain + domain);
if (domain == dom.tld())
if (disable_tld_check || domain == dom.tld())
{
validDomains.append(domain);
}
Expand Down Expand Up @@ -1687,13 +1687,15 @@ void CredentialsManagement::onTreeViewContextMenuRequested(const QPoint& pos)
serviceNameChanged = true;
}
}
QSettings s;
bool ok = false;
bool disable_tld_check = s.value("settings/disable_tld_check", false).toBool();
QString text = QInputDialog::getText(this, tr("Multiple Domains for %1").arg(pServiceItem->name()),
tr("Enter comma separated domain extensions:"), QLineEdit::Normal,
defaultDomains, &ok);
if (ok)
{
text = processMultipleDomainsInput(serviceName, text);
text = processMultipleDomainsInput(serviceName, text, disable_tld_check);
if (!text.isEmpty())
{
pServiceItem->setMultipleDomains(text);
Expand Down
2 changes: 1 addition & 1 deletion src/CredentialsManagement.h
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private slots:

void checkLinkingOnLoginSelected(const QModelIndex &srcIndex);

QString processMultipleDomainsInput(const QString& service, const QString &domains);
QString processMultipleDomainsInput(const QString& service, const QString &domains, const bool disable_tld_check);

bool isUICategoryClean() const;

Expand Down
7 changes: 7 additions & 0 deletions src/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,7 @@ MainWindow::MainWindow(WSClient *client, DbMasterController *mc, QWidget *parent

//Check is ssh agent opt has to be checked
ui->checkBoxSSHAgent->setChecked(s.value("settings/auto_start_ssh").toBool());
ui->checkBoxTLDCheck->setChecked(s.value("settings/disable_tld_check").toBool());
ui->lineEditSshArgs->setText(s.value("settings/ssh_args").toString());

ui->scrollArea->setStyleSheet("QScrollArea { background-color:transparent; }");
Expand Down Expand Up @@ -1463,6 +1464,12 @@ void MainWindow::on_checkBoxSSHAgent_stateChanged(int)
s.setValue("settings/auto_start_ssh", ui->checkBoxSSHAgent->isChecked());
}

void MainWindow::on_checkBoxTLDCheck_stateChanged(int)
{
QSettings s;
s.setValue("settings/disable_tld_check", ui->checkBoxTLDCheck->isChecked());
}

void MainWindow::on_pushButtonExportFile_clicked()
{
wsClient->exportDbFile(Common::SIMPLE_CRYPT);
Expand Down
1 change: 1 addition & 0 deletions src/MainWindow.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ private slots:
void on_pushButtonAutoStart_clicked();

void on_checkBoxSSHAgent_stateChanged(int arg1);
void on_checkBoxTLDCheck_stateChanged(int arg1);

void on_pushButtonExportFile_clicked();
void on_pushButtonImportFile_clicked();
Expand Down
31 changes: 31 additions & 0 deletions src/MainWindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -4065,6 +4065,37 @@ Hint: keep your mouse positioned over an option to get more details.</string>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_15">
<item>
<widget class="QLabel" name="label_27">
<property name="text">
<string>Allow to use invalid or private TLDs</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_63">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="checkBoxTLDCheck">
<property name="text">
<string>Disable TLD check</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_19">
<item>
Expand Down

0 comments on commit c55121c

Please sign in to comment.