mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2025-06-05 06:10:12 +00:00
Some checks failed
/ release (push) Waiting to run
testing / backend-checks (push) Waiting to run
testing / frontend-checks (push) Waiting to run
testing / test-unit (push) Blocked by required conditions
testing / test-e2e (push) Blocked by required conditions
testing / test-remote-cacher (redis) (push) Blocked by required conditions
testing / test-remote-cacher (valkey) (push) Blocked by required conditions
testing / test-remote-cacher (garnet) (push) Blocked by required conditions
testing / test-remote-cacher (redict) (push) Blocked by required conditions
testing / test-mysql (push) Blocked by required conditions
testing / test-pgsql (push) Blocked by required conditions
testing / test-sqlite (push) Blocked by required conditions
testing / security-check (push) Blocked by required conditions
Integration tests for the release process / release-simulation (push) Has been cancelled
urfave/cli v2 will eventually become unmaintained, switch over to v3 which is the latest supported version. Note: the `docs` command would be a lot of work to restore with v3 ([the package is still in alpha](https://github.com/urfave/cli-docs)) An alternative to avoid a breaking change would be to not upgrade from v2 to v3 for that reason alone. Note: these commits were cherry-picked from https://code.forgejo.org/forgefriends/forgefriends Note: it is best reviewed side by side with no display of whitespace changes (there are a lot of those when converting vars to func). - a few functional changes were necessary and are noted in context in the file changes tab - https://cli.urfave.org/migrate-v2-to-v3/ upgrade instructions were followed in the most minimal way possible - upgrade gof3 to v3.10.8 which includes and upgrade from urfave/cli v2 to urfave/cli v3 - upgrade gitlab.com/gitlab-org/api/client-go v0.129.0 because it is an indirect dependency of gof3 and requires a change because of a deprecated field that otherwise triggers a lint error but nothing else otherwise - verified that the [script](https://codeberg.org/forgejo/docs/src/branch/next/scripts/cli-docs.sh) that generates the [CLI documentation](https://codeberg.org/forgejo/docs/src/branch/next/scripts/cli-docs.sh) still works. There are cosmetic differences and the **help** subcommand is no longer advertised (although it is still supported) but the `--help` option is advertised as expected so it is fine. - end-to-end tests [passed](https://code.forgejo.org/forgejo/end-to-end/pulls/667) (they use the Forgejo CLI to some extent) ## 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). ### Tests - I added test coverage for Go changes... - [ ] in their respective `*_test.go` for unit tests. - [ ] in the `tests/integration` directory if it involves interactions with a live Forgejo server. - I added test coverage for JavaScript changes... - [ ] in `web_src/js/*.test.js` if it can be unit tested. - [ ] in `tests/e2e/*.test.e2e.js` if it requires interactions with a live Forgejo server (see also the [developer guide for JavaScript testing](https://codeberg.org/forgejo/forgejo/src/branch/forgejo/tests/e2e/README.md#end-to-end-tests)). ### 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 - [ ] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [x] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. <!--start release-notes-assistant--> ## Release notes <!--URL:https://codeberg.org/forgejo/forgejo--> - Breaking features - [PR](https://codeberg.org/forgejo/forgejo/pulls/8035): <!--number 8035 --><!--line 0 --><!--description VGhlIGBmb3JnZWpvIGRvY3NgIGNvbW1hbmQgaXMgZGVwcmVjYXRlZCBhbmQgQ0xJIGVycm9ycyBhcmUgbm93IGRpc3BsYXllZCBvbiBzdGRlcnIgaW5zdGVhZCBvZiBzdGRvdXQuIFRoZXNlIGJyZWFraW5nIGNoYW5nZXMgaGFwcGVuZWQgYmVjYXVzZSB0aGUgcGFja2FnZSB1c2VkIHRvIHBhcnNlIHRoZSBjb21tYW5kIGxpbmUgYXJndW1lbnRzIHdhcyBbdXBncmFkZWQgZnJvbSB2MiB0byB2M10oaHR0cHM6Ly9jbGkudXJmYXZlLm9yZy9taWdyYXRlLXYyLXRvLXYzLykuIEEgW3NlcGFyYXRlIHByb2plY3Qgd2FzIGluaXRpYXRlZF0oaHR0cHM6Ly9naXRodWIuY29tL3VyZmF2ZS9jbGktZG9jcykgdG8gcmUtaW1wbGVtZW50IHRoZSBgZG9jc2AgY29tbWFuZCwgYnV0IGl0IGlzIG5vdCB5ZXQgcHJvZHVjdGlvbiByZWFkeS4=-->The `forgejo docs` command is deprecated and CLI errors are now displayed on stderr instead of stdout. These breaking changes happened because the package used to parse the command line arguments was [upgraded from v2 to v3](https://cli.urfave.org/migrate-v2-to-v3/). A [separate project was initiated](https://github.com/urfave/cli-docs) to re-implement the `docs` command, but it is not yet production ready.<!--description--> <!--end release-notes-assistant--> Co-authored-by: limiting-factor <limiting-factor@posteo.com> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8035 Reviewed-by: Gusted <gusted@noreply.codeberg.org>
317 lines
7.5 KiB
Go
317 lines
7.5 KiB
Go
// Copyright 2020 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"forgejo.org/modules/assetfs"
|
|
"forgejo.org/modules/log"
|
|
"forgejo.org/modules/options"
|
|
"forgejo.org/modules/public"
|
|
"forgejo.org/modules/setting"
|
|
"forgejo.org/modules/templates"
|
|
"forgejo.org/modules/util"
|
|
|
|
"github.com/gobwas/glob"
|
|
"github.com/urfave/cli/v3"
|
|
)
|
|
|
|
// CmdEmbedded represents the available extract sub-command.
|
|
func cmdEmbedded() *cli.Command {
|
|
return &cli.Command{
|
|
Name: "embedded",
|
|
Usage: "Extract embedded resources",
|
|
Description: "A command for extracting embedded resources, like templates and images",
|
|
Commands: []*cli.Command{
|
|
subcmdList(),
|
|
subcmdView(),
|
|
subcmdExtract(),
|
|
},
|
|
}
|
|
}
|
|
|
|
func subcmdList() *cli.Command {
|
|
return &cli.Command{
|
|
Name: "list",
|
|
Usage: "List files matching the given pattern",
|
|
Action: runList,
|
|
Flags: []cli.Flag{
|
|
&cli.BoolFlag{
|
|
Name: "include-vendored",
|
|
Aliases: []string{"vendor"},
|
|
Usage: "Include files under public/vendor as well",
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func subcmdView() *cli.Command {
|
|
return &cli.Command{
|
|
Name: "view",
|
|
Usage: "View a file matching the given pattern",
|
|
Action: runView,
|
|
Flags: []cli.Flag{
|
|
&cli.BoolFlag{
|
|
Name: "include-vendored",
|
|
Aliases: []string{"vendor"},
|
|
Usage: "Include files under public/vendor as well",
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func subcmdExtract() *cli.Command {
|
|
return &cli.Command{
|
|
Name: "extract",
|
|
Usage: "Extract resources",
|
|
Action: runExtract,
|
|
Flags: []cli.Flag{
|
|
&cli.BoolFlag{
|
|
Name: "include-vendored",
|
|
Aliases: []string{"vendor"},
|
|
Usage: "Include files under public/vendor as well",
|
|
},
|
|
&cli.BoolFlag{
|
|
Name: "overwrite",
|
|
Usage: "Overwrite files if they already exist",
|
|
},
|
|
&cli.BoolFlag{
|
|
Name: "rename",
|
|
Usage: "Rename files as {name}.bak if they already exist (overwrites previous .bak)",
|
|
},
|
|
&cli.BoolFlag{
|
|
Name: "custom",
|
|
Usage: "Extract to the 'custom' directory as per app.ini",
|
|
},
|
|
&cli.StringFlag{
|
|
Name: "destination",
|
|
Aliases: []string{"dest-dir"},
|
|
Usage: "Extract to the specified directory",
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
var matchedAssetFiles []assetFile
|
|
|
|
type assetFile struct {
|
|
fs *assetfs.LayeredFS
|
|
name string
|
|
path string
|
|
}
|
|
|
|
func initEmbeddedExtractor(_ context.Context, c *cli.Command) error {
|
|
setupConsoleLogger(log.ERROR, log.CanColorStderr, os.Stderr)
|
|
|
|
patterns, err := compileCollectPatterns(c.Args().Slice())
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
collectAssetFilesByPattern(c, patterns, "options", options.BuiltinAssets())
|
|
collectAssetFilesByPattern(c, patterns, "public", public.BuiltinAssets())
|
|
collectAssetFilesByPattern(c, patterns, "templates", templates.BuiltinAssets())
|
|
|
|
return nil
|
|
}
|
|
|
|
func runList(ctx context.Context, c *cli.Command) error {
|
|
if err := runListDo(ctx, c); err != nil {
|
|
fmt.Fprintf(os.Stderr, "%v\n", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func runView(ctx context.Context, c *cli.Command) error {
|
|
if err := runViewDo(ctx, c); err != nil {
|
|
fmt.Fprintf(os.Stderr, "%v\n", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func runExtract(ctx context.Context, c *cli.Command) error {
|
|
if err := runExtractDo(ctx, c); err != nil {
|
|
fmt.Fprintf(os.Stderr, "%v\n", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func runListDo(ctx context.Context, c *cli.Command) error {
|
|
if err := initEmbeddedExtractor(ctx, c); err != nil {
|
|
return err
|
|
}
|
|
|
|
for _, a := range matchedAssetFiles {
|
|
fmt.Println(a.path)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func runViewDo(ctx context.Context, c *cli.Command) error {
|
|
if err := initEmbeddedExtractor(ctx, c); err != nil {
|
|
return err
|
|
}
|
|
|
|
if len(matchedAssetFiles) == 0 {
|
|
return errors.New("no files matched the given pattern")
|
|
} else if len(matchedAssetFiles) > 1 {
|
|
return errors.New("too many files matched the given pattern, try to be more specific")
|
|
}
|
|
|
|
data, err := matchedAssetFiles[0].fs.ReadFile(matchedAssetFiles[0].name)
|
|
if err != nil {
|
|
return fmt.Errorf("%s: %w", matchedAssetFiles[0].path, err)
|
|
}
|
|
|
|
if _, err = os.Stdout.Write(data); err != nil {
|
|
return fmt.Errorf("%s: %w", matchedAssetFiles[0].path, err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func runExtractDo(ctx context.Context, c *cli.Command) error {
|
|
if err := initEmbeddedExtractor(ctx, c); err != nil {
|
|
return err
|
|
}
|
|
|
|
if c.NArg() == 0 {
|
|
return errors.New("a list of pattern of files to extract is mandatory (e.g. '**' for all)")
|
|
}
|
|
|
|
destdir := "."
|
|
|
|
if c.IsSet("destination") {
|
|
destdir = c.String("destination")
|
|
} else if c.Bool("custom") {
|
|
destdir = setting.CustomPath
|
|
fmt.Println("Using app.ini at", setting.CustomConf)
|
|
}
|
|
|
|
fi, err := os.Stat(destdir)
|
|
if errors.Is(err, os.ErrNotExist) {
|
|
// In case Windows users attempt to provide a forward-slash path
|
|
wdestdir := filepath.FromSlash(destdir)
|
|
if wfi, werr := os.Stat(wdestdir); werr == nil {
|
|
destdir = wdestdir
|
|
fi = wfi
|
|
err = nil
|
|
}
|
|
}
|
|
if err != nil {
|
|
return fmt.Errorf("%s: %s", destdir, err)
|
|
} else if !fi.IsDir() {
|
|
return fmt.Errorf("destination %q is not a directory", destdir)
|
|
}
|
|
|
|
fmt.Printf("Extracting to %s:\n", destdir)
|
|
|
|
overwrite := c.Bool("overwrite")
|
|
rename := c.Bool("rename")
|
|
|
|
for _, a := range matchedAssetFiles {
|
|
if err := extractAsset(destdir, a, overwrite, rename); err != nil {
|
|
// Non-fatal error
|
|
fmt.Fprintf(os.Stderr, "%s: %v", a.path, err)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func extractAsset(d string, a assetFile, overwrite, rename bool) error {
|
|
dest := filepath.Join(d, filepath.FromSlash(a.path))
|
|
dir := filepath.Dir(dest)
|
|
|
|
data, err := a.fs.ReadFile(a.name)
|
|
if err != nil {
|
|
return fmt.Errorf("%s: %w", a.path, err)
|
|
}
|
|
|
|
if err := os.MkdirAll(dir, os.ModePerm); err != nil {
|
|
return fmt.Errorf("%s: %w", dir, err)
|
|
}
|
|
|
|
perms := os.ModePerm & 0o666
|
|
|
|
fi, err := os.Lstat(dest)
|
|
if err != nil {
|
|
if !errors.Is(err, os.ErrNotExist) {
|
|
return fmt.Errorf("%s: %w", dest, err)
|
|
}
|
|
} else if !overwrite && !rename {
|
|
fmt.Printf("%s already exists; skipped.\n", dest)
|
|
return nil
|
|
} else if !fi.Mode().IsRegular() {
|
|
return fmt.Errorf("%s already exists, but it's not a regular file", dest)
|
|
} else if rename {
|
|
if err := util.Rename(dest, dest+".bak"); err != nil {
|
|
return fmt.Errorf("error creating backup for %s: %w", dest, err)
|
|
}
|
|
// Attempt to respect file permissions mask (even if user:group will be set anew)
|
|
perms = fi.Mode()
|
|
}
|
|
|
|
file, err := os.OpenFile(dest, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, perms)
|
|
if err != nil {
|
|
return fmt.Errorf("%s: %w", dest, err)
|
|
}
|
|
defer file.Close()
|
|
|
|
if _, err = file.Write(data); err != nil {
|
|
return fmt.Errorf("%s: %w", dest, err)
|
|
}
|
|
|
|
fmt.Println(dest)
|
|
|
|
return nil
|
|
}
|
|
|
|
func collectAssetFilesByPattern(c *cli.Command, globs []glob.Glob, path string, layer *assetfs.Layer) {
|
|
fs := assetfs.Layered(layer)
|
|
files, err := fs.ListAllFiles(".", true)
|
|
if err != nil {
|
|
log.Error("Error listing files in %q: %v", path, err)
|
|
return
|
|
}
|
|
for _, name := range files {
|
|
if path == "public" &&
|
|
strings.HasPrefix(name, "vendor/") &&
|
|
!c.Bool("include-vendored") {
|
|
continue
|
|
}
|
|
matchName := path + "/" + name
|
|
for _, g := range globs {
|
|
if g.Match(matchName) {
|
|
matchedAssetFiles = append(matchedAssetFiles, assetFile{fs: fs, name: name, path: path + "/" + name})
|
|
break
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func compileCollectPatterns(args []string) ([]glob.Glob, error) {
|
|
if len(args) == 0 {
|
|
args = []string{"**"}
|
|
}
|
|
pat := make([]glob.Glob, len(args))
|
|
for i := range args {
|
|
if g, err := glob.Compile(args[i], '/'); err != nil {
|
|
return nil, fmt.Errorf("'%s': Invalid glob pattern: %w", args[i], err)
|
|
} else { //nolint:revive
|
|
pat[i] = g
|
|
}
|
|
}
|
|
return pat, nil
|
|
}
|