Merge pull request #401 from nbycomp/feature/reject-invalid-filter-format

Feature/reject invalid filter format

Author: taylorsilva

Dockerfile

@@ -191,7 +191,7 @@ ADD test/ /tests
 RUN /tests/all.sh
 
 FROM resource AS integrationtests
-RUN apt update && apt install -y squid
+RUN apt update && apt install -y iproute2 squid
 ADD test/ /tests/test
 ADD integration-tests /tests/integration-tests
 RUN /tests/integration-tests/integration.sh

assets/check

@@ -27,8 +27,8 @@ tag_regex=$(jq -r '.source.tag_regex // ""' <<< "$payload")
 git_config_payload=$(jq -r '.source.git_config // []' <<< "$payload")
 ref=$(jq -r '.version.ref // ""' <<< "$payload")
 skip_ci_disabled=$(jq -r '.source.disable_ci_skip // false' <<< "$payload")
-filter_whitelist=$(jq -r '.source.commit_filter.include // []' <<< "$payload")
-filter_blacklist=$(jq -r '.source.commit_filter.exclude // []' <<< "$payload")
+filter_include=$(jq '.source.commit_filter.include // []' <<< "$payload")
+filter_exclude=$(jq '.source.commit_filter.exclude // []' <<< "$payload")
 version_depth=$(jq -r '.source.version_depth // 1' <<< "$payload")
 reverse=false
 
@@ -43,6 +43,16 @@ else
   tagflag="--no-tags"
 fi
 
+for filter in "$filter_include" "$filter_exclude"
+do
+  if jq -e 'type != "array"' <<<"$filter"
+  then
+    echo 'invalid commit filter (expected array of strings)'
+    echo "$filter"
+    exit 1
+  fi
+done
+
 # We're just checking for commits; we don't ever need to fetch LFS files here!
 export GIT_LFS_SKIP_SMUDGE=1
 
@@ -81,20 +91,20 @@ else
 fi
 
 list_command="git rev-list --all --first-parent $log_range $paths_search"
-if [ `echo $filter_whitelist | jq -r '. | length'` -gt 0 ]
+if jq -e 'length > 0' <<<"$filter_include"
 then
     list_command+=" | git rev-list --stdin --date-order  --first-parent --no-walk=unsorted "
-    whitelist_items=$(echo $filter_whitelist | jq -r -c '.[]')
+    whitelist_items=$(echo $filter_include | jq -r -c '.[]')
     for wli in "$whitelist_items"
     do
         list_command+=" --grep=\"$wli\""
     done
 fi
 
-if [ `echo $filter_blacklist | jq -r '. | length'` -gt 0 ]
+if jq -e 'length > 0' <<<"$filter_exclude"
 then
     list_command+=" | git rev-list --stdin --date-order  --invert-grep --first-parent --no-walk=unsorted "
-    blacklist_items=$(echo $filter_blacklist | jq -r -c '.[]')
+    blacklist_items=$(echo $filter_exclude | jq -r -c '.[]')
     for bli in "$blacklist_items"
     do
         list_command+=" --grep=\"$bli\""

integration-tests/helpers.sh

@@ -139,10 +139,7 @@ __run() {
   set +e
   attempts=10
   while (( attempts )); do
-    ( netstat -an | grep LISTEN | grep 3128 ) >/dev/null 2>&1
-    rc=$?
-
-    if [[ $rc == 0 ]]; then
+    if ss -ltn | grep -q 3128; then
       break
     else
       echo "Waiting for proxy to finish reconfiguring..."

test/check.sh

@@ -532,7 +532,7 @@ it_skips_excluded_commits_conventional() {
 }
 
 it_skips_non_included_and_excluded_commits() {
-local repo=$(init_repo)
+  local repo=$(init_repo)
   local ref1=$(make_commit $repo)
   local ref2=$(make_commit $repo "not skipped commit")
   local ref3=$(make_commit $repo "not skipped sometimes")
@@ -545,6 +545,32 @@ local repo=$(init_repo)
   "
 }
 
+it_rejects_filter_with_incorrect_format() {
+  local repo=$(init_repo)
+  local ref1=$(make_commit $repo)
+
+  set +e
+  output=$(
+    jq --arg uri "$(init_repo)" \
+      --arg ref "$(make_commit "$repo")" \
+      -n '{
+      source: {
+        $uri,
+        commit_filter: {
+          include: "a string, not an array",
+        }
+      },
+      version: {
+        $ref
+      }
+    }' | ${resource_dir}/check | tee /dev/stderr
+  )
+  exit_code=$?
+  set -e
+
+  test $exit_code -ne 0
+}
+
 it_does_not_skip_marked_commits_when_disable_skip_configured() {
   local repo=$(init_repo)
   local ref1=$(make_commit_to_future $repo)
@@ -968,6 +994,7 @@ run it_skips_excluded_commits
 run it_skips_excluded_commits_conventional
 run it_skips_non_included_commits
 run it_skips_non_included_and_excluded_commits
+run it_rejects_filter_with_incorrect_format
 run it_does_not_skip_marked_commits_when_disable_skip_configured
 run it_fails_if_key_has_password_not_provided
 run it_can_unlock_key_with_password
@@ -999,4 +1026,3 @@ run it_checks_lastest_commit
 run it_can_check_a_repo_having_multiple_root_commits
 run it_checks_with_version_depth
 run it_checks_uri_with_tag_filter_and_version_depth
-