 55d8910255
			
		
	
	
	55d8910255
	
	
	
		
			
			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>
		
			
				
	
	
		
			205 lines
		
	
	
	
		
			4.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			205 lines
		
	
	
	
		
			4.4 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2023 The Gitea Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package cmd
 | |
| 
 | |
| import (
 | |
| 	"context"
 | |
| 	"errors"
 | |
| 	"strings"
 | |
| 
 | |
| 	auth_model "forgejo.org/models/auth"
 | |
| 	"forgejo.org/modules/util"
 | |
| 	"forgejo.org/services/auth/source/smtp"
 | |
| 
 | |
| 	"github.com/urfave/cli/v3"
 | |
| )
 | |
| 
 | |
| func smtpCLIFlags() []cli.Flag {
 | |
| 	return []cli.Flag{
 | |
| 		&cli.StringFlag{
 | |
| 			Name:  "name",
 | |
| 			Value: "",
 | |
| 			Usage: "Application Name",
 | |
| 		},
 | |
| 		&cli.StringFlag{
 | |
| 			Name:  "auth-type",
 | |
| 			Value: "PLAIN",
 | |
| 			Usage: "SMTP Authentication Type (PLAIN/LOGIN/CRAM-MD5) default PLAIN",
 | |
| 		},
 | |
| 		&cli.StringFlag{
 | |
| 			Name:  "host",
 | |
| 			Value: "",
 | |
| 			Usage: "SMTP Host",
 | |
| 		},
 | |
| 		&cli.IntFlag{
 | |
| 			Name:  "port",
 | |
| 			Usage: "SMTP Port",
 | |
| 		},
 | |
| 		&cli.BoolFlag{
 | |
| 			Name:  "force-smtps",
 | |
| 			Usage: "SMTPS is always used on port 465. Set this to force SMTPS on other ports.",
 | |
| 			Value: true,
 | |
| 		},
 | |
| 		&cli.BoolFlag{
 | |
| 			Name:  "skip-verify",
 | |
| 			Usage: "Skip TLS verify.",
 | |
| 			Value: true,
 | |
| 		},
 | |
| 		&cli.StringFlag{
 | |
| 			Name:  "helo-hostname",
 | |
| 			Value: "",
 | |
| 			Usage: "Hostname sent with HELO. Leave blank to send current hostname",
 | |
| 		},
 | |
| 		&cli.BoolFlag{
 | |
| 			Name:  "disable-helo",
 | |
| 			Usage: "Disable SMTP helo.",
 | |
| 			Value: true,
 | |
| 		},
 | |
| 		&cli.StringFlag{
 | |
| 			Name:  "allowed-domains",
 | |
| 			Value: "",
 | |
| 			Usage: "Leave empty to allow all domains. Separate multiple domains with a comma (',')",
 | |
| 		},
 | |
| 		&cli.BoolFlag{
 | |
| 			Name:  "skip-local-2fa",
 | |
| 			Usage: "Skip 2FA to log on.",
 | |
| 			Value: true,
 | |
| 		},
 | |
| 		&cli.BoolFlag{
 | |
| 			Name:  "active",
 | |
| 			Usage: "This Authentication Source is Activated.",
 | |
| 			Value: true,
 | |
| 		},
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func microcmdAuthAddSMTP() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:   "add-smtp",
 | |
| 		Usage:  "Add new SMTP authentication source",
 | |
| 		Action: runAddSMTP,
 | |
| 		Flags:  smtpCLIFlags(),
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func microcmdAuthUpdateSMTP() *cli.Command {
 | |
| 	return &cli.Command{
 | |
| 		Name:   "update-smtp",
 | |
| 		Usage:  "Update existing SMTP authentication source",
 | |
| 		Action: runUpdateSMTP,
 | |
| 		Flags:  append(smtpCLIFlags()[:1], append([]cli.Flag{idFlag()}, smtpCLIFlags()[1:]...)...),
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func parseSMTPConfig(c *cli.Command, conf *smtp.Source) error {
 | |
| 	if c.IsSet("auth-type") {
 | |
| 		conf.Auth = c.String("auth-type")
 | |
| 		validAuthTypes := []string{"PLAIN", "LOGIN", "CRAM-MD5"}
 | |
| 		if !util.SliceContainsString(validAuthTypes, strings.ToUpper(c.String("auth-type"))) {
 | |
| 			return errors.New("Auth must be one of PLAIN/LOGIN/CRAM-MD5")
 | |
| 		}
 | |
| 		conf.Auth = c.String("auth-type")
 | |
| 	}
 | |
| 	if c.IsSet("host") {
 | |
| 		conf.Host = c.String("host")
 | |
| 	}
 | |
| 	if c.IsSet("port") {
 | |
| 		conf.Port = c.Int("port")
 | |
| 	}
 | |
| 	if c.IsSet("allowed-domains") {
 | |
| 		conf.AllowedDomains = c.String("allowed-domains")
 | |
| 	}
 | |
| 	if c.IsSet("force-smtps") {
 | |
| 		conf.ForceSMTPS = c.Bool("force-smtps")
 | |
| 	}
 | |
| 	if c.IsSet("skip-verify") {
 | |
| 		conf.SkipVerify = c.Bool("skip-verify")
 | |
| 	}
 | |
| 	if c.IsSet("helo-hostname") {
 | |
| 		conf.HeloHostname = c.String("helo-hostname")
 | |
| 	}
 | |
| 	if c.IsSet("disable-helo") {
 | |
| 		conf.DisableHelo = c.Bool("disable-helo")
 | |
| 	}
 | |
| 	if c.IsSet("skip-local-2fa") {
 | |
| 		conf.SkipLocalTwoFA = c.Bool("skip-local-2fa")
 | |
| 	}
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func runAddSMTP(ctx context.Context, c *cli.Command) error {
 | |
| 	ctx, cancel := installSignals(ctx)
 | |
| 	defer cancel()
 | |
| 
 | |
| 	if err := initDB(ctx); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	if !c.IsSet("name") || len(c.String("name")) == 0 {
 | |
| 		return errors.New("name must be set")
 | |
| 	}
 | |
| 	if !c.IsSet("host") || len(c.String("host")) == 0 {
 | |
| 		return errors.New("host must be set")
 | |
| 	}
 | |
| 	if !c.IsSet("port") {
 | |
| 		return errors.New("port must be set")
 | |
| 	}
 | |
| 	active := true
 | |
| 	if c.IsSet("active") {
 | |
| 		active = c.Bool("active")
 | |
| 	}
 | |
| 
 | |
| 	var smtpConfig smtp.Source
 | |
| 	if err := parseSMTPConfig(c, &smtpConfig); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	// If not set default to PLAIN
 | |
| 	if len(smtpConfig.Auth) == 0 {
 | |
| 		smtpConfig.Auth = "PLAIN"
 | |
| 	}
 | |
| 
 | |
| 	return auth_model.CreateSource(ctx, &auth_model.Source{
 | |
| 		Type:     auth_model.SMTP,
 | |
| 		Name:     c.String("name"),
 | |
| 		IsActive: active,
 | |
| 		Cfg:      &smtpConfig,
 | |
| 	})
 | |
| }
 | |
| 
 | |
| func runUpdateSMTP(ctx context.Context, c *cli.Command) error {
 | |
| 	if !c.IsSet("id") {
 | |
| 		return errors.New("--id flag is missing")
 | |
| 	}
 | |
| 
 | |
| 	ctx, cancel := installSignals(ctx)
 | |
| 	defer cancel()
 | |
| 
 | |
| 	if err := initDB(ctx); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	source, err := auth_model.GetSourceByID(ctx, c.Int64("id"))
 | |
| 	if err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	smtpConfig := source.Cfg.(*smtp.Source)
 | |
| 
 | |
| 	if err := parseSMTPConfig(c, smtpConfig); err != nil {
 | |
| 		return err
 | |
| 	}
 | |
| 
 | |
| 	if c.IsSet("name") {
 | |
| 		source.Name = c.String("name")
 | |
| 	}
 | |
| 
 | |
| 	if c.IsSet("active") {
 | |
| 		source.IsActive = c.Bool("active")
 | |
| 	}
 | |
| 
 | |
| 	source.Cfg = smtpConfig
 | |
| 
 | |
| 	return auth_model.UpdateSource(ctx, source)
 | |
| }
 |