Skip to content

Commit 4099f90

Browse files
metsmametsma
committed
Do not allow to sign encrypted documents
IB-8763 Signed-off-by: Raul Metsma <[email protected]>
1 parent 6496acc commit 4099f90

File tree

6 files changed

+57
-100
lines changed

6 files changed

+57
-100
lines changed

‎client/CryptoDoc.cpp‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -447,13 +447,10 @@ QList<CKey> CryptoDoc::keys() const
447447

448448
bool CryptoDoc::move(const QString &to)
449449
{
450-
if(!d->isEncrypted)
451-
{
452-
d->fileName = to;
453-
return true;
454-
}
455-
456-
return false;
450+
if(d->isEncrypted)
451+
return false;
452+
d->fileName = to;
453+
return true;
457454
}
458455

459456
bool CryptoDoc::open( const QString &file )

‎client/MainWindow.cpp‎

Lines changed: 21 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -250,15 +250,17 @@ bool MainWindow::encrypt()
250250
if(!cryptoDoc)
251251
return false;
252252

253-
if(!FileDialog::fileIsWritable(cryptoDoc->fileName())) {
253+
while (!FileDialog::fileIsWritable(cryptoDoc->fileName()))
254+
{
254255
auto *dlg = new WarningDialog(tr("Cannot alter container %1. Save different location?")
255256
.arg(FileDialog::normalized(cryptoDoc->fileName())), this);
256257
dlg->addButton(WarningDialog::YES, QMessageBox::Yes);
257-
if(dlg->exec() == QMessageBox::Yes) {
258-
moveCryptoContainer();
259-
return encrypt();
260-
}
261-
return false;
258+
if(dlg->exec() != QMessageBox::Yes)
259+
return false;
260+
QString to = FileDialog::getSaveFileName(this, tr("Move file"), cryptoDoc->fileName());
261+
if(to.isNull() || !cryptoDoc->move(to))
262+
return false;
263+
ui->cryptoContainerPage->setHeader(to);
262264
}
263265

264266
WaitDialogHolder waitDialog(this, tr("Encrypting"));
@@ -373,24 +375,11 @@ void MainWindow::onSignAction(int action, const QString &info1, const QString &i
373375
save();
374376
ui->signContainerPage->transition(digiDoc);
375377
break;
376-
case ContainerSaveAs:
377-
save(true);
378-
break;
379-
case ContainerLocation:
380-
if(digiDoc)
381-
moveSignatureContainer();
382-
break;
383378
default:
384379
break;
385380
}
386381
}
387382

388-
void MainWindow::convertToBDoc()
389-
{
390-
if(wrap(cryptoDoc->fileName(), cryptoDoc->state() == EncryptedContainer))
391-
FadeInNotification::success(ui->topBar, tr("Converted to signed document!"));
392-
}
393-
394383
void MainWindow::convertToCDoc()
395384
{
396385
QString filename = FileDialog::createNewFileName(digiDoc->fileName(), false, this);
@@ -418,20 +407,6 @@ void MainWindow::convertToCDoc()
418407
FadeInNotification::success(ui->topBar, tr("Converted to crypto container!"));
419408
}
420409

