From ca534ecf32fabbca431a0ace6aac290de20d3556 Mon Sep 17 00:00:00 2001 From: Emmanuel Ngong Date: Sun, 29 Sep 2019 13:05:18 -0500 Subject: [PATCH 01/20] More details --- edu1.txt | 1 + edu2.txt | 1 + edu3.txt | 1 + 3 files changed, 3 insertions(+) create mode 100644 edu1.txt create mode 100644 edu2.txt create mode 100644 edu3.txt diff --git a/edu1.txt b/edu1.txt new file mode 100644 index 0000000..3f71ed2 --- /dev/null +++ b/edu1.txt @@ -0,0 +1 @@ +Eduks the baby diff --git a/edu2.txt b/edu2.txt new file mode 100644 index 0000000..a1ae570 --- /dev/null +++ b/edu2.txt @@ -0,0 +1 @@ +Its time for fun here diff --git a/edu3.txt b/edu3.txt new file mode 100644 index 0000000..f5d72f0 --- /dev/null +++ b/edu3.txt @@ -0,0 +1 @@ +Well let me give food to sam first. Thanks From 9478431f27296efe33715cc51159ad6534d022e4 Mon Sep 17 00:00:00 2001 From: Emmanuel Ngong Date: Sun, 29 Sep 2019 14:06:55 -0500 Subject: [PATCH 02/20] Let me see what happens i the centrol repo --- edu1.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/edu1.txt b/edu1.txt index 3f71ed2..c990f68 100644 --- a/edu1.txt +++ b/edu1.txt @@ -1 +1,2 @@ Eduks the baby +Thank God its Friday........... From 28f8b30a2a94715905f646e7d4eb0c82009eafff Mon Sep 17 00:00:00 2001 From: Emmanuel Ngong Date: Wed, 16 Oct 2019 21:55:31 -0500 Subject: [PATCH 03/20] This is monday --- monday.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 monday.txt diff --git a/monday.txt b/monday.txt new file mode 100644 index 0000000..e5504a0 --- /dev/null +++ b/monday.txt @@ -0,0 +1 @@ +This Monday......›:w From 40aecd03eb8ea07112c03d2cfcf4ff18a2097b4a Mon Sep 17 00:00:00 2001 From: Emmanuel Ngong Date: Wed, 16 Oct 2019 22:02:36 -0500 Subject: [PATCH 04/20] We made some changes --- monday.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/monday.txt b/monday.txt index e5504a0..3862e96 100644 --- a/monday.txt +++ b/monday.txt @@ -1 +1,2 @@ -This Monday......›:w +This Monday......› +wow this is great we did our commit to origin From 64399e18bc8569bc6e26dbdd9d2934433c8c59da Mon Sep 17 00:00:00 2001 From: Emmanuel Ngong Date: Wed, 16 Oct 2019 22:24:47 -0500 Subject: [PATCH 05/20] This is my 3rd commit, Clovis made some changes --- monday.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/monday.txt b/monday.txt index 3862e96..1f6adb4 100644 --- a/monday.txt +++ b/monday.txt @@ -1,2 +1,3 @@ This Monday......› wow this is great we did our commit to origin +This is my local repo only From 203502a270b9f86d91de6cc3ca6f625170a1a677 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Fri, 18 Oct 2019 01:03:42 -0500 Subject: [PATCH 06/20] Create AWS-WAF-CFT --- AWS-WAF-CFT | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+) create mode 100644 AWS-WAF-CFT diff --git a/AWS-WAF-CFT b/AWS-WAF-CFT new file mode 100644 index 0000000..8a8a629 --- /dev/null +++ b/AWS-WAF-CFT @@ -0,0 +1,242 @@ +{ + "AWSTemplateFormatVersion": "2010-09-09", + "Description": "Creates an AWS WAF configuration that protects against common attacks", + "Metadata": { + "AWS::CloudFormation::Interface": { + "ParameterGroups": [ + { + "Label": { + "default": "Web ACL Name for Common Attack Protection" + }, + "Parameters": [ + "WebACLName" + ] + } + ], + "ParameterLabels": { + "WebACLName": { + "default": "Name" + } + } + } + }, + "Parameters": { + "WebACLName": { + "Type": "String", + "Default": "CommonAttackProtection", + "Description": "Enter the name you want to use for the WebACL. This value is also added as a prefix for the names of the rules, conditions, and CloudWatch metrics created by this template." + } + }, + "Resources": { + "MyWebACL": { + "Properties": { + "Name": { "Ref" : "WebACLName" }, + "DefaultAction": { + "Type": "ALLOW" + }, + "MetricName": { "Ref" : "WebACLName" }, + "Rules": [ + { + "Action": { + "Type": "BLOCK" + }, + "Priority": 1, + "RuleId": { + "Ref": "ManualIPBlockRule" + } + }, + { + "Action": { + "Type": "COUNT" + }, + "Priority": 2, + "RuleId": { + "Ref": "SizeMatchRule" + } + }, + { + "Action": { + "Type": "BLOCK" + }, + "Priority": 3, + "RuleId": { + "Ref": "SqliRule" + } + }, + { + "Action": { + "Type": "BLOCK" + }, + "Priority": 4, + "RuleId": { + "Ref": "XssRule" + } + } + ] + }, + "Type": "AWS::WAF::WebACL" + }, + "SqliRule": { + "Properties": { + "Name": { "Fn::Join" : [ "", [{ "Ref" : "WebACLName" }, "SqliRule"]] }, + "MetricName": { "Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "SqliRule"]] }, + "Predicates": [ + { + "DataId": { + "Ref": "SqliMatchSet" + }, + "Negated": false, + "Type": "SqlInjectionMatch" + } + ] + }, + "Type": "AWS::WAF::Rule" + }, + "XssRule": { + "Properties": { + "Name": { "Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "XssRule"]] }, + "MetricName": { "Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "XssRule"]]}, + "Predicates": [ + { + "DataId": { + "Ref": "XssMatchSet" + }, + "Negated": false, + "Type": "XssMatch" + } + ] + }, + "Type": "AWS::WAF::Rule" + }, + "SizeMatchRule": { + "Properties": { + "Name": { "Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "LargeBodyMatchRule"]] }, + "MetricName": { "Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "DetectLargeBody"]]}, + "Predicates": [ + { + "DataId": { + "Ref": "SizeMatchSet" + }, + "Negated": false, + "Type": "SizeConstraint" + } + ] + }, + "Type": "AWS::WAF::Rule" + }, + "ManualIPBlockRule": { + "Properties": { + "Name": { "Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "ManualIPBlockRule"]] }, + "MetricName": { "Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "ManualIPBlockRule"]]}, + "Predicates": [ + { + "DataId": { + "Ref": "WAFManualIPBlockSet" + }, + "Negated": false, + "Type": "IPMatch" + } + ] + }, + "Type": "AWS::WAF::Rule" + }, + "WAFManualIPBlockSet": { + "Properties": { + "Name": "Manual IP Block Set" + }, + "Type": "AWS::WAF::IPSet" + }, + "SizeMatchSet": { + "Properties": { + "Name": {"Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "LargeBodyMatch"]]}, + "SizeConstraints": [ + { + "FieldToMatch": { + "Type": "BODY" + }, + "ComparisonOperator": "GT", + "Size": "8192", + "TextTransformation": "NONE" + } + ] + }, + "Type": "AWS::WAF::SizeConstraintSet" + }, + "SqliMatchSet": { + "Properties": { + "Name": {"Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "SqliMatch"]]}, + "SqlInjectionMatchTuples": [ + { + "FieldToMatch": { + "Type": "QUERY_STRING" + }, + "TextTransformation": "URL_DECODE" + }, + { + "FieldToMatch": { + "Type": "QUERY_STRING" + }, + "TextTransformation": "HTML_ENTITY_DECODE" + }, + { + "FieldToMatch": { + "Type": "BODY" + }, + "TextTransformation": "URL_DECODE" + }, + { + "FieldToMatch": { + "Type": "BODY" + }, + "TextTransformation": "HTML_ENTITY_DECODE" + }, + { + "FieldToMatch": { + "Type": "URI" + }, + "TextTransformation": "URL_DECODE" + } + ] + }, + "Type": "AWS::WAF::SqlInjectionMatchSet" + }, + "XssMatchSet": { + "Properties": { + "Name": {"Fn::Join" : [ "", [{"Ref" : "WebACLName"}, "XssMatch"]]}, + "XssMatchTuples": [ + { + "FieldToMatch": { + "Type": "QUERY_STRING" + }, + "TextTransformation": "URL_DECODE" + }, + { + "FieldToMatch": { + "Type": "QUERY_STRING" + }, + "TextTransformation": "HTML_ENTITY_DECODE" + }, + { + "FieldToMatch": { + "Type": "BODY" + }, + "TextTransformation": "URL_DECODE" + }, + { + "FieldToMatch": { + "Type": "BODY" + }, + "TextTransformation": "HTML_ENTITY_DECODE" + }, + { + "FieldToMatch": { + "Type": "URI" + }, + "TextTransformation": "URL_DECODE" + } + ] + }, + "Type": "AWS::WAF::XssMatchSet" + } + } +} From 0179b748db21f00d14b16e09741fb909868b7d45 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Sat, 2 Nov 2019 12:57:48 -0500 Subject: [PATCH 07/20] Create test --- test | 1 + 1 file changed, 1 insertion(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..802992c --- /dev/null +++ b/test @@ -0,0 +1 @@ +Hello world From 3455fd818fd596302ea48af57282a68d16b00f32 Mon Sep 17 00:00:00 2001 From: sam Date: Tue, 12 Nov 2019 20:55:29 -0600 Subject: [PATCH 08/20] this is pipeline as code --- jenkinspipeline.txt | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 jenkinspipeline.txt diff --git a/jenkinspipeline.txt b/jenkinspipeline.txt new file mode 100644 index 0000000..34d92c0 --- /dev/null +++ b/jenkinspipeline.txt @@ -0,0 +1,34 @@ +pipeline{ + + agent any + + stages{ + + stage('Checkout'){ + steps{ + + git "https://github.com/devops-trainer/DevOpsClassCodes.git" + } + } + stage('Compile'){ + steps{ + + sh 'mvn compile' + + } + } + stage('Test'){ + steps{ + sh 'mvn test' + } + } + stage('Package'){ + steps{ + sh 'mvn package' + } + } + } + + } + + From f6b6d54bc0c1453c2e8242811a2be1a8d2c94764 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:07:49 -0600 Subject: [PATCH 09/20] Delete test --- test | 1 - 1 file changed, 1 deletion(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index 802992c..0000000 --- a/test +++ /dev/null @@ -1 +0,0 @@ -Hello world From e953f97ee1f8136742acf563c0feef1a53fc5b0f Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:08:03 -0600 Subject: [PATCH 10/20] Delete sone2.txt --- sone2.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sone2.txt diff --git a/sone2.txt b/sone2.txt deleted file mode 100644 index c27c0e5..0000000 --- a/sone2.txt +++ /dev/null @@ -1 +0,0 @@ -I really want to get a very high paying job after this courses From 85cfab360c4b8330b818679c9949b13bba25ed7c Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:08:16 -0600 Subject: [PATCH 11/20] Delete sone1.txt --- sone1.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sone1.txt diff --git a/sone1.txt b/sone1.txt deleted file mode 100644 index 286cadd..0000000 --- a/sone1.txt +++ /dev/null @@ -1 +0,0 @@ -i want to practice git rebasing From 6269f7d85fd25aec8dff22d588841df68692e946 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:09:18 -0600 Subject: [PATCH 12/20] Delete edu1.txt --- edu1.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 edu1.txt diff --git a/edu1.txt b/edu1.txt deleted file mode 100644 index c990f68..0000000 --- a/edu1.txt +++ /dev/null @@ -1,2 +0,0 @@ -Eduks the baby -Thank God its Friday........... From 7230ae9a760413c4cb5bf86dc069e46c18c6e24a Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:09:31 -0600 Subject: [PATCH 13/20] Delete demo1 - Copy (2).txt --- demo1 - Copy (2).txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 demo1 - Copy (2).txt diff --git a/demo1 - Copy (2).txt b/demo1 - Copy (2).txt deleted file mode 100644 index 9846202..0000000 --- a/demo1 - Copy (2).txt +++ /dev/null @@ -1 +0,0 @@ -This is the right time to learn Git and GitHub \ No newline at end of file From 6fafbe8dd71e9d67361053124aad0d156585b468 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:09:41 -0600 Subject: [PATCH 14/20] Delete demo1 - Copy (3).txt --- demo1 - Copy (3).txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 demo1 - Copy (3).txt diff --git a/demo1 - Copy (3).txt b/demo1 - Copy (3).txt deleted file mode 100644 index 9846202..0000000 --- a/demo1 - Copy (3).txt +++ /dev/null @@ -1 +0,0 @@ -This is the right time to learn Git and GitHub \ No newline at end of file From 297ffb8bb6065a8b55a0ce294be94500c28e137c Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:09:51 -0600 Subject: [PATCH 15/20] Delete demo1 - Copy.txt --- demo1 - Copy.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 demo1 - Copy.txt diff --git a/demo1 - Copy.txt b/demo1 - Copy.txt deleted file mode 100644 index 51b3dea..0000000 --- a/demo1 - Copy.txt +++ /dev/null @@ -1,2 +0,0 @@ -This is the right time to learn Git and GitHub -This time lets do this ......... \ No newline at end of file From deebd0f142848b9a3072aa17f1cb40c618f92255 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:10:01 -0600 Subject: [PATCH 16/20] Delete monday.txt --- monday.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 monday.txt diff --git a/monday.txt b/monday.txt deleted file mode 100644 index 1f6adb4..0000000 --- a/monday.txt +++ /dev/null @@ -1,3 +0,0 @@ -This Monday......› -wow this is great we did our commit to origin -This is my local repo only From 3291ddb4f71324be9e8b6df7a95b279346a55473 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:10:15 -0600 Subject: [PATCH 17/20] Delete edu3.txt --- edu3.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 edu3.txt diff --git a/edu3.txt b/edu3.txt deleted file mode 100644 index f5d72f0..0000000 --- a/edu3.txt +++ /dev/null @@ -1 +0,0 @@ -Well let me give food to sam first. Thanks From d9d9b765407666207b707cd3ae8fdbf33a8fa130 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:10:26 -0600 Subject: [PATCH 18/20] Delete demo1.txt --- demo1.txt | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 demo1.txt diff --git a/demo1.txt b/demo1.txt deleted file mode 100644 index b8a2bfa..0000000 --- a/demo1.txt +++ /dev/null @@ -1,2 +0,0 @@ -This is the right time to learn Git and GitHub -This time lets do this \ No newline at end of file From 3c91c59cb9c533df145723054b91bbea0e4b1a24 Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:10:41 -0600 Subject: [PATCH 19/20] Delete edu2.txt --- edu2.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 edu2.txt diff --git a/edu2.txt b/edu2.txt deleted file mode 100644 index a1ae570..0000000 --- a/edu2.txt +++ /dev/null @@ -1 +0,0 @@ -Its time for fun here From b8f37180f522b66ab667fc8c09224fa88ae499fe Mon Sep 17 00:00:00 2001 From: Chiango2 <55751516+Chiango2@users.noreply.github.com> Date: Tue, 12 Nov 2019 21:10:53 -0600 Subject: [PATCH 20/20] Delete sam.txt --- sam.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 sam.txt diff --git a/sam.txt b/sam.txt deleted file mode 100644 index ba44ad0..0000000 --- a/sam.txt +++ /dev/null @@ -1,3 +0,0 @@ -Baby Sam was born on January 05 2019. -He is almost 9 months today. He is growing very well and steady. -He eats a lot and wants real food; not baby foo. Lol