fix: Integer overflows and use errors.New where relevant

Signed-off-by: jay-dee7 <[email protected]>
containerish · Aug 31, 2024 · 1ceaa91 · 1ceaa91
1 parent bf620f2
commit 1ceaa91
Show file tree

Hide file tree

Showing 17 changed files with 98 additions and 80 deletions.
diff --git a/cmd/extras/digest.go b/cmd/extras/digest.go
@@ -2,7 +2,7 @@ package extras
 
 import (
 	"encoding/json"
-	"fmt"
+	"errors"
 	"strings"
 
 	"github.com/fatih/color"
@@ -37,7 +37,7 @@ func newDigestCommand() *cli.Command {
 func generateDigest(ctx *cli.Context) error {
 	input := ctx.String("input")
 	if input == "" {
-		return fmt.Errorf(color.RedString("input is empty"))
+		return errors.New(color.RedString("input is empty"))
 	}
 
 	digestType := strings.ToUpper(ctx.String("type"))
@@ -49,7 +49,7 @@ func generateDigest(ctx *cli.Context) error {
 
 	manifestContent, err := json.Marshal([]byte(input))
 	if err != nil {
-		return fmt.Errorf(color.RedString("generateDigest: ERR_MARSHAL_INDENT: %s", err))
+		return errors.New(color.RedString("generateDigest: ERR_MARSHAL_INDENT: %s", err))
 	}
 
 	var inputDigest oci_digest.Digest

diff --git a/cmd/registry/registry.go b/cmd/registry/registry.go
@@ -1,7 +1,12 @@
 package registry
 
 import (
-	"fmt"
+	"errors"
+
+	"github.com/fatih/color"
+	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
+	"github.com/urfave/cli/v2"
 
 	user_api "github.com/containerish/OpenRegistry/api/users"
 	"github.com/containerish/OpenRegistry/auth"
@@ -23,10 +28,6 @@ import (
 	"github.com/containerish/OpenRegistry/store/v1/webauthn"
 	"github.com/containerish/OpenRegistry/telemetry"
 	"github.com/containerish/OpenRegistry/telemetry/otel"
-	"github.com/fatih/color"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-	"github.com/urfave/cli/v2"
 )
 
 // const CategoryOpenRegistry = "OpenRegistry"
@@ -62,7 +63,7 @@ func RunRegistryServer(ctx *cli.Context) error {
 	configPath := ctx.String("config")
 	cfg, err := config.ReadYamlConfig(configPath)
 	if err != nil {
-		return fmt.Errorf(color.RedString("error reading cfg file: %s", err.Error()))
+		return errors.New(color.RedString("error reading cfg file: %s", err.Error()))
 	}
 
 	logger := telemetry.ZeroLogger(cfg.Environment, cfg.Telemetry)
@@ -107,7 +108,7 @@ func RunRegistryServer(ctx *cli.Context) error {
 	}
 
 	if err = buildHTTPServer(cfg, baseRouter); err != nil {
-		return fmt.Errorf(color.RedString("error initialising OpenRegistry Server: %s", err))
+		return errors.New(color.RedString("error initialising OpenRegistry Server: %s", err))
 	}
 
 	return nil

diff --git a/config/config.go b/config/config.go
@@ -2,6 +2,7 @@ package config
 
 import (
 	"crypto/rsa"
+	"errors"
 	"fmt"
 	"strings"
 	"time"
@@ -259,7 +260,7 @@ func translateError(err error, trans ut.Translator) error {
 			return err
 		}
 		for _, e := range validatorErrs {
-			translatedErr = multierror.Append(translatedErr, fmt.Errorf(e.Translate(trans)))
+			translatedErr = multierror.Append(translatedErr, errors.New(e.Translate(trans)))
 		}
 
 		return translatedErr

diff --git a/dfs/dfs.go b/dfs/dfs.go
@@ -5,6 +5,7 @@ import (
 	"io"
 
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
+
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/store/v1/types"
 )
@@ -18,7 +19,7 @@ type DFS interface {
 		uploadId string,
 		key string,
 		digest string,
-		partNumber int64,
+		partNumber int32,
 		content io.ReadSeeker,
 		contentLength int64,
 	) (s3types.CompletedPart, error)

diff --git a/dfs/filebase/filebase.go b/dfs/filebase/filebase.go
@@ -10,11 +10,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
+	oci_digest "github.com/opencontainers/go-digest"
+
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
 	"github.com/containerish/OpenRegistry/store/v1/types"
 	core_types "github.com/containerish/OpenRegistry/types"
-	oci_digest "github.com/opencontainers/go-digest"
 )
 
 type filebase struct {
@@ -64,7 +65,7 @@ func (fb *filebase) UploadPart(
 	uploadId string,
 	layerKey string,
 	digest string,
-	partNumber int64,
+	partNumber int32,
 	content io.ReadSeeker,
 	contentLength int64,
 ) (s3types.CompletedPart, error) {
@@ -78,7 +79,7 @@ func (fb *filebase) UploadPart(
 		ChecksumSHA256:    aws.String(digest),
 		ContentLength:     &contentLength,
 		Key:               &layerKey,
-		PartNumber:        aws.Int32(int32(partNumber)),
+		PartNumber:        aws.Int32(partNumber),
 		UploadId:          &uploadId,
 	}
 
@@ -208,12 +209,15 @@ func (fb *filebase) Download(ctx context.Context, path string) (io.ReadCloser, e
 
 	return resp.Body, nil
 }
+
 func (fb *filebase) DownloadDir(dfsLink, dir string) error {
 	return nil
 }
+
 func (fb *filebase) List(path string) ([]*types.Metadata, error) {
 	return nil, nil
 }
+
 func (fb *filebase) AddImage(ns string, mf, l map[string][]byte) (string, error) {
 	return "", nil
 }

diff --git a/dfs/ipfs/p2p/p2p.go b/dfs/ipfs/p2p/p2p.go
@@ -13,15 +13,16 @@ import (
 	hexmap "github.com/alphadose/haxmap"
 	"github.com/aws/aws-sdk-go-v2/aws"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/containerish/OpenRegistry/config"
-	"github.com/containerish/OpenRegistry/dfs"
-	"github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/fatih/color"
 	"github.com/google/uuid"
 	boxo_files "github.com/ipfs/boxo/files"
 	boxo_path "github.com/ipfs/boxo/path"
 	"github.com/ipfs/kubo/client/rpc"
 	"github.com/multiformats/go-multiaddr"
+
+	"github.com/containerish/OpenRegistry/config"
+	"github.com/containerish/OpenRegistry/dfs"
+	"github.com/containerish/OpenRegistry/store/v1/types"
 )
 
 const (
@@ -112,7 +113,7 @@ func (ipfs *ipfsP2p) UploadPart(
 	uploadId string,
 	layerKey string,
 	digest string,
-	partNumber int64,
+	partNumber int32,
 	content io.ReadSeeker,
 	contentLength int64,
 ) (s3types.CompletedPart, error) {
@@ -151,7 +152,7 @@ func (ipfs *ipfsP2p) UploadPart(
 
 	return s3types.CompletedPart{
 		ChecksumSHA256: &digest,
-		PartNumber:     aws.Int32(int32(partNumber)),
+		PartNumber:     aws.Int32(partNumber),
 	}, nil
 }
 

diff --git a/dfs/mock/memMappedSystem.go b/dfs/mock/memMappedSystem.go
@@ -12,15 +12,16 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
+	"github.com/fatih/color"
+	"github.com/google/uuid"
+	"github.com/labstack/echo/v4"
+	"github.com/spf13/afero"
+
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
 	types "github.com/containerish/OpenRegistry/store/v1/types"
 	"github.com/containerish/OpenRegistry/telemetry"
 	core_types "github.com/containerish/OpenRegistry/types"
-	"github.com/fatih/color"
-	"github.com/google/uuid"
-	"github.com/labstack/echo/v4"
-	"github.com/spf13/afero"
 )
 
 type memMappedMockStorage struct {
@@ -70,7 +71,7 @@ func (ms *memMappedMockStorage) UploadPart(
 	uploadId string,
 	layerKey string,
 	digest string,
-	partNumber int64,
+	partNumber int32,
 	content io.ReadSeeker,
 	contentLength int64,
 ) (s3types.CompletedPart, error) {
@@ -91,7 +92,7 @@ func (ms *memMappedMockStorage) UploadPart(
 	return s3types.CompletedPart{
 		ChecksumCRC32:  &digest,
 		ChecksumCRC32C: &layerKey,
-		PartNumber:     aws.Int32(int32(partNumber)),
+		PartNumber:     aws.Int32(partNumber),
 	}, nil
 }
 
@@ -175,7 +176,6 @@ func (ms *memMappedMockStorage) Metadata(layer *types.ContainerImageLayer) (*typ
 		DFSLink:       identifier,
 		ContentLength: int(stat.Size()),
 	}, nil
-
 }
 
 func (ms *memMappedMockStorage) GetUploadProgress(identifier, uploadID string) (*types.ObjectMetadata, error) {

diff --git a/dfs/mock/mockFileSystem.go b/dfs/mock/mockFileSystem.go
@@ -12,16 +12,17 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
-	"github.com/containerish/OpenRegistry/config"
-	"github.com/containerish/OpenRegistry/dfs"
-	types "github.com/containerish/OpenRegistry/store/v1/types"
-	"github.com/containerish/OpenRegistry/telemetry"
-	core_types "github.com/containerish/OpenRegistry/types"
 	"github.com/fatih/color"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	"github.com/spf13/afero"
+
+	"github.com/containerish/OpenRegistry/config"
+	"github.com/containerish/OpenRegistry/dfs"
+	types "github.com/containerish/OpenRegistry/store/v1/types"
+	"github.com/containerish/OpenRegistry/telemetry"
+	core_types "github.com/containerish/OpenRegistry/types"
 )
 
 type fileBasedMockStorage struct {
@@ -82,7 +83,7 @@ func (ms *fileBasedMockStorage) UploadPart(
 	uploadId string,
 	layerKey string,
 	digest string,
-	partNumber int64,
+	partNumber int32,
 	content io.ReadSeeker,
 	contentLength int64,
 ) (s3types.CompletedPart, error) {
@@ -104,7 +105,7 @@ func (ms *fileBasedMockStorage) UploadPart(
 	return s3types.CompletedPart{
 		ChecksumCRC32:  &digest,
 		ChecksumCRC32C: &layerKey,
-		PartNumber:     aws.Int32(int32(partNumber)),
+		PartNumber:     aws.Int32(partNumber),
 	}, nil
 }
 
@@ -141,7 +142,6 @@ func (ms *fileBasedMockStorage) Upload(ctx context.Context, identifier, digest s
 }
 
 func (ms *fileBasedMockStorage) Download(ctx context.Context, path string) (io.ReadCloser, error) {
-
 	fd, err := ms.fs.Open(path)
 	if err != nil {
 		return nil, err
@@ -192,7 +192,6 @@ func (ms *fileBasedMockStorage) Metadata(layer *types.ContainerImageLayer) (*typ
 		DFSLink:       identifier,
 		ContentLength: int(stat.Size()),
 	}, nil
-
 }
 
 func (ms *fileBasedMockStorage) GetUploadProgress(identifier, uploadID string) (*types.ObjectMetadata, error) {

diff --git a/dfs/storj/storj.go b/dfs/storj/storj.go
@@ -10,11 +10,12 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
+	oci_digest "github.com/opencontainers/go-digest"
+
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
 	"github.com/containerish/OpenRegistry/store/v1/types"
 	core_types "github.com/containerish/OpenRegistry/types"
-	oci_digest "github.com/opencontainers/go-digest"
 )
 
 type storj struct {
@@ -62,7 +63,7 @@ func (sj *storj) UploadPart(
 	uploadId string,
 	layerKey string,
 	digest string,
-	partNumber int64,
+	partNumber int32,
 	content io.ReadSeeker,
 	contentLength int64,
 ) (s3types.CompletedPart, error) {
@@ -76,7 +77,7 @@ func (sj *storj) UploadPart(
 		ChecksumSHA256:    aws.String(digest),
 		ContentLength:     &contentLength,
 		Key:               &layerKey,
-		PartNumber:        aws.Int32(int32(partNumber)),
+		PartNumber:        aws.Int32(partNumber),
 		UploadId:          &uploadId,
 	}
 

diff --git a/dfs/storj/uplink/uplink.go b/dfs/storj/uplink/uplink.go
@@ -9,13 +9,14 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
+	"github.com/fatih/color"
+	"storj.io/uplink"
+	"storj.io/uplink/edge"
+
 	"github.com/containerish/OpenRegistry/config"
 	"github.com/containerish/OpenRegistry/dfs"
 	"github.com/containerish/OpenRegistry/store/v1/types"
 	core_types "github.com/containerish/OpenRegistry/types"
-	"github.com/fatih/color"
-	"storj.io/uplink"
-	"storj.io/uplink/edge"
 )
 
 type storjUplink struct {
@@ -70,7 +71,7 @@ func (u *storjUplink) UploadPart(
 	uploadId string,
 	key string,
 	digest string,
-	partNumber int64,
+	partNumber int32,
 	content io.ReadSeeker,
 	contentLength int64,
 ) (s3types.CompletedPart, error) {
@@ -122,7 +123,6 @@ func (u *storjUplink) CompleteMultipartUpload(
 			"digest": finalDigest,
 		},
 	})
-
 	if err != nil {
 		return "", fmt.Errorf("ERR_STORJ_UPLINK_COMMIT_UPLOAD: %w", err)
 	}