421-
void MainWindow::moveCryptoContainer()
422-
{
423-
QString to = FileDialog::getSaveFileName(this, tr("Move file"), cryptoDoc->fileName());
424-
if(!to.isNull() && cryptoDoc->move(to))
425-
emit ui->cryptoContainerPage->moved(to);
426-
}
427-
428-
void MainWindow::moveSignatureContainer()
429-
{
430-
QString to = FileDialog::getSaveFileName(this, tr("Move file"), digiDoc->fileName());
431-
if(!to.isNull() && digiDoc->move(to))
432-
emit ui->signContainerPage->moved(to);
433-
}
434-
435410
void MainWindow::onCryptoAction(int action, const QString &/*id*/, const QString &/*phone*/)
436411
{
437412
switch(action)
@@ -441,8 +416,8 @@ void MainWindow::onCryptoAction(int action, const QString &/*id*/, const QString
441416
selectPage(Pages::CryptoIntro);
442417
break;
443418
case ContainerConvert:
444-
if(cryptoDoc)
445-
convertToBDoc();
419+
if(cryptoDoc && wrap(cryptoDoc->fileName(), false))
420+
FadeInNotification::success(ui->topBar, tr("Converted to signed document!"));
446421
break;
447422
case DecryptContainer:
448423
case DecryptToken:
@@ -459,33 +434,11 @@ void MainWindow::onCryptoAction(int action, const QString &/*id*/, const QString
459434
FadeInNotification::success(ui->topBar, tr("Encryption succeeded!"));
460435
}
461436
break;
462-
case ContainerSaveAs:
463-
{
464-
if(!cryptoDoc)
465-
break;
466-
QString target = FileDialog::getSaveFileName(this, tr("Save file"), cryptoDoc->fileName());
467-
if(target.isEmpty())
468-
break;
469-
if( !FileDialog::fileIsWritable(target))
470-
{
471-
auto *dlg = new WarningDialog(tr("Cannot alter container %1. Save different location?").arg(target), this);
472-
dlg->addButton(WarningDialog::YES, QMessageBox::Yes);
473-
if(dlg->exec() == QMessageBox::Yes) {
474-
QString file = FileDialog::getSaveFileName(this, tr("Save file"), target);
475-
if(!file.isEmpty())
476-
cryptoDoc->saveCopy(file);
477-
}
478-
}
479-
cryptoDoc->saveCopy(target);
480-
break;
481-
}
482437
case ClearCryptoWarning:
483438
ui->crypto->warningIcon(false);
484439
ui->warnings->closeWarnings(CryptoDetails);
485440
break;
486-
case ContainerLocation:
487-
if(cryptoDoc)
488-
moveCryptoContainer();
441+
default:
489442
break;
490443
}
491444
}
@@ -624,27 +577,22 @@ void MainWindow::resetDigiDoc(DigiDoc *doc, bool warnOnChange)
624577
digiDoc = doc;
625578
}
626579

627-
bool MainWindow::save(bool saveAs)
580+
bool MainWindow::save()
628581
{
629582
if(!digiDoc)
630583
return false;
631584

632585
QString target = digiDoc->fileName();
633-
if(saveAs)
634-
target = FileDialog::getSaveFileName(this, tr("Save file"), target);
635-
if(target.isEmpty())
636-
return false;
637-
638-
if(!FileDialog::fileIsWritable(target))
586+
while(!FileDialog::fileIsWritable(target))
639587
{
640588
auto *dlg = new WarningDialog(tr("Cannot alter container %1. Save different location?").arg(target), this);
641589
dlg->addButton(WarningDialog::YES, QMessageBox::Yes);
642-
if(dlg->exec() == QMessageBox::Yes) {
643-
if(QString file = FileDialog::getSaveFileName(this, tr("Save file"), target); !file.isEmpty())
644-
return saveAs ? digiDoc->saveAs(file) : digiDoc->save(file);
645-
}
590+
if(dlg->exec() != QMessageBox::Yes)
591+
return false;
592+
if(target = FileDialog::getSaveFileName(this, tr("Save file"), target); target.isEmpty())
593+
return false;
646594
}
647-
return saveAs ? digiDoc->saveAs(target) : digiDoc->save(target);
595+
return digiDoc->save(target);
648596
}
649597

650598
void MainWindow::selectPage(Pages page)
@@ -814,7 +762,7 @@ bool MainWindow::validateFiles(const QString &container, const QStringList &file
814762
return false;
815763
}
816764

