Skip to content

Make actions URL in commit status webhooks absolute #33620

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

Merged
merged 4 commits into from
Feb 18, 2025
Merged

Make actions URL in commit status webhooks absolute #33620

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08992fb
Fix webhook target url generated by actions status event
lunny Feb 17, 2025
8f80089
Fix bug
lunny Feb 17, 2025
9246cad
Merge branch 'main' into lunny/fix_status_webhook_target_url
lunny Feb 17, 2025
766f7c8
Merge branch 'main' into lunny/fix_status_webhook_target_url
wxiaoguang Feb 18, 2025
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
11 changes: 10 additions & 1 deletion services/webhook/notifier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package webhook

import (
"context"
"strings"

git_model "code.gitea.io/gitea/models/git"
issues_model "code.gitea.io/gitea/models/issues"
Expand Down Expand Up @@ -871,14 +872,22 @@ func (m *webhookNotifier) CreateCommitStatus(ctx context.Context, repo *repo_mod
return
}

// as a webhook url, target should be an absolute url. But for internal actions target url
// the target url is a url path with no host and port to make it easy to be visited
// from multiple hosts. So we need to convert it to an absolute url here.
target := status.TargetURL
if strings.HasPrefix(target, "/") {
target = setting.AppURL + strings.TrimPrefix(target, "/")
}

payload := api.CommitStatusPayload{
Context: status.Context,
CreatedAt: status.CreatedUnix.AsTime().UTC(),
Description: status.Description,
ID: status.ID,
SHA: commit.Sha1,
State: status.State.String(),
TargetURL: status.TargetURL,
TargetURL: target,

Commit: apiCommit,
Repo: convert.ToRepo(ctx, repo, access_model.Permission{AccessMode: perm.AccessModeOwner}),
Expand Down
Loading