mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
feat: advisory message appended to block output (#362)
* docs(specs): add custom block messages and package blocklist spec * docs(specs): add custom block messages and package blocklist implementation plan * feat(config): add blocked_packages list and custom block messages * feat(audit): add package_blocklist_blocked event and blocklist model * feat(proxy): block blocklisted packages in the policy gate before analysis * feat(guard): block blocklisted packages before trust skip and analysis * feat(ui): render blocklist blocks and custom messages, fix silent-mode block output * feat(proxy): append custom messages to malware and go-cooldown block bodies * test(proxye2e): cover blocklist enforcement and custom block messages * docs(specs): remove spec and plan documents * refactor: drop guard-flow blocklist enforcement and trim docs Guard mode is being deprecated; the blocklist is enforced in proxy mode only. Remove the trusted_packages mirroring references outside the docs. * refactor(config): consolidate blocklist and block message under top-level block section Replace dependency_cooldown.message, malware.message and blocked_packages with a single block section: block.message is appended to every block output regardless of which control blocked, and block.packages is the package blocklist. * fix(ui): render block.message as info note with clean spacing * fix(ui): indent wrapped continuation lines in block reasons and messages * update config template * refactor(config): replace block section with top-level advisory_message Remove the package blocklist (will be implemented as part of policies in the future) and replace block.message with an optional top-level advisory_message appended to every block output. * chore(config): move advisory_message near top-level scalar configs in template
This commit is contained in:
+17
-1
@@ -196,7 +196,7 @@ func printMaliciousPackagesList(malwarePackages []*analyzer.PackageVersionAnalys
|
||||
mp.PackageVersion.GetVersion())))
|
||||
|
||||
if verbosityLevel == VerbosityLevelVerbose {
|
||||
fmt.Printf(" %s\n", Colors.Dim(termWidthFormatText(mp.Summary, 76)))
|
||||
fmt.Printf(" %s\n", Colors.Dim(termWidthFormatTextIndent(mp.Summary, 76, " ")))
|
||||
}
|
||||
|
||||
if mp.ReferenceURL != "" {
|
||||
@@ -228,6 +228,16 @@ func printCooldownPackagesList(packages []models.CooldownBlock) {
|
||||
}
|
||||
}
|
||||
|
||||
// printAdvisoryMessage renders the org-configured advisory_message as an info
|
||||
// note attached to the block output. Callers are responsible for surrounding
|
||||
// blank lines. No-op when the message is empty.
|
||||
func printAdvisoryMessage(message string) {
|
||||
if message == "" {
|
||||
return
|
||||
}
|
||||
fmt.Printf(" %s %s\n", Colors.Cyan("ℹ"), Colors.Cyan(termWidthFormatTextIndent(message, 76, " ")))
|
||||
}
|
||||
|
||||
func pluralizeDays(n int) string {
|
||||
if n == 1 {
|
||||
return "1 day"
|
||||
@@ -242,6 +252,12 @@ func pluralizePackages(n int) string {
|
||||
return fmt.Sprintf("%d packages", n)
|
||||
}
|
||||
|
||||
// termWidthFormatTextIndent wraps text at maxWidth and indents continuation
|
||||
// lines so wrapped output stays aligned with the first line.
|
||||
func termWidthFormatTextIndent(text string, maxWidth int, indent string) string {
|
||||
return strings.ReplaceAll(termWidthFormatText(text, maxWidth), "\n", "\n"+indent)
|
||||
}
|
||||
|
||||
// Format the string to be maximum maxWidth. Use newlines to wrap the text.
|
||||
func termWidthFormatText(text string, maxWidth int) string {
|
||||
// Replace all newlines with spaces so that we can split the text into words
|
||||
|
||||
Reference in New Issue
Block a user