Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions src/OpenVsixSignTool.Core/OpcPackage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,14 @@ private void SaveRelationships(OpcRelationships relationships)
/// <returns>A builder instance for configuring and applying a signature.</returns>
public OpcPackageSignatureBuilder CreateSignatureBuilder() => new OpcPackageSignatureBuilder(this);

/// <summary>
/// Creates a signature builder for applying a digital signature to the package, while ignoring
/// origin.psdor files
/// </summary>
/// <returns>A builder instance for configuring and applying a signature.</returns>
public OpcPackageSignatureBuilder CreateSignatureBuilderIgnoreOrigin() =>
new OpcPackageSignatureBuilder( this, ignoreOrigin: true );

/// <summary>
/// Enumerates over all of the signatures in the package.
/// </summary>
Expand Down
32 changes: 27 additions & 5 deletions src/OpenVsixSignTool.Core/OpcPackageSignatureBuilder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,20 @@ public class OpcPackageSignatureBuilder
{
private readonly OpcPackage _package;
private readonly List<OpcPart> _enqueuedParts;
private readonly bool _ignoreOriginParts;

internal OpcPackageSignatureBuilder(OpcPackage package)
{
_enqueuedParts = new List<OpcPart>();
_package = package;
_ignoreOriginParts = false;
}

internal OpcPackageSignatureBuilder( OpcPackage package, bool ignoreOrigin )
{
_enqueuedParts = new List<OpcPart>();
_package = package;
_ignoreOriginParts = ignoreOrigin;
}

/// <summary>
Expand Down Expand Up @@ -106,12 +115,25 @@ private static void PublishSignature(XmlDocument document, OpcPart signatureFile
}

_package.Flush();
var allParts = new HashSet<OpcPart>(_enqueuedParts)
HashSet<OpcPart> allParts = new HashSet<OpcPart>( _enqueuedParts );

if ( _ignoreOriginParts )
{
originFile,
_package.GetPart(_package.Relationships.DocumentUri),
_package.GetPart(originFile.Relationships.DocumentUri)
};
allParts = new HashSet<OpcPart>( _enqueuedParts )
{
_package.GetPart(_package.Relationships.DocumentUri)
};
}
else
{
allParts = new HashSet<OpcPart>( _enqueuedParts )
{
originFile,
_package.GetPart(_package.Relationships.DocumentUri),
_package.GetPart(originFile.Relationships.DocumentUri)
};
}

return (allParts, signatureFile);
}
}
Expand Down