mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the test failing when invalid certificate is in cert store

Browse Source 
testPDFAddVisibleSignature was failing for me locally because of
an expired certificate present in my store.

Change-Id: I03243f6707b1b5ca94ea87e9f8c809dd47b6a93a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171901
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2024-08-15 15:55:44 +05:00
parent 1faf465896
commit 2ca75d4133
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xmlsecurity/qa/unit/signing/signing.cxx
View File

@@ -747,23 +747,23 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testPDFAddVisibleSignature)
uno::Reference<view::XSelectionSupplier> xSelectionSupplier(pBaseModel->getCurrentController(), uno::Reference<view::XSelectionSupplier> xSelectionSupplier(pBaseModel->getCurrentController(),
uno::UNO_QUERY); uno::UNO_QUERY);
xSelectionSupplier->select(uno::Any(xShape)); xSelectionSupplier->select(uno::Any(xShape));
uno::Sequence<uno::Reference<security::XCertificate>> aCertificates auto xEnv = mxSecurityContext->getSecurityEnvironment();
= mxSecurityContext->getSecurityEnvironment()->getPersonalCertificates(); auto xCert = GetValidCertificate(xEnv->getPersonalCertificates(), xEnv);
if (!aCertificates.hasElements()) if (!xCert)
{ {
return; return;
} }
SfxViewShell* pCurrent = SfxViewShell::Current(); SfxViewShell* pCurrent = SfxViewShell::Current();
CPPUNIT_ASSERT(pCurrent); CPPUNIT_ASSERT(pCurrent);
SdrView* pView = pCurrent->GetDrawView(); SdrView* pView = pCurrent->GetDrawView();
svx::SignatureLineHelper::setShapeCertificate(pView, aCertificates[0]); svx::SignatureLineHelper::setShapeCertificate(pView, xCert);
// the document is modified now, but Sign function can't show SaveAs dialog // the document is modified now, but Sign function can't show SaveAs dialog
// in unit test, so just clear the modified // in unit test, so just clear the modified
pObjectShell->SetModified(false); pObjectShell->SetModified(false);
// When: do the actual signing. // When: do the actual signing.
pObjectShell->SignDocumentContentUsingCertificate(aCertificates[0]); pObjectShell->SignDocumentContentUsingCertificate(xCert);
// Then: count the # of shapes on the signature widget/annotation. // Then: count the # of shapes on the signature widget/annotation.
std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport(); std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport();