diff --git a/analysis/analysis.go b/analysis/analysis.go index e6ca5b1..70590c6 100644 --- a/analysis/analysis.go +++ b/analysis/analysis.go @@ -1,10 +1,6 @@ package analysis import ( - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/logger" - "activecm/rita/util" "context" "fmt" "math" @@ -12,6 +8,11 @@ import ( "runtime" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/util" + "golang.org/x/sync/errgroup" "golang.org/x/time/rate" ) diff --git a/analysis/analysis_test.go b/analysis/analysis_test.go index fc23d9d..0257911 100644 --- a/analysis/analysis_test.go +++ b/analysis/analysis_test.go @@ -1,10 +1,11 @@ package analysis import ( - "activecm/rita/config" "log" "testing" + "github.com/activecm/ritav2/config" + "github.com/joho/godotenv" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/analysis/beacons.go b/analysis/beacons.go index 8b9e769..fdb951f 100644 --- a/analysis/beacons.go +++ b/analysis/beacons.go @@ -1,14 +1,15 @@ package analysis import ( - "activecm/rita/logger" - "activecm/rita/util" "errors" "fmt" "math" "slices" "sort" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/util" + "github.com/montanaflynn/stats" ) diff --git a/analysis/spagooper.go b/analysis/spagooper.go index 4a91916..26200df 100644 --- a/analysis/spagooper.go +++ b/analysis/spagooper.go @@ -1,9 +1,6 @@ package analysis import ( - "activecm/rita/logger" - "activecm/rita/progressbar" - "activecm/rita/util" "context" "fmt" "net" @@ -11,6 +8,10 @@ import ( "strconv" "time" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/progressbar" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/charmbracelet/bubbles/progress" tea "github.com/charmbracelet/bubbletea" diff --git a/cmd/cmd.go b/cmd/cmd.go index ef36294..b41d0d9 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -1,11 +1,12 @@ package cmd import ( - "activecm/rita/config" - "activecm/rita/util" "errors" "fmt" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/util" + "github.com/google/go-github/github" "github.com/spf13/afero" "github.com/urfave/cli/v2" diff --git a/cmd/cmd_test.go b/cmd/cmd_test.go index 9378171..928c943 100644 --- a/cmd/cmd_test.go +++ b/cmd/cmd_test.go @@ -1,8 +1,6 @@ package cmd_test import ( - "activecm/rita/config" - "activecm/rita/database" "context" "fmt" "log" @@ -10,6 +8,9 @@ import ( "path/filepath" "testing" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/joho/godotenv" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/cmd/delete.go b/cmd/delete.go index 40069c2..34e644d 100644 --- a/cmd/delete.go +++ b/cmd/delete.go @@ -1,14 +1,15 @@ package cmd import ( - "activecm/rita/config" - "activecm/rita/database" "context" "errors" "fmt" "regexp" "strings" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/manifoldco/promptui" "github.com/spf13/afero" "github.com/urfave/cli/v2" diff --git a/cmd/delete_test.go b/cmd/delete_test.go index 277bc10..9ac5fb5 100644 --- a/cmd/delete_test.go +++ b/cmd/delete_test.go @@ -1,11 +1,12 @@ package cmd_test import ( - "activecm/rita/cmd" - "activecm/rita/database" "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/database" + "github.com/spf13/afero" "github.com/stretchr/testify/require" "github.com/urfave/cli/v2" diff --git a/cmd/import.go b/cmd/import.go index 106b860..fe3a236 100644 --- a/cmd/import.go +++ b/cmd/import.go @@ -1,13 +1,6 @@ package cmd import ( - "activecm/rita/analysis" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/importer" - "activecm/rita/logger" - "activecm/rita/modifier" - "activecm/rita/util" "errors" "fmt" "math" @@ -21,6 +14,14 @@ import ( "time" "unicode" + "github.com/activecm/ritav2/analysis" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/importer" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/modifier" + "github.com/activecm/ritav2/util" + "github.com/spf13/afero" "github.com/urfave/cli/v2" ) diff --git a/cmd/import_test.go b/cmd/import_test.go index 2bd81b9..bed1163 100644 --- a/cmd/import_test.go +++ b/cmd/import_test.go @@ -1,13 +1,13 @@ package cmd_test import ( - "activecm/rita/cmd" - "activecm/rita/database" - "activecm/rita/util" "context" "fmt" - "activecm/rita/importer" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/util" + iofs "io/fs" "os" "path/filepath" @@ -15,6 +15,8 @@ import ( "testing" "time" + "github.com/activecm/ritav2/importer" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/cmd/list.go b/cmd/list.go index 4efa427..3365caf 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -1,13 +1,14 @@ package cmd import ( - "activecm/rita/config" - "activecm/rita/database" "context" "fmt" "os" "strconv" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss/table" "github.com/spf13/afero" diff --git a/cmd/list_test.go b/cmd/list_test.go index ae9d219..ecd5042 100644 --- a/cmd/list_test.go +++ b/cmd/list_test.go @@ -1,14 +1,15 @@ package cmd_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" "context" "net" "strings" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/cmd/validate.go b/cmd/validate.go index 4275abc..b57104f 100644 --- a/cmd/validate.go +++ b/cmd/validate.go @@ -1,11 +1,12 @@ package cmd import ( - "activecm/rita/config" - "activecm/rita/util" "errors" "fmt" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/util" + "github.com/spf13/afero" "github.com/urfave/cli/v2" ) diff --git a/cmd/view.go b/cmd/view.go index 34f9618..71a7766 100644 --- a/cmd/view.go +++ b/cmd/view.go @@ -1,15 +1,16 @@ package cmd import ( - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/util" - "activecm/rita/viewer" "context" "database/sql" "errors" "fmt" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/util" + "github.com/activecm/ritav2/viewer" + "github.com/spf13/afero" "github.com/urfave/cli/v2" ) diff --git a/config/config.go b/config/config.go index 92ac40a..8096ff0 100644 --- a/config/config.go +++ b/config/config.go @@ -1,12 +1,13 @@ package config import ( - "activecm/rita/util" "errors" "fmt" "os" "sync" + "github.com/activecm/ritav2/util" + "github.com/hjson/hjson-go/v4" "github.com/spf13/afero" ) diff --git a/config/config_test.go b/config/config_test.go index 91bdde2..b796d8c 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,13 +1,14 @@ package config import ( - "activecm/rita/util" "fmt" "log" "net" "os" "testing" + "github.com/activecm/ritav2/util" + "github.com/joho/godotenv" "github.com/spf13/afero" "github.com/stretchr/testify/assert" diff --git a/config/filter.go b/config/filter.go index c13d90f..efc1e67 100644 --- a/config/filter.go +++ b/config/filter.go @@ -1,7 +1,7 @@ package config import ( - "activecm/rita/util" + "github.com/activecm/ritav2/util" "net" ) diff --git a/database/db.go b/database/db.go index 2b653ef..3eabd23 100644 --- a/database/db.go +++ b/database/db.go @@ -1,8 +1,6 @@ package database import ( - "activecm/rita/config" - "activecm/rita/logger" "context" "database/sql" "errors" @@ -11,6 +9,9 @@ import ( "net" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/logger" + clickhouse "github.com/ClickHouse/clickhouse-go/v2" driver "github.com/ClickHouse/clickhouse-go/v2/lib/driver" ) diff --git a/database/db_test.go b/database/db_test.go index 021c1eb..f304e88 100644 --- a/database/db_test.go +++ b/database/db_test.go @@ -1,9 +1,6 @@ package database_test import ( - "activecm/rita/cmd" - "activecm/rita/database" - "activecm/rita/util" "context" "fmt" "os" @@ -11,6 +8,10 @@ import ( "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/util" + clickhouse "github.com/ClickHouse/clickhouse-go/v2" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/database/metadb.go b/database/metadb.go index c8ccaf6..b262816 100644 --- a/database/metadb.go +++ b/database/metadb.go @@ -1,12 +1,13 @@ package database import ( - "activecm/rita/config" - "activecm/rita/util" "fmt" "strconv" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" ) diff --git a/database/server.go b/database/server.go index 54a25cc..e6e74d7 100644 --- a/database/server.go +++ b/database/server.go @@ -1,14 +1,15 @@ package database import ( - "activecm/rita/config" - "activecm/rita/logger" "context" "database/sql" "errors" "fmt" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/logger" + clickhouse "github.com/ClickHouse/clickhouse-go/v2" driver "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "github.com/spf13/afero" diff --git a/database/server_test.go b/database/server_test.go index a76afbb..6b0c0c6 100644 --- a/database/server_test.go +++ b/database/server_test.go @@ -1,9 +1,6 @@ package database_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" "context" "fmt" "log" @@ -12,6 +9,10 @@ import ( "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/joho/godotenv" "github.com/spf13/afero" diff --git a/database/threat_intel.go b/database/threat_intel.go index c62d091..2f3638d 100644 --- a/database/threat_intel.go +++ b/database/threat_intel.go @@ -1,9 +1,6 @@ package database import ( - "activecm/rita/config" - "activecm/rita/logger" - "activecm/rita/util" "bufio" "context" "errors" @@ -15,6 +12,10 @@ import ( "strings" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/util" + clickhouse "github.com/ClickHouse/clickhouse-go/v2" "github.com/spf13/afero" "golang.org/x/time/rate" diff --git a/database/threat_intel_test.go b/database/threat_intel_test.go index 6fecbb6..a24ff66 100644 --- a/database/threat_intel_test.go +++ b/database/threat_intel_test.go @@ -1,7 +1,6 @@ package database import ( - "activecm/rita/util" "bufio" "context" "io" @@ -11,6 +10,8 @@ import ( "sync" "testing" + "github.com/activecm/ritav2/util" + "github.com/stretchr/testify/require" ) diff --git a/database/valid_mime_types.go b/database/valid_mime_types.go index 9eae845..34c5fc1 100644 --- a/database/valid_mime_types.go +++ b/database/valid_mime_types.go @@ -1,8 +1,6 @@ package database import ( - "activecm/rita/config" - "activecm/rita/util" "encoding/csv" "errors" "fmt" @@ -10,6 +8,9 @@ import ( "os" "strings" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/util" + "github.com/spf13/afero" "golang.org/x/time/rate" ) diff --git a/database/writer.go b/database/writer.go index 4c841df..db41cbe 100644 --- a/database/writer.go +++ b/database/writer.go @@ -1,11 +1,12 @@ package database import ( - "activecm/rita/config" - "activecm/rita/logger" "context" "sync" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/logger" + clickhouse "github.com/ClickHouse/clickhouse-go/v2" driver "github.com/ClickHouse/clickhouse-go/v2/lib/driver" "golang.org/x/sync/errgroup" diff --git a/go.mod b/go.mod index 30637f2..8021fc5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module activecm/rita +module github.com/activecm/ritav2 go 1.22.3 diff --git a/importer/conn.go b/importer/conn.go index f272ec9..0a83fd2 100644 --- a/importer/conn.go +++ b/importer/conn.go @@ -1,17 +1,18 @@ package importer import ( - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/importer/zeektypes" - zerolog "activecm/rita/logger" - "activecm/rita/progressbar" - "activecm/rita/util" "errors" "net" "sync/atomic" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/importer/zeektypes" + zerolog "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/progressbar" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" tea "github.com/charmbracelet/bubbletea" "github.com/google/uuid" diff --git a/importer/dns.go b/importer/dns.go index 553098c..380341f 100644 --- a/importer/dns.go +++ b/importer/dns.go @@ -1,16 +1,17 @@ package importer import ( - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/importer/zeektypes" - "activecm/rita/util" "errors" "net" "strings" "sync/atomic" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/importer/zeektypes" + "github.com/activecm/ritav2/util" + "github.com/google/uuid" ) diff --git a/importer/http.go b/importer/http.go index d731eaf..38aec9e 100644 --- a/importer/http.go +++ b/importer/http.go @@ -1,12 +1,6 @@ package importer import ( - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/importer/zeektypes" - "activecm/rita/logger" - "activecm/rita/progressbar" - "activecm/rita/util" "context" "errors" "net" @@ -14,6 +8,13 @@ import ( "sync/atomic" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/importer/zeektypes" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/progressbar" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" tea "github.com/charmbracelet/bubbletea" "github.com/google/uuid" diff --git a/importer/importer.go b/importer/importer.go index a0b398b..df4d743 100644 --- a/importer/importer.go +++ b/importer/importer.go @@ -1,12 +1,6 @@ package importer import ( - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/importer/zeektypes" - zerolog "activecm/rita/logger" - "activecm/rita/progressbar" - "activecm/rita/util" "context" "errors" "fmt" @@ -17,6 +11,13 @@ import ( "sync" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/importer/zeektypes" + zerolog "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/progressbar" + "github.com/activecm/ritav2/util" + "github.com/charmbracelet/bubbles/progress" "github.com/spf13/afero" "github.com/vbauerster/mpb/v8" diff --git a/importer/parser.go b/importer/parser.go index 6a55f82..b42df7a 100644 --- a/importer/parser.go +++ b/importer/parser.go @@ -1,8 +1,6 @@ package importer import ( - zerolog "activecm/rita/logger" - "activecm/rita/util" "bufio" "compress/gzip" "errors" @@ -13,6 +11,9 @@ import ( "strings" "time" + zerolog "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/util" + jsoniter "github.com/json-iterator/go" "github.com/spf13/afero" ) diff --git a/importer/parser_test.go b/importer/parser_test.go index ef0f575..d92ed8d 100644 --- a/importer/parser_test.go +++ b/importer/parser_test.go @@ -1,13 +1,14 @@ package importer import ( - "activecm/rita/importer/zeektypes" - "activecm/rita/util" "errors" "strconv" "testing" "time" + "github.com/activecm/ritav2/importer/zeektypes" + "github.com/activecm/ritav2/util" + "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/importer/ssl.go b/importer/ssl.go index 5993725..a41fd35 100644 --- a/importer/ssl.go +++ b/importer/ssl.go @@ -1,12 +1,6 @@ package importer import ( - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/importer/zeektypes" - "activecm/rita/logger" - "activecm/rita/progressbar" - "activecm/rita/util" "context" "errors" "fmt" @@ -15,6 +9,13 @@ import ( "sync/atomic" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/importer/zeektypes" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/progressbar" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" tea "github.com/charmbracelet/bubbletea" "github.com/google/uuid" diff --git a/integration/analysis_view_test.go b/integration/analysis_view_test.go index 99de71f..ff6e63b 100644 --- a/integration/analysis_view_test.go +++ b/integration/analysis_view_test.go @@ -1,8 +1,6 @@ package integration_test import ( - "activecm/rita/modifier" - "activecm/rita/util" "context" "database/sql" "errors" @@ -10,6 +8,9 @@ import ( "strconv" "testing" + "github.com/activecm/ritav2/modifier" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/require" ) diff --git a/integration/beacons_test.go b/integration/beacons_test.go index df5e0d4..900d98a 100644 --- a/integration/beacons_test.go +++ b/integration/beacons_test.go @@ -1,17 +1,18 @@ package integration_test import ( - "activecm/rita/analysis" - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/util" "context" "net" "strconv" "testing" "time" + "github.com/activecm/ritav2/analysis" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/integration/filter_test.go b/integration/filter_test.go index 6332171..56c0515 100644 --- a/integration/filter_test.go +++ b/integration/filter_test.go @@ -1,16 +1,17 @@ package integration_test import ( - "activecm/rita/analysis" - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/progressbar" "context" "net" "testing" "time" + "github.com/activecm/ritav2/analysis" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/progressbar" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/charmbracelet/bubbles/progress" "github.com/spf13/afero" diff --git a/integration/importer_test.go b/integration/importer_test.go index b769e3a..52ab54f 100644 --- a/integration/importer_test.go +++ b/integration/importer_test.go @@ -1,13 +1,14 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - i "activecm/rita/importer" "context" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + i "github.com/activecm/ritav2/importer" + "reflect" "testing" diff --git a/integration/integration_test.go b/integration/integration_test.go index 555e60b..4e13234 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -1,9 +1,6 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" "context" "errors" "fmt" @@ -13,6 +10,10 @@ import ( "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/joho/godotenv" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/integration/materialized_view_test.go b/integration/materialized_view_test.go index f486fa1..d23a845 100644 --- a/integration/materialized_view_test.go +++ b/integration/materialized_view_test.go @@ -1,11 +1,12 @@ package integration_test import ( - "activecm/rita/importer" "database/sql" "errors" "testing" + "github.com/activecm/ritav2/importer" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/stretchr/testify/require" ) diff --git a/integration/metadb_test.go b/integration/metadb_test.go index 8643c2d..ee0e647 100644 --- a/integration/metadb_test.go +++ b/integration/metadb_test.go @@ -1,17 +1,18 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - i "activecm/rita/importer" - "activecm/rita/util" "context" "slices" "strings" "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + i "github.com/activecm/ritav2/importer" + "github.com/activecm/ritav2/util" + fp "path/filepath" "github.com/ClickHouse/clickhouse-go/v2" diff --git a/integration/missing_host_test.go b/integration/missing_host_test.go index 75f6c9d..6bdee14 100644 --- a/integration/missing_host_test.go +++ b/integration/missing_host_test.go @@ -1,16 +1,17 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/viewer" "context" "fmt" "net" "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/viewer" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/integration/networkid_test.go b/integration/networkid_test.go index 933d52e..ce0fe80 100644 --- a/integration/networkid_test.go +++ b/integration/networkid_test.go @@ -1,14 +1,15 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/util" "context" "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/google/uuid" "github.com/spf13/afero" diff --git a/integration/open_sni_test.go b/integration/open_sni_test.go index 87db280..729d897 100644 --- a/integration/open_sni_test.go +++ b/integration/open_sni_test.go @@ -1,15 +1,16 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/viewer" "context" "net" "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/viewer" + "github.com/spf13/afero" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/integration/prevalence_test.go b/integration/prevalence_test.go index c4e57fa..47b7565 100644 --- a/integration/prevalence_test.go +++ b/integration/prevalence_test.go @@ -1,13 +1,14 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" "context" "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/integration/proxy_rolling_test.go b/integration/proxy_rolling_test.go index 0108c98..d19253d 100644 --- a/integration/proxy_rolling_test.go +++ b/integration/proxy_rolling_test.go @@ -1,15 +1,16 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/viewer" "context" "net" "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/viewer" + "github.com/spf13/afero" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/integration/threat_intel_test.go b/integration/threat_intel_test.go index 91e0c59..e31e4da 100644 --- a/integration/threat_intel_test.go +++ b/integration/threat_intel_test.go @@ -1,9 +1,6 @@ package integration_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" "context" "fmt" "os/exec" @@ -11,6 +8,10 @@ import ( "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/spf13/afero" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/integration_rolling/historical_first_seen_test.go b/integration_rolling/historical_first_seen_test.go index 8ebe99a..ca8d836 100644 --- a/integration_rolling/historical_first_seen_test.go +++ b/integration_rolling/historical_first_seen_test.go @@ -1,9 +1,6 @@ package integration_rolling_test import ( - "activecm/rita/cmd" - "activecm/rita/database" - "activecm/rita/util" "context" "encoding/base64" "encoding/binary" @@ -16,6 +13,10 @@ import ( "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/util" + "github.com/dchest/siphash" "github.com/spf13/afero" "github.com/stretchr/testify/require" diff --git a/integration_rolling/ttl_test.go b/integration_rolling/ttl_test.go index 87e177d..7398deb 100644 --- a/integration_rolling/ttl_test.go +++ b/integration_rolling/ttl_test.go @@ -1,10 +1,6 @@ package integration_rolling_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/util" "context" "fmt" "log" @@ -13,6 +9,11 @@ import ( "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/joho/godotenv" "github.com/spf13/afero" diff --git a/logger/logger.go b/logger/logger.go index f2fb9e9..f1c7f9d 100644 --- a/logger/logger.go +++ b/logger/logger.go @@ -1,13 +1,14 @@ package logger import ( - "activecm/rita/config" "io" "log/syslog" "os" "sync" "time" + "github.com/activecm/ritav2/config" + "github.com/rs/zerolog" "github.com/rs/zerolog/pkgerrors" "github.com/spf13/afero" diff --git a/modifier/modifier.go b/modifier/modifier.go index bf120eb..7c5f081 100644 --- a/modifier/modifier.go +++ b/modifier/modifier.go @@ -1,16 +1,17 @@ package modifier import ( - "activecm/rita/analysis" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/logger" - "activecm/rita/util" "context" "fmt" "net" "time" + "github.com/activecm/ritav2/analysis" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/util" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/google/uuid" "golang.org/x/sync/errgroup" diff --git a/rita.go b/rita.go index c1162b1..355afd2 100644 --- a/rita.go +++ b/rita.go @@ -1,14 +1,15 @@ package main import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/logger" - "activecm/rita/viewer" "fmt" "log" "os" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/logger" + "github.com/activecm/ritav2/viewer" + "github.com/joho/godotenv" "github.com/urfave/cli/v2" ) diff --git a/viewer/csv.go b/viewer/csv.go index 6c31c17..63b7e5c 100644 --- a/viewer/csv.go +++ b/viewer/csv.go @@ -1,12 +1,13 @@ package viewer import ( - "activecm/rita/database" "fmt" "strconv" "strings" "time" + "github.com/activecm/ritav2/database" + "github.com/charmbracelet/bubbles/list" ) diff --git a/viewer/csv_test.go b/viewer/csv_test.go index 69a3100..dcda2e6 100644 --- a/viewer/csv_test.go +++ b/viewer/csv_test.go @@ -1,11 +1,12 @@ package viewer_test import ( - "activecm/rita/viewer" "net" "testing" "time" + "github.com/activecm/ritav2/viewer" + "github.com/charmbracelet/bubbles/list" "github.com/stretchr/testify/require" ) diff --git a/viewer/list.go b/viewer/list.go index 29824f2..b1a30ac 100644 --- a/viewer/list.go +++ b/viewer/list.go @@ -1,10 +1,11 @@ package viewer import ( - "activecm/rita/config" "fmt" "io" + "github.com/activecm/ritav2/config" + "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" diff --git a/viewer/results.go b/viewer/results.go index 5801037..afcddb5 100644 --- a/viewer/results.go +++ b/viewer/results.go @@ -1,14 +1,15 @@ package viewer import ( - "activecm/rita/config" - "activecm/rita/database" "fmt" "math" "net" "strings" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/ClickHouse/clickhouse-go/v2" "github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/lipgloss" diff --git a/viewer/search.go b/viewer/search.go index bf37bf9..b21c923 100644 --- a/viewer/search.go +++ b/viewer/search.go @@ -1,8 +1,6 @@ package viewer import ( - "activecm/rita/config" - "activecm/rita/util" "fmt" "net/netip" "regexp" @@ -11,6 +9,9 @@ import ( "strings" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/util" + "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" diff --git a/viewer/search_test.go b/viewer/search_test.go index 7312372..28f5339 100644 --- a/viewer/search_test.go +++ b/viewer/search_test.go @@ -1,13 +1,14 @@ package viewer_test import ( - "activecm/rita/config" - "activecm/rita/viewer" "fmt" "math" "testing" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/viewer" + "github.com/charmbracelet/bubbles/list" tea "github.com/charmbracelet/bubbletea" "github.com/stretchr/testify/require" diff --git a/viewer/sidebar.go b/viewer/sidebar.go index 31683d3..d5a818e 100644 --- a/viewer/sidebar.go +++ b/viewer/sidebar.go @@ -1,11 +1,12 @@ package viewer import ( - "activecm/rita/util" "fmt" "strings" "time" + "github.com/activecm/ritav2/util" + "github.com/charmbracelet/bubbles/viewport" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" diff --git a/viewer/sidebar_test.go b/viewer/sidebar_test.go index ccc2445..944cfa3 100644 --- a/viewer/sidebar_test.go +++ b/viewer/sidebar_test.go @@ -1,7 +1,7 @@ package viewer_test import ( - "activecm/rita/viewer" + "github.com/activecm/ritav2/viewer" tea "github.com/charmbracelet/bubbletea" "github.com/stretchr/testify/require" diff --git a/viewer/viewer.go b/viewer/viewer.go index d63380d..1932441 100644 --- a/viewer/viewer.go +++ b/viewer/viewer.go @@ -1,8 +1,6 @@ package viewer import ( - "activecm/rita/config" - "activecm/rita/database" "fmt" "math" "os" @@ -10,6 +8,9 @@ import ( "slices" "time" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/bubbles/spinner" diff --git a/viewer/viewer_test.go b/viewer/viewer_test.go index 570b0dc..557aaa0 100644 --- a/viewer/viewer_test.go +++ b/viewer/viewer_test.go @@ -1,10 +1,6 @@ package viewer_test import ( - "activecm/rita/cmd" - "activecm/rita/config" - "activecm/rita/database" - "activecm/rita/viewer" "context" "fmt" "log" @@ -13,6 +9,11 @@ import ( "testing" "time" + "github.com/activecm/ritav2/cmd" + "github.com/activecm/ritav2/config" + "github.com/activecm/ritav2/database" + "github.com/activecm/ritav2/viewer" + tea "github.com/charmbracelet/bubbletea" "github.com/joho/godotenv" "github.com/spf13/afero"