moving some files around the repo

cmd/ae_isready/main.go

@@ -1,4 +1,4 @@
-// Copyright © by Jeff Foley 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
 
@@ -12,7 +12,7 @@ import (
 	"path"
 	"time"
 
-	amasshttp "github.com/owasp-amass/engine/net/http"
+	amasshttp "github.com/owasp-amass/amass/v4/utils/net/http"
 )
 
 func main() {

cmd/amass/emails.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/caffix/stringset"
 	"github.com/fatih/color"
+	"github.com/owasp-amass/amass/v4/config"
 	assetdb "github.com/owasp-amass/asset-db"
-	"github.com/owasp-amass/config/config"
 	oam "github.com/owasp-amass/open-asset-model"
 	"github.com/owasp-amass/open-asset-model/contact"
 	"github.com/owasp-amass/open-asset-model/domain"

cmd/amass/enum.go

@@ -19,10 +19,10 @@ import (
 	"github.com/caffix/stringset"
 	pb "github.com/cheggaaa/pb/v3"
 	"github.com/fatih/color"
+	"github.com/owasp-amass/amass/v4/config"
+	"github.com/owasp-amass/amass/v4/engine/api/graphql/client"
 	"github.com/owasp-amass/amass/v4/format"
 	"github.com/owasp-amass/amass/v4/resources"
-	"github.com/owasp-amass/config/config"
-	"github.com/owasp-amass/engine/api/graphql/client"
 )
 
 const enumUsageMsg = "enum [options] -d DOMAIN"

cmd/amass/main.go

@@ -42,14 +42,14 @@ import (
 	"github.com/caffix/stringset"
 	"github.com/fatih/color"
 	"github.com/glebarez/sqlite"
+	"github.com/owasp-amass/amass/v4/config"
+	et "github.com/owasp-amass/amass/v4/engine/types"
 	"github.com/owasp-amass/amass/v4/format"
 	assetdb "github.com/owasp-amass/asset-db"
 	db "github.com/owasp-amass/asset-db"
 	pgmigrations "github.com/owasp-amass/asset-db/migrations/postgres"
 	sqlitemigrations "github.com/owasp-amass/asset-db/migrations/sqlite3"
 	"github.com/owasp-amass/asset-db/repository"
-	"github.com/owasp-amass/config/config"
-	et "github.com/owasp-amass/engine/types"
 	"github.com/owasp-amass/open-asset-model/domain"
 	oamnet "github.com/owasp-amass/open-asset-model/network"
 	migrate "github.com/rubenv/sql-migrate"

cmd/amass/subs.go

@@ -19,8 +19,8 @@ import (
 
 	"github.com/caffix/stringset"
 	"github.com/fatih/color"
+	"github.com/owasp-amass/amass/v4/config"
 	assetdb "github.com/owasp-amass/asset-db"
-	"github.com/owasp-amass/config/config"
 	oam "github.com/owasp-amass/open-asset-model"
 	"github.com/owasp-amass/open-asset-model/domain"
 	"github.com/owasp-amass/open-asset-model/network"

cmd/oam_i2y/ini.go

@@ -1,4 +1,4 @@
-// Copyright © by Jeff Foley 2017-2023. 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
 
@@ -15,7 +15,7 @@ import (
 
 	"github.com/caffix/stringset"
 	"github.com/go-ini/ini"
-	"github.com/owasp-amass/amass/v4/net/dns"
+	"github.com/owasp-amass/amass/v4/utils/net/dns"
 )
 
 // Updater allows an object to implement a method that updates a configuration.

cmd/oam_i2y/main.go

@@ -1,4 +1,4 @@
-// Copyright © by Jeff Foley 2017-2023. 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
 
@@ -32,7 +32,7 @@ import (
 	"path/filepath"
 
 	"github.com/fatih/color"
-	"github.com/owasp-amass/config/config"
+	"github.com/owasp-amass/amass/v4/config"
 	"gopkg.in/yaml.v3"
 )
 

format/parse.go

@@ -1,4 +1,4 @@
-// Copyright © by Jeff Foley 2017-2023. 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
 
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	amassnet "github.com/owasp-amass/amass/v4/net"
+	amassnet "github.com/owasp-amass/amass/v4/utils/net"
 )
 
 // ParseStrings implements the flag.Value interface.

resources/alterations.txt

@@ -0,0 +1,257 @@
+1
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+2
+20
+2013
+2014
+2015
+2016
+2017
+2018
+2019
+2020
+2021
+2022
+2023
+3
+4
+5
+6
+7
+8
+9
+a
+acc
+account
+accounts
+admin
+administrator
+akali
+akamai
+alpha
+alt
+america
+analytics
+api
+apollo
+app
+april
+auth
+aws
+b
+backend
+beta
+billing
+boards
+box
+brand
+brasil
+brazil
+bucket
+bucky
+c
+cdn
+cf
+cfg
+chef
+ci
+client
+cloudfront
+cms
+cn
+com
+confluence
+container
+control
+d
+data
+db
+dec
+demo
+dev
+developer
+devops
+docker
+docs
+drop
+e
+edge
+elasticbeanstalk
+elb
+email
+eng
+engima
+engine
+engineering
+eu
+europe
+europewest
+euw
+euwe
+evelynn
+events
+f
+feb
+firewall
+forms
+forum
+frontpage
+ftp
+fw
+g
+games
+germany
+gh
+git
+github
+global
+h
+hkg
+hw
+hwcdn
+i
+ids
+imap
+int
+inte
+internal
+j
+jenkins
+jinx
+july
+june
+k
+korea
+kr
+l
+lan
+las
+latin
+latinamerica
+lax
+lb
+loadbalancer
+login
+m
+machine
+mail
+march
+merch
+mirror
+mon
+n
+na
+nautilus
+net
+netherlands
+new
+nginx
+nl
+node
+northamerica
+nov
+o
+oceania
+oct
+old
+ops
+org
+origin
+p
+page
+pass
+pay
+payment
+pc
+php
+pl
+poland
+prd
+preferences
+preprod
+priv
+private
+prod
+production
+profile
+profiles
+promo
+promotion
+proxy
+pub
+q
+qa
+r
+redirector
+region
+repo
+repository
+reset
+restrict
+restricted
+reviews
+s
+s3
+sandbox
+search
+secure
+security
+sept
+server
+service
+singed
+skins
+smtp
+spring
+sql
+ssl
+sso
+staff
+stag
+stage
+staging
+static
+stg
+support
+swagger
+system
+t
+team
+test
+testbed
+testing
+tomcat
+tpe
+tr
+trial
+tst
+tur
+turk
+turkey
+twitch
+u
+uat
+users
+v
+v1
+v2
+vi
+vpn
+w
+w3
+web
+webapp
+westeurope
+www
+x
+y
+z