Merge branch 'main' into lunny/catfile_batch_refactor

Author: lunny

cmd/admin_auth_smtp.go

@@ -39,12 +39,10 @@ func smtpCLIFlags() []cli.Flag {
 		&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",
@@ -54,7 +52,6 @@ func smtpCLIFlags() []cli.Flag {
 		&cli.BoolFlag{
 			Name:  "disable-helo",
 			Usage: "Disable SMTP helo.",
-			Value: true,
 		},
 		&cli.StringFlag{
 			Name:  "allowed-domains",
@@ -64,7 +61,6 @@ func smtpCLIFlags() []cli.Flag {
 		&cli.BoolFlag{
 			Name:  "skip-local-2fa",
 			Usage: "Skip 2FA to log on.",
-			Value: true,
 		},
 		&cli.BoolFlag{
 			Name:  "active",

cmd/admin_auth_smtp_test.go

@@ -60,10 +60,8 @@ func TestAddSMTP(t *testing.T) {
 					Auth: "PLAIN",
 					Host: "localhost",
 					Port: 25,
-					// ForceSMTPS: true,
-					// SkipVerify: true,
 				},
-				TwoFactorPolicy: "skip",
+				TwoFactorPolicy: "",
 			},
 		},
 		{
@@ -73,12 +71,12 @@ func TestAddSMTP(t *testing.T) {
 				"--host", "localhost",
 				"--port", "25",
 				"--auth-type", "LOGIN",
-				"--force-smtps=false",
-				"--skip-verify=false",
+				"--force-smtps",
+				"--skip-verify",
 				"--helo-hostname", "example.com",
-				"--disable-helo=false",
+				"--disable-helo=true",
 				"--allowed-domains", "example.com,example.org",
-				"--skip-local-2fa=false",
+				"--skip-local-2fa",
 				"--active=false",
 			},
 			source: &auth_model.Source{
@@ -89,13 +87,13 @@ func TestAddSMTP(t *testing.T) {
 					Auth:           "LOGIN",
 					Host:           "localhost",
 					Port:           25,
-					ForceSMTPS:     false,
-					SkipVerify:     false,
+					ForceSMTPS:     true,
+					SkipVerify:     true,
 					HeloHostname:   "example.com",
-					DisableHelo:    false,
+					DisableHelo:    true,
 					AllowedDomains: "example.com,example.org",
 				},
-				TwoFactorPolicy: "",
+				TwoFactorPolicy: "skip",
 			},
 		},
 	}
@@ -157,13 +155,10 @@ func TestUpdateSMTP(t *testing.T) {
 				Name:     "old name",
 				IsActive: true,
 				Cfg: &smtp.Source{
-					Auth:       "PLAIN",
-					Host:       "old host",
-					Port:       26,
-					ForceSMTPS: true,
-					SkipVerify: true,
+					Auth: "PLAIN",
+					Host: "old host",
+					Port: 26,
 				},
-				TwoFactorPolicy: "",
 			},
 			args: []string{
 				"--id", "1",
@@ -177,13 +172,10 @@ func TestUpdateSMTP(t *testing.T) {
 				Name:     "test",
 				IsActive: true,
 				Cfg: &smtp.Source{
-					Auth:       "PLAIN",
-					Host:       "localhost",
-					Port:       25,
-					ForceSMTPS: true,
-					SkipVerify: true,
+					Auth: "PLAIN",
+					Host: "localhost",
+					Port: 25,
 				},
-				TwoFactorPolicy: "skip",
 			},
 		},
 		{
@@ -197,10 +189,7 @@ func TestUpdateSMTP(t *testing.T) {
 					Auth:           "PLAIN",
 					Host:           "old host",
 					Port:           26,
-					ForceSMTPS:     true,
-					SkipVerify:     true,
 					HeloHostname:   "old.example.com",
-					DisableHelo:    false,
 					AllowedDomains: "old.example.com",
 				},
 				TwoFactorPolicy: "",
@@ -211,12 +200,12 @@ func TestUpdateSMTP(t *testing.T) {
 				"--host", "localhost",
 				"--port", "25",
 				"--auth-type", "LOGIN",
-				"--force-smtps=false",
-				"--skip-verify=false",
+				"--force-smtps",
+				"--skip-verify",
 				"--helo-hostname", "example.com",
-				"--disable-helo=true",
+				"--disable-helo",
 				"--allowed-domains", "example.com,example.org",
-				"--skip-local-2fa=true",
+				"--skip-local-2fa",
 				"--active=false",
 			},
 			authSource: &auth_model.Source{
@@ -228,8 +217,8 @@ func TestUpdateSMTP(t *testing.T) {
 					Auth:           "LOGIN",
 					Host:           "localhost",
 					Port:           25,
-					ForceSMTPS:     false,
-					SkipVerify:     false,
+					ForceSMTPS:     true,
+					SkipVerify:     true,
 					HeloHostname:   "example.com",
 					DisableHelo:    true,
 					AllowedDomains: "example.com,example.org",
@@ -252,11 +241,8 @@ func TestUpdateSMTP(t *testing.T) {
 						Name:     "test",
 						IsActive: true,
 						Cfg: &smtp.Source{
-							Auth:       "PLAIN",
-							SkipVerify: true,
-							ForceSMTPS: true,
+							Auth: "PLAIN",
 						},
-						TwoFactorPolicy: "skip",
 					}, nil
 				},
 

cmd/cmd.go

@@ -132,3 +132,13 @@ func PrepareConsoleLoggerLevel(defaultLevel log.Level) func(context.Context, *cl
 		return ctx, nil
 	}
 }
+
+func isValidDefaultSubCommand(cmd *cli.Command) (string, bool) {
+	// Dirty patch for urfave/cli's strange design.
+	// "./gitea bad-cmd" should not start the web server.
+	rootArgs := cmd.Root().Args().Slice()
+	if len(rootArgs) != 0 && rootArgs[0] != cmd.Name {
+		return rootArgs[0], false
+	}
+	return "", true
+}

cmd/cmd_test.go

@@ -0,0 +1,38 @@
+// Copyright 2025 The Gitea Authors. All rights reserved.
+// SPDX-License-Identifier: MIT
+
+package cmd
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/urfave/cli/v3"
+)
+
+func TestDefaultCommand(t *testing.T) {
+	test := func(t *testing.T, args []string, expectedRetName string, expectedRetValid bool) {
+		called := false
+		cmd := &cli.Command{
+			DefaultCommand: "test",
+			Commands: []*cli.Command{
+				{
+					Name: "test",
+					Action: func(ctx context.Context, command *cli.Command) error {
+						retName, retValid := isValidDefaultSubCommand(command)
+						assert.Equal(t, expectedRetName, retName)
+						assert.Equal(t, expectedRetValid, retValid)
+						called = true
+						return nil
+					},
+				},
+			},
+		}
+		assert.NoError(t, cmd.Run(t.Context(), args))
+		assert.True(t, called)
+	}
+	test(t, []string{"./gitea"}, "", true)
+	test(t, []string{"./gitea", "test"}, "", true)
+	test(t, []string{"./gitea", "other"}, "other", false)
+}

cmd/main.go

@@ -152,6 +152,8 @@ func NewMainApp(appVer AppVersion) *cli.Command {
 		CmdDocs,
 	}
 
+	// TODO: we should eventually drop the default command,
+	// but not sure whether it would break Windows users who used to double-click the EXE to run.
 	app.DefaultCommand = CmdWeb.Name
 
 	app.Flags = append(app.Flags, cli.VersionFlag)

cmd/manager_logging.go

@@ -119,7 +119,6 @@ var (
 								Name:    "rotate",
 								Aliases: []string{"r"},
 								Usage:   "Rotate logs",
-								Value:   true,
 							},
 							&cli.Int64Flag{
 								Name:    "max-size",
@@ -130,7 +129,6 @@ var (
 								Name:    "daily",
 								Aliases: []string{"d"},
 								Usage:   "Rotate logs daily",
-								Value:   true,
 							},
 							&cli.IntFlag{
 								Name:    "max-days",
@@ -141,7 +139,6 @@ var (
 								Name:    "compress",
 								Aliases: []string{"z"},
 								Usage:   "Compress rotated logs",
-								Value:   true,
 							},
 							&cli.IntFlag{
 								Name:    "compression-level",

cmd/web.go

@@ -251,6 +251,10 @@ func runWeb(_ context.Context, cmd *cli.Command) error {
 		}
 	}()
 
+	if subCmdName, valid := isValidDefaultSubCommand(cmd); !valid {
+		return fmt.Errorf("unknown command: %s", subCmdName)
+	}
+
 	managerCtx, cancel := context.WithCancel(context.Background())
 	graceful.InitManager(managerCtx)
 	defer cancel()

models/packages/package_property.go

@@ -92,8 +92,8 @@ func DeletePropertyByID(ctx context.Context, propertyID int64) error {
 	return err
 }
 
-// DeletePropertyByName deletes properties by name
-func DeletePropertyByName(ctx context.Context, refType PropertyType, refID int64, name string) error {
+// DeletePropertiesByName deletes properties by name
+func DeletePropertiesByName(ctx context.Context, refType PropertyType, refID int64, name string) error {
 	_, err := db.GetEngine(ctx).Where("ref_type = ? AND ref_id = ? AND name = ?", refType, refID, name).Delete(&PackageProperty{})
 	return err
 }

modules/packages/content_store.go

@@ -28,8 +28,7 @@ func NewContentStore() *ContentStore {
 	return contentStore
 }
 
-// Get gets a package blob
-func (s *ContentStore) Get(key BlobHash256Key) (storage.Object, error) {
+func (s *ContentStore) OpenBlob(key BlobHash256Key) (storage.Object, error) {
 	return s.store.Open(KeyToRelativePath(key))
 }
 

routers/api/packages/container/manifest.go

@@ -23,6 +23,7 @@ import (
 	"code.gitea.io/gitea/modules/util"
 	notify_service "code.gitea.io/gitea/services/notify"
 	packages_service "code.gitea.io/gitea/services/packages"
+	container_service "code.gitea.io/gitea/services/packages/container"
 
 	"github.com/opencontainers/go-digest"
 	oci "github.com/opencontainers/image-spec/specs-go/v1"
@@ -84,12 +85,11 @@ func processOciImageManifest(ctx context.Context, mci *manifestCreationInfo, buf
 	manifestDigest := ""
 
 	err := func() error {
-		var manifest oci.Manifest
-		if err := json.NewDecoder(buf).Decode(&manifest); err != nil {
+		manifest, configDescriptor, metadata, err := container_service.ParseManifestMetadata(ctx, buf, mci.Owner.ID, mci.Image)
+		if err != nil {
 			return err
 		}
-
-		if _, err := buf.Seek(0, io.SeekStart); err != nil {
+		if _, err = buf.Seek(0, io.SeekStart); err != nil {
 			return err
 		}
 
@@ -99,28 +99,7 @@ func processOciImageManifest(ctx context.Context, mci *manifestCreationInfo, buf
 		}
 		defer committer.Close()
 
-		configDescriptor, err := container_model.GetContainerBlob(ctx, &container_model.BlobSearchOptions{
-			OwnerID: mci.Owner.ID,
-			Image:   mci.Image,
-			Digest:  string(manifest.Config.Digest),
-		})
-		if err != nil {
-			return err
-		}
-
-		configReader, err := packages_module.NewContentStore().Get(packages_module.BlobHash256Key(configDescriptor.Blob.HashSHA256))
-		if err != nil {
-			return err
-		}
-		defer configReader.Close()
-
-		metadata, err := container_module.ParseImageConfig(manifest.Config.MediaType, configReader)
-		if err != nil {
-			return err
-		}
-
 		blobReferences := make([]*blobReference, 0, 1+len(manifest.Layers))
-
 		blobReferences = append(blobReferences, &blobReference{
 			Digest:       manifest.Config.Digest,
 			MediaType:    manifest.Config.MediaType,
@@ -388,19 +367,16 @@ func createPackageAndVersion(ctx context.Context, mci *manifestCreationInfo, met
 			return nil, err
 		}
 	} else {
-		props, err := packages_model.GetPropertiesByName(ctx, packages_model.PropertyTypeVersion, pv.ID, container_module.PropertyManifestTagged)
-		if err != nil {
+		if err = packages_model.DeletePropertiesByName(ctx, packages_model.PropertyTypeVersion, pv.ID, container_module.PropertyManifestTagged); err != nil {
 			return nil, err
 		}
-		for _, prop := range props {
-			if err = packages_model.DeletePropertyByID(ctx, prop.ID); err != nil {
-				return nil, err
-			}
-		}
 	}
 
+	if err = packages_model.DeletePropertiesByName(ctx, packages_model.PropertyTypeVersion, pv.ID, container_module.PropertyManifestReference); err != nil {
+		return nil, err
+	}
 	for _, manifest := range metadata.Manifests {
-		if err = packages_model.InsertOrUpdateProperty(ctx, packages_model.PropertyTypeVersion, pv.ID, container_module.PropertyManifestReference, manifest.Digest); err != nil {
+		if _, err = packages_model.InsertProperty(ctx, packages_model.PropertyTypeVersion, pv.ID, container_module.PropertyManifestReference, manifest.Digest); err != nil {
 			return nil, err
 		}
 	}