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

check the whitelist regex in the base plugin class (for #93) #99

Merged
merged 2 commits into from
Dec 7, 2018
Merged

check the whitelist regex in the base plugin class (for #93) #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15701df
check the whitelist regex in the base plugin class
calvinli Dec 6, 2018
5b45888
remove whitelist check from keyword plugin, this functionality moved …
calvinli Dec 7, 2018
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
4 changes: 4 additions & 0 deletions detect_secrets/plugins/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from abc import ABCMeta
from abc import abstractmethod

from detect_secrets.plugins.core.constants import WHITELIST_REGEX


class BasePlugin(object):
"""This is an abstract class to define Plugins API"""
Expand All @@ -23,6 +25,8 @@ def analyze(self, file, filename):
"""
potential_secrets = {}
for line_num, line in enumerate(file.readlines(), start=1):
if WHITELIST_REGEX.search(line):
continue
secrets = self.analyze_string(line, line_num, filename)
potential_secrets.update(secrets)

Expand Down
4 changes: 0 additions & 4 deletions detect_secrets/plugins/keyword.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

from .base import BasePlugin
from detect_secrets.core.potential_secret import PotentialSecret
from detect_secrets.plugins.core.constants import WHITELIST_REGEX


BLACKLIST = (
Expand All @@ -54,9 +53,6 @@ class KeywordDetector(BasePlugin):
def analyze_string(self, string, line_num, filename):
output = {}

if WHITELIST_REGEX.search(string):
return output

for identifier in self.secret_generator(string):
secret = PotentialSecret(
self.secret_type,
Expand Down
2 changes: 2 additions & 0 deletions test_data/config.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ keyB = 456789123
567891234

keyC =

password = 12345678901234 # pragma: whitelist secret