817-
bool MainWindow::wrap(const QString& wrappedFile, bool enclose)
765+
bool MainWindow::wrap(const QString& wrappedFile, bool pdf)
818766
{
819767
QString filename = FileDialog::createNewFileName(wrappedFile, true, this);
820768
if(filename.isNull())
@@ -823,8 +771,8 @@ bool MainWindow::wrap(const QString& wrappedFile, bool enclose)
823771
std::unique_ptr<DigiDoc> signatureContainer(new DigiDoc(this));
824772
signatureContainer->create(filename);
825773

826-
// If encrypted container or pdf, add whole file to signature container; otherwise content only
827-
if(enclose)
774+
// If pdf, add whole file to signature container; otherwise content only
775+
if(pdf)
828776
signatureContainer->documentModel()->addFile(wrappedFile);
829777
else
830778
signatureContainer->documentModel()->addTempFiles(cryptoDoc->documentModel()->tempFiles());

‎client/MainWindow.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,11 @@ class MainWindow final : public QWidget
6060
private:
6161
void adjustDrops();
6262
void changePinClicked(QSmartCardData::PinType type, QSmartCard::PinAction action);
63-
void convertToBDoc();
6463
void convertToCDoc();
6564
ria::qdigidoc4::ContainerState currentState();
6665
bool decrypt();
6766
bool encrypt();
6867
void loadPicture();
69-
void moveCryptoContainer();
70-
void moveSignatureContainer();
7168
void navigateToPage( ria::qdigidoc4::Pages page, const QStringList &files = QStringList(), bool create = true );
7269
void onCryptoAction(int action, const QString &id, const QString &phone);
7370
void onSignAction(int action, const QString &info1, const QString &info2);
@@ -78,15 +75,15 @@ class MainWindow final : public QWidget
7875
bool removeFile(DocumentModel *model, int index);
7976
void removeSignature(int index);
8077
void removeSignatureFile(int index);
81-
bool save(bool saveAs = false);
78+
bool save();
8279
template <typename F>
8380
void sign(F &&sign);
8481
bool validateFiles(const QString &container, const QStringList &files);
8582
void updateSelector();
8683
void updateSelectorData(TokenData data);
8784
void updateMyEID(const TokenData &t);
8885
void updateMyEid(const QSmartCardData &data);
89-
bool wrap(const QString& wrappedFile, bool enclose);
86+
bool wrap(const QString& wrappedFile, bool pdf);
9087
bool wrapContainer(bool signing);
9188

9289
static QStringList dropEventFiles(QDropEvent *event);

‎client/common_enums.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,7 @@ enum Actions : unsigned char {
3939
ContainerCancel,
4040
ContainerConvert,
4141
ContainerEncrypt,
42-
ContainerLocation,
4342
ContainerSave,
44-
ContainerSaveAs,
4543

4644
EncryptContainer,
4745
DecryptContainer,

‎client/widgets/ContainerPage.cpp‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,8 @@ ContainerPage::ContainerPage(QWidget *parent)
6262
connect(btn, &QAbstractButton::clicked, this, [this,code] { emit forward(code); });
6363
};
6464

65-
connect(this, &ContainerPage::moved,this, &ContainerPage::setHeader);
66-
connectCode(ui->changeLocation, Actions::ContainerLocation);
6765
connectCode(ui->cancel, Actions::ContainerCancel);
6866
connectCode(ui->convert, Actions::ContainerConvert);
69-
connectCode(ui->saveAs, Actions::ContainerSaveAs);
7067
connectCode(ui->save, Actions::ContainerSave);
7168
connect(ui->leftPane, &FileList::addFiles, this, &ContainerPage::addFiles);
7269
connect(ui->leftPane, &ItemList::removed, this, &ContainerPage::fileRemoved);
@@ -300,6 +297,17 @@ void ContainerPage::transition(CryptoDoc *container, const QSslCertificate &cert
300297
clear();
301298
emit action(ClearCryptoWarning);
302299
});
300+
disconnect(ui->changeLocation, &QPushButton::clicked, container, nullptr);
301+
connect(ui->changeLocation, &QPushButton::clicked, container, [container, this] {
302+
QString to = FileDialog::getSaveFileName(this, tr("Move file"), container->fileName());
303+
if(!to.isNull() && container->move(to))
304+
setHeader(to);
305+
});
306+
disconnect(ui->saveAs, &QPushButton::clicked, container, nullptr);
307+
connect(ui->saveAs, &QPushButton::clicked, container, [container, this] {
308+
if(QString target = FileDialog::getSaveFileName(this, tr("Save file"), container->fileName()); !target.isEmpty())
309+
container->saveCopy(target);
310+
});
303311

