csmock: export functions that can be reused by cspodman #115

lbossis · 2023-08-16T01:49:32Z

Ready for review

kdudka

Thank you for working on this. I am marking this pull request as a draft until the related change in cspodman is proven to work as expected.

py/common/util.py

py/csmock

py/common/util.py

py/csmock

py/common/util.py

kdudka · 2023-08-22T07:44:07Z

@lbossis Thank you for working on this. I am marking this pull request as a draft until the related change in cspodman is proven to work as expected.

kdudka · 2023-09-13T12:30:46Z

py/common/util.py

+    in order to expose it for potential use where it might fit
+    """
+    # install global filter of known false positives
+    filter_cmd = f"csdiff --json-output --show-internal \"{props.known_false_positives}\""


@lbossis This would break csmock because csdiff takes two operands and you omitted the trailing -:

csmock/py/csmock

Line 676 in 0671e2a

filter_cmd = 'csdiff --json-output --show-internal "%s" -' % props.known_false_positives

... so that they can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

github-advanced-security

vcs-diff-lint found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

py/common/results.py

+        # then apply custom per-checker filters
+        for (chk, csgrep_args) in props.imp_csgrep_filters:
+            chk_re = re_from_checker_set(props.imp_checker_set - set([chk]))
+            cmd += " | csdiff <(csgrep '%s' --mode=json --drop-scan-props --invert-regex --checker '%s' %s) -" \


py/common/results.py

+    """transform scan-results.js to scan-results.{err,html} and write stats"""
+    if props.imp_checker_set:
+        # filter out "important" defects, first based on checkers only
+        cmd = "csgrep '%s' --mode=json --checker '%s'" % \


py/common/results.py

+        # then apply custom per-checker filters
+        for (chk, csgrep_args) in props.imp_csgrep_filters:
+            chk_re = re_from_checker_set(props.imp_checker_set - set([chk]))
+            cmd += " | csdiff <(csgrep '%s' --mode=json --drop-scan-props --invert-regex --checker '%s' %s) -" \


py/common/results.py

+
+        # write the result into *-imp.js
+        imp_js_file = re.sub("\\.js", "-imp.js", js_file)
+        cmd += " > '%s'" % imp_js_file


py/common/results.py

+
+        # initialize the "imp" flag in the resulting full .js output file
+        tmp_js_file = re.sub("\\.js", "-tmp.js", js_file)
+        cmd = "cslinker --implist '%s' '%s' > '%s' && mv -v '%s' '%s'" \


py/common/results.py

+    (err_file, _) = transform_results(js_file, results)
+
+    if props.print_defects:
+        os.system("csgrep '%s'" % err_file)


py/common/results.py

+        os.system("csgrep '%s'" % err_file)
+
+
+def apply_result_filters(props, results, supp_filters=[]):


py/common/results.py

+        return
+
+    # install path exclusion filters for this pkg
+    with open(ep_file) as file_handle:


py/csmock

 from csmock.common.util         import shell_quote
 from csmock.common.util         import strlist_to_shell_cmd
 from csmock.common.results      import FatalError
 from csmock.common.results      import ScanResults
+from csmock.common.results      import apply_result_filters
+from csmock.common.results      import finalize_results


py/csmock

 from csmock.common.util         import shell_quote
 from csmock.common.util         import strlist_to_shell_cmd
 from csmock.common.results      import FatalError
 from csmock.common.results      import ScanResults
+from csmock.common.results      import apply_result_filters
+from csmock.common.results      import finalize_results
+from csmock.common.results      import handle_known_fp_list


Test.

rhyw · 2023-09-21T09:08:38Z

Didn't verify but the proposed changes LGTM.

... so that they can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka · 2023-09-22T10:29:07Z

@rhyw Thanks for review!

lbossis marked this pull request as ready for review August 16, 2023 03:01

kdudka reviewed Aug 16, 2023

View reviewed changes

py/common/util.py Outdated Show resolved Hide resolved

kdudka marked this pull request as draft August 16, 2023 07:27

lzaoral reviewed Aug 16, 2023

View reviewed changes

py/csmock Outdated Show resolved Hide resolved

github-advanced-security bot found potential problems Aug 16, 2023

View reviewed changes

github-advanced-security bot found potential problems Aug 17, 2023

View reviewed changes

py/common/util.py Fixed Show fixed Hide fixed

py/common/util.py Fixed Show fixed Hide fixed

py/common/util.py Fixed Show fixed Hide fixed

lbossis force-pushed the code-refactoring-move-function-handle_known_fp_list-to-csmock-common--OSH-151 branch from 44c6d5c to f115b7e Compare August 17, 2023 16:19

github-advanced-security bot found potential problems Aug 17, 2023

View reviewed changes

py/common/util.py Fixed Show fixed Hide fixed

py/common/util.py Fixed Show fixed Hide fixed

lbossis force-pushed the code-refactoring-move-function-handle_known_fp_list-to-csmock-common--OSH-151 branch from f115b7e to 687ac1d Compare August 17, 2023 17:02

github-advanced-security bot found potential problems Aug 17, 2023

View reviewed changes

py/common/util.py Fixed Show fixed Hide fixed

lbossis force-pushed the code-refactoring-move-function-handle_known_fp_list-to-csmock-common--OSH-151 branch from 687ac1d to c5df618 Compare August 17, 2023 18:13

lbossis marked this pull request as ready for review August 17, 2023 18:46

kdudka marked this pull request as draft August 22, 2023 07:44

kdudka reviewed Sep 13, 2023

View reviewed changes

kdudka pushed a commit to lbossis/csmock that referenced this pull request Sep 13, 2023

csmock: export handle_known_fp_list() and require_file()

4fe62b6

... so that they can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka added a commit to lbossis/csmock that referenced this pull request Sep 13, 2023

csmock: update scan metadata in handle_known_fp_list()

019fd85

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka added a commit to lbossis/csmock that referenced this pull request Sep 13, 2023

csmock: export finalize_results()

8a0fd05

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka added a commit to lbossis/csmock that referenced this pull request Sep 13, 2023

csmock: export apply_result_filters()

dd5baab

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka force-pushed the code-refactoring-move-function-handle_known_fp_list-to-csmock-common--OSH-151 branch from a4f417b to dd5baab Compare September 13, 2023 15:22

kdudka changed the title ~~Code refactoring to enable reuse of the function handle_known_fp_list~~ csmock: export functions that can be reused by cspodman Sep 13, 2023

github-advanced-security bot found potential problems Sep 13, 2023

View reviewed changes

kdudka requested review from kdudka and removed request for kdudka September 13, 2023 15:23

kdudka marked this pull request as ready for review September 13, 2023 15:24

kdudka added a commit to lbossis/csmock that referenced this pull request Sep 13, 2023

csmock: export finalize_results()

b14c9ee

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka added a commit to lbossis/csmock that referenced this pull request Sep 13, 2023

csmock: export apply_result_filters()

e109338

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka force-pushed the code-refactoring-move-function-handle_known_fp_list-to-csmock-common--OSH-151 branch from dd5baab to e109338 Compare September 13, 2023 15:27

github-advanced-security bot found potential problems Sep 13, 2023

View reviewed changes

kdudka requested a review from lzaoral September 13, 2023 15:29

kdudka requested review from kdudka and removed request for kdudka September 13, 2023 15:29

lzaoral removed their request for review September 14, 2023 10:47

This comment was marked as off-topic.

Sign in to view

kdudka requested a review from rhyw September 18, 2023 09:47

rhyw approved these changes Sep 22, 2023

View reviewed changes

lbossis and others added 4 commits September 22, 2023 12:27

csmock: export handle_known_fp_list() and require_file()

e570654

... so that they can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

csmock: update scan metadata in handle_known_fp_list()

8a7d66c

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

csmock: export finalize_results()

22752ad

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

csmock: export apply_result_filters()

40b402c

... so that it can be reused by cspodman Related: https://issues.redhat.com/browse/OSH-151 Closes: csutils#115

kdudka force-pushed the code-refactoring-move-function-handle_known_fp_list-to-csmock-common--OSH-151 branch from e109338 to 40b402c Compare September 22, 2023 10:28

kdudka closed this in e570654 Sep 22, 2023

kdudka merged commit 40b402c into csutils:main Sep 22, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

csmock: export functions that can be reused by cspodman #115

csmock: export functions that can be reused by cspodman #115

lbossis commented Aug 16, 2023

kdudka left a comment

kdudka commented Aug 22, 2023

kdudka Sep 13, 2023

github-advanced-security bot left a comment

This comment was marked as off-topic.

rhyw commented Sep 21, 2023

kdudka commented Sep 22, 2023

		os.system("csgrep '%s'" % err_file)


		def apply_result_filters(props, results, supp_filters=[]):

csmock: export functions that can be reused by cspodman #115

csmock: export functions that can be reused by cspodman #115

Conversation

lbossis commented Aug 16, 2023

kdudka left a comment

Choose a reason for hiding this comment

kdudka commented Aug 22, 2023

kdudka Sep 13, 2023

Choose a reason for hiding this comment

github-advanced-security bot left a comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

rhyw commented Sep 21, 2023

kdudka commented Sep 22, 2023