trustbridge/trustbridge: ui/createcertlistdialog.cpp comparison

comparison ui/createcertlistdialog.cpp @ 466:0d71ce440bcc

Factor out list creation to make it more testable

author	Andre Heinecke <aheinecke@intevation.de>
date	Wed, 23 Apr 2014 15:48:08 +0000
parents	88dfe16a0bb9
children	9cd28df2c4ce

comparison

equal deleted inserted replaced

-:88dfe16a0bb9
+:0d71ce440bcc
 delete mPk;
 mPk = NULL;
 }
 }
-void CreateCertListDialog::createList()
+bool CreateCertListDialog::writeList(const QList<Certificate>& certs,
-{
+const QString& filePath,
-if (!mPk) {
+const QDateTime& listDate,
-showErrorMessage(tr("Please select a valid rsa key."));
+pk_context *pk)
-}
+{
-if (mSaveDir->text().isEmpty()) {
-showErrorMessage(tr("Please select an output location first."));
-}
-QDateTime currentDateTimeUtc = QDateTime::currentDateTimeUtc();
 /* Build up the list data */
 QByteArray listData("F:1\r\n");
-listData.append(currentDateTimeUtc.toString(Qt::ISODate) + "\r\n");
+listData.append(listDate.toString(Qt::ISODate) + "\r\n");
-foreach (const Certificate& cert, mAdminWindow->certificates()) {
+foreach (const Certificate& cert, certs) {
 listData.append(QString::fromLatin1("D:") + cert.base64Line() + "\r\n");
 }
-QByteArray signature = rsaSignSHA256Hash(sha256sum(listData), mPk);
+QByteArray signature = rsaSignSHA256Hash(sha256sum(listData), pk);
+if (signature.size() != 3072 / 8) {
+qDebug() << "Signature creation returned signature of invalid size.";
+return false;
+}
 listData.prepend("\r\n");
 listData.prepend(signature.toBase64());
 listData.prepend("S:");
+QFile outputFile(filePath);
+if (!outputFile.open(QIODevice::WriteOnly)) {
+qDebug() << "Failed to open output file: " << filePath;
+return false;
+}
+if (outputFile.write(listData) != listData.size()) {
+qDebug() << "Failed to write list: " << filePath;
+outputFile.close();
+return false;
+}
+outputFile.close();
+return true;
+}
+void CreateCertListDialog::createList()
+{
+if (!mPk) {
+showErrorMessage(tr("Please select a valid rsa key."));
+}
+if (mSaveDir->text().isEmpty()) {
+showErrorMessage(tr("Please select an output location first."));
+}
+QDateTime currentDateTimeUtc = QDateTime::currentDateTimeUtc();
 QString fileName = QString::fromLatin1("certificates-")
 .append(currentDateTimeUtc.toString(("yyyyMMddHHmmss")))
 .append(".txt");
 QString filePath = mSaveDir->text().append("/").append(fileName);
+if (!writeList(mAdminWindow->certificates(), filePath,
+currentDateTimeUtc, mPk)) {
+showErrorMessage(tr("Failed to write list to: %1").arg(filePath));
+}
 QFile outputFile(filePath);
-if (!outputFile.open(QIODevice::WriteOnly)) {
-showErrorMessage(tr("Failed to open output file %1").arg(filePath));
-return;
-}
-if (outputFile.write(listData) != listData.size()) {
-showErrorMessage(tr("Failed to write certificate list."));
-return;
-}
 /* Archive the list */
 QDir archiveDir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
 if (!archiveDir.mkpath(archiveDir.path())) {
 showErrorMessage(tr("Failed to create archive location."));

Mercurial > trustbridge > trustbridge

comparison ui/createcertlistdialog.cpp @ 466:0d71ce440bcc