Skip to content

Do not throw when unsignedSignatureProperties is missing #728

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

Do not throw when unsignedSignatureProperties is missing #728

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
29 changes: 13 additions & 16 deletions src/SignatureXAdES_LT.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ void SignatureXAdES_LT::validate(const string &policy) const
}

try {
auto revocationValues = unsignedSignatureProperties()/"RevocationValues";
auto usp = unsignedSignatureProperties();
if(!usp)
THROW("UnsignedProperties block 'UnsignedSignatureProperties' is missing.");
auto revocationValues = usp/"RevocationValues";
if(!revocationValues)
THROW("RevocationValues object is missing");
if(revocationValues + 1)
Expand Down Expand Up @@ -262,22 +265,16 @@ void SignatureXAdES_LT::addOCSPValue(const string &id, const OCSP &ocsp)
*/
OCSP SignatureXAdES_LT::getOCSPResponseValue() const
{
try
auto ocspValues = unsignedSignatureProperties()/"RevocationValues"/"OCSPValues";
for(auto resp = ocspValues/"EncapsulatedOCSPValue"; resp; resp++)
{
auto ocspValues = unsignedSignatureProperties()/"RevocationValues"/"OCSPValues";
for(auto resp = ocspValues/"EncapsulatedOCSPValue"; resp; resp++)
{
try {
OCSP ocsp(resp);
ocsp.verifyResponse(signingCertificate());
return ocsp;
} catch(const Exception &) {
}
try {
OCSP ocsp(resp);
ocsp.verifyResponse(signingCertificate());
return ocsp;
} catch(const Exception &) {
}
// Return first OCSP response when chains are not complete and validation fails
return {ocspValues/"EncapsulatedOCSPValue"};
}
catch(const Exception &)
{}
return {};
// Return first OCSP response when chains are not complete and validation fails
return {ocspValues/"EncapsulatedOCSPValue"};
}
16 changes: 5 additions & 11 deletions src/SignatureXAdES_T.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,7 @@ void SignatureXAdES_T::extendSignatureProfile(Signer *signer)

TS SignatureXAdES_T::TimeStamp() const
{
try {
return {unsignedSignatureProperties()/"SignatureTimeStamp"/"EncapsulatedTimeStamp"};
} catch(const Exception &) {}
return {};
return {unsignedSignatureProperties()/"SignatureTimeStamp"/"EncapsulatedTimeStamp"};
}

void SignatureXAdES_T::validate(const std::string &policy) const
Expand All @@ -104,6 +101,8 @@ void SignatureXAdES_T::validate(const std::string &policy) const

try {
auto usp = unsignedSignatureProperties();
if(!usp)
THROW("UnsignedProperties block 'UnsignedSignatureProperties' is missing.");
auto ts = usp/"SignatureTimeStamp";
if(!ts)
THROW("Missing SignatureTimeStamp");
Expand Down Expand Up @@ -185,14 +184,9 @@ void SignatureXAdES_T::validate(const std::string &policy) const
throw exception;
}

XMLNode SignatureXAdES_T::unsignedSignatureProperties() const
XMLNode SignatureXAdES_T::unsignedSignatureProperties() const noexcept
{
auto up = qualifyingProperties()/"UnsignedProperties";
if(!up)
THROW("QualifyingProperties block 'UnsignedProperties' is missing.");
if(auto usp = up/"UnsignedSignatureProperties")
return usp;
THROW("UnsignedProperties block 'UnsignedSignatureProperties' is missing.");
return qualifyingProperties()/"UnsignedProperties"/"UnsignedSignatureProperties";
}

TS SignatureXAdES_T::verifyTS(XMLNode timestamp, digidoc::Exception &exception,
Expand Down
2 changes: 1 addition & 1 deletion src/SignatureXAdES_T.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class SignatureXAdES_T: public SignatureXAdES_B
void extendSignatureProfile(Signer *signer) override;

protected:
XMLNode unsignedSignatureProperties() const;
XMLNode unsignedSignatureProperties() const noexcept;
TS TimeStamp() const;

static TS verifyTS(XMLNode timestamp, Exception &exception,
Expand Down
Loading