Merge pull request #40 from Dewberry/enhancement-return-reader

Enhancement Return Reader

Author: ShaneMPutnam

.example.env

@@ -17,6 +17,8 @@ PG_LOG_CHECKPOINTS='off'
 S3_MOCK=0 ##  Options: [0, 1] corresponds to [no S3 Mock, s3 Mock]. This integer value configures the initialization mode in docker-compose.
 #### Optional:
 
+INIT_AUTH= ##set to zero if you do not want to initialize auth (used when s3api is a package in a non auth app)
+
 ## MINIO
 MINIO_S3_ENDPOINT='http://minio:9000'
 MINIO_S3_REGION='s3-region-string'

auth/auth.go

@@ -53,10 +53,16 @@ func getPublicKeys() ([]PublicKey, error) {
 }
 
 func init() {
+	initAuth := os.Getenv("INIT_AUTH")
+	if initAuth == "0" {
+		log.Println("Skipping authentication initialization")
+		return // Skip initialization if the environment variable is explicitly set to 0
+	}
+
 	var err error
 	publicKeys, err = getPublicKeys()
 	if err != nil {
-		panic(err)
+		panic(fmt.Sprintf("Failed to initialize authentication: %v", err))
 	}
 }
 
@@ -130,7 +136,11 @@ func overlap(s1 []string, s2 []string) bool {
 
 func Authorize(handler echo.HandlerFunc, allowedRoles ...string) echo.HandlerFunc {
 	return func(c echo.Context) error {
+		initAuth := os.Getenv("INIT_AUTH")
 
+		if initAuth == "0" {
+			return handler(c)
+		}
 		headers := c.Request().Header
 
 		authHead := headers.Get("Authorization")

blobstore/object_content.go

@@ -13,7 +13,7 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-func (s3Ctrl *S3Controller) FetchObjectContent(bucket string, key string) ([]byte, error) {
+func (s3Ctrl *S3Controller) FetchObjectContent(bucket string, key string) (io.ReadCloser, error) {
 	keyExist, err := s3Ctrl.KeyExists(bucket, key)
 	if err != nil {
 		return nil, err
@@ -30,12 +30,7 @@ func (s3Ctrl *S3Controller) FetchObjectContent(bucket string, key string) ([]byt
 		return nil, err
 	}
 
-	body, err := io.ReadAll(output.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	return body, nil
+	return output.Body, nil
 }
 
 func (bh *BlobHandler) HandleObjectContents(c echo.Context) error {
@@ -54,7 +49,7 @@ func (bh *BlobHandler) HandleObjectContents(c echo.Context) error {
 		return c.JSON(http.StatusUnprocessableEntity, errMsg.Error())
 	}
 
-	body, err := s3Ctrl.FetchObjectContent(bucket, key)
+	outPutBody, err := s3Ctrl.FetchObjectContent(bucket, key)
 	if err != nil {
 		log.Error("HandleObjectContents: " + err.Error())
 		if strings.Contains(err.Error(), "object") {
@@ -63,7 +58,10 @@ func (bh *BlobHandler) HandleObjectContents(c echo.Context) error {
 			return c.JSON(http.StatusInternalServerError, err.Error())
 		}
 	}
-
+	body, err := io.ReadAll(outPutBody)
+	if err != nil {
+		return c.JSON(http.StatusInternalServerError, err.Error())
+	}
 	log.Info("HandleObjectContents: Successfully fetched object data for key:", key)
 	//TODO: add contentType
 	return c.Blob(http.StatusOK, "", body)