-
Notifications
You must be signed in to change notification settings - Fork 2
go 1.26 upgrade #35
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
Merged
go 1.26 upgrade #35
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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 |
|---|---|---|
| @@ -1,24 +1,24 @@ | ||
| module github.com/bzimmer/activity | ||
|
|
||
| go 1.24.2 | ||
| go 1.26.0 | ||
|
|
||
| require ( | ||
| github.com/bzimmer/httpwares v0.1.3 | ||
| github.com/martinlindhe/unit v0.0.0-20230420213220-4adfd7d0a0d6 | ||
| github.com/stretchr/testify v1.8.1 | ||
| github.com/twpayne/go-geom v1.6.1 | ||
| github.com/twpayne/go-gpx v1.4.1 | ||
| github.com/twpayne/go-gpx v1.5.0 | ||
| github.com/twpayne/go-polyline v1.1.1 | ||
| golang.org/x/oauth2 v0.29.0 | ||
| golang.org/x/sync v0.13.0 | ||
| golang.org/x/time v0.11.0 | ||
| golang.org/x/oauth2 v0.35.0 | ||
| golang.org/x/sync v0.19.0 | ||
| golang.org/x/time v0.14.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/pmezard/go-difflib v1.0.0 // indirect | ||
| golang.org/x/net v0.39.0 // indirect | ||
| golang.org/x/text v0.24.0 // indirect | ||
| golang.org/x/net v0.50.0 // indirect | ||
| golang.org/x/text v0.34.0 // indirect | ||
| gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) |
This file contains hidden or 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 hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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,109 @@ | ||
| package zwift | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestValidateZwiftS3URL(t *testing.T) { | ||
| t.Parallel() | ||
| a := assert.New(t) | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| url string | ||
| wantErr bool | ||
| errMsg string | ||
| }{ | ||
| { | ||
| name: "valid zwift S3 URL", | ||
| url: "https://zwift-activity-prod.s3.amazonaws.com/activity.fit", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "valid zwift S3 URL with path", | ||
| url: "https://zwift-exports.s3.amazonaws.com/path/to/file.fit", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "valid zwift S3 URL - case insensitive bucket", | ||
| url: "https://ZWIFT-data.s3.amazonaws.com/file.fit", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "valid zwift S3 URL - zwift in middle of bucket name", | ||
| url: "https://prod-zwift-data.s3.amazonaws.com/file.fit", | ||
| wantErr: false, | ||
| }, | ||
| { | ||
| name: "invalid URL - malformed", | ||
| url: "://invalid-url", | ||
| wantErr: true, | ||
| errMsg: "invalid URL", | ||
| }, | ||
| { | ||
| name: "invalid URL - http scheme", | ||
| url: "http://zwift-activity.s3.amazonaws.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid URL scheme: expected https, got http", | ||
| }, | ||
| { | ||
| name: "invalid URL - ftp scheme", | ||
| url: "ftp://zwift-activity.s3.amazonaws.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid URL scheme: expected https, got ftp", | ||
| }, | ||
| { | ||
| name: "invalid URL - no scheme", | ||
| url: "zwift-activity.s3.amazonaws.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid URL scheme: expected https, got", | ||
| }, | ||
| { | ||
| name: "invalid host - not S3", | ||
| url: "https://zwift.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid host: expected *.s3.amazonaws.com, got zwift.com", | ||
| }, | ||
| { | ||
| name: "invalid host - not amazonaws", | ||
| url: "https://zwift-bucket.s3.google.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid host: expected *.s3.amazonaws.com, got zwift-bucket.s3.google.com", | ||
| }, | ||
| { | ||
| name: "invalid host - missing bucket name", | ||
| url: "https://s3.amazonaws.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid host: expected *.s3.amazonaws.com, got s3.amazonaws.com", | ||
| }, | ||
| { | ||
| name: "invalid bucket - no zwift in name", | ||
| url: "https://activity-prod.s3.amazonaws.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid bucket: expected Zwift bucket, got activity-prod", | ||
| }, | ||
| { | ||
| name: "invalid bucket - wrong service name", | ||
| url: "https://strava-exports.s3.amazonaws.com/file.fit", | ||
| wantErr: true, | ||
| errMsg: "invalid bucket: expected Zwift bucket, got strava-exports", | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| t.Parallel() | ||
| err := validateZwiftS3URL(tt.url) | ||
| if tt.wantErr { | ||
| a.Error(err) | ||
| if tt.errMsg != "" { | ||
| a.Contains(err.Error(), tt.errMsg) | ||
| } | ||
| } else { | ||
| a.NoError(err) | ||
| } | ||
| }) | ||
| } | ||
| } |
Oops, something went wrong.
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.
The new validateZwiftS3URL function lacks test coverage. Given that this function is implementing important security validation to prevent SSRF attacks, it should have comprehensive tests covering:
This is especially important since other test files in the codebase (e.g., activity_test.go, model_test.go, auth_test.go) have comprehensive test coverage for their respective functionality.