Skip to content

Commit

Permalink
Fix coverity warning
Browse files Browse the repository at this point in the history 
IB-7550

Signed-off-by: Raul Metsma <raul@metsma.ee>
  • Loading branch information
@metsma
metsma committed Jan 22, 2023
1 parent fc67dea commit 7a10b53
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ jobs:
pages:
name: Deploy pages
if: github.repository == 'open-eid/libdigidocpp' && contains(github.ref, 'master')
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
permissions:
contents: write
steps:
Expand All @@ -218,7 +218,7 @@ jobs:
coverity:
name: Run Coverity tests
if: github.repository == 'open-eid/libdigidocpp' && contains(github.ref, 'coverity_scan')
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
PROJECTNAME: ${{ github.repository }}
Expand Down
45 changes: 20 additions & 25 deletions src/SiVaContainer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,10 @@ static std::string base64_decode(const XMLCh *in) {
class SiVaContainer::Private
{
public:
string path;
string path, mediaType;
unique_ptr<istream> ddoc;
vector<DataFile*> dataFiles;
vector<Signature*> signatures;
string mediaType;
};

vector<unsigned char> SignatureSiVa::dataToSign() const
Expand Down Expand Up @@ -148,9 +147,10 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
: d(make_unique<Private>())
{
DEBUG("SiVaContainer::SiVaContainer(%s, %s, %d)", path.c_str(), ext.c_str(), useHashCode);
unique_ptr<istream> ifs = make_unique<ifstream>(File::encodeName(d->path = path).c_str(), ifstream::binary);
unique_ptr<istream> ifs = make_unique<ifstream>(File::encodeName(d->path = path), ifstream::binary);
auto fileName = File::fileName(path);
istream *is = ifs.get();
if(ext == "DDOC")
if(ext == "ddoc")
{
d->mediaType = "application/x-ddoc";
d->ddoc = move(ifs);
Expand All @@ -160,7 +160,7 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
else
{
d->mediaType = "application/pdf";
d->dataFiles.push_back(new DataFilePrivate(move(ifs), File::fileName(path), "application/pdf"));
d->dataFiles.push_back(new DataFilePrivate(move(ifs), fileName, "application/pdf"));
}

array<XMLByte, 48*100> buf{};
Expand All @@ -179,15 +179,14 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
b64.append((char*)out, size);
delete out;
}
ifs.release();
ifs.reset();

string url = CONF(verifyServiceUri);
string req = json({
{"filename", File::fileName(path)},
{"filename", fileName},
{"document", move(b64)},
{"signaturePolicy", "POLv4"}
}).dump();
Connect::Result r = Connect(url, "POST", 0, {}, CONF(verifyServiceCerts)).exec({
Connect::Result r = Connect(CONF(verifyServiceUri), "POST", 0, {}, CONF(verifyServiceCerts)).exec({
{"Content-Type", "application/json;charset=UTF-8"}
}, (const unsigned char*)req.c_str(), req.size());

Expand All @@ -202,13 +201,13 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
{
Exception e(EXCEPTION_PARAMS("Signature validation"));
for(const json &error: result["requestErrors"])
EXCEPTION_ADD(e, "%s", error.value<string>("message", {}).c_str());
EXCEPTION_ADD(e, "%s", error.value<string>("message", {}).data());
throw e;
}

for(const json &signature: result["validationReport"]["validationConclusion"]["signatures"])
{
SignatureSiVa *s = new SignatureSiVa;
auto s = unique_ptr<SignatureSiVa>(new SignatureSiVa);
s->_id = signature["id"];
s->_signingTime = signature["claimedSigningTime"];
s->_profile = signature["signatureFormat"];
Expand All @@ -217,8 +216,7 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
s->_signedBy = signature["signedBy"];
s->_signatureMethod = signature.value<string>("signatureMethod", {});
s->_signatureLevel = signature.value<string>("signatureLevel", {});
json info = signature.value<json>("info", {});
if(!info.is_null())
if(json info = signature.value<json>("info", {}); !info.is_null())
{
s->_bestTime = info.value<string>("bestSignatureTime", {});
s->_tsTime = info.value<string>("timestampCreationTime", {});
Expand All @@ -233,8 +231,7 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
}
for(const json &signerRole: info.value<json>("signerRole", {}))
s->_signerRoles.push_back(signerRole["claimedRole"]);
json signatureProductionPlace = info.value<json>("signatureProductionPlace", {});
if(!signatureProductionPlace.is_null())
if(json signatureProductionPlace = info.value<json>("signatureProductionPlace", {}); !signatureProductionPlace.is_null())
{
s->_city = signatureProductionPlace.value<string>("city", {});
s->_stateOrProvince = signatureProductionPlace.value<string>("stateOrProvince", {});
Expand All @@ -245,7 +242,7 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
for(const json &certificate: signature.value<json>("certificates", {}))
{
XMLSize_t size = 0;
XMLByte *der = Base64::decode((const XMLByte*)certificate.value<string>("content", {}).c_str(), &size);
XMLByte *der = Base64::decode((const XMLByte*)certificate.value<string_view>("content", {}).data(), &size);
if(certificate["type"] == "SIGNING")
s->_signingCertificate = X509Cert(der, size, X509Cert::Der);
if(certificate["type"] == "REVOCATION")
Expand Down Expand Up @@ -276,16 +273,14 @@ SiVaContainer::SiVaContainer(const string &path, const string &ext, bool useHash
continue;
WARN("%s", message.c_str());
}
d->signatures.push_back(s);
d->signatures.push_back(s.release());
}
}

SiVaContainer::~SiVaContainer()
{
for(const Signature *s: d->signatures)
delete s;
for(const DataFile *f: d->dataFiles)
delete f;
for_each(d->signatures.cbegin(), d->signatures.cend(), default_delete<Signature>());
for_each(d->dataFiles.cbegin(), d->dataFiles.cend(), default_delete<DataFile>());
}

void SiVaContainer::addDataFile(const string & /*path*/, const string & /*mediaType*/)
Expand Down Expand Up @@ -320,9 +315,8 @@ vector<DataFile *> SiVaContainer::dataFiles() const

unique_ptr<Container> SiVaContainer::openInternal(const string &path)
{
static const set<string_view> supported = {"PDF", "DDOC"};
static const set<string_view> supported = {"pdf", "ddoc"};
string ext = File::fileExtension(path);
transform(ext.begin(), ext.end(), ext.begin(), ::toupper);
if(!supported.count(ext))
return {};
try {
Expand Down Expand Up @@ -381,7 +375,7 @@ std::unique_ptr<std::istream> SiVaContainer::parseDDoc(bool useHashCode)
DOMImplementation *pImplement = DOMImplementationRegistry::getDOMImplementation(cpXMLCh(u"LS"));
unique_ptr<DOMLSOutput> pDomLsOutput(pImplement->createLSOutput());
unique_ptr<DOMLSSerializer> pSerializer(pImplement->createLSSerializer());
unique_ptr<stringstream> result = make_unique<stringstream>();
auto result = make_unique<stringstream>();
xml::dom::ostream_format_target out(*result);
pDomLsOutput->setByteStream(&out);
pSerializer->setNewLine(cpXMLCh(u"\n"));
Expand Down Expand Up @@ -445,7 +439,8 @@ void SiVaContainer::save(const string &path)
{
d->ddoc->clear();
d->ddoc->seekg(0);
ofstream(File::encodeName(to).c_str(), ofstream::binary) << d->ddoc->rdbuf();
if(ofstream out{File::encodeName(to), ofstream::binary})
out << d->ddoc->rdbuf();
}
else
d->dataFiles[0]->saveAs(to);
Expand Down

0 comments on commit 7a10b53

Please sign in to comment.