mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2026-05-12 22:10:25 +00:00
ci: detect and prevent empty case statements in Go code (#11593)
One of the security patches released 2026-03-09 [fixed a vulnerability](https://codeberg.org/forgejo/forgejo/pulls/11513/commits/d1c7b04d09f6a13896eaa1322ac690b2021539da) caused by a misapplication of Go `case` statements, where the implementation would have been correct if Go `case` statements automatically fall through to the next case block, but they do not. This PR adds a semgrep rule which detects any empty `case` statement and raises an error, in order to prevent this coding mistake in the future. For example, code like this will now trigger a build error: ```go switch setting.Protocol { case setting.HTTPUnix: case setting.FCGI: case setting.FCGIUnix: default: defaultLocalURL := string(setting.Protocol) + "://" } ``` Example error: ``` cmd/web.go ❯❯❱ semgrep.config.forgejo-switch-empty-case switch has a case block with no content. This is treated as "break" by Go, but developers may confuse it for "fallthrough". To fix this error, disambiguate by using "break" or "fallthrough". 279┆ switch setting.Protocol { 280┆ case setting.HTTPUnix: 281┆ case setting.FCGI: 282┆ case setting.FCGIUnix: 283┆ default: 284┆ defaultLocalURL := string(setting.Protocol) + "://" 285┆ if setting.HTTPAddr == "0.0.0.0" { 286┆ defaultLocalURL += "localhost" 287┆ } else { 288┆ defaultLocalURL += setting.HTTPAddr ``` As described in the error output, this error can be fixed by explicitly listing `break` (the real Go behaviour, to do nothing in the block), or by listing `fallthrough` (if the intent was to fall through). All existing code triggering this detection has been changed to `break` (or, rarely, irrelevant cases have been removed), which should maintain the same code functionality. While performing this fixup, a light analysis was performed on each case and they *appeared* correct, but with ~65 cases I haven't gone into extreme depth. Tests are present for the semgrep rule in `.semgrep/tests/go.go`. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Documentation - [ ] I created a pull request [to the documentation](https://codeberg.org/forgejo/docs) to explain to Forgejo users how to use this change. - [x] I did not document these changes and I do not expect someone else to do it. ### Release notes - [ ] This change will be noticed by a Forgejo user or admin (feature, bug fix, performance, etc.). I suggest to include a release note for this change. - [x] This change is not visible to a Forgejo user or admin (refactor, dependency upgrade, etc.). I think there is no need to add a release note for this change. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/11593 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
This commit is contained in:
parent
c564867439
commit
f93d2cb261
45 changed files with 135 additions and 22 deletions
|
|
@ -141,6 +141,7 @@ func getSignVersion(req *http.Request) (string, error) {
|
|||
|
||||
switch m[1] {
|
||||
case "1.0", "1.1", "1.2", "1.3":
|
||||
break
|
||||
default:
|
||||
return "", util.NewInvalidArgumentErrorf("unsupported version")
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,6 +176,7 @@ func Search(ctx *context.APIContext) {
|
|||
opts.Mirror = optional.Some(false)
|
||||
opts.Collaborate = optional.Some(true)
|
||||
case "":
|
||||
break
|
||||
default:
|
||||
ctx.Error(http.StatusUnprocessableEntity, "", fmt.Errorf("Invalid search mode: \"%s\"", mode))
|
||||
return
|
||||
|
|
|
|||
|
|
@ -54,7 +54,9 @@ func MonitorDiagnosis(ctx *context.Context) {
|
|||
|
||||
select {
|
||||
case <-time.After(time.Duration(seconds) * time.Second):
|
||||
break
|
||||
case <-ctx.Done():
|
||||
break
|
||||
}
|
||||
pprof.StopCPUProfile()
|
||||
trace.Stop()
|
||||
|
|
|
|||
|
|
@ -34,7 +34,9 @@ func initTestQueueOnce() {
|
|||
for range t {
|
||||
select {
|
||||
case <-graceful.GetManager().ShutdownContext().Done():
|
||||
break
|
||||
case <-time.After(5 * time.Second):
|
||||
break
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
|
@ -56,6 +58,7 @@ func initTestQueueOnce() {
|
|||
for {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
break
|
||||
case <-time.After(500 * time.Millisecond):
|
||||
if adding {
|
||||
if testQueue.GetQueueItemNumber() == qs.Length {
|
||||
|
|
|
|||
|
|
@ -1418,6 +1418,7 @@ func generateCodeChallenge(ctx *context.Context, provider string) (codeChallenge
|
|||
case *openidConnect.Provider, *fitbit.Provider, *zoom.Provider:
|
||||
// those providers forward the `code_verifier`
|
||||
// a code_challenge can be generated
|
||||
break
|
||||
}
|
||||
|
||||
codeVerifier := util.CryptoRandomString(util.RandomStringHigh)
|
||||
|
|
|
|||
|
|
@ -634,6 +634,7 @@ func SearchRepo(ctx *context.Context) {
|
|||
opts.Mirror = optional.Some(false)
|
||||
opts.Collaborate = optional.Some(true)
|
||||
case "":
|
||||
break
|
||||
default:
|
||||
ctx.Error(http.StatusUnprocessableEntity, fmt.Sprintf("Invalid search mode: \"%s\"", mode))
|
||||
return
|
||||
|
|
|
|||
|
|
@ -511,8 +511,6 @@ func buildIssueOverview(ctx *context.Context, unitType unit.Type) {
|
|||
}
|
||||
|
||||
switch filterMode {
|
||||
case issues_model.FilterModeAll:
|
||||
case issues_model.FilterModeYourRepositories:
|
||||
case issues_model.FilterModeAssign:
|
||||
opts.AssigneeID = ctx.Doer.ID
|
||||
case issues_model.FilterModeCreate:
|
||||
|
|
@ -846,7 +844,7 @@ func getUserIssueStats(ctx *context.Context, ctxUser *user_model.User, filterMod
|
|||
openClosedOpts := opts.Copy()
|
||||
switch filterMode {
|
||||
case issues_model.FilterModeAll:
|
||||
// no-op
|
||||
break
|
||||
case issues_model.FilterModeYourRepositories:
|
||||
openClosedOpts.AllPublic = false
|
||||
case issues_model.FilterModeAssign:
|
||||
|
|
|
|||
|
|
@ -180,8 +180,6 @@ func ViewPackageVersion(ctx *context.Context) {
|
|||
ctx.Data["PackageRegistryHost"] = setting.Packages.RegistryHost
|
||||
|
||||
switch pd.Package.Type {
|
||||
case packages_model.TypeContainer:
|
||||
|
||||
case packages_model.TypeAlpine:
|
||||
branches := make(container.Set[string])
|
||||
repositories := make(container.Set[string])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue