Skip to content

Improved OCI redirect handling #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 10, 2023
Merged

Improved OCI redirect handling #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ce5624d
fix: remove use of deprecated function (linting)
EmmEff Feb 10, 2023
7ebbd65
refactor: fix stumbly code structure
EmmEff Feb 10, 2023
96e3b85
fix: add 'mapped=1' to query string for oci-redirect
EmmEff Feb 10, 2023
1cbe1ea
chore: add func comment
EmmEff Feb 10, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions client/oci.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ func (c *Client) ociRegistryAuth(ctx context.Context, name string, accessTypes [
v := url.Values{}
v.Set("namespace", name)

// Setting 'mapped' to '1' (true) enables support for mapping short library refs to
// fully-qualified name
v.Set("mapped", strconv.Itoa(1))

ats := make([]string, 0, len(accessTypes))
for _, at := range accessTypes {
ats = append(ats, string(at))
Expand Down Expand Up @@ -630,6 +634,7 @@ func (r *ociRegistry) getImageConfig(ctx context.Context, creds credentials, nam

var errOCIDownloadNotSupported = errors.New("not supported")

// newOCIRegistry returns *ociRegistry, credentials for that registry, and the (optionally) remapped image name
func (c *Client) newOCIRegistry(ctx context.Context, name string, accessTypes []accessType) (*ociRegistry, *bearerTokenCredentials, string, error) {
// Attempt to obtain (direct) OCI registry auth token
originalName := name
Expand Down
17 changes: 9 additions & 8 deletions client/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,17 @@ func (c *Client) ConcurrentDownloadImage(ctx context.Context, dst *os.File, arch
}

// Check for direct OCI registry access
if err := c.ociDownloadImage(ctx, arch, name, tag, dst, spec, pb); err == nil {
return err
} else if !errors.Is(err, errOCIDownloadNotSupported) {
// Return OCI download error or fallback to legacy download
return err
}
if err := c.ociDownloadImage(ctx, arch, name, tag, dst, spec, pb); err != nil {
if !errors.Is(err, errOCIDownloadNotSupported) {
// Return OCI download error or fallback to legacy download
return err
}

c.Logger.Log("Fallback to (legacy) library download")
c.Logger.Log("Fallback to (legacy) library download")

return c.legacyDownloadImage(ctx, arch, name, tag, dst, spec, pb)
return c.legacyDownloadImage(ctx, arch, name, tag, dst, spec, pb)
}
return nil
}

func (c *Client) legacyDownloadImage(ctx context.Context, arch, name, tag string, dst io.WriterAt, spec *Downloader, pb ProgressBar) error {
Expand Down
2 changes: 1 addition & 1 deletion client/pull_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func seedRandomNumberGenerator(t *testing.T) {
if _, err := crypto_rand.Read(b[:]); err != nil {
t.Fatalf("error seeding random number generator: %v", err)
}
math_rand.Seed(int64(binary.LittleEndian.Uint64(b[:])))
math_rand.New(math_rand.NewSource(int64(binary.LittleEndian.Uint64(b[:]))))
}

// mockLibraryServer returns *httptest.Server that mocks Cloud Library server; in particular,
Expand Down