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

General_timeout_increase #84

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

General_timeout_increase #84

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40e032a
General timeout increase.
raphabot Jul 5, 2022
ac15e96
General timeout increase
raphabot Jul 5, 2022
d3edbe1
Merge branch 'main' into general_timeout_increase
raphabot Jul 5, 2022
eafad57
Merge branch 'main' into general_timeout_increase
raphabot Jul 7, 2022
6138837
Merge branch 'main' into general_timeout_increase
raphabot Jul 15, 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
3 changes: 1 addition & 2 deletions challenges/container_security/templates/c1cs_codepipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,13 @@ Resources:
Source:
Type: S3
Location: !Sub ${QSS3BucketName}/${QSS3KeyPrefix}templates/dockerFiles.zip
TimeoutInMinutes: 10
DependsOn: c1csECR

lambdaFunctionStartCodeBuild:
Type: AWS::Lambda::Function
Properties:
Runtime: python3.8
Timeout: 60
Timeout: 600
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The custom resource that triggers this lambda has a timeout of 600, so I matched it here.

Handler: index.lambda_handler
Role: !GetAtt startCodeBuildRole.Arn
Code:
Expand Down
2 changes: 1 addition & 1 deletion challenges/container_security/templates/c1cs_get_alb_hostname.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Resources:
Type: AWS::Lambda::Function
Properties:
Runtime: python3.8
Timeout: 60
Timeout: 120
Handler: index.lambda_handler
Role: !GetAtt c1csGetAlbHostnameRole.Arn
Code:
Expand Down
2 changes: 1 addition & 1 deletion ...es/container_security/templates/c1cs_invoke_attack_container_state_matchine.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Resources:
Type: AWS::Lambda::Function
Properties:
Runtime: python3.8
Timeout: 60
Timeout: 120
Handler: index.lambda_handler
Role: !GetAtt Deployc1csAttackContainerstateMachineLambdaRole.Arn
Code:
Expand Down
4 changes: 2 additions & 2 deletions challenges/file_storage_security/templates/answerValidation.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Resources:
raise Exception("Payload not detected! Try again.")

Role: !GetAtt PayloadCheckerLambdaRole.Arn
Timeout: 30
Timeout: 60
PayloadCheckerLambdaRole:
Type: AWS::IAM::Role
Properties:
Expand Down Expand Up @@ -222,4 +222,4 @@ Resources:


Role: !GetAtt PayloadCheckerLambdaRole.Arn
Timeout: 30
Timeout: 60
2 changes: 1 addition & 1 deletion challenges/file_storage_security/templates/attackerMachine.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Resources:
Type: AWS::Lambda::Function
Properties:
Runtime: python3.8
Timeout: 20
Timeout: 60
Handler: index.lambda_handler
Role: !GetAtt K8sAdminRole.Arn
Code:
Expand Down
10 changes: 5 additions & 5 deletions challenges/file_storage_security/templates/imageUpload.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Resources:
return {"status": "True", "statusCode": 200, "body": "Payload delivered"}

Role: !GetAtt PayloadDropperLambdaRole.Arn
Timeout: 30
Timeout: 60
PayloadDropperLambdaUrl:
Type: AWS::Lambda::Url
Properties:
Expand Down Expand Up @@ -199,7 +199,7 @@ Resources:
S3Bucket: !Ref CopyZipsS3Bucket
S3Key: !Sub "${CopyZipsPrefix}${WebsiteCodeZip}" # Make sure to set S3Key like this.
Role: !GetAtt WebsiteLambdaRole.Arn
Timeout: 30
Timeout: 60
WebsiteLambdaRole:
Type: AWS::IAM::Role
Properties:
Expand Down Expand Up @@ -311,7 +311,7 @@ Resources:
return {"statusCode": 404}

Role: !GetAtt GetPresignedPutLambdaRole.Arn
Timeout: 30
Timeout: 60
GetPresignedPutLambdaRole:
Type: AWS::IAM::Role
Properties:
Expand Down Expand Up @@ -468,7 +468,7 @@ Resources:
}

Role: !GetAtt GetImgLambdaRole.Arn
Timeout: 30
Timeout: 60
GetImgLambdaRole:
Type: AWS::IAM::Role
Properties:
Expand Down Expand Up @@ -600,7 +600,7 @@ Resources:
}

