Skip to content

CM-13664 - do not scan cycode config file #20

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

Merged
MichalBor merged 6 commits into from
Aug 9, 2022
Merged

CM-13664 - do not scan cycode config file #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73e2a50
make exclude by path work for commit_history and repository scans
MichalBor Aug 8, 2022
1f90955
remove debug test
MichalBor Aug 8, 2022
bb7ede7
WIP
MichalBor Aug 8, 2022
681f418
Merge branch 'CM-11974' into CM-13664
MichalBor Aug 8, 2022
da25c6e
fix
MichalBor Aug 8, 2022
8196018
Merge branch 'main' into CM-13664
MichalBor Aug 9, 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
4 changes: 3 additions & 1 deletion cli/code_scanner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from cli.config import configuration_manager
from cli.utils.path_utils import is_sub_path, is_binary_file, get_file_size, get_relevant_files_in_path, get_path_by_os
from cli.utils.string_utils import get_content_size, is_binary_content
from cli.user_settings.config_file_manager import ConfigFileManager
from cli.zip_file import InMemoryZip
from cli.exceptions.custom_exceptions import CycodeError, HttpUnauthorizedError, ZipTooLargeError
from cyclient import logger
Expand Down Expand Up @@ -398,7 +399,8 @@ def _does_document_exceed_max_size_limit(content: str) -> bool:

def _is_subpath_of_cycode_configuration_folder(filename: str) -> bool:
return is_sub_path(configuration_manager.global_config_file_manager.get_config_directory_path(), filename) \
or is_sub_path(configuration_manager.local_config_file_manager.get_config_directory_path(), filename)
or is_sub_path(configuration_manager.local_config_file_manager.get_config_directory_path(), filename) \
or filename.endswith(ConfigFileManager.get_config_file_route())


def _handle_exception(context: click.Context, e: Exception):
Expand Down
4 changes: 4 additions & 0 deletions cli/user_settings/config_file_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ def get_config_directory_path(self) -> str:
def get_filename(self) -> str:
return os.path.join(self.get_config_directory_path(), self.FILE_NAME)

@staticmethod
def get_config_file_route() -> str:
return os.path.join(ConfigFileManager.CYCODE_HIDDEN_DIRECTORY, ConfigFileManager.FILE_NAME)

def _get_exclusions_by_exclusion_type(self, scan_type, exclusion_type) -> List:
scan_type_exclusions = self.get_exclusions_by_scan_type(scan_type)
return scan_type_exclusions.get(exclusion_type, [])
Expand Down