External/pmg
1
0
Fork 0
mirror of https://github.com/safedep/pmg.git synced 2026-08-03 07:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

provide package blocked feedback in proxy mode (#154)

Browse Source 
* provide package blocked feedback in proxy mode

* update test case & clear status on block

* refactor reporting

* clearStatus on `continueExecution`

* set spinnerChan to nil

* add sync for spinner
This commit is contained in:
Sahil Bansal
2026-02-11 09:22:18 +05:30
committed by GitHub
parent a6cb60a757
commit 7fe9fc8763
5 changed files with 47 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
guard/guard.go
+11 -16
View File
@@ -202,7 +202,8 @@ func (g *packageManagerGuard) Run(ctx context.Context, args []string, parsedComm
result.BlockedPackages = append(result.BlockedPackages, analysisResult)
blockConfig.MalwarePackages = append(blockConfig.MalwarePackages, analysisResult)
g.logMalwareDetection(analysisResult, true)
return result, g.blockInstallation(blockConfig)
return result, nil
}
if analysisResult.Action == analyzer.ActionConfirm {
@@ -227,7 +228,8 @@ func (g *packageManagerGuard) Run(ctx context.Context, args []string, parsedComm
result.BlockedPackages = append(result.BlockedPackages, pkg)
}
result.WasUserCancelled = true
return result, g.blockInstallation(blockConfig)
return result, nil
}
// User confirmed installation despite warning
@@ -394,12 +396,12 @@ func (g *packageManagerGuard) setStatus(status string) {
g.interaction.SetStatus(status)
}
func (g *packageManagerGuard) blockInstallation(config *ui.BlockConfig) error {
if g.interaction.Block == nil {
return nil
func (g *packageManagerGuard) showWarning(message string) {
if g.interaction.ShowWarning == nil {
return
}
return g.interaction.Block(config)
g.interaction.ShowWarning(message)
}
func (g *packageManagerGuard) clearStatus() {
@@ -410,14 +412,6 @@ func (g *packageManagerGuard) clearStatus() {
g.interaction.ClearStatus()
}
func (g *packageManagerGuard) showWarning(message string) {
if g.interaction.ShowWarning == nil {
return
}
g.interaction.ShowWarning(message)
}
func (g *packageManagerGuard) handleManifestInstallation(ctx context.Context, parsedCommand *packagemanager.ParsedCommand) (*GuardResult, error) {
result := &GuardResult{}
@@ -497,7 +491,7 @@ func (g *packageManagerGuard) handleManifestInstallation(ctx context.Context, pa
g.logMalwareDetection(analysisResult, true)
return result, g.blockInstallation(blockConfig)
return result, nil
}
if analysisResult.Action == analyzer.ActionConfirm {
@@ -525,7 +519,8 @@ func (g *packageManagerGuard) handleManifestInstallation(ctx context.Context, pa
}
result.WasUserCancelled = true
return result, g.blockInstallation(blockConfig)
return result, nil
}
// User confirmed installation despite warning
guard/guard_test.go
+6 -19
View File
@@ -124,16 +124,8 @@ func TestGuardInsecureInstallation(t *testing.T) {
config.DryRun = true
config.ResolveDependencies = false // Disable dependency resolution to avoid nil pointer issues
blockCalled := false
var blockedPackages []*analyzer.PackageVersionAnalysisResult
interaction := PackageManagerGuardInteraction{
ShowWarning: func(message string) {},
Block: func(config *ui.BlockConfig) error {
blockCalled = true
blockedPackages = config.MalwarePackages
return nil
},
}
pg, err := NewPackageManagerGuard(config, nil, nil,
@@ -161,21 +153,17 @@ func TestGuardInsecureInstallation(t *testing.T) {
},
}
_, err = pg.Run(context.Background(), []string{"npm", "install", "nyc-config@10.0.0"}, parsedCommand)
r, err := pg.Run(context.Background(), []string{"npm", "install", "nyc-config@10.0.0"}, parsedCommand)
// We expect no error from the guard itself (blocking is handled via the Block callback)
assert.NoError(t, err)
// Block should be called because InsecureInstallation is disabled
assert.True(t, blockCalled, "Block should be called when InsecureInstallation is disabled")
// Verify that the malicious package was detected and blocked
assert.NotEmpty(t, blockedPackages, "Blocked packages should not be empty")
if len(blockedPackages) > 0 {
assert.Equal(t, "nyc-config", blockedPackages[0].PackageVersion.GetPackage().GetName())
assert.Equal(t, "10.0.0", blockedPackages[0].PackageVersion.GetVersion())
assert.Equal(t, analyzer.ActionBlock, blockedPackages[0].Action)
}
assert.NotEmpty(t, r.BlockedPackages, "Blocked packages should not be empty")
assert.Greater(t, r.BlockedCount, 0)
assert.Equal(t, "nyc-config", r.BlockedPackages[0].PackageVersion.GetPackage().GetName())
assert.Equal(t, "10.0.0", r.BlockedPackages[0].PackageVersion.GetVersion())
assert.Equal(t, analyzer.ActionBlock, r.BlockedPackages[0].Action)
})
t.Run("should continue execution for commands without install targets when InsecureInstallation is enabled", func(t *testing.T) {
@@ -269,4 +257,3 @@ func TestGuardInsecureInstallation(t *testing.T) {
assert.False(t, config.InsecureInstallation, "InsecureInstallation should default to false")
})
}
internal/flows/proxy_flow.go
-2
View File
@@ -85,8 +85,6 @@ func (f *proxyFlow) Run(ctx context.Context, args []string, parsedCmd *packagema
return nil
}
ui.SetStatus("Initializing proxy mode...")
// Setup CA certificate for MITM
caCert, caCertPath, err := f.setupCACertificate()
if err != nil {
internal/ui/report.go
+8 -1
View File
@@ -119,6 +119,8 @@ func (r *ReportData) WasSuccessful() bool {
func Report(data *ReportData) {
data.Finalize()
StopSpinner()
switch verbosityLevel {
case VerbosityLevelSilent:
reportSilent(data)
@@ -133,7 +135,6 @@ func Report(data *ReportData) {
// Normal successful execution produces no output
func reportSilent(data *ReportData) {
// Silent mode: no report output
// Block messages and errors are already shown via ui.Block() and ui.ErrorExit()
}
// reportNormal shows minimal, assuring output
@@ -171,6 +172,12 @@ func reportNormal(data *ReportData) {
switch data.Outcome {
case OutcomeBlocked:
fmt.Println()
fmt.Printf("%s %s\n", Colors.Red("✗"), Colors.Red("Malicious package blocked"))
printMaliciousPackagesList(data.BlockedPackages)
fmt.Println()
icon = Colors.Red("✗")
message = fmt.Sprintf("PMG: %d packages analyzed, %d blocked",
data.TotalAnalyzed, data.BlockedCount)
internal/ui/spinner.go
+22 -1
View File
@@ -2,10 +2,14 @@ package ui
import (
"fmt"
"sync"
"time"
)
var spinnerChan chan bool
var (
spinnerChan chan bool
spinnerMu sync.Mutex
)
func StartSpinner(msg string) {
StartSpinnerWithColor(msg, Colors.Normal)
@@ -20,7 +24,15 @@ func StartSpinnerWithColor(msg string, c ColorFn) {
frames := []rune(style)
length := len(frames)
spinnerMu.Lock()
// If a previous spinner exists, stop it cleanly before starting a new one
if spinnerChan != nil {
close(spinnerChan)
spinnerChan = nil
}
spinnerChan = make(chan bool)
spinnerMu.Unlock()
ticker := time.NewTicker(100 * time.Millisecond)
go func() {
@@ -40,6 +52,13 @@ func StartSpinnerWithColor(msg string, c ColorFn) {
}
func StopSpinner() {
spinnerMu.Lock()
defer spinnerMu.Unlock()
if spinnerChan == nil {
return
}
// Gracefully handle the case where the spinner is already stopped
// and the channel is closed, yet client code calls StopSpinner() again.
defer func() {
@@ -48,6 +67,8 @@ func StopSpinner() {
close(spinnerChan)
spinnerChan = nil
fmt.Printf("\r")
fmt.Println()
}