Merge pull request #164 from EmmEff/cleanly-handle-401

Return ErrUnauthorized

Author: EmmEff

client/client.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2019-2023, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the LICENSE.md file
 // distributed with the sources of this project regarding your rights to use or distribute this
 // software.
@@ -7,6 +7,7 @@ package client
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -16,6 +17,9 @@ import (
 	"github.com/go-log/log"
 )
 
+// ErrUnauthorized represents HTTP status "401 Unauthorized"
+var ErrUnauthorized = errors.New("unauthorized")
+
 // Config contains the client configuration.
 type Config struct {
 	// Base URL of the service.

client/oci.go

@@ -449,7 +449,11 @@ func (r *ociRegistry) doRequestWithCredentials(req *http.Request, creds credenti
 	if code := res.StatusCode; code/100 != 2 {
 		defer res.Body.Close()
 
-		return nil, fmt.Errorf("unexpected HTTP status %v", res.StatusCode)
+		if code == http.StatusUnauthorized {
+			return nil, ErrUnauthorized
+		}
+
+		return nil, fmt.Errorf("unexpected http status %v", res.StatusCode)
 	}
 
 	return res, nil
@@ -494,6 +498,10 @@ func (r *ociRegistry) doRequest(req *http.Request, creds credentials, opts ...mo
 			return r.retryRequestWithCredentials(req, creds, opts...)
 		}
 
+		if code == http.StatusUnauthorized {
+			return nil, ErrUnauthorized
+		}
+
 		return nil, fmt.Errorf("unexpected http status %v", code)
 	}
 

client/pull.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2022, Sylabs Inc. All rights reserved.
+// Copyright (c) 2018-2023, Sylabs Inc. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -63,6 +63,9 @@ func (c *Client) DownloadImage(ctx context.Context, w io.Writer, arch, path, tag
 		if err != nil {
 			return fmt.Errorf("download did not succeed: %v", err)
 		}
+		if res.StatusCode == http.StatusUnauthorized {
+			return ErrUnauthorized
+		}
 		return fmt.Errorf("unexpected http status code: %d", res.StatusCode)
 	}
 
@@ -228,7 +231,10 @@ func (c *Client) legacyDownloadImage(ctx context.Context, arch, name, tag string
 	}
 
 	if res.StatusCode != http.StatusSeeOther {
-		return fmt.Errorf("unexpected HTTP status %d: %v", res.StatusCode, err)
+		if res.StatusCode == http.StatusUnauthorized {
+			return ErrUnauthorized
+		}
+		return fmt.Errorf("unexpected http status %d", res.StatusCode)
 	}
 
 	// Get image metadata to determine image size