MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-03-29 00:33:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

all 2xx status codes to be success for audit (#20394)

Browse Source
This commit is contained in:
Harshavardhana 2024-09-06 15:53:34 -07:00 committed by GitHub
parent 64e803b136
commit 0f1e8db4c5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/vulncheck.yml vendored
View File

@ -21,7 +21,7 @@ jobs:
- name: Set up Go - name: Set up Go
uses: actions/setup-go@v5 uses: actions/setup-go@v5
with: with:
go-version: 1.22.5 go-version: 1.22.7
- name: Get official govulncheck - name: Get official govulncheck
run: go install golang.org/x/vuln/cmd/govulncheck@latest run: go install golang.org/x/vuln/cmd/govulncheck@latest
shell: bash shell: bash

12
internal/event/target/webhook.go
View File

@ -196,13 +196,15 @@ func (target *WebhookTarget) send(eventData event.Event) error {
if err != nil { if err != nil {
return err return err
} }
defer xhttp.DrainBody(resp.Body) xhttp.DrainBody(resp.Body)
if resp.StatusCode < 200 || resp.StatusCode > 299 { if resp.StatusCode >= 200 && resp.StatusCode <= 299 {
return fmt.Errorf("sending event failed with %v", resp.Status) // accepted HTTP status codes.
return nil
} else if resp.StatusCode == http.StatusForbidden {
return fmt.Errorf("%s returned '%s', please check if your auth token is correctly set", target.args.Endpoint, resp.Status)
} }
return fmt.Errorf("%s returned '%s', please check your endpoint configuration", target.args.Endpoint, resp.Status)
return nil
} }
// SendFromStore - reads an event from store and sends it to webhook. // SendFromStore - reads an event from store and sends it to webhook.

8
internal/logger/target/http/http.go
View File

@ -266,15 +266,13 @@ func (h *Target) send(ctx context.Context, payload []byte, payloadCount int, pay
// Drain any response. // Drain any response.
xhttp.DrainBody(resp.Body) xhttp.DrainBody(resp.Body)
switch resp.StatusCode { if resp.StatusCode >= 200 && resp.StatusCode <= 299 {
case http.StatusOK, http.StatusCreated, http.StatusAccepted, http.StatusNoContent:
// accepted HTTP status codes. // accepted HTTP status codes.
return nil return nil
case http.StatusForbidden: } else if resp.StatusCode == http.StatusForbidden {
return fmt.Errorf("%s returned '%s', please check if your auth token is correctly set", h.Endpoint(), resp.Status) return fmt.Errorf("%s returned '%s', please check if your auth token is correctly set", h.Endpoint(), resp.Status)
default:
return fmt.Errorf("%s returned '%s', please check your endpoint configuration", h.Endpoint(), resp.Status)
} }
return fmt.Errorf("%s returned '%s', please check your endpoint configuration", h.Endpoint(), resp.Status)
} }
func (h *Target) startQueueProcessor(ctx context.Context, mainWorker bool) { func (h *Target) startQueueProcessor(ctx context.Context, mainWorker bool) {