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

fix(cognito-identitypool-alpha): validation error if provided id is a token #30882

Merged
merged 3 commits into from
Aug 15, 2024
Merged

fix(cognito-identitypool-alpha): validation error if provided id is a token #30882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ee0136
skip validation if unresolved token
Tietew Jul 18, 2024
c7cc42c
Merge branch 'main' into cognito-idp-allow-token
Tietew Aug 1, 2024
0bc55e7
Merge branch 'main' into cognito-idp-allow-token
mergify[bot] Aug 14, 2024
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
13 changes: 10 additions & 3 deletions packages/@aws-cdk/aws-cognito-identitypool-alpha/lib/identitypool.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
Stack,
ArnFormat,
Lazy,
Token,
} from 'aws-cdk-lib/core';
import {
Construct,
Expand Down Expand Up @@ -329,9 +330,15 @@ export class IdentityPool extends Resource implements IIdentityPool {
if (!res) {
throw new Error('Invalid Identity Pool ARN');
}
const idParts = res.split(':');
if (!(idParts.length === 2)) throw new Error('Invalid Identity Pool Id: Identity Pool Ids must follow the format <region>:<id>');
if (idParts[0] !== pool.region) throw new Error('Invalid Identity Pool Id: Region in Identity Pool Id must match stack region');
if (!Token.isUnresolved(res)) {
const idParts = res.split(':');
if (!(idParts.length === 2)) {
throw new Error('Invalid Identity Pool Id: Identity Pool Ids must follow the format <region>:<id>');
}
if (!Token.isUnresolved(pool.region) && idParts[0] !== pool.region) {
throw new Error('Invalid Identity Pool Id: Region in Identity Pool Id must match stack region');
}
}
class ImportedIdentityPool extends Resource implements IIdentityPool {
public readonly identityPoolId = res;
public readonly identityPoolArn = identityPoolArn;
Expand Down
19 changes: 17 additions & 2 deletions packages/@aws-cdk/aws-cognito-identitypool-alpha/test/identitypool.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
} from 'aws-cdk-lib/aws-iam';
import {
Fn,
Lazy,
Stack,
} from 'aws-cdk-lib';
import {
Expand Down Expand Up @@ -203,14 +204,28 @@ describe('identity pool', () => {
account: '1234567891011',
},
});
expect(() => IdentityPool.fromIdentityPoolId(stack, 'idPoolIdError', 'idPool')).toThrowError('Invalid Identity Pool Id: Identity Pool Ids must follow the format <region>:<id>');
expect(() => IdentityPool.fromIdentityPoolArn(stack, 'idPoolArnError', 'arn:aws:cognito-identity:my-region:1234567891011:identitypool\/your-region:idPool/')).toThrowError('Invalid Identity Pool Id: Region in Identity Pool Id must match stack region');
expect(() => IdentityPool.fromIdentityPoolId(stack, 'idPoolIdError', 'idPool')).toThrow('Invalid Identity Pool Id: Identity Pool Ids must follow the format <region>:<id>');
expect(() => IdentityPool.fromIdentityPoolId(stack, 'idPoolIdRegionError', 'your-region:idPool')).toThrow('Invalid Identity Pool Id: Region in Identity Pool Id must match stack region');
expect(() => IdentityPool.fromIdentityPoolArn(stack, 'idPoolArnError', 'arn:aws:cognito-identity:my-region:1234567891011:identitypool\/your-region:idPool/')).toThrow('Invalid Identity Pool Id: Region in Identity Pool Id must match stack region');
const idPool = IdentityPool.fromIdentityPoolId(stack, 'staticIdPool', 'my-region:idPool');

expect(idPool.identityPoolId).toEqual('my-region:idPool');
expect(idPool.identityPoolArn).toMatch(/cognito-identity:my-region:1234567891011:identitypool\/my-region:idPool/);
});

test('fromIdentityPoolId accept token', () => {
const stack = new Stack();
expect(() => IdentityPool.fromIdentityPoolId(stack, 'IdPool1', Lazy.string({ produce: () => 'lazy-id' }))).not.toThrow();
expect(() => IdentityPool.fromIdentityPoolId(stack, 'IdPool2', 'id-region:pool-id')).not.toThrow();
});

test('fromIdentityPoolArn accepts token', () => {
const stack = new Stack();
expect(() => IdentityPool.fromIdentityPoolArn(stack, 'IdPool1', Lazy.string({ produce: () => 'lazy-arn' }))).not.toThrow();
expect(() => IdentityPool.fromIdentityPoolArn(stack, 'IdPool2', `arn:aws:cognito-identity:${stack.region}:${stack.account}:identitypool/id-region:pool-id`)).not.toThrow();
expect(() => IdentityPool.fromIdentityPoolArn(stack, 'IdPool3', `arn:aws:cognito-identity:arn-region:${stack.account}:identitypool/${Lazy.string({ produce: () => 'lazy-region' })}:pool-id`)).not.toThrow();
});

test('user pools are properly configured', () => {
const stack = new Stack();
const poolProvider = UserPoolIdentityProvider.fromProviderName(stack, 'poolProvider', 'poolProvider');
Expand Down