Skip to content
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

Jump to bottom

[remerge] A more spec-compliant/resilient OCI distribution implementation #318

Merged
merged 18 commits into from
Dec 7, 2022
Merged

[remerge] A more spec-compliant/resilient OCI distribution implementation #318

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
68d50ca
setup reference implementation registry for testing
joshspicer Dec 2, 2022
ebfc4c3
uncomment
joshspicer Dec 2, 2022
68ae246
revert plainHTTP defaulting to true
joshspicer Dec 2, 2022
1945816
mode for plain http when targetting localhost
joshspicer Dec 2, 2022
2701867
print only when plain HTTP
joshspicer Dec 2, 2022
c6f673c
surface JSON errors better
joshspicer Dec 2, 2022
ec68d10
refactor out reading in tgz Buffer to only do that work once
joshspicer Dec 2, 2022
1d5ed62
generate a postUploadSessionId for each blob that needs to be uploaded
joshspicer Dec 2, 2022
20d7774
update auth contract change in utils file
joshspicer Dec 2, 2022
28dd163
factor out containerFeaturesOCIPush test to its own matrix run
joshspicer Dec 2, 2022
de93dad
clarifying comment
joshspicer Dec 2, 2022
b27f9fc
add comments clarifying auth
joshspicer Dec 2, 2022
56ceefc
allow localhost past the domain name check
joshspicer Dec 2, 2022
866ce3e
add 'info tags' and 'info manifest' commands'
joshspicer Dec 2, 2022
227a85e
use new info commands in test
joshspicer Dec 3, 2022
f80ba58
typecheck
joshspicer Dec 3, 2022
cdd92f5
clarify error case of getManifest()
joshspicer Dec 3, 2022
fd4de3f
Apply suggestions from code review
joshspicer Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
revert plainHTTP defaulting to true
  • Loading branch information
@joshspicer
joshspicer committed Dec 2, 2022
commit 68ae246902e54c486ae1e960592d92bc132640d4
7 changes: 3 additions & 4 deletions src/spec-configuration/containerCollectionsOCI.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ async function getBasicAuthCredential(output: Log, registry: string, env: NodeJS

let userToken: string | undefined = undefined;
if (!!env['GITHUB_TOKEN'] && registry === 'ghcr.io') {
userToken = env['GITHUB_TOKEN'];
userToken = `USERNAME:${env['GITHUB_TOKEN']}`;
} else if (!!env['DEVCONTAINERS_OCI_AUTH']) {
// eg: DEVCONTAINERS_OCI_AUTH=domain1|user1|token1,domain2|user2|token2
const authContexts = env['DEVCONTAINERS_OCI_AUTH'].split(',');
Expand Down Expand Up @@ -268,7 +268,7 @@ async function generateScopeTokenCredential(output: Log, registry: string, ociRe
const authServer = registry === 'docker.io' ? 'auth.docker.io' : registry;
const registryServer = registry === 'docker.io' ? 'registry.docker.io' : registry;
const url = `https://${authServer}/token?scope=repository:${ociRepoPath}:${operationScopes}&service=${registryServer}`;
output.write(`url: ${url}`, LogLevel.Trace);
output.write(`Fetching scope token from: ${url}`, LogLevel.Trace);

const options = {
type: 'GET',
Expand Down Expand Up @@ -299,7 +299,6 @@ async function generateScopeTokenCredential(output: Log, registry: string, ociRe
output.write('Failed to parse registry auth token response', LogLevel.Error);
return undefined;
}

return scopeToken;
}

Expand All @@ -308,7 +307,7 @@ async function generateScopeTokenCredential(output: Log, registry: string, ociRe
// Will attempt to generate/fetch the correct authorization header for subsequent requests (Bearer or Basic)
export async function fetchAuthorization(output: Log, registry: string, ociRepoPath: string, env: NodeJS.ProcessEnv, operationScopes: string): Promise<string | undefined> {
const basicAuthTokenBase64 = await getBasicAuthCredential(output, registry, env);
const scopeToken = generateScopeTokenCredential(output, registry, ociRepoPath, env, operationScopes, basicAuthTokenBase64);
const scopeToken = await generateScopeTokenCredential(output, registry, ociRepoPath, env, operationScopes, basicAuthTokenBase64);

if (scopeToken) {
output.write(`Using scope token for registry '${registry}'`, LogLevel.Trace);
Expand Down
6 changes: 3 additions & 3 deletions src/spec-utils/httpRequest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import ProxyAgent from 'proxy-agent';
import * as url from 'url';
import { Log, LogLevel } from './log';

export function request(options: { type: string; url: string; headers: Record<string, string>; data?: Buffer }, output?: Log, plainHTTP = true) {
export function request(options: { type: string; url: string; headers: Record<string, string>; data?: Buffer }, output?: Log, plainHTTP = false) {
return new Promise<Buffer>((resolve, reject) => {
const parsed = new url.URL(options.url);
const reqOptions: RequestOptions = {
Expand Down Expand Up @@ -42,7 +42,7 @@ export function request(options: { type: string; url: string; headers: Record<st
}

// HTTP HEAD request that returns status code.
export function headRequest(options: { url: string; headers: Record<string, string> }, output?: Log, plainHTTP = true) {
export function headRequest(options: { url: string; headers: Record<string, string> }, output?: Log, plainHTTP = false) {
return new Promise<number>((resolve, reject) => {
const parsed = new url.URL(options.url);
const reqOptions: RequestOptions = {
Expand All @@ -68,7 +68,7 @@ export function headRequest(options: { url: string; headers: Record<string, stri

// Send HTTP Request.
// Does not throw on status code, but rather always returns 'statusCode', 'resHeaders', and 'resBody'.
export function requestResolveHeaders(options: { type: string; url: string; headers: Record<string, string>; data?: Buffer }, _output?: Log, plainHTTP = true) {
export function requestResolveHeaders(options: { type: string; url: string; headers: Record<string, string>; data?: Buffer }, _output?: Log, plainHTTP = false) {
return new Promise<{ statusCode: number; resHeaders: Record<string, string>; resBody: Buffer }>((resolve, reject) => {
const parsed = new url.URL(options.url);
const reqOptions: RequestOptions = {
Expand Down