jmb/scanfile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

go format

Browse source
This commit is contained in:
Johannes Bülow 2025-07-25 12:43:28 +02:00
parent 4ee3a0be1a
commit cc8246c222
Signed by: jmb
GPG key ID: B56971CF7B8F83A6
18 changed files with 207 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
server/internal/database/file.go
View file

@ -78,5 +78,4 @@ func GetAllFiles() ([]sqlc.File, error) {
} }
return files, err return files, err
} }

1
server/internal/processing/msoffice/olevba.go
View file

@ -24,7 +24,6 @@ type olevbaResponse struct {
Stomping bool `json:"stomping"` Stomping bool `json:"stomping"`
} }
func OleVBAScan(fileID pgtype.UUID) (olevbaResponse, error) { func OleVBAScan(fileID pgtype.UUID) (olevbaResponse, error) {
slog.Debug("Starting OLEvba scan", "file-uuid", fileID.String()) slog.Debug("Starting OLEvba scan", "file-uuid", fileID.String())
oleidUrl, err := url.Parse(viper.GetString("processing.oleurl")) oleidUrl, err := url.Parse(viper.GetString("processing.oleurl"))

1
server/internal/processing/msoffice/olevba_test.go
View file

@ -10,7 +10,6 @@ import (
"github.com/spf13/viper" "github.com/spf13/viper"
) )
func TestOleVba(t *testing.T) { func TestOleVba(t *testing.T) {
slog.SetDefault(slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug}))) slog.SetDefault(slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: slog.LevelDebug})))
viper.Set("processing.oleurl", "http://localhost:5000") viper.Set("processing.oleurl", "http://localhost:5000")

4
server/internal/processing/yara/wrap.go
View file

@ -21,7 +21,7 @@ func compileSourcesFromFiles() error {
return err return err
} }
cmd := exec.Command("/usr/local/bin/yr", "compile","--path-as-namespace", "--relaxed-re-syntax", "--output", outputPath, root) cmd := exec.Command("/usr/local/bin/yr", "compile", "--path-as-namespace", "--relaxed-re-syntax", "--output", outputPath, root)
slog.Debug("Yara compile command", "cmd", cmd.String()) slog.Debug("Yara compile command", "cmd", cmd.String())
result, err := cmd.Output() result, err := cmd.Output()
if err != nil { if err != nil {
@ -46,7 +46,7 @@ func scanFile(fileName string) ([]string, error) {
slog.Error("Error in Yara Scan", "file-uuid", fileName, "error", err) slog.Error("Error in Yara Scan", "file-uuid", fileName, "error", err)
return matched, err return matched, err
} }
cmd := exec.Command("/usr/local/bin/yr", "scan", "--output-format ndjson", "--print-namespace","--compiled-rules", outputPath, fullPath) cmd := exec.Command("/usr/local/bin/yr", "scan", "--output-format ndjson", "--print-namespace", "--compiled-rules", outputPath, fullPath)
slog.Debug("Yara scan command", "cmd", cmd.String()) slog.Debug("Yara scan command", "cmd", cmd.String())
result, err := cmd.Output() result, err := cmd.Output()
if err != nil { if err != nil {

3
server/internal/processing/yara/yara.go
View file

@ -5,7 +5,7 @@ import (
"git.jmbit.de/jmb/scanfile/server/internal/sqlc" "git.jmbit.de/jmb/scanfile/server/internal/sqlc"
) )
func InitYara() error{ func InitYara() error {
return compileSourcesFromFiles() return compileSourcesFromFiles()
} }
@ -27,6 +27,5 @@ func YaraProcessing(job sqlc.ProcessingJob) error {
return err return err
} }
return nil return nil
} }

3
server/internal/store/filetype.go
View file

@ -27,11 +27,10 @@ func GetFileType(fileId string) (string, error) {
// Returns the MimeType for a []byte // Returns the MimeType for a []byte
// Only pass the necessary data! // Only pass the necessary data!
func GetBytesFileType(data []byte) (string) { func GetBytesFileType(data []byte) string {
mimetype.SetLimit(uint32(viper.GetSizeInBytes("processing.maxmimesize"))) mimetype.SetLimit(uint32(viper.GetSizeInBytes("processing.maxmimesize")))
mtype := mimetype.Detect(data) mtype := mimetype.Detect(data)
slog.Debug("GetBytesFileType", "file-mime", mtype.String()) slog.Debug("GetBytesFileType", "file-mime", mtype.String())
return mtype.String() return mtype.String()
} }

1
server/internal/store/filetype_test.go
View file

@ -41,7 +41,6 @@ func setconf() error {
return nil return nil
} }
func TestFileType(t *testing.T) { func TestFileType(t *testing.T) {
err := setconf() err := setconf()
if err != nil { if err != nil {

4
server/web/admin.go
View file

@ -7,8 +7,6 @@ import (
"git.jmbit.de/jmb/scanfile/server/internal/database" "git.jmbit.de/jmb/scanfile/server/internal/database"
) )
func AdminWebHandler(w http.ResponseWriter, r *http.Request) { func AdminWebHandler(w http.ResponseWriter, r *http.Request) {
jobs, err := database.ALlProcessingJobs() jobs, err := database.ALlProcessingJobs()
if err != nil { if err != nil {
@ -23,5 +21,3 @@ func AdminWebHandler(w http.ResponseWriter, r *http.Request) {
return return
} }
} }