mirror of
https://github.com/go-gitea/gitea.git
synced 2025-05-03 06:01:36 +00:00
fix: do not return archive download URLs in API if downloads are disabled (#34324)
If archive downloads are are disabled using _DISABLE_DOWNLOAD_SOURCE_ARCHIVES_, archive links are still returned by the API. This PR changes the data returned, so the fields _zipball_url_ and _tarball_url_ are omitted if archive downloads have been disabled. Resolve #32159
This commit is contained in:
parent
ba5c3f8087
commit
e67f74efc8
@ -11,8 +11,8 @@ type Tag struct {
|
|||||||
Message string `json:"message"`
|
Message string `json:"message"`
|
||||||
ID string `json:"id"`
|
ID string `json:"id"`
|
||||||
Commit *CommitMeta `json:"commit"`
|
Commit *CommitMeta `json:"commit"`
|
||||||
ZipballURL string `json:"zipball_url"`
|
ZipballURL string `json:"zipball_url,omitempty"`
|
||||||
TarballURL string `json:"tarball_url"`
|
TarballURL string `json:"tarball_url,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// AnnotatedTag represents an annotated tag
|
// AnnotatedTag represents an annotated tag
|
||||||
|
@ -197,13 +197,22 @@ func ToBranchProtection(ctx context.Context, bp *git_model.ProtectedBranch, repo
|
|||||||
|
|
||||||
// ToTag convert a git.Tag to an api.Tag
|
// ToTag convert a git.Tag to an api.Tag
|
||||||
func ToTag(repo *repo_model.Repository, t *git.Tag) *api.Tag {
|
func ToTag(repo *repo_model.Repository, t *git.Tag) *api.Tag {
|
||||||
|
tarballURL := util.URLJoin(repo.HTMLURL(), "archive", t.Name+".tar.gz")
|
||||||
|
zipballURL := util.URLJoin(repo.HTMLURL(), "archive", t.Name+".zip")
|
||||||
|
|
||||||
|
// Archive URLs are "" if the download feature is disabled
|
||||||
|
if setting.Repository.DisableDownloadSourceArchives {
|
||||||
|
tarballURL = ""
|
||||||
|
zipballURL = ""
|
||||||
|
}
|
||||||
|
|
||||||
return &api.Tag{
|
return &api.Tag{
|
||||||
Name: t.Name,
|
Name: t.Name,
|
||||||
Message: strings.TrimSpace(t.Message),
|
Message: strings.TrimSpace(t.Message),
|
||||||
ID: t.ID.String(),
|
ID: t.ID.String(),
|
||||||
Commit: ToCommitMeta(repo, t),
|
Commit: ToCommitMeta(repo, t),
|
||||||
ZipballURL: util.URLJoin(repo.HTMLURL(), "archive", t.Name+".zip"),
|
ZipballURL: zipballURL,
|
||||||
TarballURL: util.URLJoin(repo.HTMLURL(), "archive", t.Name+".tar.gz"),
|
TarballURL: tarballURL,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user