fix "modifer" -> "modifier" typo everywhere

.air.toml

@@ -21,7 +21,7 @@ tmp_dir = "tmp"
   poll = false
   poll_interval = 0
   post_cmd = []
-  pre_cmd = ["git rev-parse --short HEAD > handlers/VERSION; git rev-parse --short HEAD > cmd/VERSION"]
+  pre_cmd = ["git submodule update --init --recursive; rev-parse --short HEAD > handlers/VERSION; git rev-parse --short HEAD > cmd/VERSION"]
   rerun = false
   rerun_delay = 500
   send_interrupt = false

.gitmodules

@@ -1,6 +1,6 @@
-[submodule "proxychain/requestmodifers/vendor/ua-parser-js"]
-	path = proxychain/requestmodifers/vendor/ua-parser-js
-	url = https://github.com/faisalman/ua-parser-js.git
-[submodule "proxychain/responsemodifers/vendor/ddg-tracker-surrogates"]
-	path = proxychain/responsemodifers/vendor/ddg-tracker-surrogates
+[submodule "proxychain/responsemodifiers/vendor/ddg-tracker-surrogates"]
+	path = proxychain/responsemodifiers/vendor/ddg-tracker-surrogates
 	url = https://github.com/duckduckgo/tracker-surrogates
+[submodule "proxychain/requestmodifiers/vendor/ua-parser-js"]
+	path = proxychain/requestmodifiers/vendor/ua-parser-js
+	url = https://github.com/faisalman/ua-parser-js.git

cmd/main.go

