From 6c0721dcb811d0794d71b1951f370d92f0f176fe Mon Sep 17 00:00:00 2001 From: Kevin Pham Date: Sun, 3 Dec 2023 17:04:30 -0600 Subject: [PATCH] fix "modifer" -> "modifier" typo everywhere --- .air.toml | 2 +- .gitmodules | 10 +++++----- cmd/main.go | 2 +- go.mod | 1 - go.sum | 3 --- handlers/api_content.go | 4 ++-- handlers/outline.go | 4 ++-- handlers/proxy.go | 4 ++-- proxychain/proxychain.go | 12 ++++++------ .../{requestmodifers => requestmodifiers}/bot/bot.go | 0 .../bot/bot_test.go | 0 .../forward_request_headers.go | 2 +- .../masquerade_as_trusted_bot.go | 4 ++-- .../modify_domain_with_regex.go | 2 +- .../modify_outgoing_cookies.go | 2 +- .../modify_path_with_regex.go | 2 +- .../modify_query_params.go | 2 +- .../modify_request_headers.go | 2 +- .../request_archive_is.go | 4 ++-- .../request_google_cache.go | 2 +- .../request_wayback_machine.go | 4 ++-- .../resolve_with_google_doh.go | 2 +- .../spoof_ja3_fingerprint.go | 2 +- .../spoof_origin.go | 2 +- .../spoof_referrer.go | 4 ++-- .../spoof_referrer_from_baidu_post.go | 2 +- .../spoof_referrer_from_bing_search.go | 2 +- .../spoof_referrer_from_google_search.go | 2 +- .../spoof_referrer_from_linkedin_post.go | 2 +- .../spoof_referrer_from_naver_post.go | 2 +- .../spoof_referrer_from_pinterest_post.go | 2 +- .../spoof_referrer_from_qq_post.go | 2 +- .../spoof_referrer_from_reddit_post.go | 2 +- .../spoof_referrer_from_tumblr_post.go | 2 +- .../spoof_referrer_from_twitter_post.go | 2 +- .../spoof_referrer_from_vkontake_post.go | 2 +- .../spoof_referrer_from_weibo_post.go | 2 +- .../spoof_user_agent.go | 4 ++-- .../spoof_user_agent.js | 0 .../spoof_x_forwarded_for.go | 2 +- .../vendor/ua-parser-js | 0 .../api/error_api.go | 0 .../api/outline_api.go | 0 .../api_content.go | 4 ++-- .../api_content_test.go | 4 ++-- .../block_element_removal.go | 4 ++-- .../block_element_removal.js | 0 .../bypass_cors.go | 2 +- .../bypass_csp.go | 2 +- .../forward_response_headers.go | 2 +- .../generate_readable_outline.go | 2 +- .../generate_readable_outline.html | 0 .../inject_script.go | 4 ++-- .../modify_incoming_cookies.go | 2 +- .../modify_response_header.go | 2 +- .../patch_dynamic_resource_urls.go | 4 ++-- .../patch_dynamic_resource_urls.js | 0 .../patch_google_analytics.go | 2 +- .../patch_google_analytics.js | 0 .../patch_tracker_scripts.go | 4 ++-- .../rewrite_http_resource_urls.go | 4 ++-- .../rewriters/after_dom_idle_script_injector.js | 0 .../rewriters/css_rewriter.go | 0 .../rewriters/html_rewriter.go | 0 .../rewriters/html_token_url_rewriter.go | 0 .../rewriters/script_injector_rewriter.go | 0 .../vendor/ddg-tracker-surrogates | 0 67 files changed, 73 insertions(+), 77 deletions(-) rename proxychain/{requestmodifers => requestmodifiers}/bot/bot.go (100%) rename proxychain/{requestmodifers => requestmodifiers}/bot/bot_test.go (100%) rename proxychain/{requestmodifers => requestmodifiers}/forward_request_headers.go (97%) rename proxychain/{requestmodifers => requestmodifiers}/masquerade_as_trusted_bot.go (99%) rename proxychain/{requestmodifers => requestmodifiers}/modify_domain_with_regex.go (92%) rename proxychain/{requestmodifers => requestmodifiers}/modify_outgoing_cookies.go (99%) rename proxychain/{requestmodifers => requestmodifiers}/modify_path_with_regex.go (92%) rename proxychain/{requestmodifers => requestmodifiers}/modify_query_params.go (96%) rename proxychain/{requestmodifers => requestmodifiers}/modify_request_headers.go (96%) rename proxychain/{requestmodifers => requestmodifiers}/request_archive_is.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/request_google_cache.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/request_wayback_machine.go (94%) rename proxychain/{requestmodifers => requestmodifiers}/resolve_with_google_doh.go (98%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_ja3_fingerprint.go (98%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_origin.go (96%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer.go (93%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_baidu_post.go (98%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_bing_search.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_google_search.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_linkedin_post.go (96%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_naver_post.go (96%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_pinterest_post.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_qq_post.go (94%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_reddit_post.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_tumblr_post.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_twitter_post.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_vkontake_post.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_referrer_from_weibo_post.go (95%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_user_agent.go (93%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_user_agent.js (100%) rename proxychain/{requestmodifers => requestmodifiers}/spoof_x_forwarded_for.go (93%) rename proxychain/{requestmodifers => requestmodifiers}/vendor/ua-parser-js (100%) rename proxychain/{responsemodifers => responsemodifiers}/api/error_api.go (100%) rename proxychain/{responsemodifers => responsemodifiers}/api/outline_api.go (100%) rename proxychain/{responsemodifers => responsemodifiers}/api_content.go (95%) rename proxychain/{responsemodifers => responsemodifiers}/api_content_test.go (95%) rename proxychain/{responsemodifers => responsemodifiers}/block_element_removal.go (93%) rename proxychain/{responsemodifers => responsemodifiers}/block_element_removal.js (100%) rename proxychain/{responsemodifers => responsemodifiers}/bypass_cors.go (96%) rename proxychain/{responsemodifers => responsemodifiers}/bypass_csp.go (97%) rename proxychain/{responsemodifers => responsemodifiers}/forward_response_headers.go (97%) rename proxychain/{responsemodifers => responsemodifiers}/generate_readable_outline.go (99%) rename proxychain/{responsemodifers => responsemodifiers}/generate_readable_outline.html (100%) rename proxychain/{responsemodifers => responsemodifiers}/inject_script.go (94%) rename proxychain/{responsemodifers => responsemodifiers}/modify_incoming_cookies.go (99%) rename proxychain/{responsemodifers => responsemodifiers}/modify_response_header.go (95%) rename proxychain/{responsemodifers => responsemodifiers}/patch_dynamic_resource_urls.go (96%) rename proxychain/{responsemodifers => responsemodifiers}/patch_dynamic_resource_urls.js (100%) rename proxychain/{responsemodifers => responsemodifiers}/patch_google_analytics.go (97%) rename proxychain/{responsemodifers => responsemodifiers}/patch_google_analytics.js (100%) rename proxychain/{responsemodifers => responsemodifiers}/patch_tracker_scripts.go (95%) rename proxychain/{responsemodifers => responsemodifiers}/rewrite_http_resource_urls.go (94%) rename proxychain/{responsemodifers => responsemodifiers}/rewriters/after_dom_idle_script_injector.js (100%) rename proxychain/{responsemodifers => responsemodifiers}/rewriters/css_rewriter.go (100%) rename proxychain/{responsemodifers => responsemodifiers}/rewriters/html_rewriter.go (100%) rename proxychain/{responsemodifers => responsemodifiers}/rewriters/html_token_url_rewriter.go (100%) rename proxychain/{responsemodifers => responsemodifiers}/rewriters/script_injector_rewriter.go (100%) rename proxychain/{responsemodifers => responsemodifiers}/vendor/ddg-tracker-surrogates (100%) diff --git a/.air.toml b/.air.toml index 65789a7..0778d8a 100644 --- a/.air.toml +++ b/.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 diff --git a/.gitmodules b/.gitmodules index 4481990..1c1ef8c 100644 --- a/.gitmodules +++ b/.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 diff --git a/cmd/main.go b/cmd/main.go index 951b9b1..daaa7a8 100644 --- a/cmd/main.go +++ b/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" diff --git a/go.mod b/go.mod index a6454de..61613f7 100644 --- a/go.mod +++ b/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 diff --git a/go.sum b/go.sum index 73e7c65..c973ed8 100644 --- a/go.sum +++ b/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= diff --git a/handlers/api_content.go b/handlers/api_content.go index 71608e5..bf495b4 100644 --- a/handlers/api_content.go +++ b/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" ) diff --git a/handlers/outline.go b/handlers/outline.go index e4af47f..ab1e105 100644 --- a/handlers/outline.go +++ b/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" ) diff --git a/handlers/proxy.go b/handlers/proxy.go index 5d753f8..ce5e57c 100644 --- a/handlers/proxy.go +++ b/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" ) diff --git a/proxychain/proxychain.go b/proxychain/proxychain.go index 30d7f31..bc5a847 100644 --- a/proxychain/proxychain.go +++ b/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 diff --git a/proxychain/requestmodifers/bot/bot.go b/proxychain/requestmodifiers/bot/bot.go similarity index 100% rename from proxychain/requestmodifers/bot/bot.go rename to proxychain/requestmodifiers/bot/bot.go diff --git a/proxychain/requestmodifers/bot/bot_test.go b/proxychain/requestmodifiers/bot/bot_test.go similarity index 100% rename from proxychain/requestmodifers/bot/bot_test.go rename to proxychain/requestmodifiers/bot/bot_test.go diff --git a/proxychain/requestmodifers/forward_request_headers.go b/proxychain/requestmodifiers/forward_request_headers.go similarity index 97% rename from proxychain/requestmodifers/forward_request_headers.go rename to proxychain/requestmodifiers/forward_request_headers.go index 7e139dd..41a2cfd 100644 --- a/proxychain/requestmodifers/forward_request_headers.go +++ b/proxychain/requestmodifiers/forward_request_headers.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "strings" diff --git a/proxychain/requestmodifers/masquerade_as_trusted_bot.go b/proxychain/requestmodifiers/masquerade_as_trusted_bot.go similarity index 99% rename from proxychain/requestmodifers/masquerade_as_trusted_bot.go rename to proxychain/requestmodifiers/masquerade_as_trusted_bot.go index 7186219..b29159d 100644 --- a/proxychain/requestmodifers/masquerade_as_trusted_bot.go +++ b/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 diff --git a/proxychain/requestmodifers/modify_domain_with_regex.go b/proxychain/requestmodifiers/modify_domain_with_regex.go similarity index 92% rename from proxychain/requestmodifers/modify_domain_with_regex.go rename to proxychain/requestmodifiers/modify_domain_with_regex.go index d6d97e8..77b9a0e 100644 --- a/proxychain/requestmodifers/modify_domain_with_regex.go +++ b/proxychain/requestmodifiers/modify_domain_with_regex.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "regexp" diff --git a/proxychain/requestmodifers/modify_outgoing_cookies.go b/proxychain/requestmodifiers/modify_outgoing_cookies.go similarity index 99% rename from proxychain/requestmodifers/modify_outgoing_cookies.go rename to proxychain/requestmodifiers/modify_outgoing_cookies.go index 88405cb..e1415a8 100644 --- a/proxychain/requestmodifers/modify_outgoing_cookies.go +++ b/proxychain/requestmodifiers/modify_outgoing_cookies.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( //"net/http" diff --git a/proxychain/requestmodifers/modify_path_with_regex.go b/proxychain/requestmodifiers/modify_path_with_regex.go similarity index 92% rename from proxychain/requestmodifers/modify_path_with_regex.go rename to proxychain/requestmodifiers/modify_path_with_regex.go index 109570a..04840b5 100644 --- a/proxychain/requestmodifers/modify_path_with_regex.go +++ b/proxychain/requestmodifiers/modify_path_with_regex.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "regexp" diff --git a/proxychain/requestmodifers/modify_query_params.go b/proxychain/requestmodifiers/modify_query_params.go similarity index 96% rename from proxychain/requestmodifers/modify_query_params.go rename to proxychain/requestmodifiers/modify_query_params.go index 0b8448e..3cd84b3 100644 --- a/proxychain/requestmodifers/modify_query_params.go +++ b/proxychain/requestmodifiers/modify_query_params.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "net/url" diff --git a/proxychain/requestmodifers/modify_request_headers.go b/proxychain/requestmodifiers/modify_request_headers.go similarity index 96% rename from proxychain/requestmodifers/modify_request_headers.go rename to proxychain/requestmodifiers/modify_request_headers.go index 601c47e..8c60e24 100644 --- a/proxychain/requestmodifers/modify_request_headers.go +++ b/proxychain/requestmodifiers/modify_request_headers.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/request_archive_is.go b/proxychain/requestmodifiers/request_archive_is.go similarity index 95% rename from proxychain/requestmodifers/request_archive_is.go rename to proxychain/requestmodifiers/request_archive_is.go index d3ebc7d..90956e9 100644 --- a/proxychain/requestmodifers/request_archive_is.go +++ b/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" diff --git a/proxychain/requestmodifers/request_google_cache.go b/proxychain/requestmodifiers/request_google_cache.go similarity index 95% rename from proxychain/requestmodifers/request_google_cache.go rename to proxychain/requestmodifiers/request_google_cache.go index a3abfaf..457ed66 100644 --- a/proxychain/requestmodifers/request_google_cache.go +++ b/proxychain/requestmodifiers/request_google_cache.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "net/url" diff --git a/proxychain/requestmodifers/request_wayback_machine.go b/proxychain/requestmodifiers/request_wayback_machine.go similarity index 94% rename from proxychain/requestmodifers/request_wayback_machine.go rename to proxychain/requestmodifiers/request_wayback_machine.go index ecc4270..92b9e97 100644 --- a/proxychain/requestmodifers/request_wayback_machine.go +++ b/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/" diff --git a/proxychain/requestmodifers/resolve_with_google_doh.go b/proxychain/requestmodifiers/resolve_with_google_doh.go similarity index 98% rename from proxychain/requestmodifers/resolve_with_google_doh.go rename to proxychain/requestmodifiers/resolve_with_google_doh.go index 19560b7..4d3a41d 100644 --- a/proxychain/requestmodifers/resolve_with_google_doh.go +++ b/proxychain/requestmodifiers/resolve_with_google_doh.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "context" diff --git a/proxychain/requestmodifers/spoof_ja3_fingerprint.go b/proxychain/requestmodifiers/spoof_ja3_fingerprint.go similarity index 98% rename from proxychain/requestmodifers/spoof_ja3_fingerprint.go rename to proxychain/requestmodifiers/spoof_ja3_fingerprint.go index d746024..84a70a7 100644 --- a/proxychain/requestmodifers/spoof_ja3_fingerprint.go +++ b/proxychain/requestmodifiers/spoof_ja3_fingerprint.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers // removed due to using a different TLS spoofing technique diff --git a/proxychain/requestmodifers/spoof_origin.go b/proxychain/requestmodifiers/spoof_origin.go similarity index 96% rename from proxychain/requestmodifers/spoof_origin.go rename to proxychain/requestmodifiers/spoof_origin.go index 1dcc109..bf54844 100644 --- a/proxychain/requestmodifers/spoof_origin.go +++ b/proxychain/requestmodifiers/spoof_origin.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer.go b/proxychain/requestmodifiers/spoof_referrer.go similarity index 93% rename from proxychain/requestmodifers/spoof_referrer.go rename to proxychain/requestmodifiers/spoof_referrer.go index cc40801..775fc56 100644 --- a/proxychain/requestmodifers/spoof_referrer.go +++ b/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. diff --git a/proxychain/requestmodifers/spoof_referrer_from_baidu_post.go b/proxychain/requestmodifiers/spoof_referrer_from_baidu_post.go similarity index 98% rename from proxychain/requestmodifers/spoof_referrer_from_baidu_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_baidu_post.go index 2e057c5..2c849b9 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_baidu_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_baidu_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "fmt" diff --git a/proxychain/requestmodifers/spoof_referrer_from_bing_search.go b/proxychain/requestmodifiers/spoof_referrer_from_bing_search.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_bing_search.go rename to proxychain/requestmodifiers/spoof_referrer_from_bing_search.go index c85b80a..c1e3ffe 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_bing_search.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_bing_search.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_google_search.go b/proxychain/requestmodifiers/spoof_referrer_from_google_search.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_google_search.go rename to proxychain/requestmodifiers/spoof_referrer_from_google_search.go index 9193639..f183292 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_google_search.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_google_search.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_linkedin_post.go b/proxychain/requestmodifiers/spoof_referrer_from_linkedin_post.go similarity index 96% rename from proxychain/requestmodifers/spoof_referrer_from_linkedin_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_linkedin_post.go index d288931..633b878 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_linkedin_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_linkedin_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_naver_post.go b/proxychain/requestmodifiers/spoof_referrer_from_naver_post.go similarity index 96% rename from proxychain/requestmodifers/spoof_referrer_from_naver_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_naver_post.go index 7a7852d..6268f83 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_naver_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_naver_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "fmt" diff --git a/proxychain/requestmodifers/spoof_referrer_from_pinterest_post.go b/proxychain/requestmodifiers/spoof_referrer_from_pinterest_post.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_pinterest_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_pinterest_post.go index 9d98c7b..321ca5d 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_pinterest_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_pinterest_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_qq_post.go b/proxychain/requestmodifiers/spoof_referrer_from_qq_post.go similarity index 94% rename from proxychain/requestmodifers/spoof_referrer_from_qq_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_qq_post.go index 2eace11..2961cc7 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_qq_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_qq_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_reddit_post.go b/proxychain/requestmodifiers/spoof_referrer_from_reddit_post.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_reddit_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_reddit_post.go index a580f69..4103024 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_reddit_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_reddit_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_tumblr_post.go b/proxychain/requestmodifiers/spoof_referrer_from_tumblr_post.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_tumblr_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_tumblr_post.go index 3679936..f44f094 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_tumblr_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_tumblr_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_twitter_post.go b/proxychain/requestmodifiers/spoof_referrer_from_twitter_post.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_twitter_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_twitter_post.go index 348e4cf..5cd54ab 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_twitter_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_twitter_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_vkontake_post.go b/proxychain/requestmodifiers/spoof_referrer_from_vkontake_post.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_vkontake_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_vkontake_post.go index 1bae306..e555117 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_vkontake_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_vkontake_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/spoof_referrer_from_weibo_post.go b/proxychain/requestmodifiers/spoof_referrer_from_weibo_post.go similarity index 95% rename from proxychain/requestmodifers/spoof_referrer_from_weibo_post.go rename to proxychain/requestmodifiers/spoof_referrer_from_weibo_post.go index 69e32fc..068d482 100644 --- a/proxychain/requestmodifers/spoof_referrer_from_weibo_post.go +++ b/proxychain/requestmodifiers/spoof_referrer_from_weibo_post.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "fmt" diff --git a/proxychain/requestmodifers/spoof_user_agent.go b/proxychain/requestmodifiers/spoof_user_agent.go similarity index 93% rename from proxychain/requestmodifers/spoof_user_agent.go rename to proxychain/requestmodifiers/spoof_user_agent.go index 8e2b3a7..921d7ae 100644 --- a/proxychain/requestmodifers/spoof_user_agent.go +++ b/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 diff --git a/proxychain/requestmodifers/spoof_user_agent.js b/proxychain/requestmodifiers/spoof_user_agent.js similarity index 100% rename from proxychain/requestmodifers/spoof_user_agent.js rename to proxychain/requestmodifiers/spoof_user_agent.js diff --git a/proxychain/requestmodifers/spoof_x_forwarded_for.go b/proxychain/requestmodifiers/spoof_x_forwarded_for.go similarity index 93% rename from proxychain/requestmodifers/spoof_x_forwarded_for.go rename to proxychain/requestmodifiers/spoof_x_forwarded_for.go index 45a9dff..c12dd28 100644 --- a/proxychain/requestmodifers/spoof_x_forwarded_for.go +++ b/proxychain/requestmodifiers/spoof_x_forwarded_for.go @@ -1,4 +1,4 @@ -package requestmodifers +package requestmodifiers import ( "ladder/proxychain" diff --git a/proxychain/requestmodifers/vendor/ua-parser-js b/proxychain/requestmodifiers/vendor/ua-parser-js similarity index 100% rename from proxychain/requestmodifers/vendor/ua-parser-js rename to proxychain/requestmodifiers/vendor/ua-parser-js diff --git a/proxychain/responsemodifers/api/error_api.go b/proxychain/responsemodifiers/api/error_api.go similarity index 100% rename from proxychain/responsemodifers/api/error_api.go rename to proxychain/responsemodifiers/api/error_api.go diff --git a/proxychain/responsemodifers/api/outline_api.go b/proxychain/responsemodifiers/api/outline_api.go similarity index 100% rename from proxychain/responsemodifers/api/outline_api.go rename to proxychain/responsemodifiers/api/outline_api.go diff --git a/proxychain/responsemodifers/api_content.go b/proxychain/responsemodifiers/api_content.go similarity index 95% rename from proxychain/responsemodifers/api_content.go rename to proxychain/responsemodifiers/api_content.go index b664709..2814091 100644 --- a/proxychain/responsemodifers/api_content.go +++ b/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. diff --git a/proxychain/responsemodifers/api_content_test.go b/proxychain/responsemodifiers/api_content_test.go similarity index 95% rename from proxychain/responsemodifers/api_content_test.go rename to proxychain/responsemodifiers/api_content_test.go index edc96ac..dbfa82f 100644 --- a/proxychain/responsemodifers/api_content_test.go +++ b/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) { diff --git a/proxychain/responsemodifers/block_element_removal.go b/proxychain/responsemodifiers/block_element_removal.go similarity index 93% rename from proxychain/responsemodifers/block_element_removal.go rename to proxychain/responsemodifiers/block_element_removal.go index 97e40f6..bf1646b 100644 --- a/proxychain/responsemodifers/block_element_removal.go +++ b/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 diff --git a/proxychain/responsemodifers/block_element_removal.js b/proxychain/responsemodifiers/block_element_removal.js similarity index 100% rename from proxychain/responsemodifers/block_element_removal.js rename to proxychain/responsemodifiers/block_element_removal.js diff --git a/proxychain/responsemodifers/bypass_cors.go b/proxychain/responsemodifiers/bypass_cors.go similarity index 96% rename from proxychain/responsemodifers/bypass_cors.go rename to proxychain/responsemodifiers/bypass_cors.go index 46c0e04..291b6f8 100644 --- a/proxychain/responsemodifers/bypass_cors.go +++ b/proxychain/responsemodifiers/bypass_cors.go @@ -1,4 +1,4 @@ -package responsemodifers +package responsemodifiers import ( "ladder/proxychain" diff --git a/proxychain/responsemodifers/bypass_csp.go b/proxychain/responsemodifiers/bypass_csp.go similarity index 97% rename from proxychain/responsemodifers/bypass_csp.go rename to proxychain/responsemodifiers/bypass_csp.go index 22fcdbe..9d08ef0 100644 --- a/proxychain/responsemodifers/bypass_csp.go +++ b/proxychain/responsemodifiers/bypass_csp.go @@ -1,4 +1,4 @@ -package responsemodifers +package responsemodifiers import ( "ladder/proxychain" diff --git a/proxychain/responsemodifers/forward_response_headers.go b/proxychain/responsemodifiers/forward_response_headers.go similarity index 97% rename from proxychain/responsemodifers/forward_response_headers.go rename to proxychain/responsemodifiers/forward_response_headers.go index b6d0519..1cdf008 100644 --- a/proxychain/responsemodifers/forward_response_headers.go +++ b/proxychain/responsemodifiers/forward_response_headers.go @@ -1,4 +1,4 @@ -package responsemodifers +package responsemodifiers import ( "fmt" diff --git a/proxychain/responsemodifers/generate_readable_outline.go b/proxychain/responsemodifiers/generate_readable_outline.go similarity index 99% rename from proxychain/responsemodifers/generate_readable_outline.go rename to proxychain/responsemodifiers/generate_readable_outline.go index bfa8773..c1fa326 100644 --- a/proxychain/responsemodifers/generate_readable_outline.go +++ b/proxychain/responsemodifiers/generate_readable_outline.go @@ -1,4 +1,4 @@ -package responsemodifers +package responsemodifiers import ( "bytes" diff --git a/proxychain/responsemodifers/generate_readable_outline.html b/proxychain/responsemodifiers/generate_readable_outline.html similarity index 100% rename from proxychain/responsemodifers/generate_readable_outline.html rename to proxychain/responsemodifiers/generate_readable_outline.html diff --git a/proxychain/responsemodifers/inject_script.go b/proxychain/responsemodifiers/inject_script.go similarity index 94% rename from proxychain/responsemodifers/inject_script.go rename to proxychain/responsemodifiers/inject_script.go index 5e5ef87..e9ec024 100644 --- a/proxychain/responsemodifers/inject_script.go +++ b/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 diff --git a/proxychain/responsemodifers/modify_incoming_cookies.go b/proxychain/responsemodifiers/modify_incoming_cookies.go similarity index 99% rename from proxychain/responsemodifers/modify_incoming_cookies.go rename to proxychain/responsemodifiers/modify_incoming_cookies.go index 5a83830..f655c94 100644 --- a/proxychain/responsemodifers/modify_incoming_cookies.go +++ b/proxychain/responsemodifiers/modify_incoming_cookies.go @@ -1,4 +1,4 @@ -package responsemodifers +package responsemodifiers import ( "fmt" diff --git a/proxychain/responsemodifers/modify_response_header.go b/proxychain/responsemodifiers/modify_response_header.go similarity index 95% rename from proxychain/responsemodifers/modify_response_header.go rename to proxychain/responsemodifiers/modify_response_header.go index 5266d6d..0d6c850 100644 --- a/proxychain/responsemodifers/modify_response_header.go +++ b/proxychain/responsemodifiers/modify_response_header.go @@ -1,4 +1,4 @@ -package responsemodifers +package responsemodifiers import ( "ladder/proxychain" diff --git a/proxychain/responsemodifers/patch_dynamic_resource_urls.go b/proxychain/responsemodifiers/patch_dynamic_resource_urls.go similarity index 96% rename from proxychain/responsemodifers/patch_dynamic_resource_urls.go rename to proxychain/responsemodifiers/patch_dynamic_resource_urls.go index 21c3483..cf5b689 100644 --- a/proxychain/responsemodifers/patch_dynamic_resource_urls.go +++ b/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 diff --git a/proxychain/responsemodifers/patch_dynamic_resource_urls.js b/proxychain/responsemodifiers/patch_dynamic_resource_urls.js similarity index 100% rename from proxychain/responsemodifers/patch_dynamic_resource_urls.js rename to proxychain/responsemodifiers/patch_dynamic_resource_urls.js diff --git a/proxychain/responsemodifers/patch_google_analytics.go b/proxychain/responsemodifiers/patch_google_analytics.go similarity index 97% rename from proxychain/responsemodifers/patch_google_analytics.go rename to proxychain/responsemodifiers/patch_google_analytics.go index 3df2c8b..793d9ab 100644 --- a/proxychain/responsemodifers/patch_google_analytics.go +++ b/proxychain/responsemodifiers/patch_google_analytics.go @@ -1,4 +1,4 @@ -package responsemodifers +package responsemodifiers import ( _ "embed" diff --git a/proxychain/responsemodifers/patch_google_analytics.js b/proxychain/responsemodifiers/patch_google_analytics.js similarity index 100% rename from proxychain/responsemodifers/patch_google_analytics.js rename to proxychain/responsemodifiers/patch_google_analytics.js diff --git a/proxychain/responsemodifers/patch_tracker_scripts.go b/proxychain/responsemodifiers/patch_tracker_scripts.go similarity index 95% rename from proxychain/responsemodifers/patch_tracker_scripts.go rename to proxychain/responsemodifiers/patch_tracker_scripts.go index 045f7a4..7d4abcb 100644 --- a/proxychain/responsemodifers/patch_tracker_scripts.go +++ b/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") } } diff --git a/proxychain/responsemodifers/rewrite_http_resource_urls.go b/proxychain/responsemodifiers/rewrite_http_resource_urls.go similarity index 94% rename from proxychain/responsemodifers/rewrite_http_resource_urls.go rename to proxychain/responsemodifiers/rewrite_http_resource_urls.go index 5320d13..cde7a92 100644 --- a/proxychain/responsemodifers/rewrite_http_resource_urls.go +++ b/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 diff --git a/proxychain/responsemodifers/rewriters/after_dom_idle_script_injector.js b/proxychain/responsemodifiers/rewriters/after_dom_idle_script_injector.js similarity index 100% rename from proxychain/responsemodifers/rewriters/after_dom_idle_script_injector.js rename to proxychain/responsemodifiers/rewriters/after_dom_idle_script_injector.js diff --git a/proxychain/responsemodifers/rewriters/css_rewriter.go b/proxychain/responsemodifiers/rewriters/css_rewriter.go similarity index 100% rename from proxychain/responsemodifers/rewriters/css_rewriter.go rename to proxychain/responsemodifiers/rewriters/css_rewriter.go diff --git a/proxychain/responsemodifers/rewriters/html_rewriter.go b/proxychain/responsemodifiers/rewriters/html_rewriter.go similarity index 100% rename from proxychain/responsemodifers/rewriters/html_rewriter.go rename to proxychain/responsemodifiers/rewriters/html_rewriter.go diff --git a/proxychain/responsemodifers/rewriters/html_token_url_rewriter.go b/proxychain/responsemodifiers/rewriters/html_token_url_rewriter.go similarity index 100% rename from proxychain/responsemodifers/rewriters/html_token_url_rewriter.go rename to proxychain/responsemodifiers/rewriters/html_token_url_rewriter.go diff --git a/proxychain/responsemodifers/rewriters/script_injector_rewriter.go b/proxychain/responsemodifiers/rewriters/script_injector_rewriter.go similarity index 100% rename from proxychain/responsemodifers/rewriters/script_injector_rewriter.go rename to proxychain/responsemodifiers/rewriters/script_injector_rewriter.go diff --git a/proxychain/responsemodifers/vendor/ddg-tracker-surrogates b/proxychain/responsemodifiers/vendor/ddg-tracker-surrogates similarity index 100% rename from proxychain/responsemodifers/vendor/ddg-tracker-surrogates rename to proxychain/responsemodifiers/vendor/ddg-tracker-surrogates