mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 13:35:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

Certificate Wizard: Remove dead code, cleanup style

Browse source
This commit is contained in:
Daniel Molkentin 2015-01-28 17:38:38 +01:00
parent 5fc231cda4
commit 6fa73e073f
3 changed files with 20 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/gui/addcertificatedialog.cpp
View file

@ -39,11 +39,11 @@ void AddCertificateDialog::showErrorMessage(const QString message)
ui->labelErrorCertif->setText(message); ui->labelErrorCertif->setText(message);
} }
void AddCertificateDialog::Reinit() void AddCertificateDialog::reinit()
{ {
ui->labelErrorCertif->setText(""); ui->labelErrorCertif->clear();
ui->lineEditCertificatePath->setText(""); ui->lineEditCertificatePath->clear();
ui->lineEditPWDCertificate->setText(""); ui->lineEditPWDCertificate->clear();
} }
} }

2
src/gui/addcertificatedialog.h
View file

@ -20,7 +20,7 @@ public:
QString getCertificatePath(); QString getCertificatePath();
QString getCertificatePasswd(); QString getCertificatePasswd();
void showErrorMessage(const QString message); void showErrorMessage(const QString message);
void Reinit(); void reinit();
private slots: private slots:
void on_pushButtonBrowseCertificate_clicked(); void on_pushButtonBrowseCertificate_clicked();

51
src/gui/wizard/owncloudsetuppage.cpp
View file

@ -288,6 +288,15 @@ void OwncloudSetupPage::slotAskSSLClientCertificate()
connect(addCertDial, SIGNAL(accepted()),this,SLOT(slotCertificateAccepted())); connect(addCertDial, SIGNAL(accepted()),this,SLOT(slotCertificateAccepted()));
} }
QString subjectInfoHelper(const QSslCertificate& cert, const QByteArray &qa)
{
#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
return cert.subjectInfo(qa);
#else
return cert.subjectInfo(qa).join(QLatin1Char('/'));
#endif
}
//called during the validation of the client certificate. //called during the validation of the client certificate.
void OwncloudSetupPage::slotCertificateAccepted() void OwncloudSetupPage::slotCertificateAccepted()
{ {
@ -301,44 +310,14 @@ void OwncloudSetupPage::slotCertificateAccepted()
QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(ba, QSsl::Pem); QList<QSslCertificate> sslCertificateList = QSslCertificate::fromData(ba, QSsl::Pem);
sslCertificate = sslCertificateList.takeAt(0); sslCertificate = sslCertificateList.takeAt(0);
this->_ocWizard->ownCloudCertificate = ba; _ocWizard->ownCloudCertificate = ba;
this->_ocWizard->ownCloudPrivateKey = certif.PrivateKey.c_str(); _ocWizard->ownCloudPrivateKey = certif.PrivateKey.c_str();
this->_ocWizard->ownCloudCertificatePath = addCertDial->getCertificatePath(); _ocWizard->ownCloudCertificatePath = addCertDial->getCertificatePath();
this->_ocWizard->ownCloudCertificatePasswd = addCertDial->getCertificatePasswd(); _ocWizard->ownCloudCertificatePasswd = addCertDial->getCertificatePasswd();
//FIXME qknight: hacky code ahead AccountPtr acc = _ocWizard->account();
AccountPtr acc = this->_ocWizard->account();
acc->setCertificate(_ocWizard->ownCloudCertificate, _ocWizard->ownCloudPrivateKey); acc->setCertificate(_ocWizard->ownCloudCertificate, _ocWizard->ownCloudPrivateKey);
addCertDial->reinit();
QList<QByteArray> qba = sslCertificate.subjectInfoAttributes();
QString _DN = "";
QString _C,_ST, _L, _O, _OU, _CN, _emailAddress;
foreach(QByteArray qa, qba)
{
if(strcmp(qa.data(),"C")==0){
_C="/"+QString(qa)+"="+sslCertificate.subjectInfo(qa).join('/');
}
else if(strcmp(qa.data(),"ST")==0){
_ST="/"+QString(qa)+"="+sslCertificate.subjectInfo(qa).join('/');
}
else if(strcmp(qa.data(),"L")==0){
_L="/"+QString(qa)+"="+sslCertificate.subjectInfo(qa).join('/');
}
else if(strcmp(qa.data(),"O")==0){
_O="/"+QString(qa)+"="+sslCertificate.subjectInfo(qa).join('/');
}
else if(strcmp(qa.data(),"OU")==0){
_OU="/"+QString(qa)+"="+sslCertificate.subjectInfo(qa).join('/');
}
else if(strcmp(qa.data(),"CN")==0){
_CN="/"+QString(qa)+"="+sslCertificate.subjectInfo(qa).join('/');
}
else if(strcmp(qa.data(),"emailAddress")==0){
_emailAddress="/"+QString(qa)+"="+sslCertificate.subjectInfo(qa).join('/');
}
}
_DN += _C+_ST+_L+_O+_OU+_CN+_emailAddress;
addCertDial->Reinit();
validatePage(); validatePage();
} else { } else {
QString message; QString message;