diff --git a/.air.toml b/.air.toml index aaa7489..b7dbf81 100644 --- a/.air.toml +++ b/.air.toml @@ -12,7 +12,7 @@ tmp_dir = "tmp" exclude_regex = ["_test.go"] exclude_unchanged = false follow_symlink = false - full_bin = "./tmp/main --ruleset ./ruleset_v2.yaml" + full_bin = "./tmp/main --ruleset ./rulesets_v2" include_dir = [] include_ext = ["go", "tpl", "tmpl", "yaml", "html", "js"] include_file = [] diff --git a/.github/workflows/build-css.yaml b/.github/workflows/build-css.yaml index 175949b..4e566e9 100644 --- a/.github/workflows/build-css.yaml +++ b/.github/workflows/build-css.yaml @@ -29,7 +29,7 @@ jobs: name: Build Tailwind CSS run: pnpm build - - name: Commit generated stylesheet + name: Commit generated stylesheet for handlers/styles.css run: | if git diff --quiet handlers/styles.css; then echo "No changes to commit." diff --git a/cmd/main.go b/cmd/main.go index c8c6c80..a20841e 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -6,10 +6,11 @@ import ( "log" "os" - "ladder/handlers" - "ladder/internal/cli" - "ladder/proxychain/requestmodifiers/bot" - ruleset_v2 "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" diff --git a/go.mod b/go.mod index 52de4ce..15fb7f3 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module ladder +module github.com/everywall/ladder go 1.21.1 diff --git a/handlers/api_content.go b/handlers/api_content.go index bf495b4..306cbad 100644 --- a/handlers/api_content.go +++ b/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" ) diff --git a/handlers/api_modifiers.go b/handlers/api_modifiers.go index 6242536..cb30df5 100644 --- a/handlers/api_modifiers.go +++ b/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 { diff --git a/handlers/api_modifiers_codegen/api_modifiers_codegen.go b/handlers/api_modifiers_codegen/api_modifiers_codegen.go index 22edc01..c3c3a44 100644 --- a/handlers/api_modifiers_codegen/api_modifiers_codegen.go +++ b/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 { diff --git a/handlers/api_modifiers_structdef.gen.go b/handlers/api_modifiers_structdef.gen.go index b6ae548..c74f26f 100644 --- a/handlers/api_modifiers_structdef.gen.go +++ b/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 { @@ -160,7 +160,7 @@ var AllMods Modifiers = Modifiers{ Description: "DeleteOutGoingCookiesExcept prevents non-whitelisted cookies from being sent from the client to the upstream proxy server. Cookies whose names are in the whitelist are not removed.", CodeEditLink: "https://github.com/joncrangle/ladder.git/edit/proxy_v2/playground/proxychain/requestmodifiers/modify_outgoing_cookies.go", Params: []Param{ - {Name: "whitelist", Type: "&{Ellipsis:12348 Elt:string}"}, + {Name: "whitelist", Type: "&{Ellipsis:12476 Elt:string}"}, }, }, { @@ -485,7 +485,7 @@ var AllMods Modifiers = Modifiers{ Description: "DeleteIncomingCookies prevents ALL cookies from being sent from the proxy server back down to the client.", CodeEditLink: "https://github.com/joncrangle/ladder.git/edit/proxy_v2/playground/proxychain/responsemodifiers/modify_incoming_cookies.go", Params: []Param{ - {Name: "_", Type: "&{Ellipsis:16319 Elt:string}"}, + {Name: "_", Type: "&{Ellipsis:18780 Elt:string}"}, }, }, { @@ -493,7 +493,7 @@ var AllMods Modifiers = Modifiers{ Description: "DeleteIncomingCookiesExcept prevents non-whitelisted cookies from being sent from the proxy server to the client. Cookies whose names are in the whitelist are not removed.", CodeEditLink: "https://github.com/joncrangle/ladder.git/edit/proxy_v2/playground/proxychain/responsemodifiers/modify_incoming_cookies.go", Params: []Param{ - {Name: "whitelist", Type: "&{Ellipsis:16864 Elt:string}"}, + {Name: "whitelist", Type: "&{Ellipsis:19325 Elt:string}"}, }, }, { @@ -513,6 +513,15 @@ var AllMods Modifiers = Modifiers{ {Name: "val", Type: "string"}, }, }, +{ + Name: "ModifyIncomingScriptsWithRegex", + Description: "ModifyIncomingScriptsWithRegex modifies all incoming javascript (application/javascript and inline