From 7df1d5471e0173dc355a0b7837072d9cdb375403 Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 9 Jun 2026 14:40:01 +0200 Subject: [PATCH 1/8] B: recovery --- slander.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 slander.md diff --git a/slander.md b/slander.md new file mode 100644 index 000000000..a091da2ef --- /dev/null +++ b/slander.md @@ -0,0 +1,4 @@ +# Breaking News + +MegaCorp CEO Lane enjoyed the live-action Last Airbender movie +MegaCorp CTO ThePrimeagen is a fan of The Notebook (and most other Nicholas Sparks content) \ No newline at end of file From cb426c8ddefb839e97805bb443026562a5e29ee8 Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 9 Jun 2026 15:09:11 +0200 Subject: [PATCH 2/8] C: --- customers/all.csv | 1 + orgs/partners.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/customers/all.csv b/customers/all.csv index 16dd7b21e..884a55a15 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1 +1,2 @@ first_name,last_name,company,title +karson,yummy,intercooler,ceo \ No newline at end of file diff --git a/orgs/partners.txt b/orgs/partners.txt index 880748638..93abf2117 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1 +1,3 @@ partner list +Boot.dev +TheStartup \ No newline at end of file From 189c6fa9740c500621269a9691e0756df60811f1 Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 9 Jun 2026 15:09:54 +0200 Subject: [PATCH 3/8] D: --- customers/all.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/customers/all.csv b/customers/all.csv index 16dd7b21e..9ca3b90b1 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1 +1,2 @@ first_name,last_name,company,title +jayson,gross,htmz,contributor \ No newline at end of file From 8ceb3775976142e83ec2cb7999bf968a497f58f8 Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 9 Jun 2026 16:00:38 +0200 Subject: [PATCH 4/8] G: --- customers/all.csv | 2 +- orgs/partners.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/customers/all.csv b/customers/all.csv index 734dbd659..91ac78526 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1,2 +1,2 @@ first_name,last_name,company,title -jayson,gross,htmz,contributor +carson,gross,htmx,creator diff --git a/orgs/partners.txt b/orgs/partners.txt index 93abf2117..e25dfe69d 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,3 +1,3 @@ partner list -Boot.dev +SalesInc TheStartup \ No newline at end of file From f46b5bbbaeeb6cc3d8b7077ae91d2d871fa60140 Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 9 Jun 2026 16:11:52 +0200 Subject: [PATCH 5/8] F: --- customers/all.csv | 2 +- orgs/partners.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/customers/all.csv b/customers/all.csv index 91ac78526..507f1d7fa 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1,2 +1,2 @@ first_name,last_name,company,title -carson,gross,htmx,creator + diff --git a/orgs/partners.txt b/orgs/partners.txt index e25dfe69d..24b4c33fe 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,3 +1,3 @@ partner list -SalesInc + TheStartup \ No newline at end of file From 74bf40c9dcc24331e788b4e7a9609278d4236e0a Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 9 Jun 2026 17:11:12 +0200 Subject: [PATCH 6/8] H: resolve merge conflict files with correct ours/theirs selections --- customers/all.csv | 2 +- orgs/partners.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customers/all.csv b/customers/all.csv index 507f1d7fa..b0c5b07f7 100644 --- a/customers/all.csv +++ b/customers/all.csv @@ -1,2 +1,2 @@ first_name,last_name,company,title - +jayson,gross,htmz,contributor% diff --git a/orgs/partners.txt b/orgs/partners.txt index 24b4c33fe..2f6c37ace 100644 --- a/orgs/partners.txt +++ b/orgs/partners.txt @@ -1,3 +1,3 @@ partner list - -TheStartup \ No newline at end of file +SalesInc +TheStartup From 3eb9d0bed11a120cc2859378c0829a6caa7ee682 Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 9 Jun 2026 17:18:58 +0200 Subject: [PATCH 7/8] J: redacted --- customers/banned.csv | 3 +++ customers/favs.md | 3 +++ 2 files changed, 6 insertions(+) create mode 100644 customers/banned.csv create mode 100644 customers/favs.md diff --git a/customers/banned.csv b/customers/banned.csv new file mode 100644 index 000000000..b01b34169 --- /dev/null +++ b/customers/banned.csv @@ -0,0 +1,3 @@ +first_name,last_name,company,title +Ballan,Agrandian,Boots.lore,Protagonist +sam,ctrlman,closedai,ceo \ No newline at end of file diff --git a/customers/favs.md b/customers/favs.md new file mode 100644 index 000000000..bfe19c681 --- /dev/null +++ b/customers/favs.md @@ -0,0 +1,3 @@ +# Favorite Customers +* Jesse Pinkman, Heisenberg's Assistant +* Walter White, Heisenberg, Chemist From b3addcbd093e6ad72eddae63dd373aa70e893f97 Mon Sep 17 00:00:00 2001 From: klaachkinggit Date: Tue, 16 Jun 2026 17:51:23 +0200 Subject: [PATCH 8/8] K: add scanner enhancements --- scripts/scan.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/scripts/scan.sh b/scripts/scan.sh index f4d9eb226..b264426ee 100755 --- a/scripts/scan.sh +++ b/scripts/scan.sh @@ -1 +1,11 @@ -# TODO: write the script +printf "\n====== SCANNING FOR CREDIT CARD NUMBERS ======\n" +grep -rE --color=always '(\b[0-9]{4}[- ]?){3}[0-9]{4}\b' . --exclude-dir={.git} --line-number +echo "========= CREDIT CARD SCAN COMPLETE ==========" +printf "\n==== SCANNING FOR SOCIAL SECURITY NUMBERS ==== +" +grep -rE --color=always '\b[0-9]{3}-[0-9]{2}-[0-9]{4}\b' . --exclude-dir={.git} --line-number +echo "======= SOCIAL SECURITY SCAN COMPLETE ========" +printf "\n========= SCANNING FOR PHONE NUMBERS =========\n" +grep -rE --color=always '\b[0-9]{3}-[0-9]{3}-[0-9]{4}\b' . --exclude-dir={.git} --line-number +grep -rE --color=always '\([0-9]{3}\) [0-9]{3}-[0-9]{4}' . --exclude-dir={.git} --line-number +echo "========= PHONE NUMBER SCAN COMPLETE ========="