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

Remove inactive blocklist entries #29697

Merged
merged 23 commits into from
May 14, 2024
Merged

Remove inactive blocklist entries #29697

merged 23 commits into from
May 14, 2024

Conversation

stanleyjzheng
Copy link
Contributor

@stanleyjzheng stanleyjzheng commented Mar 12, 2024 •
edited
Loading

@stanleyjzheng stanleyjzheng mentioned this pull request Mar 12, 2024
Closed
@stanleyjzheng
Copy link
Contributor Author

Will need to merge MyEtherWallet/ethereum-lists#2107 to fix CI first.

@tayvano tayvano changed the title Remove inactive blocklist entries [DO NOT MERGE] Remove inactive blocklist entries Mar 12, 2024
@tayvano tayvano requested a review from blurpesec March 12, 2024 20:23
@tayvano
Copy link
Collaborator

tayvano commented Mar 12, 2024

do not merge until @blurpesec has approved

@jonade
Copy link
Contributor

jonade commented Mar 16, 2024 •
edited
Loading

Wondering what the logic is to remove domains? I notice some that I have only added a few days ago. I assume it's if DNS simply doesn't resolve?

A lot that I had added were sourced from Cert Transparency, so they have simply not completed setup of the phishing kits, but they likely will rotate their campaigns onto those soon.

blurpesec
blurpesec previously approved these changes Apr 25, 2024
View reviewed changes
@AlexHerman1
Copy link
Collaborator

@409H are you able to resolve the merge conflict and merge?

@AlexHerman1 AlexHerman1 added the improvement Issue or PR for features in the software of this repo label Apr 25, 2024
@409H
Merge remote-tracking branch 'origin/main'
d40be8d 
* origin/main: (25114 commits)
  Update config.json (#55756)
  Update config.json (#55755)
  Update config.json (#55754)
  Update config.json (#55753)
  Update config.json (#55752)
  Update config.json (#55751)
  Update config.json (#55750)
  Update config.json (#55749)
  Update config.json (#55748)
  Update config.json (#55747)
  Update config.json (#55746)
  Update config.json (#55745)
  Update config.json (#55744)
  Update config.json (#55743)
  Update config.json (#55742)
  Update config.json (#55741)
  Update config.json (#55740)
  CP-sync-3414 scams from ChainPatrol (#55702)
  Update config.json (#55739)
  Update config.json (#55738)
  ...
@409H
Merge remote-tracking branch 'origin/main'
8dc7f47 
* origin/main:
  Update config.json (#55757)
  Adding entries to blocklist  (#55723)
@409H
Copy link
Collaborator

409H commented Apr 29, 2024

@409H are you able to resolve the merge conflict and merge?

Brought the branch up to today, though will be outdated due to SEAL bot constantly merging into main. We need to fix the MEWlist CI check and update the branch again when we are ready to merge it

@stanleyjzheng
Copy link
Contributor Author

@409H are you able to resolve the merge conflict and merge?

Brought the branch up to today, though will be outdated due to SEAL bot constantly merging into main. We need to fix the MEWlist CI check and update the branch again when we are ready to merge it

Appreciate it. Have a PR up to fix the MEWlist CI here: MyEtherWallet/ethereum-lists#2107

@409H
Copy link
Collaborator

409H commented Apr 30, 2024

@stanleyjzheng that repo seems to be relatively unmaintained (4 commits in the last year). I'll issue a PR to your branch to remove this CI check

@409H
Copy link
Collaborator

409H commented Apr 30, 2024

Do we still need @blurpesec to review @tayvano ?

@409H 409H changed the title [DO NOT MERGE] Remove inactive blocklist entries Remove inactive blocklist entries Apr 30, 2024
@blurpesec blurpesec self-requested a review May 14, 2024 22:59
@409H 409H merged commit 67ef635 into MetaMask:main May 14, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@409H 409H 409H approved these changes

@blurpesec blurpesec blurpesec approved these changes

@kumavis kumavis Awaiting requested review from kumavis kumavis is a code owner

@FrederikBolding FrederikBolding Awaiting requested review from FrederikBolding FrederikBolding is a code owner

Assignees
No one assigned
Labels
improvement Issue or PR for features in the software of this repo
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@stanleyjzheng @tayvano @jonade @AlexHerman1 @409H @blurpesec