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.

Sign up for GitHub

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

Jump to bottom

Use Psiphon clientlib #252

Merged
merged 8 commits into from
Jun 24, 2024
Merged

Use Psiphon clientlib #252

merged 8 commits into from
Jun 24, 2024

Conversation

fortuna
Copy link
Contributor

@fortuna fortuna commented Jun 18, 2024 •
edited
Loading

Supersedes #251

@fortuna fortuna requested a review from jyyi1 June 18, 2024 00:17
@fortuna fortuna mentioned this pull request Jun 18, 2024
Open
@fortuna
Copy link
Contributor Author

fortuna commented Jun 24, 2024

@jyyi1 any thouhgts?

jyyi1
jyyi1 approved these changes Jun 24, 2024
View reviewed changes
Copy link
Contributor

@jyyi1 jyyi1 left a comment

Choose a reason for hiding this comment

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

Thanks, the code looks good!

x/psiphon/psiphon.go
Comment on lines +96 to +97
goos := strings.Join(strings.FieldsFunc(runtime.GOOS, clientPlatformAllowChars), "-")
goarch := strings.Join(strings.FieldsFunc(runtime.GOARCH, clientPlatformAllowChars), "-")
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we really need to normalize these two strings? It seems all GOOS and GOARCH are already normalized.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I copied the code from @adam-p in #251.

I think there's no guarantee that GOOS and GOARCH will comply with the Psiphon format, so it makes sense to always escape.

@fortuna fortuna merged commit 888e11d into main Jun 24, 2024
6 checks passed
@fortuna fortuna deleted the fortuna-psiphon branch June 24, 2024 21:04
amircybersec pushed a commit that referenced this pull request Sep 6, 2024
@fortuna @amircybersec
Use Psiphon clientlib (#252)
d3ddfd1
@ignoramous ignoramous mentioned this pull request Nov 10, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyyi1 jyyi1 jyyi1 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@fortuna @jyyi1