@@ -10,7 +10,7 @@ import (
 
 	"ladder/handlers"
 	"ladder/internal/cli"
-	"ladder/proxychain/requestmodifers/bot"
+	"ladder/proxychain/requestmodifiers/bot"
 
 	"github.com/akamensky/argparse"
 	"github.com/gofiber/fiber/v2"

go.mod

@@ -3,7 +3,6 @@ module ladder
 go 1.21.1
 
 require (
-	github.com/3th1nk/cidr v0.2.0
 	github.com/akamensky/argparse v1.4.0
 	github.com/bogdanfinn/fhttp v0.5.24
 	github.com/bogdanfinn/tls-client v1.6.1

go.sum

@@ -1,5 +1,3 @@
-github.com/3th1nk/cidr v0.2.0 h1:81jjEknszD8SHPLVTPPk+BZjNVqq1ND2YXLSChl6Lrs=
-github.com/3th1nk/cidr v0.2.0/go.mod h1:XsSQnS4rEYyB2veDfnIGgViulFpIITPKtp3f0VxpiLw=
 github.com/abadojack/whatlanggo v1.0.1 h1:19N6YogDnf71CTHm3Mp2qhYfkRdyvbgwWdd2EPxJRG4=
 github.com/abadojack/whatlanggo v1.0.1/go.mod h1:66WiQbSbJBIlOZMsvbKe5m6pzQovxCH9B/K8tQB2uoc=
 github.com/akamensky/argparse v1.4.0 h1:YGzvsTqCvbEZhL8zZu2AiA5nq805NZh75JNj4ajn1xc=
@@ -84,7 +82,6 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tam7t/hpkp v0.0.0-20160821193359-2b70b4024ed5 h1:YqAladjX7xpA6BM04leXMWAEjS0mTZ5kUU9KRBriQJc=

handlers/api_content.go

@@ -2,8 +2,8 @@ package handlers
 
 import (
 	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifers"
-	tx "ladder/proxychain/responsemodifers"
+	rx "ladder/proxychain/requestmodifiers"
+	tx "ladder/proxychain/responsemodifiers"
 
 	"github.com/gofiber/fiber/v2"
 )

handlers/outline.go

@@ -2,8 +2,8 @@ package handlers
 
 import (
 	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifers"
-	tx "ladder/proxychain/responsemodifers"
+	rx "ladder/proxychain/requestmodifiers"
+	tx "ladder/proxychain/responsemodifiers"
 
 	"github.com/gofiber/fiber/v2"
 )

handlers/proxy.go

@@ -2,8 +2,8 @@ package handlers
 
 import (
 	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifers"
-	tx "ladder/proxychain/responsemodifers"
+	rx "ladder/proxychain/requestmodifiers"
+	tx "ladder/proxychain/responsemodifiers"
 
 	"github.com/gofiber/fiber/v2"
 )

proxychain/proxychain.go

@@ -42,9 +42,9 @@ applying request and response modifications along the way.
 
 import (
 
-	rx "ladder/pkg/proxychain/requestmodifers"
-	tx "ladder/pkg/proxychain/responsemodifers"
-	"ladder/pkg/proxychain/responsemodifers/rewriters"
+	rx "ladder/pkg/proxychain/requestmodifiers"
+	tx "ladder/pkg/proxychain/responsemodifiers"
+	"ladder/pkg/proxychain/responsemodifiers/rewriters"
 	"ladder/internal/proxychain"
 
 )
@@ -134,14 +134,14 @@ type HTTPClient interface {
 	Post(url, contentType string, body io.Reader) (resp *http.Response, err error)
 }
 
-// SetRequestModifications sets the ProxyChain's request modifers
+// SetRequestModifications sets the ProxyChain's request modifiers
 // the modifier will not fire until ProxyChain.Execute() is run.
 func (chain *ProxyChain) SetRequestModifications(mods ...RequestModification) *ProxyChain {
 	chain.requestModifications = mods
 	return chain
 }
 
-// AddRequestModifications adds more request modifers to the ProxyChain
+// AddRequestModifications adds more request modifiers to the ProxyChain
 // the modifier will not fire until ProxyChain.Execute() is run.
 func (chain *ProxyChain) AddRequestModifications(mods ...RequestModification) *ProxyChain {
 	chain.requestModifications = append(chain.requestModifications, mods...)
@@ -162,7 +162,7 @@ func (chain *ProxyChain) AddOnceResponseModifications(mods ...ResponseModificati
 	return chain
 }
 
-// AddResponseModifications sets the ProxyChain's response modifers
+// AddResponseModifications sets the ProxyChain's response modifiers
 // the modifier will not fire until ProxyChain.Execute() is run.
 func (chain *ProxyChain) AddResponseModifications(mods ...ResponseModification) *ProxyChain {
 	chain.responseModifications = mods

proxychain/requestmodifiers/forward_request_headers.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"strings"

proxychain/requestmodifiers/masquerade_as_trusted_bot.go

@@ -1,8 +1,8 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"
-	"ladder/proxychain/requestmodifers/bot"
+	"ladder/proxychain/requestmodifiers/bot"
 )
 
 // MasqueradeAsGoogleBot modifies user agent and x-forwarded for

proxychain/requestmodifiers/modify_domain_with_regex.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"regexp"

proxychain/requestmodifiers/modify_outgoing_cookies.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	//"net/http"

proxychain/requestmodifiers/modify_path_with_regex.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"regexp"

proxychain/requestmodifiers/modify_query_params.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"net/url"

proxychain/requestmodifiers/modify_request_headers.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/request_archive_is.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"fmt"
@@ -6,7 +6,7 @@ import (
 	"regexp"
 
 	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifers"
+	tx "ladder/proxychain/responsemodifiers"
 )
 
 const archivistUrl string = "https://archive.is/latest"

proxychain/requestmodifiers/request_google_cache.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"net/url"

proxychain/requestmodifiers/request_wayback_machine.go

@@ -1,11 +1,11 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"net/url"
 	"regexp"
 
 	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifers"
+	tx "ladder/proxychain/responsemodifiers"
 )
 
 const waybackUrl string = "https://web.archive.org/web/"

proxychain/requestmodifiers/resolve_with_google_doh.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"context"

proxychain/requestmodifiers/spoof_ja3_fingerprint.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 // removed due to using a different TLS spoofing technique
 

proxychain/requestmodifiers/spoof_origin.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer.go

@@ -1,10 +1,10 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"fmt"
 
 	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifers"
+	tx "ladder/proxychain/responsemodifiers"
 )
 
 // SpoofReferrer modifies the referrer header.

proxychain/requestmodifiers/spoof_referrer_from_baidu_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"fmt"

proxychain/requestmodifiers/spoof_referrer_from_bing_search.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_google_search.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_linkedin_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_naver_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"fmt"

proxychain/requestmodifiers/spoof_referrer_from_pinterest_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_qq_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_reddit_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_tumblr_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_twitter_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_vkontake_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/requestmodifiers/spoof_referrer_from_weibo_post.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"fmt"

proxychain/requestmodifiers/spoof_user_agent.go

@@ -1,11 +1,11 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	_ "embed"
 	"strings"
 
 	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifers"
+	tx "ladder/proxychain/responsemodifiers"
 )
 
 // https://github.com/faisalman/ua-parser-js/tree/master

