Skip to content

Fix handling SiVa warnings #708

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

Merged
kristelmerilain merged 1 commit into from
Dec 16, 2025
Merged

Fix handling SiVa warnings #708

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
16 changes: 7 additions & 9 deletions src/SiVaContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,13 @@ void SignatureSiVa::validate(const string &policy) const
}
if(_indication == "TOTAL-PASSED")
{
if(QES.contains(_signatureLevel) || _signatureLevel.empty() || policy == POLv1)
// DDoc returns _signatureLevel empty
if(policy == POLv2 && !_signatureLevel.empty() && !QES.contains(_signatureLevel))
{
if(!e.causes().empty())
throw e;
return;
Exception ex(EXCEPTION_PARAMS("Signing certificate does not meet Qualification requirements"));
ex.setCode(Exception::CertificateIssuerMissing);
e.addCause(ex);
}
Exception ex(EXCEPTION_PARAMS("Signing certificate does not meet Qualification requirements"));
ex.setCode(Exception::CertificateIssuerMissing);
e.addCause(ex);
}
} catch(const Exception &ex) {
e.addCause(ex);
Expand Down Expand Up @@ -215,7 +213,7 @@ SiVaContainer::SiVaContainer(const string &path, ContainerOpenCB *cb, bool useHa
}, (const unsigned char*)req.c_str(), req.size());
req.clear();

if(!r.isOK() && !r.isStatusCode("400"))
if(!r && !r.isStatusCode("400"))
THROW("Failed to send request to SiVa");

json result = json::parse(r.content, nullptr, false);
Expand All @@ -241,7 +239,7 @@ SiVaContainer::SiVaContainer(const string &path, ContainerOpenCB *cb, bool useHa
s->_signedBy = signature["signedBy"];
s->_signatureMethod = signature.value<string>("signatureMethod", {});
s->_signatureLevel = signature.value<string>("signatureLevel", {});
if(json info = signature.value<json>("info", {}); !info.is_null())
if(auto info = signature.value<json>("info", {}); !info.is_null())
{
s->_bestTime = info.value<string>("bestSignatureTime", {});
s->_tsTime = info.value<string>("timestampCreationTime", {});
Expand Down