Skip to content

Commit

Permalink
updates to dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@caffix
caffix committed Oct 16, 2024
1 parent 3069ead commit bd09040
Show file tree
Hide file tree
Showing 80 changed files with 2,459 additions and 162 deletions.
6 changes: 3 additions & 3 deletions cmd/amass_engine/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © by Jeff Foley 2023-2024. All rights reserved.
// Copyright © by Jeff Foley 2017-2024. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
// SPDX-License-Identifier: Apache-2.0

Expand All @@ -16,8 +16,8 @@ import (
"syscall"
"time"

"github.com/owasp-amass/engine"
"github.com/owasp-amass/engine/plugins"
"github.com/owasp-amass/amass/v4/engine"
"github.com/owasp-amass/amass/v4/engine/plugins"
slogcommon "github.com/samber/slog-common"
slogsyslog "github.com/samber/slog-syslog/v2"
)
Expand Down
4 changes: 2 additions & 2 deletions engine/api/graphql/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (

"github.com/google/uuid"
"github.com/gorilla/websocket"
"github.com/owasp-amass/config/config"
et "github.com/owasp-amass/engine/types"
"github.com/owasp-amass/amass/v4/config"
et "github.com/owasp-amass/amass/v4/engine/types"
)

type Handler func(message string)
Expand Down
6 changes: 3 additions & 3 deletions engine/api/graphql/client/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"testing"
"time"

"github.com/owasp-amass/config/config"
"github.com/owasp-amass/engine"
"github.com/owasp-amass/engine/types"
"github.com/owasp-amass/amass/v4/config"
"github.com/owasp-amass/amass/v4/engine"
"github.com/owasp-amass/amass/v4/engine/types"
oamnet "github.com/owasp-amass/open-asset-model/network"
)

Expand Down
8 changes: 4 additions & 4 deletions engine/api/graphql/server/gqlgen.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ resolver:
# gqlgen will search for any type names in the schema in these go packages
# if they match it will use them, otherwise it will generate them.
autobind:
# - "github.com/owasp-amass/config/config"
# - "github.com/owasp-amass/engine/api/graphql/client"
# - "github.com/owasp-amass/amass/v4/config"
# - "github.com/owasp-amass/amass/v4/engine/api/graphql/client"

# This section declares type mapping between the GraphQL and go type systems
#
Expand Down Expand Up @@ -101,7 +101,7 @@ models:

# LogMessaage:
# model:
# - github.com/owasp-amass/engine/pubsub.LogMessage
# - github.com/owasp-amass/amass/v4/engine/pubsub.LogMessage
# OAM:
# model:
# - github.com/owasp-amass/config/config.Scope
# - github.com/owasp-amass/amass/v4/config.Scope
2 changes: 1 addition & 1 deletion engine/api/graphql/server/resolver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ package server
import (
"log/slog"

et "github.com/owasp-amass/engine/types"
et "github.com/owasp-amass/amass/v4/engine/types"
)

type Resolver struct {
Expand Down
6 changes: 3 additions & 3 deletions engine/api/graphql/server/schema.resolvers.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion engine/api/graphql/server/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/99designs/gqlgen/graphql/handler"
"github.com/99designs/gqlgen/graphql/handler/transport"
et "github.com/owasp-amass/engine/types"
et "github.com/owasp-amass/amass/v4/engine/types"
)

const keyServerAddr key = "serverAddr"
Expand Down
2 changes: 1 addition & 1 deletion engine/dispatcher/dispatcher.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os"

"github.com/caffix/queue"
et "github.com/owasp-amass/engine/types"
et "github.com/owasp-amass/amass/v4/engine/types"
)

