Merge pull request #68 from everywall/fix/proxy_v2/add-package-urls

#65 use full URL in package line

cmd/main.go

@@ -7,10 +7,11 @@ import (
 	"log"
 	"os"
 
-	"ladder/handlers"
-	"ladder/internal/cli"
-	"ladder/proxychain/requestmodifiers/bot"
-	"ladder/proxychain/ruleset"
+	"github.com/everywall/ladder/handlers"
+	"github.com/everywall/ladder/internal/cli"
+
+	"github.com/everywall/ladder/proxychain/requestmodifiers/bot"
+	ruleset_v2 "github.com/everywall/ladder/proxychain/ruleset"
 
 	"github.com/akamensky/argparse"
 	"github.com/gofiber/fiber/v2"

go.mod

@@ -1,4 +1,4 @@
-module ladder
+module github.com/everywall/ladder
 
 go 1.21.1
 

handlers/api_content.go

@@ -1,9 +1,10 @@
 package handlers
 
 import (
-	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifiers"
-	tx "ladder/proxychain/responsemodifiers"
+	rx "github.com/everywall/ladder/proxychain/requestmodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
 
 	"github.com/gofiber/fiber/v2"
 )

handlers/api_modifiers.go

@@ -2,8 +2,9 @@ package handlers
 
 import (
 	"encoding/json"
+
+	"github.com/everywall/ladder/proxychain/responsemodifiers/api"
 	"github.com/gofiber/fiber/v2"
-	"ladder/proxychain/responsemodifiers/api"
 )
 
 func NewAPIModifersListHandler(opts *ProxyOptions) fiber.Handler {

handlers/api_modifiers_codegen/api_modifiers_codegen.go

@@ -146,7 +146,7 @@ package handlers
 // for use in proxychains.
 
 import (
-	"ladder/proxychain/responsemodifiers/api"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/api"
 )
 
 type ModifiersAPIResponse struct {

handlers/api_modifiers_structdef.gen.go

@@ -5,7 +5,7 @@ package handlers
 // for use in proxychains.
 
 import (
-	"ladder/proxychain/responsemodifiers/api"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/api"
 )
 
 type ModifiersAPIResponse struct {

handlers/api_raw.go

@@ -1,9 +1,10 @@
 package handlers
 
 import (
-	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifiers"
-	tx "ladder/proxychain/responsemodifiers"
+	rx "github.com/everywall/ladder/proxychain/requestmodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
 
 	"github.com/gofiber/fiber/v2"
 )

handlers/outline.go

@@ -1,9 +1,10 @@
 package handlers
 
 import (
-	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifiers"
-	tx "ladder/proxychain/responsemodifiers"
+	rx "github.com/everywall/ladder/proxychain/requestmodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
 
 	"github.com/gofiber/fiber/v2"
 )

handlers/proxy.go

@@ -1,10 +1,11 @@
 package handlers
 
 import (
-	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifiers"
-	tx "ladder/proxychain/responsemodifiers"
-	"ladder/proxychain/ruleset"
+	rx "github.com/everywall/ladder/proxychain/requestmodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
+	ruleset_v2 "github.com/everywall/ladder/proxychain/ruleset"
 
 	"github.com/gofiber/fiber/v2"
 )

internal/cli/ruleset_merge.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"os"
 
-	"ladder/proxychain/ruleset"
+	ruleset_v2 "github.com/everywall/ladder/proxychain/ruleset"
 )
 
 // HandleRulesetMerge merges a set of ruleset files, specified by the rulesetPath or RULESET env variable, into either YAML or Gzip format.

proxychain/codegen/codegen.go

@@ -70,8 +70,8 @@ package ruleset_v2
 // for use in proxychains.
 
 import (
-	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifiers"
+	"github.com/everywall/ladder/proxychain"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
 )
 
 type ResponseModifierFactory func(params ...string) proxychain.ResponseModification
@@ -142,8 +142,8 @@ package ruleset_v2
 // for use in proxychains.
 
 import (
-	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifiers"
+	"github.com/everywall/ladder/proxychain"
+	rx "github.com/everywall/ladder/proxychain/requestmodifiers"
 )
 
 type RequestModifierFactory func(params ...string) proxychain.RequestModification

proxychain/requestmodifiers/add_cache_buster_query.go

@@ -1,8 +1,9 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
 	"math/rand"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 // AddCacheBusterQuery modifies query params to add a random parameter key

proxychain/requestmodifiers/forward_request_headers.go

@@ -3,7 +3,7 @@ package requestmodifiers
 import (
 	"strings"
 	//"fmt"
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 var forwardBlacklist map[string]bool

proxychain/requestmodifiers/masquerade_as_trusted_bot.go

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

proxychain/requestmodifiers/modify_domain_with_regex.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 func ModifyDomainWithRegex(matchRegex string, replacement string) proxychain.RequestModification {

proxychain/requestmodifiers/modify_outgoing_cookies.go

@@ -5,7 +5,7 @@ import (
 	//http "github.com/Danny-Dasilva/fhttp"
 	http "github.com/bogdanfinn/fhttp"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SetOutgoingCookie modifes a specific cookie name

proxychain/requestmodifiers/modify_path_with_regex.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 func ModifyPathWithRegex(matchRegex string, replacement string) proxychain.RequestModification {

proxychain/requestmodifiers/modify_query_params.go

@@ -4,7 +4,7 @@ import (
 	//"fmt"
 	"net/url"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // ModifyQueryParams replaces query parameter values in URL's query params in a ProxyChain's URL.

proxychain/requestmodifiers/modify_request_headers.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SetRequestHeader modifies a specific outgoing header

proxychain/requestmodifiers/request_archive_is.go

@@ -5,8 +5,9 @@ import (
 	"net/url"
 	"regexp"
 
-	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 const archivistUrl string = "https://archive.is/latest"

proxychain/requestmodifiers/request_google_cache.go

@@ -3,7 +3,7 @@ package requestmodifiers
 import (
 	"net/url"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 const googleCacheUrl string = "https://webcache.googleusercontent.com/search?q=cache:"

proxychain/requestmodifiers/request_wayback_machine.go

@@ -4,8 +4,9 @@ import (
 	"net/url"
 	"regexp"
 
-	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 const waybackUrl string = "https://web.archive.org/web/"

proxychain/requestmodifiers/resolve_with_google_doh.go

@@ -14,7 +14,7 @@ import (
 		//"net/http"
 	*/
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // resolveWithGoogleDoH resolves DNS using Google's DNS-over-HTTPS

proxychain/requestmodifiers/spoof_origin.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofOrigin modifies the origin header

proxychain/requestmodifiers/spoof_referrer.go

@@ -3,8 +3,9 @@ package requestmodifiers
 import (
 	"fmt"
 
-	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrer modifies the referrer header.

proxychain/requestmodifiers/spoof_referrer_from_baidu_post.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromBaiduSearch modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_bing_search.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromBingSearch modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_google_search.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromGoogleSearch modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_linkedin_post.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromLinkedInPost modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_naver_post.go

@@ -3,7 +3,7 @@ package requestmodifiers
 import (
 	"fmt"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromNaverSearch modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_pinterest_post.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromPinterestPost modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_qq_post.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromQQPost modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_reddit_post.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromRedditPost modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_tumblr_post.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromTumblrPost modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_twitter_post.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromTwitterPost modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_vkontake_post.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromVkontaktePost modifies the referrer header

proxychain/requestmodifiers/spoof_referrer_from_weibo_post.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math/rand"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofReferrerFromWeiboPost modifies the referrer header

proxychain/requestmodifiers/spoof_user_agent.go

@@ -4,8 +4,9 @@ import (
 	_ "embed"
 	"strings"
 
-	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifiers"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 // https://github.com/faisalman/ua-parser-js/tree/master

proxychain/requestmodifiers/spoof_x_forwarded_for.go

@@ -1,7 +1,7 @@
 package requestmodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SpoofXForwardedFor modifies the X-Forwarded-For header

proxychain/responsemodifiers/api_content.go

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

proxychain/responsemodifiers/api_content_test.go

@@ -7,7 +7,7 @@ import (
 	"net/url"
 	"testing"
 
-	"ladder/proxychain/responsemodifiers/api"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/api"
 )
 
 func TestCreateAPIErrReader(t *testing.T) {

proxychain/responsemodifiers/block_element_removal.go

@@ -4,8 +4,9 @@ import (
 	_ "embed"
 	"strings"
 
-	"ladder/proxychain"
-	"ladder/proxychain/responsemodifiers/rewriters"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/rewriters"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 //go:embed vendor/block_element_removal.js

proxychain/responsemodifiers/block_third_party_scripts.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"ladder/proxychain"
-	"ladder/proxychain/responsemodifiers/rewriters"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/rewriters"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 // BlockThirdPartyScripts rewrites HTML and injects JS to block all third party JS from loading.

proxychain/responsemodifiers/bypass_cors.go

@@ -1,7 +1,7 @@
 package responsemodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // BypassCORS modifies response headers to prevent the browser

proxychain/responsemodifiers/bypass_csp.go

@@ -1,7 +1,7 @@
 package responsemodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // TODO: handle edge case where CSP is specified in meta tag:

proxychain/responsemodifiers/delete_localstorage_data.go

@@ -4,7 +4,7 @@ import (
 	_ "embed"
 	"strings"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // DeleteLocalStorageData deletes localstorage cookies.

proxychain/responsemodifiers/delete_sessionstorage_data.go

@@ -4,7 +4,7 @@ import (
 	_ "embed"
 	"strings"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // DeleteSessionStorageData deletes localstorage cookies.

proxychain/responsemodifiers/forward_response_headers.go

@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"strings"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 var forwardBlacklist map[string]bool

proxychain/responsemodifiers/generate_readable_outline.go

@@ -10,7 +10,7 @@ import (
 	"net/url"
 	"strings"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 
 	"golang.org/x/net/html"
 	"golang.org/x/net/html/atom"

proxychain/responsemodifiers/inject_script.go

@@ -4,8 +4,9 @@ import (
 	_ "embed"
 	"strings"
 
-	"ladder/proxychain"
-	"ladder/proxychain/responsemodifiers/rewriters"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/rewriters"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 // injectScript modifies HTTP responses

proxychain/responsemodifiers/modify_incoming_cookies.go

@@ -7,7 +7,7 @@ import (
 	//"net/http"
 	//http "github.com/Danny-Dasilva/fhttp"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // DeleteIncomingCookies prevents ALL cookies from being sent from the proxy server

proxychain/responsemodifiers/modify_response_header.go

@@ -1,7 +1,7 @@
 package responsemodifiers
 
 import (
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 // SetResponseHeader modifies response headers from the upstream server

proxychain/responsemodifiers/patch_dynamic_resource_urls.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"ladder/proxychain"
-	"ladder/proxychain/responsemodifiers/rewriters"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/rewriters"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 //go:embed vendor/patch_dynamic_resource_urls.js

proxychain/responsemodifiers/patch_tracker_scripts.go

@@ -7,7 +7,7 @@ import (
 	"log"
 	"regexp"
 
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 //go:embed vendor/ddg-tracker-surrogates/mapping.json

proxychain/responsemodifiers/rewrite_http_resource_urls.go

@@ -5,8 +5,9 @@ import (
 	"fmt"
 	"strings"
 
-	"ladder/proxychain"
-	"ladder/proxychain/responsemodifiers/rewriters"
+	"github.com/everywall/ladder/proxychain/responsemodifiers/rewriters"
+
+	"github.com/everywall/ladder/proxychain"
 )
 
 // RewriteHTMLResourceURLs modifies HTTP responses

proxychain/ruleset/rule.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 
 	//"gopkg.in/yaml.v3"
-	"ladder/proxychain"
+	"github.com/everywall/ladder/proxychain"
 )
 
 type Rule struct {

proxychain/ruleset/rule_reqmod_types.gen.go

@@ -5,8 +5,8 @@ package ruleset_v2
 // for use in proxychains.
 
 import (
-	"ladder/proxychain"
-	rx "ladder/proxychain/requestmodifiers"
+	"github.com/everywall/ladder/proxychain"
+	rx "github.com/everywall/ladder/proxychain/requestmodifiers"
 )
 
 type RequestModifierFactory func(params ...string) proxychain.RequestModification

proxychain/ruleset/rule_resmod_types.gen.go

@@ -5,8 +5,8 @@ package ruleset_v2
 // for use in proxychains.
 
 import (
-	"ladder/proxychain"
-	tx "ladder/proxychain/responsemodifiers"
+	"github.com/everywall/ladder/proxychain"
+	tx "github.com/everywall/ladder/proxychain/responsemodifiers"
 )
 
 type ResponseModifierFactory func(params ...string) proxychain.ResponseModification