Skip to content
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

Add auth and version support to socks proxy #883

Merged
merged 5 commits into from
Feb 19, 2024
Merged

Add auth and version support to socks proxy #883

merged 5 commits into from
Feb 19, 2024

Conversation

AriaMoradi
Copy link
Member

@AriaMoradi AriaMoradi commented Feb 18, 2024

closes #785

I didn't test the code against a real proxy but it should be fine according to the docs.

Java 8: https://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html#socks
Java 20 (much more readable): https://docs.oracle.com/en/java/javase/20/core/java-networking.html#GUID-E0E7F3CF-FF30-4324-B2F8-AA88EB067994

@AriaMoradi AriaMoradi changed the title Add auth support to socsk proxy @AriaMoradi Add auth support to socsk proxy Feb 18, 2024
Copy link
Collaborator

@Syer10 Syer10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, just some general cleanup

Comment on lines 239 to 250
serverConfig.socksProxyUsername,
serverConfig.socksProxyPassword,
) { proxyEnabled, proxyHost, proxyPort, proxyUsername, proxyPassword ->
data class DataClassForDestruction(
val proxyEnabled: Boolean,
val proxyHost: String,
val proxyPort: String,
val proxyUsername: String,
val proxyPassword: String,
)
DataClassForDestruction(proxyEnabled, proxyHost, proxyPort, proxyUsername, proxyPassword)
},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
serverConfig.socksProxyUsername,
serverConfig.socksProxyPassword,
) { proxyEnabled, proxyHost, proxyPort, proxyUsername, proxyPassword ->
data class DataClassForDestruction(
val proxyEnabled: Boolean,
val proxyHost: String,
val proxyPort: String,
val proxyUsername: String,
val proxyPassword: String,
)
DataClassForDestruction(proxyEnabled, proxyHost, proxyPort, proxyUsername, proxyPassword)
},
serverConfig.socksProxyUsername,
serverConfig.socksProxyPassword,
) { proxyEnabled, proxyHost, proxyPort, proxyUsername, proxyPassword ->
data class ProxySettings(
val proxyEnabled: Boolean,
val proxyHost: String,
val proxyPort: String,
val proxyUsername: String,
val proxyPassword: String,
)
ProxySettings(proxyEnabled, proxyHost, proxyPort, proxyUsername, proxyPassword)
}.distinctUntilChanged(),

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

API says it doesn't need distinctUntilChanged()
image

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its just to be safe.

@AriaMoradi
Copy link
Member Author

Might as well add support for socks 4 by providing java's socksProxyVersion

@AriaMoradi AriaMoradi changed the title Add auth support to socsk proxy Add auth support to socks proxy Feb 19, 2024
@AriaMoradi AriaMoradi changed the title Add auth support to socks proxy Add auth and version support to socks proxy Feb 19, 2024
@Syer10 Syer10 merged commit fc53d69 into master Feb 19, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] Specify Authentication for SOCKS 5 Proxy
2 participants