-
Notifications
You must be signed in to change notification settings - Fork 358
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.
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
Enable unpack/repack of RPM containers #15405
Merged
NikolaMilosavljevic
merged 8 commits into
dotnet:main
from
NikolaMilosavljevic:rpm.repack
Jan 15, 2025
+355
−5
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
aa6f343
RPM repack
NikolaMilosavljevic 1a58b5f
Merge branch 'main' into rpm.repack
NikolaMilosavljevic 3f0edcf
Resolve merge conflicts
NikolaMilosavljevic 11a9dcf
Update src/Microsoft.DotNet.SignTool.Tests/SignToolTests.cs
NikolaMilosavljevic 109e8b3
Update src/Microsoft.DotNet.SignTool/src/BatchSignUtil.cs
NikolaMilosavljevic 6e23c29
Add logging for the success case
NikolaMilosavljevic b955430
Move helper method to RpmBuilder class
NikolaMilosavljevic 568cfb0
Update the comment
NikolaMilosavljevic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -509,6 +509,17 @@ private void VerifyCertificates(TaskLoggingHelper log) | |
log.LogError($"Deb package {fileName} must be signed with a LinuxSign certificate."); | ||
} | ||
} | ||
else if (fileName.IsRpm()) | ||
{ | ||
if (isInvalidEmptyCertificate) | ||
{ | ||
log.LogError($"Rpm package {fileName} should have a certificate name."); | ||
} | ||
if (!IsLinuxSignCertificate(fileName.SignInfo.Certificate)) | ||
{ | ||
log.LogError($"Rpm package {fileName} must be signed with a LinuxSign certificate."); | ||
} | ||
} | ||
else if (fileName.IsNupkg()) | ||
{ | ||
if(isInvalidEmptyCertificate) | ||
|
@@ -577,8 +588,27 @@ private void VerifyAfterSign(TaskLoggingHelper log, FileSignInfo file) | |
{ | ||
_log.LogError($"Deb package {file.FullPath} is not signed properly."); | ||
} | ||
else | ||
{ | ||
_log.LogMessage(MessageImportance.Low, $"Deb package {file.FullPath} is signed properly"); | ||
} | ||
#endif | ||
} | ||
else if (file.IsRpm()) | ||
{ | ||
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) | ||
{ | ||
_log.LogMessage(MessageImportance.Low, $"Skipping signature verification of {file.FullPath} on non-Linux platform."); | ||
} | ||
else if (!_signTool.VerifySignedRpm(log, file.FullPath)) | ||
{ | ||
_log.LogError($"Rpm package {file.FullPath} is not signed properly."); | ||
} | ||
else | ||
{ | ||
_log.LogMessage(MessageImportance.Low, $"Rpm package {file.FullPath} is signed properly"); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can you add an else here with a "signed properly" message? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll add it for both DEB and RPM. |
||
} | ||
else if (file.IsPowerShellScript()) | ||
{ | ||
if (!_signTool.VerifySignedPowerShellFile(file.FullPath)) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the RPM extension also need to be added to s_fileExtensionSignInfoWithCollisionId, s_fileExtensionSignInfoPostBuild, and SignableExtensions? It's possible that this may be addressed in #14433