proxychain/requestmodifiers/spoof_x_forwarded_for.go

@@ -1,4 +1,4 @@
-package requestmodifers
+package requestmodifiers
 
 import (
 	"ladder/proxychain"

proxychain/responsemodifiers/api_content.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"bytes"
@@ -8,7 +8,7 @@ import (
 	"github.com/markusmobius/go-trafilatura"
 
 	"ladder/proxychain"
-	"ladder/proxychain/responsemodifers/api"
+	"ladder/proxychain/responsemodifiers/api"
 )
 
 // APIContent creates an JSON representation of the article and returns it as an API response.

proxychain/responsemodifiers/api_content_test.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"encoding/json"
@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"testing"
 
-	"ladder/proxychain/responsemodifers/api"
+	"ladder/proxychain/responsemodifiers/api"
 )
 
 func TestCreateAPIErrReader(t *testing.T) {

proxychain/responsemodifiers/block_element_removal.go

@@ -1,11 +1,11 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	_ "embed"
 	"strings"
 
 	"ladder/proxychain"
-	"ladder/proxychain/responsemodifers/rewriters"
+	"ladder/proxychain/responsemodifiers/rewriters"
 )
 
 //go:embed block_element_removal.js

proxychain/responsemodifiers/bypass_cors.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"ladder/proxychain"

proxychain/responsemodifiers/bypass_csp.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"ladder/proxychain"

proxychain/responsemodifiers/forward_response_headers.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"fmt"

proxychain/responsemodifiers/generate_readable_outline.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"bytes"

proxychain/responsemodifiers/inject_script.go

@@ -1,11 +1,11 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	_ "embed"
 	"strings"
 
 	"ladder/proxychain"
-	"ladder/proxychain/responsemodifers/rewriters"
+	"ladder/proxychain/responsemodifiers/rewriters"
 )
 
 // injectScript modifies HTTP responses

proxychain/responsemodifiers/modify_incoming_cookies.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"fmt"

proxychain/responsemodifiers/modify_response_header.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"ladder/proxychain"

proxychain/responsemodifiers/patch_dynamic_resource_urls.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	_ "embed"
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"ladder/proxychain"
-	"ladder/proxychain/responsemodifers/rewriters"
+	"ladder/proxychain/responsemodifiers/rewriters"
 )
 
 //go:embed patch_dynamic_resource_urls.js

proxychain/responsemodifiers/patch_google_analytics.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	_ "embed"

proxychain/responsemodifiers/patch_tracker_scripts.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	"embed"
@@ -20,7 +20,7 @@ var rules domainRules
 func init() {
 	err := json.Unmarshal([]byte(mappingJSON), &rules)
 	if err != nil {
-		log.Printf("[ERROR]: PatchTrackerScripts: failed to deserialize ladder/proxychain/responsemodifers/vendor/ddg-tracker-surrogates/mapping.json")
+		log.Printf("[ERROR]: PatchTrackerScripts: failed to deserialize ladder/proxychain/responsemodifiers/vendor/ddg-tracker-surrogates/mapping.json")
 	}
 }
 

proxychain/responsemodifiers/rewrite_http_resource_urls.go

@@ -1,4 +1,4 @@
-package responsemodifers
+package responsemodifiers
 
 import (
 	_ "embed"
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"ladder/proxychain"
-	"ladder/proxychain/responsemodifers/rewriters"
+	"ladder/proxychain/responsemodifiers/rewriters"
 )
 
 // RewriteHTMLResourceURLs modifies HTTP responses