Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/gui/sslerrordialog.cpp
diff options
context:
space:
mode:
authorChristian Kamm <mail@ckamm.de>2017-05-17 11:55:42 +0300
committerckamm <mail@ckamm.de>2017-05-17 13:26:27 +0300
commitc8d0f788e00bdae125a26d9159ce9efdd6325cd2 (patch)
treead77cb515fe650984e6b76dfffe09838090d77bd /src/gui/sslerrordialog.cpp
parentae263d60bd6d1bc0eb0c3712bab11de120b8cdd3 (diff)
Apply clang-format
Diffstat (limited to 'src/gui/sslerrordialog.cpp')
-rw-r--r--src/gui/sslerrordialog.cpp110
1 files changed, 57 insertions, 53 deletions
diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp
index 53e90961e..4f6be75d6 100644
--- a/src/gui/sslerrordialog.cpp
+++ b/src/gui/sslerrordialog.cpp
@@ -24,8 +24,7 @@
#include "ui_sslerrordialog.h"
-namespace OCC
-{
+namespace OCC {
Q_LOGGING_CATEGORY(lcSslErrorDialog, "gui.sslerrordialog", QtInfoMsg)
@@ -38,7 +37,7 @@ namespace Utility {
bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, const QSslConfiguration &conf, QList<QSslCertificate> *certs, AccountPtr account)
{
- (void) conf;
+ (void)conf;
if (!certs) {
qCCritical(lcSslErrorDialog) << "Certs parameter required but is NULL!";
return false;
@@ -60,24 +59,27 @@ bool SslDialogErrorHandler::handleErrors(QList<QSslError> errors, const QSslConf
return false;
}
-SslErrorDialog::SslErrorDialog(AccountPtr account, QWidget *parent) :
- QDialog(parent), _allTrusted(false), _ui(new Ui::SslErrorDialog), _account(account)
+SslErrorDialog::SslErrorDialog(AccountPtr account, QWidget *parent)
+ : QDialog(parent)
+ , _allTrusted(false)
+ , _ui(new Ui::SslErrorDialog)
+ , _account(account)
{
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
- _ui->setupUi( this );
- setWindowTitle( tr("Untrusted Certificate") );
+ _ui->setupUi(this);
+ setWindowTitle(tr("Untrusted Certificate"));
QPushButton *okButton =
- _ui->_dialogButtonBox->button( QDialogButtonBox::Ok );
+ _ui->_dialogButtonBox->button(QDialogButtonBox::Ok);
QPushButton *cancelButton =
- _ui->_dialogButtonBox->button( QDialogButtonBox::Cancel );
+ _ui->_dialogButtonBox->button(QDialogButtonBox::Cancel);
okButton->setEnabled(false);
connect(_ui->_cbTrustConnect, SIGNAL(clicked(bool)),
- okButton, SLOT(setEnabled(bool)));
+ okButton, SLOT(setEnabled(bool)));
- if( okButton ) {
+ if (okButton) {
okButton->setDefault(true);
- connect( okButton, SIGNAL(clicked()),SLOT(accept()));
- connect( cancelButton, SIGNAL(clicked()),SLOT(reject()));
+ connect(okButton, SIGNAL(clicked()), SLOT(accept()));
+ connect(cancelButton, SIGNAL(clicked()), SLOT(reject()));
}
}
@@ -90,19 +92,18 @@ SslErrorDialog::~SslErrorDialog()
QString SslErrorDialog::styleSheet() const
{
const QString style = QLatin1String(
- "#cert {margin-left: 5px;} "
- "#ca_error { color:#a00011; margin-left:5px; margin-right:5px; }"
- "#ca_error p { margin-top: 2px; margin-bottom:2px; }"
- "#ccert { margin-left: 5px; }"
- "#issuer { margin-left: 5px; }"
- "tt { font-size: small; }"
- );
+ "#cert {margin-left: 5px;} "
+ "#ca_error { color:#a00011; margin-left:5px; margin-right:5px; }"
+ "#ca_error p { margin-top: 2px; margin-bottom:2px; }"
+ "#ccert { margin-left: 5px; }"
+ "#issuer { margin-left: 5px; }"
+ "tt { font-size: small; }");
return style;
}
#define QL(x) QLatin1String(x)
-bool SslErrorDialog::checkFailingCertsKnown( const QList<QSslError> &errors )
+bool SslErrorDialog::checkFailingCertsKnown(const QList<QSslError> &errors)
{
// check if unknown certs caused errors.
_unknownCerts.clear();
@@ -113,8 +114,7 @@ bool SslErrorDialog::checkFailingCertsKnown( const QList<QSslError> &errors )
for (int i = 0; i < errors.count(); ++i) {
QSslError error = errors.at(i);
- if (trustedCerts.contains(error.certificate()) ||
- _unknownCerts.contains(error.certificate() )) {
+ if (trustedCerts.contains(error.certificate()) || _unknownCerts.contains(error.certificate())) {
continue;
}
errorStrings += error.errorString();
@@ -130,24 +130,24 @@ bool SslErrorDialog::checkFailingCertsKnown( const QList<QSslError> &errors )
}
QString msg = QL("<html><head>");
- msg += QL("<link rel='stylesheet' type='text/css' href='format.css'>");
- msg += QL("</head><body>");
+ msg += QL("<link rel='stylesheet' type='text/css' href='format.css'>");
+ msg += QL("</head><body>");
auto host = _account->url().host();
msg += QL("<h3>") + tr("Cannot connect securely to <i>%1</i>:").arg(host) + QL("</h3>");
// loop over the unknown certs and line up their errors.
msg += QL("<div id=\"ca_errors\">");
- foreach( const QSslCertificate& cert, _unknownCerts ) {
+ foreach (const QSslCertificate &cert, _unknownCerts) {
msg += QL("<div id=\"ca_error\">");
// add the errors for this cert
- foreach( QSslError err, errors ) {
- if( err.certificate() == cert ) {
+ foreach (QSslError err, errors) {
+ if (err.certificate() == cert) {
msg += QL("<p>") + err.errorString() + QL("</p>");
}
}
msg += QL("</div>");
- msg += certDiv( cert );
- if( _unknownCerts.count() > 1 ) {
+ msg += certDiv(cert);
+ if (_unknownCerts.count() > 1) {
msg += QL("<hr/>");
}
}
@@ -155,30 +155,33 @@ bool SslErrorDialog::checkFailingCertsKnown( const QList<QSslError> &errors )
QTextDocument *doc = new QTextDocument(0);
QString style = styleSheet();
- doc->addResource( QTextDocument::StyleSheetResource, QUrl( QL("format.css") ), style);
- doc->setHtml( msg );
+ doc->addResource(QTextDocument::StyleSheetResource, QUrl(QL("format.css")), style);
+ doc->setHtml(msg);
- _ui->_tbErrors->setDocument( doc );
+ _ui->_tbErrors->setDocument(doc);
_ui->_tbErrors->show();
return false;
}
-QString SslErrorDialog::certDiv( QSslCertificate cert ) const
+QString SslErrorDialog::certDiv(QSslCertificate cert) const
{
QString msg;
msg += QL("<div id=\"cert\">");
- msg += QL("<h3>") + tr("with Certificate %1").arg( Utility::escape(cert.subjectInfo( QSslCertificate::CommonName ))) + QL("</h3>");
+ msg += QL("<h3>") + tr("with Certificate %1").arg(Utility::escape(cert.subjectInfo(QSslCertificate::CommonName))) + QL("</h3>");
msg += QL("<div id=\"ccert\">");
QStringList li;
- QString org = Utility::escape(cert.subjectInfo( QSslCertificate::Organization));
- QString unit = Utility::escape(cert.subjectInfo( QSslCertificate::OrganizationalUnitName));
- QString country = Utility::escape(cert.subjectInfo( QSslCertificate::CountryName));
- if (unit.isEmpty()) unit = tr("&lt;not specified&gt;");
- if (org.isEmpty()) org = tr("&lt;not specified&gt;");
- if (country.isEmpty()) country = tr("&lt;not specified&gt;");
+ QString org = Utility::escape(cert.subjectInfo(QSslCertificate::Organization));
+ QString unit = Utility::escape(cert.subjectInfo(QSslCertificate::OrganizationalUnitName));
+ QString country = Utility::escape(cert.subjectInfo(QSslCertificate::CountryName));
+ if (unit.isEmpty())
+ unit = tr("&lt;not specified&gt;");
+ if (org.isEmpty())
+ org = tr("&lt;not specified&gt;");
+ if (country.isEmpty())
+ country = tr("&lt;not specified&gt;");
li << tr("Organization: %1").arg(org);
li << tr("Unit: %1").arg(unit);
li << tr("Country: %1").arg(country);
@@ -187,33 +190,34 @@ QString SslErrorDialog::certDiv( QSslCertificate cert ) const
msg += QL("<p>");
QString md5sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Md5).toHex());
- QString sha1sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Sha1).toHex());
+ QString sha1sum = Utility::formatFingerprint(cert.digest(QCryptographicHash::Sha1).toHex());
msg += tr("Fingerprint (MD5): <tt>%1</tt>").arg(md5sum) + QL("<br/>");
msg += tr("Fingerprint (SHA1): <tt>%1</tt>").arg(sha1sum) + QL("<br/>");
msg += QL("<br/>");
- msg += tr("Effective Date: %1").arg( cert.effectiveDate().toString()) + QL("<br/>");
- msg += tr("Expiration Date: %1").arg( cert.expiryDate().toString()) + QL("</p>");
+ msg += tr("Effective Date: %1").arg(cert.effectiveDate().toString()) + QL("<br/>");
+ msg += tr("Expiration Date: %1").arg(cert.expiryDate().toString()) + QL("</p>");
- msg += QL("</div>" );
+ msg += QL("</div>");
- msg += QL("<h3>") + tr("Issuer: %1").arg(Utility::escape(cert.issuerInfo( QSslCertificate::CommonName))) + QL("</h3>");
+ msg += QL("<h3>") + tr("Issuer: %1").arg(Utility::escape(cert.issuerInfo(QSslCertificate::CommonName))) + QL("</h3>");
msg += QL("<div id=\"issuer\">");
li.clear();
- li << tr("Organization: %1").arg(Utility::escape(cert.issuerInfo( QSslCertificate::Organization)));
- li << tr("Unit: %1").arg(Utility::escape(cert.issuerInfo( QSslCertificate::OrganizationalUnitName)));
- li << tr("Country: %1").arg(Utility::escape(cert.issuerInfo( QSslCertificate::CountryName)));
+ li << tr("Organization: %1").arg(Utility::escape(cert.issuerInfo(QSslCertificate::Organization)));
+ li << tr("Unit: %1").arg(Utility::escape(cert.issuerInfo(QSslCertificate::OrganizationalUnitName)));
+ li << tr("Country: %1").arg(Utility::escape(cert.issuerInfo(QSslCertificate::CountryName)));
msg += QL("<p>") + li.join(QL("<br/>")) + QL("</p>");
- msg += QL("</div>" );
- msg += QL("</div>" );
+ msg += QL("</div>");
+ msg += QL("</div>");
return msg;
}
bool SslErrorDialog::trustConnection()
{
- if( _allTrusted ) return true;
+ if (_allTrusted)
+ return true;
- bool stat = ( _ui->_cbTrustConnect->checkState() == Qt::Checked );
+ bool stat = (_ui->_cbTrustConnect->checkState() == Qt::Checked);
qCInfo(lcSslErrorDialog) << "SSL-Connection is trusted: " << stat;
return stat;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-02 17:10:38 +0300