mirror of
https://codeberg.org/forgejo/forgejo
synced 2025-10-18 22:50:36 +02:00
Fixes #9433. ``` $ ./gitea admin user create --username blah --must-change-password false Hint: boolean false must be specified as a single arg, eg. '--restricted=false', not '--restricted false' Command error: unexpected arguments: false ``` **Breaking**: CLI sub-commands that only have flags would previously ignore anything that might be considered an "extra" argument, and would proceed without any errors. I've manually tested this change on the single `admin user create` command with positive (ensuring cmd still works) and negative (ensuring errors are reported) test cases. I've attempted to ensure the change is applied only to commands which don't use the CLI `Args()` and avoided touching them, including: - `admin user must-change-password` takes a list of users - `doctor recreate-tables` takes a list of tables - `embedded [list/view/extract]` use a pattern of resources to operate upon - git repo hook subcommands, and the ssh serv command, use arguments and have been omitted from the change ## 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. Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/9458 Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Mathieu Fenniak <mathieu@fenniak.net> Co-committed-by: Mathieu Fenniak <mathieu@fenniak.net>
166 lines
4.4 KiB
Go
166 lines
4.4 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
// Package cmd provides subcommands to the gitea binary - such as "web" or
|
|
// "admin".
|
|
package cmd
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"os/signal"
|
|
"slices"
|
|
"strings"
|
|
"syscall"
|
|
|
|
"forgejo.org/models/db"
|
|
"forgejo.org/modules/log"
|
|
"forgejo.org/modules/setting"
|
|
"forgejo.org/modules/util"
|
|
|
|
"github.com/urfave/cli/v3"
|
|
)
|
|
|
|
// argsSet checks that all the required arguments are set. args is a list of
|
|
// arguments that must be set in the passed Context.
|
|
func argsSet(c *cli.Command, args ...string) error {
|
|
for _, a := range args {
|
|
if !c.IsSet(a) {
|
|
return errors.New(a + " is not set")
|
|
}
|
|
|
|
if s, ok := c.Value(a).(string); ok {
|
|
if util.IsEmptyString(s) {
|
|
return errors.New(a + " is required")
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// When a CLI command is intended to be used only with flags and no other arbitrary args, noDanglingArgs will validate
|
|
// the end-user's usage.
|
|
func noDanglingArgs(ctx context.Context, c *cli.Command) (context.Context, error) {
|
|
if c.Args().Len() != 0 {
|
|
args := c.Args().Slice()
|
|
if slices.Contains(args, "false") {
|
|
println("Hint: boolean false must be specified as a single arg, eg. '--restricted=false', not '--restricted false'")
|
|
}
|
|
return nil, fmt.Errorf("unexpected arguments: %s", strings.Join(c.Args().Slice(), ", "))
|
|
}
|
|
return nil, nil
|
|
}
|
|
|
|
// confirm waits for user input which confirms an action
|
|
func confirm() (bool, error) {
|
|
var response string
|
|
|
|
_, err := fmt.Scanln(&response)
|
|
if err != nil {
|
|
return false, err
|
|
}
|
|
|
|
switch strings.ToLower(response) {
|
|
case "y", "yes":
|
|
return true, nil
|
|
case "n", "no":
|
|
return false, nil
|
|
default:
|
|
return false, errors.New(response + " isn't a correct confirmation string")
|
|
}
|
|
}
|
|
|
|
func initDB(ctx context.Context) error {
|
|
setting.MustInstalled()
|
|
setting.LoadDBSetting()
|
|
setting.InitSQLLoggersForCli(log.INFO)
|
|
|
|
if setting.Database.Type == "" {
|
|
log.Fatal(`Database settings are missing from the configuration file: %q.
|
|
Ensure you are running in the correct environment or set the correct configuration file with -c.
|
|
If this is the intended configuration file complete the [database] section.`, setting.CustomConf)
|
|
}
|
|
if err := db.InitEngine(ctx); err != nil {
|
|
return fmt.Errorf("unable to initialize the database using the configuration in %q. Error: %w", setting.CustomConf, err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func installSignals(ctx context.Context) (context.Context, context.CancelFunc) {
|
|
ctx, cancel := context.WithCancel(ctx)
|
|
go func() {
|
|
// install notify
|
|
signalChannel := make(chan os.Signal, 1)
|
|
|
|
signal.Notify(
|
|
signalChannel,
|
|
syscall.SIGINT,
|
|
syscall.SIGTERM,
|
|
)
|
|
select {
|
|
case <-signalChannel:
|
|
case <-ctx.Done():
|
|
}
|
|
cancel()
|
|
signal.Reset()
|
|
}()
|
|
|
|
return ctx, cancel
|
|
}
|
|
|
|
func setupConsoleLogger(level log.Level, colorize bool, out io.Writer) {
|
|
if out != os.Stdout && out != os.Stderr {
|
|
panic("setupConsoleLogger can only be used with os.Stdout or os.Stderr")
|
|
}
|
|
|
|
writeMode := log.WriterMode{
|
|
Level: level,
|
|
Colorize: colorize,
|
|
WriterOption: log.WriterConsoleOption{Stderr: out == os.Stderr},
|
|
}
|
|
writer := log.NewEventWriterConsole("console-default", writeMode)
|
|
log.GetManager().GetLogger(log.DEFAULT).ReplaceAllWriters(writer)
|
|
}
|
|
|
|
func globalBool(c *cli.Command, name string) bool {
|
|
for _, ctx := range c.Lineage() {
|
|
if ctx.Bool(name) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// PrepareConsoleLoggerLevel by default, use INFO level for console logger, but some sub-commands (for git/ssh protocol) shouldn't output any log to stdout.
|
|
// Any log appears in git stdout pipe will break the git protocol, eg: client can't push and hangs forever.
|
|
func PrepareConsoleLoggerLevel(defaultLevel log.Level) func(ctx context.Context, cli *cli.Command) (context.Context, error) {
|
|
return func(ctx context.Context, cli *cli.Command) (context.Context, error) {
|
|
level := defaultLevel
|
|
if globalBool(cli, "quiet") {
|
|
level = log.FATAL
|
|
}
|
|
if globalBool(cli, "debug") || globalBool(cli, "verbose") {
|
|
level = log.TRACE
|
|
}
|
|
log.SetConsoleLogger(log.DEFAULT, "console-default", level)
|
|
return ctx, nil
|
|
}
|
|
}
|
|
|
|
func multipleBefore(beforeFuncs ...cli.BeforeFunc) cli.BeforeFunc {
|
|
return func(ctx context.Context, cli *cli.Command) (context.Context, error) {
|
|
for _, beforeFunc := range beforeFuncs {
|
|
bctx, err := beforeFunc(ctx, cli)
|
|
if err != nil {
|
|
return bctx, err
|
|
}
|
|
if bctx != nil {
|
|
ctx = bctx
|
|
}
|
|
}
|
|
return ctx, nil
|
|
}
|
|
}
|