Skip to content

Commit 5919c9d

Browse files
ayoubfaouziayoubfaouzi
authored
ref: replace all interface{} with any (#11)
* chore: add golang-ci linter * rename file * feat(upload): walk files async * update * update ci * update * update * disable sandboxing by default * replace all interface{} with any --------- Co-authored-by: Ayoub Faouzi <ayoubfaouzi@users.noreply.github.com>
1 parent d55bd33 commit 5919c9d

24 files changed

Lines changed: 292 additions & 722 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,19 @@ jobs:
77
name: Build & Test
88
strategy:
99
matrix:
10-
go-version: [1.21.x]
10+
go-version: [1.25.x]
1111
os: [ubuntu-latest, macos-latest, windows-latest]
1212
runs-on: ${{ matrix.os }}
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616

1717
- name: Install Go
18-
uses: actions/setup-go@v5
18+
uses: actions/setup-go@v6
1919
with:
2020
go-version: ${{ matrix.go-version }}
2121

2222
- name: Build
2323
run: |
2424
go env -w GOFLAGS=-mod=mod
2525
go build -v ./...
26-
27-
- name: golangci-lint
28-
uses: golangci/golangci-lint-action@v6
29-
with:
30-
version: v1.59

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ __debug_bin
2323
go.work
2424

2525
# Private data
26-
private/
2726
config.toml
27+
hack/

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A CLI tool to interact with Saferwall.com to download samples, scan or re-scan n
77
You can either download pre-built binaries or build the tool yourself.
88

99
```sh
10-
go install github.com/saferwall/saferwall-cli
10+
go install github.com/saferwall/cli
1111
```
1212

1313

‎cli.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package main
66

77
import (
8-
"github.com/saferwall/saferwall-cli/cmd"
8+
"github.com/saferwall/cli/cmd"
99
)
1010

1111
func main() {

‎cmd/delete.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"log"
1010
"strings"
1111

12-
s "github.com/saferwall/saferwall-cli/internal/storage"
13-
"github.com/saferwall/saferwall-cli/internal/util"
14-
"github.com/saferwall/saferwall-cli/internal/webapi"
12+
s "github.com/saferwall/cli/internal/storage"
13+
"github.com/saferwall/cli/internal/util"
14+
"github.com/saferwall/cli/internal/webapi"
1515
"github.com/spf13/cobra"
1616
)
1717

‎cmd/download.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313
"path/filepath"
1414
"strings"
1515

16-
s "github.com/saferwall/saferwall-cli/internal/storage"
17-
"github.com/saferwall/saferwall-cli/internal/util"
18-
"github.com/saferwall/saferwall-cli/internal/webapi"
16+
s "github.com/saferwall/cli/internal/storage"
17+
"github.com/saferwall/cli/internal/util"
18+
"github.com/saferwall/cli/internal/webapi"
1919
"github.com/spf13/cobra"
2020
)
2121

‎cmd/list.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ import (
1010
"encoding/json"
1111
"log"
1212

13-
"github.com/saferwall/saferwall-cli/internal/entity"
14-
s "github.com/saferwall/saferwall-cli/internal/storage"
15-
"github.com/saferwall/saferwall-cli/internal/util"
16-
"github.com/saferwall/saferwall-cli/internal/webapi"
13+
"github.com/saferwall/cli/internal/entity"
14+
s "github.com/saferwall/cli/internal/storage"
15+
"github.com/saferwall/cli/internal/util"
16+
"github.com/saferwall/cli/internal/webapi"
1717
"github.com/spf13/cobra"
1818
)
1919

@@ -94,7 +94,7 @@ var listFilesCmd = &cobra.Command{
9494
}
9595

9696
var listSha256 []string
97-
files := results.Items.([]interface{})
97+
files := results.Items.([]any)
9898
for _, fileIf := range files {
9999
file := entity.File{}
100100
b, _ := json.Marshal(fileIf)

‎cmd/rescan.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"time"
1212

1313
"github.com/gammazero/workerpool"
14-
"github.com/saferwall/saferwall-cli/internal/util"
15-
"github.com/saferwall/saferwall-cli/internal/webapi"
14+
"github.com/saferwall/cli/internal/util"
15+
"github.com/saferwall/cli/internal/webapi"
1616
"github.com/spf13/cobra"
1717
)
1818

