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

xmlsecurity OOXML export: fix missing rels content-type

Browse Source 
This wasn't a problem when we signed MSO-produced documents that have
these all the time, but it was a problem for LO-produced documents.

We don't add an explicit content type for _xmlsignatures/origin.sigs, so
need a default for the .sigs extension.

Change-Id: Ic5d0647991c42f9f1ef3519986a4bd1b56de396d
This commit is contained in:
Miklos Vajna
2016-02-15 10:51:12 +01:00
parent 38c14a06c1
commit 24c20f1e16
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xmlsecurity/source/helper/xmlsignaturehelper.cxx
View File

@@ -525,18 +525,23 @@ void XMLSignatureHelper::ExportSignatureContentTypes(css::uno::Reference<css::em
return;
}
// Append sigs to defaults, if it's not there already.
// Append rels and sigs to defaults, if it's not there already.
uno::Sequence<beans::StringPair>& rDefaults = aContentTypeInfo[0];
auto aDefaults = comphelper::sequenceToContainer< std::vector<beans::StringPair> >(rDefaults);
auto it = std::find_if(rDefaults.begin(), rDefaults.end(), [](const beans::StringPair& rPair)
{
return rPair.First == "rels";
});
if (it == rDefaults.end())
aDefaults.push_back(beans::StringPair("rels", "application/vnd.openxmlformats-package.relationships+xml"));
it = std::find_if(rDefaults.begin(), rDefaults.end(), [](const beans::StringPair& rPair)
{
return rPair.First == "sigs";
});
if (it == rDefaults.end())
{
auto aDefaults = comphelper::sequenceToContainer< std::vector<beans::StringPair> >(rDefaults);
aDefaults.push_back(beans::StringPair("sigs", "application/vnd.openxmlformats-package.digital-signature-origin"));
rDefaults = comphelper::containerToSequence(aDefaults);
}
rDefaults = comphelper::containerToSequence(aDefaults);
// Remove existing signature overrides.
uno::Sequence<beans::StringPair>& rOverrides = aContentTypeInfo[1];