304312
clear();
305313
emit action(ClearCryptoWarning);
@@ -319,23 +327,17 @@ void ContainerPage::transition(CryptoDoc *container, const QSslCertificate &cert
319327

320328
void ContainerPage::transition(DigiDoc* container)
321329
{
322-
clear();
323-
emit action(ClearSignatureWarning);
324-
std::map<ria::qdigidoc4::WarningType, int> errors;
325-
setHeader(container->fileName());
326-
327330
disconnect(this, &ContainerPage::certChanged, container, nullptr);
328331
connect(this, &ContainerPage::certChanged, container, [this, container](const SslCertificate &) {
329332
showSigningButton();
330333
});
331-
332334
disconnect(ui->summary, &QAbstractButton::clicked, container, nullptr);
333335
connect(ui->summary, &QAbstractButton::clicked, container, [this,container] {
334336
#ifdef Q_OS_WIN
335337
if( QPrinterInfo::availablePrinterNames().isEmpty() )
336338
{
337339
WarningDialog::show(this,
338-
tr("In order to view Validity Confirmation Sheet there has to be at least one printer installed!"));
340+
tr("In order to view Validity Confirmation Sheet there has to be at least one printer installed!"));
339341
return;
340342
}
341343
#endif
@@ -349,6 +351,22 @@ void ContainerPage::transition(DigiDoc* container)
349351
dialog->exec();
350352
dialog->deleteLater();
351353
});
354+
disconnect(ui->changeLocation, &QPushButton::clicked, container, nullptr);
355+
connect(ui->changeLocation, &QPushButton::clicked, container, [container, this] {
356+
QString to = FileDialog::getSaveFileName(this, tr("Move file"), container->fileName());
357+
if(!to.isNull() && container->move(to))
358+
setHeader(to);
359+
});
360+
disconnect(ui->saveAs, &QPushButton::clicked, container, nullptr);
361+
connect(ui->saveAs, &QPushButton::clicked, container, [container, this] {
362+
if(QString target = FileDialog::getSaveFileName(this, tr("Save file"), container->fileName()); !target.isEmpty())
363+
container->saveAs(target);
364+
});
365+
366+
clear();
367+
emit action(ClearSignatureWarning);
368+
std::map<ria::qdigidoc4::WarningType, int> errors;
369+
setHeader(container->fileName());
352370

353371
if(!container->timestamps().isEmpty())
354372
{
@@ -445,20 +463,20 @@ void ContainerPage::updatePanes(ContainerState state)
445463
cancelText = QT_TR_NOOP("Start");
446464
convertText = QT_TR_NOOP("Sign");
447465

448-
ui->changeLocation->show();
449466
ui->leftPane->init(fileName, QT_TRANSLATE_NOOP("ItemList", "Encrypted files"));
450467
ui->rightPane->init(ItemAddress, QT_TRANSLATE_NOOP("ItemList", "Recipients"));
451468
showMainAction({ EncryptContainer });
469+
setButtonsVisible({ ui->changeLocation, ui->convert }, true);
452470
setButtonsVisible({ ui->saveAs, ui->email }, false);
453471
break;
454472
case EncryptedContainer:
455473
cancelText = QT_TR_NOOP("Start");
456474
convertText = QT_TR_NOOP("Sign");
457475

458-
ui->changeLocation->hide();
459476
ui->leftPane->init(fileName, QT_TRANSLATE_NOOP("ItemList", "Encrypted files"));
460477
ui->rightPane->init(ItemAddress, QT_TRANSLATE_NOOP("ItemList", "Recipients"));
461478
updateDecryptionButton();
479+
setButtonsVisible({ ui->changeLocation, ui->convert }, false);
462480
setButtonsVisible({ ui->saveAs, ui->email }, true);
463481
break;
464482
default:

‎client/widgets/ContainerPage.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ class ContainerPage final : public QWidget
5757
void addFiles(const QStringList &files);
5858
void certChanged(const SslCertificate &cert);
5959
void fileRemoved(int row);
60-
void moved(const QString &to);
6160
void removed(int row);
6261
void warning(const WarningText &warningText);
6362

0 commit comments

Comments
 (0)