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

Delete GitLab webhooks with partial URL match #4259

Merged
merged 9 commits into from
Oct 27, 2024
Merged

Delete GitLab webhooks with partial URL match #4259

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a392fa3
fix http-proxy-middleware cve
pat-s Oct 26, 2024
3490004
delete webhook on partial match
pat-s Oct 26, 2024
3326e6a
Merge branch 'main' into fix/gitlab-token-delete
pat-s Oct 26, 2024
e1145be
delete all hooks of repo and don't return error
pat-s Oct 26, 2024
aef2f2d
don't break inside loop
pat-s Oct 26, 2024
207e13d
chore: add log entrz
pat-s Oct 27, 2024
3c81b3f
Merge branch 'main' into fix/gitlab-token-delete
pat-s Oct 27, 2024
57e6d05
exit after all pages have been processed
pat-s Oct 27, 2024
cf8d299
lint
pat-s Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions server/forge/gitlab/gitlab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,16 @@ func (g *GitLab) Deactivate(ctx context.Context, user *model.User, repo *model.R
}

for _, hook := range hooks {
if hook.URL == webURL {
if strings.Contains(hook.URL, webURL) {
hookID = hook.ID
break
_, err = client.Projects.DeleteProjectHook(_repo.ID, hookID, gitlab.WithContext(ctx))
log.Info().Msg(fmt.Sprintf("successfully deleted hook with ID %d for repo %s", hookID, repo.FullName))
if err != nil {
return err
}
}
}

// Exit the loop when we've seen all pages
if resp.CurrentPage >= resp.TotalPages {
break
}
Expand All @@ -568,13 +571,7 @@ func (g *GitLab) Deactivate(ctx context.Context, user *model.User, repo *model.R
listProjectHooksOptions.Page = resp.NextPage
}

if hookID == -1 {
return fmt.Errorf("could not find hook to delete")
}

_, err = client.Projects.DeleteProjectHook(_repo.ID, hookID, gitlab.WithContext(ctx))

return err
return nil
}

// Branches returns the names of all branches for the named repository.
Expand Down