Role: !GetAtt ExploitCheckLambdaRole.Arn
Timeout: 30
Timeout: 60
ExploitCheckLambdaRole:
Type: AWS::IAM::Role
Properties:
Expand Down
2 changes: 1 addition & 1 deletion challenges/file_storage_security/templates/invokeAttackerStateMachine.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Resources:
Type: AWS::Lambda::Function
Properties:
Runtime: python3.8
Timeout: 20
Timeout: 60
Handler: index.lambda_handler
Role: !GetAtt DeployAttackerEnvStateMachineRole.Arn
Code:
Expand Down
1 change: 0 additions & 1 deletion challenges/file_storage_security/templates/main.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ Resources:
Parameters:
SourceBucket: !Ref QSS3BucketName
TemplateURL: !Sub 'https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}utils/copyzips/copyzips.template.yaml'
TimeoutInMinutes: 10
CopyZips:
Type: Custom::CopyZips
Properties:
Expand Down
4 changes: 2 additions & 2 deletions challenges/network_security/templates/network_security_main.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ Resources:
Description: "Lambda to determine if Network Security portion of the challenge is complete"
Runtime: python3.7
Handler: index.handler
Timeout: 10
Timeout: 60
Role: !GetAtt LambdaScoreIAMRole.Arn
VpcConfig:
SubnetIds:
Expand Down Expand Up @@ -320,7 +320,7 @@ Resources:
Description: "Lambda to clean up Network Security Managed Service Endpoint on completion of challenge"
Runtime: python3.7
Handler: index.handler
Timeout: 10
Timeout: 60
Role: !GetAtt CleanupLambdaRole.Arn
Code:
ZipFile: |
Expand Down
2 changes: 1 addition & 1 deletion challenges/network_security/templates/network_security_xaccountiamrole.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Resources:
Handler: "index.handler"
Runtime: python3.9
Role: !GetAtt BasicLambdaRole.Arn
Timeout: 30
Timeout: 60
Code:
ZipFile: |
import boto3
Expand Down
2 changes: 1 addition & 1 deletion challenges/onboarding/templates/c1-onboarding-service-catalog.child-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ Resources:
Runtime: python3.8
FunctionName: techday-cloudone-onboarding-prod-verifyC1Onboarding
MemorySize: 256
Timeout: 30
Timeout: 60
Description: Task 1 - Cloud One Onboarding verification module for C1onboarding-TechDay
Tags:
- Key: BusinessCase
Expand Down
1 change: 0 additions & 1 deletion challenges/vision_one/templates/copyzipsvousage.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Resources:
Parameters:
SourceBucket: !Ref QSS3BucketName
TemplateURL: !Sub 'https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}templates/vocopyzips.template.yaml'
TimeoutInMinutes: 10

# Run a CopyZip custom resource for the given parameters
CopyZips:
Expand Down
2 changes: 1 addition & 1 deletion templates/lockout_infra.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Resources:
Type: AWS::Lambda::Function
Properties:
Description: Lambda to unlock player after break
Timeout: 30
Timeout: 60
Handler: index.lambda_handler
Runtime: python3.8
Role: !GetAtt LockoutLambdaExecutionRole.Arn
Expand Down
1 change: 0 additions & 1 deletion utils/copyzips/sample-usage.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ Resources:
Parameters:
SourceBucket: !Ref QSS3BucketName
TemplateURL: !Sub 'https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}utils/copyzips/copyzips.template.yaml'
TimeoutInMinutes: 10

# Run a CopyZip custom resource for the given parameters
CopyZips:
Expand Down
2 changes: 1 addition & 1 deletion utils/ec2keypair/ec2keypair.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ Resources:
Runtime: python3.7
Role: !GetAtt CreateKeyPairLambdaExecutionRole.Arn
MemorySize: 128
Timeout: 10
Timeout: 60

KeyPair:
Type: AWS::CloudFormation::CustomResource
Expand Down
2 changes: 1 addition & 1 deletion utils/randomstring/randomstring.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Resources:
Runtime: python3.7
Role: !GetAtt LambdaExecutionRole.Arn
MemorySize: 128
Timeout: 10
Timeout: 60

# Custom Resource 1
SecretPassword:
Expand Down
1 change: 0 additions & 1 deletion utils/randomstring/sample-usage.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Resources:
Parameters:
DestinationBucket: QSS3BucketName
TemplateURL: !Sub 'https://${QSS3BucketName}.s3.amazonaws.com/${QSS3KeyPrefix}utils/randomstring/randomstring.template.yaml'
TimeoutInMinutes: 10

# Generate String
SecretPassword:
Expand Down