Use ErrInvalidArgument in packages

modules/packages/composer/metadata.go

@@ -5,12 +5,12 @@ package composer
 
 import (
 	"archive/zip"
-	"errors"
 	"io"
 	"regexp"
 	"strings"
 
 	"code.gitea.io/gitea/modules/json"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
 
 	"github.com/hashicorp/go-version"
@@ -20,12 +20,9 @@ import (
 const TypeProperty = "composer.type"
 
 var (
-	// ErrMissingComposerFile indicates a missing composer.json file
-	ErrMissingComposerFile = errors.New("composer.json file is missing")
-	// ErrInvalidName indicates an invalid package name
-	ErrInvalidName = errors.New("package name is invalid")
-	// ErrInvalidVersion indicates an invalid package version
-	ErrInvalidVersion = errors.New("package version is invalid")
+	ErrMissingComposerFile = util.SilentWrap{Message: "composer.json file is missing", Err: util.ErrInvalidArgument}
+	ErrInvalidName         = util.SilentWrap{Message: "package name is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidVersion      = util.SilentWrap{Message: "package version is invalid", Err: util.ErrInvalidArgument}
 )
 
 // Package represents a Composer package

modules/packages/helm/metadata.go

@@ -6,25 +6,21 @@ package helm
 import (
 	"archive/tar"
 	"compress/gzip"
-	"errors"
 	"io"
 	"strings"
 
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
 
 	"github.com/hashicorp/go-version"
 	"gopkg.in/yaml.v3"
 )
 
 var (
-	// ErrMissingChartFile indicates a missing Chart.yaml file
-	ErrMissingChartFile = errors.New("Chart.yaml file is missing")
-	// ErrInvalidName indicates an invalid package name
-	ErrInvalidName = errors.New("package name is invalid")
-	// ErrInvalidVersion indicates an invalid package version
-	ErrInvalidVersion = errors.New("package version is invalid")
-	// ErrInvalidChart indicates an invalid chart
-	ErrInvalidChart = errors.New("chart is invalid")
+	ErrMissingChartFile = util.SilentWrap{Message: "Chart.yaml file is missing", Err: util.ErrInvalidArgument}
+	ErrInvalidName      = util.SilentWrap{Message: "package name is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidVersion   = util.SilentWrap{Message: "package version is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidChart     = util.SilentWrap{Message: "chart is invalid", Err: util.ErrInvalidArgument}
 )
 
 // Metadata for a Chart file. This models the structure of a Chart.yaml file.

modules/packages/npm/creator.go

@@ -8,30 +8,25 @@ import (
 	"crypto/sha1"
 	"crypto/sha512"
 	"encoding/base64"
-	"errors"
 	"fmt"
 	"io"
 	"regexp"
 	"strings"
 	"time"
 
 	"code.gitea.io/gitea/modules/json"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
 
 	"github.com/hashicorp/go-version"
 )
 
 var (
-	// ErrInvalidPackage indicates an invalid package
-	ErrInvalidPackage = errors.New("The package is invalid")
-	// ErrInvalidPackageName indicates an invalid name
-	ErrInvalidPackageName = errors.New("The package name is invalid")
-	// ErrInvalidPackageVersion indicates an invalid version
-	ErrInvalidPackageVersion = errors.New("The package version is invalid")
-	// ErrInvalidAttachment indicates a invalid attachment
-	ErrInvalidAttachment = errors.New("The package attachment is invalid")
-	// ErrInvalidIntegrity indicates an integrity validation error
-	ErrInvalidIntegrity = errors.New("Failed to validate integrity")
+	ErrInvalidPackage        = util.SilentWrap{Message: "package is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidPackageName    = util.SilentWrap{Message: "package name is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidPackageVersion = util.SilentWrap{Message: "package version is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidAttachment     = util.SilentWrap{Message: "package attachment is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidIntegrity      = util.SilentWrap{Message: "failed to validate integrity", Err: util.ErrInvalidArgument}
 )
 
 var nameMatch = regexp.MustCompile(`\A((@[^\s\/~'!\(\)\*]+?)[\/])?([^_.][^\s\/~'!\(\)\*]+)\z`)

modules/packages/nuget/metadata.go

@@ -7,27 +7,23 @@ import (
 	"archive/zip"
 	"bytes"
 	"encoding/xml"
-	"errors"
 	"fmt"
 	"io"
 	"path/filepath"
 	"regexp"
 	"strings"
 
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
 
 	"github.com/hashicorp/go-version"
 )
 
 var (
-	// ErrMissingNuspecFile indicates a missing Nuspec file
-	ErrMissingNuspecFile = errors.New("Nuspec file is missing")
-	// ErrNuspecFileTooLarge indicates a Nuspec file which is too large
-	ErrNuspecFileTooLarge = errors.New("Nuspec file is too large")
-	// ErrNuspecInvalidID indicates an invalid id in the Nuspec file
-	ErrNuspecInvalidID = errors.New("Nuspec file contains an invalid id")
-	// ErrNuspecInvalidVersion indicates an invalid version in the Nuspec file
-	ErrNuspecInvalidVersion = errors.New("Nuspec file contains an invalid version")
+	ErrMissingNuspecFile    = util.SilentWrap{Message: "Nuspec file is missing", Err: util.ErrInvalidArgument}
+	ErrNuspecFileTooLarge   = util.SilentWrap{Message: "Nuspec file is too large", Err: util.ErrInvalidArgument}
+	ErrNuspecInvalidID      = util.SilentWrap{Message: "Nuspec file contains an invalid id", Err: util.ErrInvalidArgument}
+	ErrNuspecInvalidVersion = util.SilentWrap{Message: "Nuspec file contains an invalid version", Err: util.ErrInvalidArgument}
 )
 
 // PackageType specifies the package type the metadata describes

modules/packages/nuget/symbol_extractor.go

@@ -7,21 +7,21 @@ import (
 	"archive/zip"
 	"bytes"
 	"encoding/binary"
-	"errors"
 	"fmt"
 	"io"
 	"path"
 	"path/filepath"
 	"strings"
 
 	"code.gitea.io/gitea/modules/packages"
+	"code.gitea.io/gitea/modules/util"
 )
 
 var (
-	ErrMissingPdbFiles       = errors.New("Package does not contain PDB files")
-	ErrInvalidFiles          = errors.New("Package contains invalid files")
-	ErrInvalidPdbMagicNumber = errors.New("Invalid Portable PDB magic number")
-	ErrMissingPdbStream      = errors.New("Missing PDB stream")
+	ErrMissingPdbFiles       = util.SilentWrap{Message: "package does not contain PDB files", Err: util.ErrInvalidArgument}
+	ErrInvalidFiles          = util.SilentWrap{Message: "package contains invalid files", Err: util.ErrInvalidArgument}
+	ErrInvalidPdbMagicNumber = util.SilentWrap{Message: "invalid Portable PDB magic number", Err: util.ErrInvalidArgument}
+	ErrMissingPdbStream      = util.SilentWrap{Message: "missing PDB stream", Err: util.ErrInvalidArgument}
 )
 
 type PortablePdb struct {

modules/packages/pub/metadata.go

@@ -6,22 +6,22 @@ package pub
 import (
 	"archive/tar"
 	"compress/gzip"
-	"errors"
 	"io"
 	"regexp"
 	"strings"
 
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
 
 	"github.com/hashicorp/go-version"
 	"gopkg.in/yaml.v3"
 )
 
 var (
-	ErrMissingPubspecFile  = errors.New("Pubspec file is missing")
-	ErrPubspecFileTooLarge = errors.New("Pubspec file is too large")
-	ErrInvalidName         = errors.New("Package name is invalid")
-	ErrInvalidVersion      = errors.New("Package version is invalid")
+	ErrMissingPubspecFile  = util.SilentWrap{Message: "Pubspec file is missing", Err: util.ErrInvalidArgument}
+	ErrPubspecFileTooLarge = util.SilentWrap{Message: "Pubspec file is too large", Err: util.ErrInvalidArgument}
+	ErrInvalidName         = util.SilentWrap{Message: "Package name is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidVersion      = util.SilentWrap{Message: "Package version is invalid", Err: util.ErrInvalidArgument}
 )
 
 var namePattern = regexp.MustCompile(`\A[a-zA-Z_][a-zA-Z0-9_]*\z`)

modules/packages/rubygems/marshal.go

@@ -6,9 +6,10 @@ package rubygems
 import (
 	"bufio"
 	"bytes"
-	"errors"
 	"io"
 	"reflect"
+
+	"code.gitea.io/gitea/modules/util"
 )
 
 const (
@@ -30,10 +31,8 @@ const (
 )
 
 var (
-	// ErrUnsupportedType indicates an unsupported type
-	ErrUnsupportedType = errors.New("Type is unsupported")
-	// ErrInvalidIntRange indicates an invalid number range
-	ErrInvalidIntRange = errors.New("Number is not in valid range")
+	ErrUnsupportedType = util.SilentWrap{Message: "type is unsupported", Err: util.ErrInvalidArgument}
+	ErrInvalidIntRange = util.SilentWrap{Message: "number is not in valid range", Err: util.ErrInvalidArgument}
 )
 
 // RubyUserMarshal is a Ruby object that has a marshal_load function.

modules/packages/rubygems/metadata.go

@@ -6,23 +6,20 @@ package rubygems
 import (
 	"archive/tar"
 	"compress/gzip"
-	"errors"
 	"io"
 	"regexp"
 	"strings"
 
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/modules/validation"
 
 	"gopkg.in/yaml.v3"
 )
 
 var (
-	// ErrMissingMetadataFile indicates a missing metadata.gz file
-	ErrMissingMetadataFile = errors.New("Metadata file is missing")
-	// ErrInvalidName indicates an invalid id in the metadata.gz file
-	ErrInvalidName = errors.New("Metadata file contains an invalid name")
-	// ErrInvalidVersion indicates an invalid version in the metadata.gz file
-	ErrInvalidVersion = errors.New("Metadata file contains an invalid version")
+	ErrMissingMetadataFile = util.SilentWrap{Message: "metadata.gz file is missing", Err: util.ErrInvalidArgument}
+	ErrInvalidName         = util.SilentWrap{Message: "package name is invalid", Err: util.ErrInvalidArgument}
+	ErrInvalidVersion      = util.SilentWrap{Message: "package version is invalid", Err: util.ErrInvalidArgument}
 )
 
 var versionMatcher = regexp.MustCompile(`\A[0-9]+(?:\.[0-9a-zA-Z]+)*(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?\z`)

routers/api/packages/composer/composer.go

@@ -4,6 +4,7 @@
 package composer
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -200,7 +201,11 @@ func UploadPackage(ctx *context.Context) {
 
 	cp, err := composer_module.ParsePackage(buf, buf.Size())
 	if err != nil {
-		apiError(ctx, http.StatusBadRequest, err)
+		if errors.Is(err, util.ErrInvalidArgument) {
+			apiError(ctx, http.StatusBadRequest, err)
+		} else {
+			apiError(ctx, http.StatusInternalServerError, err)
+		}
 		return
 	}
 

routers/api/packages/helm/helm.go

@@ -4,6 +4,7 @@
 package helm
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -163,7 +164,11 @@ func UploadPackage(ctx *context.Context) {
 
 	metadata, err := helm_module.ParseChartArchive(buf)
 	if err != nil {
-		apiError(ctx, http.StatusBadRequest, err)
+		if errors.Is(err, util.ErrInvalidArgument) {
+			apiError(ctx, http.StatusBadRequest, err)
+		} else {
+			apiError(ctx, http.StatusInternalServerError, err)
+		}
 		return
 	}
 

routers/api/packages/npm/npm.go

@@ -158,7 +158,11 @@ func DownloadPackageFileByName(ctx *context.Context) {
 func UploadPackage(ctx *context.Context) {
 	npmPackage, err := npm_module.ParsePackage(ctx.Req.Body)
 	if err != nil {
-		apiError(ctx, http.StatusBadRequest, err)
+		if errors.Is(err, util.ErrInvalidArgument) {
+			apiError(ctx, http.StatusBadRequest, err)
+		} else {
+			apiError(ctx, http.StatusInternalServerError, err)
+		}
 		return
 	}
 

routers/api/packages/nuget/nuget.go

@@ -411,7 +411,11 @@ func UploadSymbolPackage(ctx *context.Context) {
 
 	pdbs, err := nuget_module.ExtractPortablePdb(buf, buf.Size())
 	if err != nil {
-		apiError(ctx, http.StatusBadRequest, err)
+		if errors.Is(err, util.ErrInvalidArgument) {
+			apiError(ctx, http.StatusBadRequest, err)
+		} else {
+			apiError(ctx, http.StatusInternalServerError, err)
+		}
 		return
 	}
 	defer pdbs.Close()
@@ -507,7 +511,7 @@ func processUploadedFile(ctx *context.Context, expectedType nuget_module.Package
 
 	np, err := nuget_module.ParsePackageMetaData(buf, buf.Size())
 	if err != nil {
-		if err == nuget_module.ErrMissingNuspecFile || err == nuget_module.ErrNuspecFileTooLarge || err == nuget_module.ErrNuspecInvalidID || err == nuget_module.ErrNuspecInvalidVersion {
+		if errors.Is(err, util.ErrInvalidArgument) {
 			apiError(ctx, http.StatusBadRequest, err)
 		} else {
 			apiError(ctx, http.StatusInternalServerError, err)

routers/api/packages/pub/pub.go

@@ -4,6 +4,7 @@
 package pub
 
 import (
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -19,6 +20,7 @@ import (
 	packages_module "code.gitea.io/gitea/modules/packages"
 	pub_module "code.gitea.io/gitea/modules/packages/pub"
 	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/routers/api/packages/helper"
 	packages_service "code.gitea.io/gitea/services/packages"
 )
@@ -173,7 +175,11 @@ func UploadPackageFile(ctx *context.Context) {
 
 	pck, err := pub_module.ParsePackage(buf)
 	if err != nil {
-		apiError(ctx, http.StatusInternalServerError, err)
+		if errors.Is(err, util.ErrInvalidArgument) {
+			apiError(ctx, http.StatusBadRequest, err)
+		} else {
+			apiError(ctx, http.StatusInternalServerError, err)
+		}
 		return
 	}
 

routers/api/packages/rubygems/rubygems.go

@@ -6,6 +6,7 @@ package rubygems
 import (
 	"compress/gzip"
 	"compress/zlib"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -217,7 +218,11 @@ func UploadPackageFile(ctx *context.Context) {
 
 	rp, err := rubygems_module.ParsePackageMetaData(buf)
 	if err != nil {
-		apiError(ctx, http.StatusInternalServerError, err)
+		if errors.Is(err, util.ErrInvalidArgument) {
+			apiError(ctx, http.StatusBadRequest, err)
+		} else {
+			apiError(ctx, http.StatusInternalServerError, err)
+		}
 		return
 	}
 	if _, err := buf.Seek(0, io.SeekStart); err != nil {