-
Notifications
You must be signed in to change notification settings - Fork 55
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Adding username/password parameters to Socks5 config URL #204
Merged
Merged
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
e793764
add dynamic config support
amircybersec bbd9f82
Merge branch 'Jigsaw-Code:main' into main
amircybersec ba98871
Revert "add dynamic config support"
amircybersec bcb602e
Merge branch 'Jigsaw-Code:main' into main
amircybersec 4cb44eb
Merge branch 'Jigsaw-Code:main' into main
amircybersec bb6fad6
Merge branch 'Jigsaw-Code:main' into main
amircybersec 8250a7f
add socks5 auth support to config url
amircybersec 53228b1
removed print line
amircybersec 27ff269
use latest commit on main for SDK in x
amircybersec 00486ad
updating sdk version
amircybersec d1d879b
updated doc to reflect auth parameters
amircybersec File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "net/url" | ||
|
|
||
| "github.com/Jigsaw-Code/outline-sdk/transport" | ||
| "github.com/Jigsaw-Code/outline-sdk/transport/socks5" | ||
| ) | ||
|
|
||
| func newSOCKS5StreamDialerFromURL(innerDialer transport.StreamDialer, configURL *url.URL) (transport.StreamDialer, error) { | ||
| endpoint := transport.StreamDialerEndpoint{Dialer: innerDialer, Address: configURL.Host} | ||
| dialer, err := socks5.NewStreamDialer(&endpoint) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| userInfo := configURL.User | ||
| if userInfo != nil { | ||
| username := userInfo.Username() | ||
| password, _ := userInfo.Password() | ||
| err := dialer.SetCredentials([]byte(username), []byte(password)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| return dialer, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please update the Go doc with the new parameter. It doesn't show the credentials currently: https://pkg.go.dev/github.com/Jigsaw-Code/outline-sdk/x/config
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@fortuna good catch! it slipped my mind. I updated the doc to include authentication params (
UserInfo) in the URL.