Skip to content

Preserve cause-less signature validation errors #760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Preserve cause-less signature validation errors #760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Signature.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,12 @@ std::string Signature::Validator::diagnostics() const

void Signature::Validator::parseException(const Exception &e)
{
for(const Exception &child: e.causes())
if(const Exception::Causes causes = e.causes(); causes.empty())
{
d->diagnostics += e.msg() + "\n";
d->result = std::max(d->result, Invalid);
}
else for(const Exception &child: causes)
{
d->diagnostics += child.msg() + "\n";
switch(child.code())
Expand All @@ -372,7 +377,8 @@ void Signature::Validator::parseException(const Exception &e)
default:
d->result = std::max(d->result, Invalid);
}
parseException(child);
if(!child.causes().empty())
parseException(child);
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/SignatureXAdES_LT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,9 @@ void SignatureXAdES_LT::validate(const string &policy) const
try {
SignatureXAdES_T::validate(policy);
} catch(const Exception &e) {
for(const Exception &ex: e.causes())
if(const Exception::Causes causes = e.causes(); causes.empty())
exception.addCause(e);
else for(const Exception &ex: causes)
exception.addCause(ex);
}

Expand Down
4 changes: 3 additions & 1 deletion src/SignatureXAdES_LTA.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ void SignatureXAdES_LTA::validate(const string &policy) const
try {
SignatureXAdES_LT::validate(policy);
} catch(const Exception &e) {
for(const Exception &ex: e.causes())
if(const Exception::Causes causes = e.causes(); causes.empty())
exception.addCause(e);
else for(const Exception &ex: causes)
exception.addCause(ex);
}

Expand Down
4 changes: 3 additions & 1 deletion src/SignatureXAdES_T.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ void SignatureXAdES_T::validate(const std::string &policy) const
} catch(const Exception &e) {
if(profile().find(ASiC_E::ASIC_TS_PROFILE) == string::npos)
throw;
for(const Exception &ex: e.causes())
if(const Exception::Causes causes = e.causes(); causes.empty())
exception.addCause(e);
else for(const Exception &ex: causes)
exception.addCause(ex);
}

Expand Down
49 changes: 49 additions & 0 deletions test/libdigidocpp_boost.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,55 @@ const string ASiCS::EXT = "asics";

BOOST_GLOBAL_FIXTURE(TestFixture);

namespace
{
class ThrowingSignature final: public Signature
{
public:
explicit ThrowingSignature(Exception exception)
: exception(std::move(exception))
{}

string id() const override { return {}; }
string claimedSigningTime() const override { return {}; }
string trustedSigningTime() const override { return {}; }
X509Cert signingCertificate() const override { return X509Cert(); }
string signatureMethod() const override { return {}; }
void validate() const override { throw exception; }
vector<unsigned char> dataToSign() const override { return {}; }
void setSignatureValue(const vector<unsigned char> &) override {}
string profile() const override { return {}; }

private:
Exception exception;
};
}

BOOST_AUTO_TEST_SUITE(SignatureValidatorSuite)
BOOST_AUTO_TEST_CASE(causeLessExceptionIsInvalid)
{
ThrowingSignature signature(Exception(EXCEPTION_PARAMS("Validation failed without causes")));
Signature::Validator validator(&signature);

BOOST_CHECK_EQUAL(validator.status(), Signature::Validator::Invalid);
BOOST_CHECK_EQUAL(validator.diagnostics(), "Validation failed without causes\n");
BOOST_CHECK(validator.warnings().empty());
}

BOOST_AUTO_TEST_CASE(nestedWarningRemainsWarning)
{
Exception warning(EXCEPTION_PARAMS("Signature digest weak"));
warning.setCode(Exception::SignatureDigestWeak);
ThrowingSignature signature(Exception(EXCEPTION_PARAMS("Signature validation"), warning));
Signature::Validator validator(&signature);

BOOST_CHECK_EQUAL(validator.status(), Signature::Validator::Warning);
BOOST_CHECK_EQUAL(validator.diagnostics(), "Signature digest weak\n");
BOOST_REQUIRE_EQUAL(validator.warnings().size(), 1U);
BOOST_CHECK_EQUAL(validator.warnings().front(), Exception::SignatureDigestWeak);
}
BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(LogSuite)
BOOST_AUTO_TEST_CASE(logEntryIsWrittenImmediately)
{
Expand Down