@@ -27,7 +27,7 @@ func init() {
2727
"SHA256 of the file to rescan")
2828
reScanCmd.Flags().BoolVarP(&asyncScanFlag, "async", "a", false,
2929
"Scan files in parallel")
30-
reScanCmd.Flags().BoolVarP(&skipDetonationFlag, "skipDetonation", "d", false,
30+
reScanCmd.Flags().BoolVarP(&enableDetonationFlag, "enableDetonation", "d", false,
3131
"Skip detonation")
3232
reScanCmd.Flags().IntVarP(&timeoutFlag, "timeout", "t", 15,
3333
"Detonation duration in seconds")
@@ -46,7 +46,7 @@ func reScanFile(web webapi.Service, shaList []string, token string) error {
4646
for _, sha256 := range shaList {
4747
wp.Submit(func() {
4848
log.Printf("rescanning %s", sha256)
49-
err := web.Rescan(sha256, token, osFlag, skipDetonationFlag, timeoutFlag)
49+
err := web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag)
5050
if err != nil {
5151
log.Fatalf("failed to rescan file: %v", sha256)
5252
}
@@ -62,7 +62,7 @@ func reScanFile(web webapi.Service, shaList []string, token string) error {
6262
for _, sha256 := range shaList {
6363

6464
log.Printf("re-scanning %s", sha256)
65-
err := web.Rescan(sha256, token, osFlag, skipDetonationFlag, timeoutFlag)
65+
err := web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag)
6666
if err != nil {
6767
log.Fatalf("failed to rescan file: %v", sha256)
6868
}

‎cmd/root.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ import (
99
"log"
1010
"path/filepath"
1111

12-
"github.com/saferwall/saferwall-cli/internal/config"
13-
"github.com/saferwall/saferwall-cli/internal/util"
12+
"github.com/saferwall/cli/internal/config"
13+
"github.com/saferwall/cli/internal/util"
1414
"github.com/spf13/cobra"
1515
)
1616

1717
const (
18-
version = "0.2.0"
18+
version = "0.5.0"
1919
)
2020

2121
var cfg config.Config

‎cmd/scan.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ import (
1212
"time"
1313

1414
"github.com/gammazero/workerpool"
15-
"github.com/saferwall/saferwall-cli/internal/util"
16-
"github.com/saferwall/saferwall-cli/internal/webapi"
15+
"github.com/saferwall/cli/internal/util"
16+
"github.com/saferwall/cli/internal/webapi"
1717
"github.com/spf13/cobra"
1818
)
1919

2020
// Used for flags.
2121
var filePath string
2222
var forceRescanFlag bool
2323
var asyncScanFlag bool
24-
var skipDetonationFlag bool
24+
var enableDetonationFlag bool
2525
var timeoutFlag int
2626
var osFlag string
2727

@@ -32,7 +32,7 @@ func init() {
3232
"Force rescan the file if it exists")
3333
scanCmd.Flags().BoolVarP(&asyncScanFlag, "async", "a", false,
3434
"Scan files in parallel")
35-
scanCmd.Flags().BoolVarP(&skipDetonationFlag, "skipDetonation", "d", false,
35+
scanCmd.Flags().BoolVarP(&enableDetonationFlag, "enableDetonation", "d", false,
3636
"Skip detonation")
3737
scanCmd.Flags().IntVarP(&timeoutFlag, "timeout", "t", 15,
3838
"Detonation duration in seconds")
@@ -86,14 +86,14 @@ func scanFile(web webapi.Service, filePath, token string) error {
8686

8787
// Upload the file to be scanned, this will automatically trigger a scan request.
8888
if !exists {
89-
_, err = web.Scan(filename, token, osFlag, skipDetonationFlag, timeoutFlag)
89+
_, err = web.Scan(filename, token, osFlag, enableDetonationFlag, timeoutFlag)
9090
if err != nil {
9191
log.Fatalf("failed to upload file: %v", filename)
9292
}
9393
} else {
9494
// Force rescan the file
9595
if forceRescanFlag {
96-
err = web.Rescan(sha256, token, osFlag, skipDetonationFlag, timeoutFlag)
96+
err = web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag)
9797
if err != nil {
9898
log.Fatalf("failed to rescan file: %v", filename)
9999
}
@@ -127,16 +127,16 @@ func scanFile(web webapi.Service, filePath, token string) error {
127127
// Upload the file to be scanned, this will automatically
128128
// trigger a scan request.
129129
if !exists {
130-
body, err := web.Scan(filename, token, osFlag, skipDetonationFlag, timeoutFlag)
130+
body, err := web.Scan(filename, token, osFlag, enableDetonationFlag, timeoutFlag)
131131
if err != nil {
132132
log.Fatalf("failed to upload file: %s, error: %v", filename, err)
133133
}
134134
log.Print(body)
135-
time.Sleep(15 * time.Second)
135+
time.Sleep(10 * time.Second)
136136
} else {
137137
// Force re-scan the file
138138
if forceRescanFlag {
139-
err = web.Rescan(sha256, token, osFlag, skipDetonationFlag, timeoutFlag)
139+
err = web.Rescan(sha256, token, osFlag, enableDetonationFlag, timeoutFlag)
140140
if err != nil {
141141
log.Fatalf("failed to re-scan file: %v", filename)
142142
}

0 commit comments

Comments
 (0)