Skip to content

feat: add --network and --country flags to rescan #33

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.

Sign up for GitHub

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

Merged
ayoubfaouzi merged 1 commit into from
Aug 14, 2026
Merged

feat: add --network and --country flags to rescan #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions cmd/rescan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ import (

var sha256Re = regexp.MustCompile(`^[a-fA-F0-9]{64}$`)

var (
rescanNetworkEnabled bool
rescanCountry string
)

func init() {
reScanCmd.Flags().IntVar(&parallelFlag, "parallel", 1,
"Number of files to rescan in parallel")
Expand All @@ -26,6 +31,10 @@ func init() {
"Detonation duration in seconds")
reScanCmd.Flags().StringVarP(&osFlag, "os", "o", "windows-10-x64",
"Preferred OS for detonation, choice(windows-7-x64 | windows-10-x64 | windows-11-x64)")
reScanCmd.Flags().BoolVar(&rescanNetworkEnabled, "network", true,
"Allow sandbox internet access")
reScanCmd.Flags().StringVar(&rescanCountry, "country", "US",
"Two-letter VPN exit country when network access is enabled")
}

// reScanFile re-scans a list of SHA256 with a TUI progress display.
Expand Down
12 changes: 8 additions & 4 deletions cmd/scanui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ func uploadFileCmd(index int, web webapi.Service, filename, token string) tea.Cm
// Archive: rescan each unique child, not the container itself.
children := uniqueDerivedFiles(file.DerivedFiles)
for _, df := range children {
if err := web.Rescan(df.SHA256, token, osFlag, enableDetonationFlag, timeoutFlag); err != nil {
if err := web.Rescan(df.SHA256, token, osFlag, enableDetonationFlag, timeoutFlag,
rescanNetworkEnabled, rescanCountry); err != nil {
return fileUploadedMsg{index: index, err: fmt.Errorf("rescan child %s: %w", df.SHA256[:12], err)}
}
}
Expand All @@ -137,7 +138,8 @@ func uploadFileCmd(index int, web webapi.Service, filename, token string) tea.Cm
}
}

err = web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag)
err = web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag,
rescanNetworkEnabled, rescanCountry)
if err != nil {
return fileUploadedMsg{index: index, err: fmt.Errorf("rescan: %w", err)}
}
Expand Down Expand Up @@ -195,7 +197,8 @@ func rescanFileCmd(index int, web webapi.Service, sha256, token string) tea.Cmd
if file.IsArchive && len(file.DerivedFiles) > 0 {
children := uniqueDerivedFiles(file.DerivedFiles)
for _, df := range children {
if err := web.Rescan(df.SHA256, token, osFlag, enableDetonationFlag, timeoutFlag); err != nil {
if err := web.Rescan(df.SHA256, token, osFlag, enableDetonationFlag, timeoutFlag,
rescanNetworkEnabled, rescanCountry); err != nil {
return fileUploadedMsg{index: index, err: fmt.Errorf("rescan child %s: %w", df.SHA256[:12], err)}
}
}
Expand All @@ -209,7 +212,8 @@ func rescanFileCmd(index int, web webapi.Service, sha256, token string) tea.Cmd
}
}

err := web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag)
err := web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag,
rescanNetworkEnabled, rescanCountry)
if err != nil {
return fileUploadedMsg{index: index, err: fmt.Errorf("rescan: %w", err)}
}
Expand Down
5 changes: 4 additions & 1 deletion internal/webapi/files.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,13 +166,16 @@ func (s Service) Scan(filepath string, authToken, preferredOS string, enableDeto
return &file, nil
}

func (s Service) Rescan(sha256, authToken, preferredOS string, enableDetonation bool, timeout int) error {
func (s Service) Rescan(sha256, authToken, preferredOS string, enableDetonation bool,
timeout int, networkEnabled bool, country string) error {
url := s.filesURL + sha256 + "/rescan"

requestBody, err := json.Marshal(map[string]any{
"skip_detonation": !enableDetonation,
"os": preferredOS,
"timeout": timeout,
"network_enabled": networkEnabled,
"country": country,
})
if err != nil {
return err
Expand Down
12 changes: 10 additions & 2 deletions internal/webapi/files_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ func TestRescan(t *testing.T) {
defer srv.Close()

svc := New(srv.URL)
if err := svc.Rescan(testSHA256, testAPIKey, "windows-7-x64", false, 60); err != nil {
if err := svc.Rescan(testSHA256, testAPIKey, "windows-7-x64", false, 60,
true, "US"); err != nil {
t.Fatalf("Rescan() error = %v", err)
}

Expand All @@ -132,6 +133,12 @@ func TestRescan(t *testing.T) {
if got := gotBody["timeout"]; got != float64(60) {
t.Errorf("timeout = %v, want 60", got)
}
if got := gotBody["network_enabled"]; got != true {
t.Errorf("network_enabled = %v, want true", got)
}
if got := gotBody["country"]; got != "US" {
t.Errorf("country = %v, want US", got)
}
}

func TestRescanError(t *testing.T) {
Expand All @@ -142,7 +149,8 @@ func TestRescanError(t *testing.T) {
defer srv.Close()

svc := New(srv.URL)
err := svc.Rescan(testSHA256, testAPIKey, "windows-10-x64", false, 15)
err := svc.Rescan(testSHA256, testAPIKey, "windows-10-x64", false, 15,
false, "")
if err == nil {
t.Fatal("Rescan() expected error on HTTP 404, got nil")
}
Expand Down