Skip to content

Commit

Permalink
Swap to my forks
Browse files Browse the repository at this point in the history
  • Loading branch information
@bdwyertech
bdwyertech committed Mar 5, 2021
1 parent 55b6755 commit 6b8db92
Show file tree
Hide file tree
Showing 31 changed files with 139 additions and 311 deletions.
9 changes: 2 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,16 @@ go 1.16

replace github.com/elazarl/goproxy => github.com/bdwyertech/goproxy v0.0.0-20200419011457-7aaf118834c9

replace github.com/aus/proxyplease => github.com/bdwyertech/proxyplease v0.1.1-0.20210304025852-a16bce5f30dd

// My branch supports reading PAC from Mac SCUtil Config
replace github.com/rapid7/go-get-proxied => github.com/bdwyertech/go-get-proxied v0.0.0-20210305160813-ca7ca4cda17c

// replace github.com/aus/proxyplease => ../proxyplease

// replace github.com/rapid7/go-get-proxied => ../go-get-proxied

require (
github.com/aus/proxyplease v0.0.0-00010101000000-000000000000
github.com/bdwyertech/proxyplease v0.1.1-0.20210305210130-a100ce82b827
github.com/elazarl/goproxy v0.0.0-00010101000000-000000000000
github.com/kardianos/service v1.2.0
github.com/mattn/go-colorable v0.1.8
github.com/mattn/go-isatty v0.0.12
github.com/sirupsen/logrus v1.8.0
golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3
golang.org/x/sys v0.0.0-20210304203840-7b4935edff86
)
24 changes: 15 additions & 9 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
github.com/alexbrainman/sspi v0.0.0-20180613141037-e580b900e9f5/go.mod h1:976q2ETgjT2snVCf2ZaBnyBbVoPERGjUz+0sofzEfro=
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74 h1:Kk6a4nehpJ3UuJRqlA3JxYxBZEqCeOmATOvrbT4p9RA=
github.com/alexbrainman/sspi v0.0.0-20210105120005-909beea2cc74/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
github.com/bdwyertech/go-get-proxied v0.0.0-20210305160813-ca7ca4cda17c h1:pgMz8KsYfNp8rCXMr6c+92CHIx5vs0DRQpMm4uUfwgQ=
github.com/bdwyertech/go-get-proxied v0.0.0-20210305160813-ca7ca4cda17c/go.mod h1:naQjqgnUovcdHd48PuNF3PFU3cwS/oaVFfvf7dIFCes=
github.com/aus/proxyplease v0.1.0/go.mod h1:hIgmILi8LhQ+6f1CZKQFCPyM4rjOyXTnQq0MSBa1UMk=
github.com/bdwyertech/go-get-proxied v0.0.0-20210305205935-912c3d1ded9e h1:y76jg9cKgIiVi2hbqulYJr39CpO99ajl4h9ede7oRnI=
github.com/bdwyertech/go-get-proxied v0.0.0-20210305205935-912c3d1ded9e/go.mod h1:gM7ddayfKDubVwLb5eu7Anq8gih5R74RR63b9hxCRA4=
github.com/bdwyertech/go-scutil v0.0.0-20210305044044-814e0f3f0cd3 h1:oMOwe3KddRPeMJkr+oYXQcJua9kZbIUCq30Ze/QYGJE=
github.com/bdwyertech/go-scutil v0.0.0-20210305044044-814e0f3f0cd3/go.mod h1:gV303gJocqRNJVrg/n4cB+ZwoHxKKMiAiwe+t627Kjw=
github.com/bdwyertech/goproxy v0.0.0-20200419011457-7aaf118834c9 h1:Eu3d1Y6dGkfqvQ+S0v5RccH8pBZlzhOTBU+U7NQmlRs=
github.com/bdwyertech/goproxy v0.0.0-20200419011457-7aaf118834c9/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
github.com/bdwyertech/proxyplease v0.1.1-0.20210304025852-a16bce5f30dd h1:MuroEdaY4e8zt4K++2uqnl1CLkCqu/pvpV+Iq6WTkrc=
github.com/bdwyertech/proxyplease v0.1.1-0.20210304025852-a16bce5f30dd/go.mod h1:ZHaPOAtIsr8KPMDbp60vH/LCYuBkoUwDVDDzXjmOdl0=
github.com/bdwyertech/proxyplease v0.1.1-0.20210305210130-a100ce82b827 h1:10AC1o6J6f9IedR3Oq+R/nb8cAw8BGxY794j7aRIiQk=
github.com/bdwyertech/proxyplease v0.1.1-0.20210305210130-a100ce82b827/go.mod h1:7QvkgCxa9M28QJMYs0ji/c+C92p4DvEz2uPFKq+EsM0=
github.com/darren/gpac v0.0.0-20201209040425-3300e0622b93 h1:H6CW26kV4Egh6/v0o7Nd33ArRtwfQ9erfrVzOCZ1O6Q=
github.com/darren/gpac v0.0.0-20201209040425-3300e0622b93/go.mod h1:1Id6bMaG5dQYTt+Pk0msQw4r/+kkuzfuFwoictr5mcU=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand All @@ -19,6 +21,7 @@ github.com/dop251/goja v0.0.0-20200629185240-bfd59704b500 h1:QthjkRYZQj+FcH5GZXl
github.com/dop251/goja v0.0.0-20200629185240-bfd59704b500/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA=
github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2 h1:dWB6v3RcOy03t/bUadywsbyrQwCqZeNIEX6M1OtSZOM=
github.com/elazarl/goproxy/ext v0.0.0-20190711103511-473e67f1d7d2/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
github.com/git-lfs/go-ntlm v0.0.0-20190401175752-c5056e7fa066/go.mod h1:YnCP1lAyul0ITv9nT/OqXseZmGeaqvMVa2uvl8ssQvE=
github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
Expand All @@ -38,31 +41,33 @@ github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoU
github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rapid7/go-get-proxied v0.0.0-20181210221417-16249a544090/go.mod h1:ELOKvSUbHx1oVeecsknc02S0eEAFD+TdV3rTt3BcNzM=
github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYeAmZ5ZIpBWTGllZSQnw97Dj+woV0toclVaRGI8pc=
github.com/sirupsen/logrus v1.8.0 h1:nfhvjKcUMhBMVqbKHJlk5RPrrfYr/NMo3692g0dwfWU=
github.com/sirupsen/logrus v1.8.0/go.mod h1:4GuYW9TZmE769R5STWrRakJc4UqQ3+QQ95fyz7ENv1A=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 h1:/ZScEX8SfEmUGRHs0gxpqteO5nfNW6axyZbBdw9A12g=
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210304203840-7b4935edff86 h1:TmVfeQsidiBAiZMvxnHWD63KxYBVCiFs+k/pWtzhllI=
golang.org/x/sys v0.0.0-20210304203840-7b4935edff86/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3 h1:RdE7htvBru4I4VZQofQjCZk5W9+aLNlSF5n0zgVwm8s=
golang.org/x/sys v0.0.0-20210305034016-7844c3c200c3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
Expand All @@ -73,5 +78,6 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
h12.io/socks v1.0.1/go.mod h1:AIhxy1jOId/XCz9BO+EIgNL2rQiPTBNnOfnVnQ+3Eck=
h12.io/socks v1.0.2 h1:cZhhbV8+DE0Y1kotwhr1a3RC3kFO7AtuZ4GLr3qKSc8=
h12.io/socks v1.0.2/go.mod h1:AIhxy1jOId/XCz9BO+EIgNL2rQiPTBNnOfnVnQ+3Eck=
2 changes: 1 addition & 1 deletion pkg/gontlm-proxy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

