docker/login-action
1
0
Fork 0
mirror of https://github.com/docker/login-action.git synced 2026-08-06 17:54:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

raise Docker Hub OIDC max expiry to 6 hours

Browse Source 
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2026-08-06 11:51:35 +02:00
parent dbcb813823
commit 99ffd0f38a
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -757,10 +757,10 @@ The following inputs can be used as `step.with` keys:
The following environment variables can be set as `step.env` keys: The following environment variables can be set as `step.env` keys:
| Name | Type | Default | Description | | Name | Type | Default | Description |
|-------------------------------|--------|---------|-----------------------------------------------------------------------------| |-------------------------------|--------|---------|----------------------------------------------------------------------------------------------------|
| `DOCKERHUB_OIDC_CONNECTIONID` | String | | Docker Hub OIDC connection ID. Required for Docker Hub OIDC login | | `DOCKERHUB_OIDC_CONNECTIONID` | String | | Docker Hub OIDC connection ID. Required for Docker Hub OIDC login |
| `DOCKERHUB_OIDC_EXPIREIN` | Number | `300` | Docker Hub OIDC token lifetime in seconds. Must be between `300` and `3600` | | `DOCKERHUB_OIDC_EXPIREIN` | Number | `300` | Docker Hub OIDC token lifetime in seconds. Must be between `300` (5 minutes) and `21600` (6 hours) |
## Contributing ## Contributing

8
__tests__/dockerhub.test.ts
View File

@@ -86,10 +86,10 @@ describe('getOIDCToken', () => {
}); });
test('uses custom token expiration', async () => { test('uses custom token expiration', async () => {
process.env.DOCKERHUB_OIDC_EXPIREIN = '900'; process.env.DOCKERHUB_OIDC_EXPIREIN = '21600';
await dockerhub.getOIDCToken('docker.io', 'dbowie'); await dockerhub.getOIDCToken('docker.io', 'dbowie');
const body = new URLSearchParams(postSpy.mock.calls[0][1]); const body = new URLSearchParams(postSpy.mock.calls[0][1]);
expect(body.get('expires_in')).toBe('900'); expect(body.get('expires_in')).toBe('21600');
}); });
test('uses stage identity host for stage registry', async () => { test('uses stage identity host for stage registry', async () => {
@@ -112,9 +112,9 @@ describe('getOIDCToken', () => {
expect(postSpy).not.toHaveBeenCalled(); expect(postSpy).not.toHaveBeenCalled();
}); });
test.each(['not-a-number', '299', '3601'])('validates token expiration %p', async expiresIn => { test.each(['not-a-number', '299', '21601'])('validates token expiration %p', async expiresIn => {
process.env.DOCKERHUB_OIDC_EXPIREIN = expiresIn; process.env.DOCKERHUB_OIDC_EXPIREIN = expiresIn;
await expect(dockerhub.getOIDCToken('docker.io', 'dbowie')).rejects.toThrow(`Invalid DOCKERHUB_OIDC_EXPIREIN: ${expiresIn}. Must be between 300 and 3600`); await expect(dockerhub.getOIDCToken('docker.io', 'dbowie')).rejects.toThrow(`Invalid DOCKERHUB_OIDC_EXPIREIN: ${expiresIn}. Must be between 300 and 21600`);
expect(getIDTokenMock).not.toHaveBeenCalled(); expect(getIDTokenMock).not.toHaveBeenCalled();
expect(postSpy).not.toHaveBeenCalled(); expect(postSpy).not.toHaveBeenCalled();
}); });

2
src/dockerhub.ts
View File

@@ -15,7 +15,7 @@ interface OIDCTokenResponse {
const registries = new Set(['', 'docker.io', 'registry-1.docker.io', 'registry-1-stage.docker.io', 'dhi.io']); const registries = new Set(['', 'docker.io', 'registry-1.docker.io', 'registry-1-stage.docker.io', 'dhi.io']);
const defaultExpiresIn = 300; const defaultExpiresIn = 300;
const minExpiresIn = 300; const minExpiresIn = 300;
const maxExpiresIn = 3600; const maxExpiresIn = 21600;
const maxRetries = 5; const maxRetries = 5;
export const isDockerHubOIDC = (registry: string, password: string): boolean => { export const isDockerHubOIDC = (registry: string, password: string): boolean => {