type dis struct {
Expand Down
12 changes: 6 additions & 6 deletions engine/engine.go
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright © by Jeff Foley 2023-2024. All rights reserved.
// Copyright © by Jeff Foley 2017-2024. All rights reserved.
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
// SPDX-License-Identifier: Apache-2.0

Expand All @@ -9,11 +9,11 @@ import (
"log/slog"
"os"

"github.com/owasp-amass/engine/api/graphql/server"
"github.com/owasp-amass/engine/dispatcher"
"github.com/owasp-amass/engine/registry"
"github.com/owasp-amass/engine/sessions"
et "github.com/owasp-amass/engine/types"
"github.com/owasp-amass/amass/v4/engine/api/graphql/server"

Check failure on line 12 in engine/engine.go

View workflow job for this annotation

GitHub Actions / Lint (ubuntu-latest, 1.21) 

could not import github.com/owasp-amass/amass/v4/engine/api/graphql/server (-: # github.com/owasp-amass/amass/v4/engine/api/graphql/server

Check failure on line 12 in engine/engine.go

View workflow job for this annotation

GitHub Actions / Lint (macos-latest, 1.21) 

could not import github.com/owasp-amass/amass/v4/engine/api/graphql/server (-: # github.com/owasp-amass/amass/v4/engine/api/graphql/server
"github.com/owasp-amass/amass/v4/engine/dispatcher"
"github.com/owasp-amass/amass/v4/engine/registry"
"github.com/owasp-amass/amass/v4/engine/sessions"
et "github.com/owasp-amass/amass/v4/engine/types"
)

type Engine struct {
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/binaryedge.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"time"

"github.com/caffix/stringset"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/chaos.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/crtsh.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/dnsrepo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"time"

"github.com/caffix/stringset"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/grepapp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"time"

"github.com/caffix/stringset"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/hackertarget.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/hunterio.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"strings"
"github.com/owasp-amass/amass/v4/utils/net/http"
"github.com/owasp-amass/engine/plugins/support"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/contact"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/leakix.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/passivetotal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"time"

"github.com/owasp-amass/amass/v4/config"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/prospeo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/securitytrails.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/urlscan.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"strings"
"sync"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/network"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/virustotal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/api/zetalytics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"strings"
"time"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/archive/wayback.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"time"

"github.com/caffix/stringset"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
"github.com/owasp-amass/amass/v4/utils/net/dns"
"github.com/owasp-amass/amass/v4/utils/net/http"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/brute/alterations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"unicode"

"github.com/caffix/stringset"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
oam "github.com/owasp-amass/open-asset-model"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
4 changes: 2 additions & 2 deletions engine/plugins/dns/apex.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"log/slog"
"strings"

"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
et "github.com/owasp-amass/engine/types"
"github.com/owasp-amass/open-asset-model/domain"
)

Expand Down
4 changes: 2 additions & 2 deletions engine/plugins/dns/cname.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

"github.com/miekg/dns"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
et "github.com/owasp-amass/engine/types"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/resolve"
)
Expand Down
4 changes: 2 additions & 2 deletions engine/plugins/dns/ip.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"time"

"github.com/miekg/dns"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
et "github.com/owasp-amass/engine/types"
"github.com/owasp-amass/open-asset-model/domain"
oamnet "github.com/owasp-amass/open-asset-model/network"
"github.com/owasp-amass/resolve"
Expand Down
4 changes: 2 additions & 2 deletions engine/plugins/dns/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

"github.com/miekg/dns"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
et "github.com/owasp-amass/engine/types"
oam "github.com/owasp-amass/open-asset-model"
oamnet "github.com/owasp-amass/open-asset-model/network"
"github.com/owasp-amass/open-asset-model/source"
Expand Down
2 changes: 1 addition & 1 deletion engine/plugins/dns/reverse.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"time"

"github.com/miekg/dns"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
amassnet "github.com/owasp-amass/amass/v4/utils/net"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
"github.com/owasp-amass/open-asset-model/domain"
oamnet "github.com/owasp-amass/open-asset-model/network"
"github.com/owasp-amass/resolve"
Expand Down
4 changes: 2 additions & 2 deletions engine/plugins/dns/subs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (

"github.com/caffix/stringset"
"github.com/miekg/dns"
"github.com/owasp-amass/amass/v4/engine/plugins/support"
et "github.com/owasp-amass/amass/v4/engine/types"
dbt "github.com/owasp-amass/asset-db/types"
"github.com/owasp-amass/engine/plugins/support"
et "github.com/owasp-amass/engine/types"
"github.com/owasp-amass/open-asset-model/domain"
"github.com/owasp-amass/resolve"
"golang.org/x/net/publicsuffix"
Expand Down
Loading

0 comments on commit bd09040

Please sign in to comment.