log "github.com/sirupsen/logrus"

"github.com/aus/proxyplease"
"github.com/bdwyertech/proxyplease"
"github.com/elazarl/goproxy"
// "github.com/bhendo/concord"
// "github.com/bhendo/concord/handshakers"
Expand Down
0 ...hub.com/rapid7/go-get-proxied/LICENSE.txt → ...com/bdwyertech/go-get-proxied/LICENSE.txt
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ub.com/rapid7/go-get-proxied/proxy/doc.go → ...om/bdwyertech/go-get-proxied/proxy/doc.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...m/rapid7/go-get-proxied/proxy/provider.go → ...wyertech/go-get-proxied/proxy/provider.go
View file
File renamed without changes.
1 change: 1 addition & 0 deletions ...7/go-get-proxied/proxy/provider_darwin.go → ...h/go-get-proxied/proxy/provider_darwin.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...d7/go-get-proxied/proxy/provider_linux.go → ...ch/go-get-proxied/proxy/provider_linux.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion .../go-get-proxied/proxy/provider_windows.go → .../go-get-proxied/proxy/provider_windows.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ....com/rapid7/go-get-proxied/proxy/proxy.go → .../bdwyertech/go-get-proxied/proxy/proxy.go
View file
File renamed without changes.
0 ...ub.com/rapid7/go-get-proxied/proxy/url.go → ...om/bdwyertech/go-get-proxied/proxy/url.go
View file
File renamed without changes.
0 .../rapid7/go-get-proxied/winhttp/winhttp.go → ...yertech/go-get-proxied/winhttp/winhttp.go
View file
File renamed without changes.
0 vendor/github.com/aus/proxyplease/.gitignore → ...hub.com/bdwyertech/proxyplease/.gitignore
View file
File renamed without changes.
0 vendor/github.com/aus/proxyplease/LICENSE → ...github.com/bdwyertech/proxyplease/LICENSE
View file
File renamed without changes.
0 vendor/github.com/aus/proxyplease/README.md → ...thub.com/bdwyertech/proxyplease/README.md
View file
File renamed without changes.
0 vendor/github.com/aus/proxyplease/basic.go → ...ithub.com/bdwyertech/proxyplease/basic.go
View file
File renamed without changes.
0 vendor/github.com/aus/proxyplease/connect.go → ...hub.com/bdwyertech/proxyplease/connect.go
View file
File renamed without changes.
0 vendor/github.com/aus/proxyplease/debug.go → ...ithub.com/bdwyertech/proxyplease/debug.go
View file
File renamed without changes.
7 changes: 3 additions & 4 deletions vendor/github.com/aus/proxyplease/go.mod → .../github.com/bdwyertech/proxyplease/go.mod
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 28 additions & 5 deletions vendor/github.com/aus/proxyplease/go.sum → .../github.com/bdwyertech/proxyplease/go.sum
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...ub.com/aus/proxyplease/negotiate_other.go → ...bdwyertech/proxyplease/negotiate_other.go
View file
File renamed without changes.
0 ....com/aus/proxyplease/negotiate_windows.go → ...wyertech/proxyplease/negotiate_windows.go
View file
File renamed without changes.
0 .../github.com/aus/proxyplease/ntlm_other.go → ....com/bdwyertech/proxyplease/ntlm_other.go
View file
File renamed without changes.
0 ...ithub.com/aus/proxyplease/ntlm_windows.go → ...om/bdwyertech/proxyplease/ntlm_windows.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion vendor/github.com/aus/proxyplease/proxy.go → ...ithub.com/bdwyertech/proxyplease/proxy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 vendor/github.com/aus/proxyplease/socks.go → ...ithub.com/bdwyertech/proxyplease/socks.go
View file
File renamed without changes.
Loading

0 comments on commit 6b8db92

Please sign in to comment.