From 9e0dba8c17eb6507083b4d7602541c25f1fd7f38 Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Wed, 11 Apr 2012 14:21:15 +0200 Subject: [PATCH 1/4] fixed amount part of URI in QR-Codes / removed (no label) string if we have NO label / coding style updates / removed an unused variable --- src/qt/addressbookpage.cpp | 8 +++----- src/qt/qrcodedialog.cpp | 34 ++++++++++++++++++++-------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 88212835d..f9cca13a1 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -310,16 +310,14 @@ void AddressBookPage::on_showQRCode_clicked() QTableView *table = ui->tableView; QModelIndexList indexes = table->selectionModel()->selectedRows(AddressTableModel::Address); - - QRCodeDialog *d; foreach (QModelIndex index, indexes) { QString address = index.data().toString(), label = index.sibling(index.row(), 0).data().toString(), - title = QString("%1 << %2 >>").arg(label).arg(address); + title = QString("<< %1 >>").arg(address); - QRCodeDialog *d = new QRCodeDialog(title, address, label, tab == ReceivingTab, this); - d->show(); + QRCodeDialog *dialog = new QRCodeDialog(title, address, label, tab == ReceivingTab, this); + dialog->show(); } #endif } diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp index 82959831d..bf132ad01 100644 --- a/src/qt/qrcodedialog.cpp +++ b/src/qt/qrcodedialog.cpp @@ -8,7 +8,7 @@ #include -#define EXPORT_IMAGE_SIZE 256 +#define EXPORT_IMAGE_SIZE 256 QRCodeDialog::QRCodeDialog(const QString &title, const QString &addr, const QString &label, bool enableReq, QWidget *parent) : QDialog(parent), @@ -24,7 +24,9 @@ QRCodeDialog::QRCodeDialog(const QString &title, const QString &addr, const QStr ui->lblAm1->setVisible(enableReq); ui->lblAm2->setVisible(enableReq); - ui->lnLabel->setText(label); + // don't display "(no label)" if there IS no label, as this is confusing in the QR dialog + if(label != tr("(no label)")) + ui->lnLabel->setText(label); genCode(); } @@ -37,13 +39,14 @@ QRCodeDialog::~QRCodeDialog() void QRCodeDialog::genCode() { QString uri = getURI(); - //qDebug() << "Encoding:" << uri.toUtf8().constData(); QRcode *code = QRcode_encodeString(uri.toUtf8().constData(), 0, QR_ECLEVEL_L, QR_MODE_8, 1); myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32); myImage.fill(0xffffff); unsigned char *p = code->data; - for(int y = 0; y < code->width; y++) { - for(int x = 0; x < code->width; x++) { + for (int y = 0; y < code->width; y++) + { + for (int x = 0; x < code->width; x++) + { myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff)); p++; } @@ -57,22 +60,26 @@ QString QRCodeDialog::getURI() QString ret = QString("bitcoin:%1").arg(address); int paramCount = 0; - if(ui->chkReq->isChecked() && ui->lnReqAmount->text().isEmpty() == false) { - bool ok= false; - double amount = ui->lnReqAmount->text().toDouble(&ok); - if(ok) { - ret += QString("?amount=%1X8").arg(ui->lnReqAmount->text()); + if (ui->chkReq->isChecked() && !ui->lnReqAmount->text().isEmpty()) + { + bool ok = false; + ui->lnReqAmount->text().toDouble(&ok); + if (ok) + { + ret += QString("?amount=%1").arg(ui->lnReqAmount->text()); paramCount++; } } - if(ui->lnLabel->text().isEmpty() == false) { + if (!ui->lnLabel->text().isEmpty()) + { QString lbl(QUrl::toPercentEncoding(ui->lnLabel->text())); ret += QString("%1label=%2").arg(paramCount == 0 ? "?" : "&").arg(lbl); paramCount++; } - if(ui->lnMessage->text().isEmpty() == false) { + if (!ui->lnMessage->text().isEmpty()) + { QString msg(QUrl::toPercentEncoding(ui->lnMessage->text())); ret += QString("%1message=%2").arg(paramCount == 0 ? "?" : "&").arg(msg); paramCount++; @@ -99,9 +106,8 @@ void QRCodeDialog::on_lnMessage_textChanged(const QString &) void QRCodeDialog::on_btnSaveAs_clicked() { QString fn = GUIUtil::getSaveFileName(this, tr("Save Image..."), QString(), tr("PNG Images (*.png)")); - if(!fn.isEmpty()) { + if (!fn.isEmpty()) myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn); - } } void QRCodeDialog::on_chkReq_toggled(bool) From 1e8c62b29cc0bee5f8da4aa10720fddf0a1cbdfe Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Wed, 11 Apr 2012 23:05:22 +0200 Subject: [PATCH 2/4] updated to reflect pull-request suggestions / renamed some GUI elements --- src/qt/addressbookpage.cpp | 6 ++---- src/qt/forms/qrcodedialog.ui | 12 ++++++------ src/qt/qrcodedialog.cpp | 28 ++++++++++++---------------- src/qt/qrcodedialog.h | 4 ++-- 4 files changed, 22 insertions(+), 28 deletions(-) diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index f9cca13a1..3e55c39e0 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -312,11 +312,9 @@ void AddressBookPage::on_showQRCode_clicked() foreach (QModelIndex index, indexes) { - QString address = index.data().toString(), - label = index.sibling(index.row(), 0).data().toString(), - title = QString("<< %1 >>").arg(address); + QString address = index.data().toString(), label = index.sibling(index.row(), 0).data(Qt::EditRole).toString(); - QRCodeDialog *dialog = new QRCodeDialog(title, address, label, tab == ReceivingTab, this); + QRCodeDialog *dialog = new QRCodeDialog(address, label, tab == ReceivingTab, this); dialog->show(); } #endif diff --git a/src/qt/forms/qrcodedialog.ui b/src/qt/forms/qrcodedialog.ui index fa21f60b9..552eed056 100644 --- a/src/qt/forms/qrcodedialog.ui +++ b/src/qt/forms/qrcodedialog.ui @@ -44,7 +44,7 @@ - + true @@ -56,7 +56,7 @@ - + 0 @@ -91,7 +91,7 @@ - + 0 @@ -113,7 +113,7 @@ - + Label: @@ -136,7 +136,7 @@ - + Message: @@ -194,7 +194,7 @@ - chkReq + chkReqPayment clicked(bool) lnReqAmount setEnabled(bool) diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp index bf132ad01..515cae29d 100644 --- a/src/qt/qrcodedialog.cpp +++ b/src/qt/qrcodedialog.cpp @@ -10,23 +10,19 @@ #define EXPORT_IMAGE_SIZE 256 -QRCodeDialog::QRCodeDialog(const QString &title, const QString &addr, const QString &label, bool enableReq, QWidget *parent) : - QDialog(parent), - ui(new Ui::QRCodeDialog), - address(addr) +QRCodeDialog::QRCodeDialog(const QString &addr, const QString &label, bool enableReq, QWidget *parent) : + QDialog(parent), ui(new Ui::QRCodeDialog), address(addr) { ui->setupUi(this); - setWindowTitle(title); + setWindowTitle(QString("%1").arg(address)); setAttribute(Qt::WA_DeleteOnClose); - ui->chkReq->setVisible(enableReq); + ui->chkReqPayment->setVisible(enableReq); ui->lnReqAmount->setVisible(enableReq); - ui->lblAm1->setVisible(enableReq); - ui->lblAm2->setVisible(enableReq); + ui->lblAmount->setVisible(enableReq); + ui->lblBTC->setVisible(enableReq); - // don't display "(no label)" if there IS no label, as this is confusing in the QR dialog - if(label != tr("(no label)")) - ui->lnLabel->setText(label); + ui->lnLabel->setText(label); genCode(); } @@ -60,7 +56,7 @@ QString QRCodeDialog::getURI() QString ret = QString("bitcoin:%1").arg(address); int paramCount = 0; - if (ui->chkReq->isChecked() && !ui->lnReqAmount->text().isEmpty()) + if (ui->chkReqPayment->isChecked() && !ui->lnReqAmount->text().isEmpty()) { bool ok = false; ui->lnReqAmount->text().toDouble(&ok); @@ -88,17 +84,17 @@ QString QRCodeDialog::getURI() return ret; } -void QRCodeDialog::on_lnReqAmount_textChanged(const QString &) +void QRCodeDialog::on_lnReqAmount_textChanged(const QString &arg1) { genCode(); } -void QRCodeDialog::on_lnLabel_textChanged(const QString &) +void QRCodeDialog::on_lnLabel_textChanged(const QString &arg1) { genCode(); } -void QRCodeDialog::on_lnMessage_textChanged(const QString &) +void QRCodeDialog::on_lnMessage_textChanged(const QString &arg1) { genCode(); } @@ -110,7 +106,7 @@ void QRCodeDialog::on_btnSaveAs_clicked() myImage.scaled(EXPORT_IMAGE_SIZE, EXPORT_IMAGE_SIZE).save(fn); } -void QRCodeDialog::on_chkReq_toggled(bool) +void QRCodeDialog::on_chkReqPayment_toggled(bool) { genCode(); } diff --git a/src/qt/qrcodedialog.h b/src/qt/qrcodedialog.h index 7463a8810..ad0611605 100644 --- a/src/qt/qrcodedialog.h +++ b/src/qt/qrcodedialog.h @@ -13,7 +13,7 @@ class QRCodeDialog : public QDialog Q_OBJECT public: - explicit QRCodeDialog(const QString &title, const QString &address, const QString &label, bool allowReq, QWidget *parent = 0); + explicit QRCodeDialog(const QString &addr, const QString &label, bool enableReq, QWidget *parent = 0); ~QRCodeDialog(); private slots: @@ -22,7 +22,7 @@ private slots: void on_lnMessage_textChanged(const QString &arg1); void on_btnSaveAs_clicked(); - void on_chkReq_toggled(bool checked); + void on_chkReqPayment_toggled(bool checked); private: Ui::QRCodeDialog *ui; From b1a99c3a1fb2613e9c7cecd565e8cc604b03eb6f Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 12 Apr 2012 18:39:22 +0200 Subject: [PATCH 3/4] limit length of generated URI to 255 chars to prevent a DoS against the QR-Code dialog --- src/qt/qrcodedialog.cpp | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp index 515cae29d..80a56d95f 100644 --- a/src/qt/qrcodedialog.cpp +++ b/src/qt/qrcodedialog.cpp @@ -35,20 +35,28 @@ QRCodeDialog::~QRCodeDialog() void QRCodeDialog::genCode() { QString uri = getURI(); - QRcode *code = QRcode_encodeString(uri.toUtf8().constData(), 0, QR_ECLEVEL_L, QR_MODE_8, 1); - myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32); - myImage.fill(0xffffff); - unsigned char *p = code->data; - for (int y = 0; y < code->width; y++) + + if (uri != "") { - for (int x = 0; x < code->width; x++) + ui->lblQRCode->setText(""); + + QRcode *code = QRcode_encodeString(uri.toUtf8().constData(), 0, QR_ECLEVEL_L, QR_MODE_8, 1); + myImage = QImage(code->width + 8, code->width + 8, QImage::Format_RGB32); + myImage.fill(0xffffff); + unsigned char *p = code->data; + for (int y = 0; y < code->width; y++) { - myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff)); - p++; + for (int x = 0; x < code->width; x++) + { + myImage.setPixel(x + 4, y + 4, ((*p & 1) ? 0x0 : 0xffffff)); + p++; + } } + QRcode_free(code); + ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300)); } - QRcode_free(code); - ui->lblQRCode->setPixmap(QPixmap::fromImage(myImage).scaled(300, 300)); + else + ui->lblQRCode->setText(tr("Resulting URI too long, try to reduce the text for label / message.")); } QString QRCodeDialog::getURI() @@ -81,7 +89,11 @@ QString QRCodeDialog::getURI() paramCount++; } - return ret; + // limit URI length to 255 chars, to prevent a DoS of the QR-Code dialog + if (ret.length() < 256) + return ret; + else + return QString(""); } void QRCodeDialog::on_lnReqAmount_textChanged(const QString &arg1) From 7261945eb5f64423d47a5bff63ecd8b65d88b8ed Mon Sep 17 00:00:00 2001 From: Philip Kaufmann Date: Thu, 12 Apr 2012 20:21:02 +0200 Subject: [PATCH 4/4] enable wordWrap on lblQRCode / small code comment change --- src/qt/forms/qrcodedialog.ui | 3 +++ src/qt/qrcodedialog.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/qt/forms/qrcodedialog.ui b/src/qt/forms/qrcodedialog.ui index 552eed056..714b1d6cd 100644 --- a/src/qt/forms/qrcodedialog.ui +++ b/src/qt/forms/qrcodedialog.ui @@ -34,6 +34,9 @@ Qt::AlignCenter + + true + diff --git a/src/qt/qrcodedialog.cpp b/src/qt/qrcodedialog.cpp index 80a56d95f..9965f1438 100644 --- a/src/qt/qrcodedialog.cpp +++ b/src/qt/qrcodedialog.cpp @@ -89,7 +89,7 @@ QString QRCodeDialog::getURI() paramCount++; } - // limit URI length to 255 chars, to prevent a DoS of the QR-Code dialog + // limit URI length to 255 chars, to prevent a DoS against the QR-Code dialog if (ret.length() < 256) return ret; else