Merge pull request #2564 from cyberark/dependabot/bundler/rack-2.2.3.1

Bump rack from 2.2.3 to 2.2.3.1

CHANGELOG.md

@@ -12,10 +12,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [1.17.7] - 2022-05-19
 
 ### Changed
+- Made simplecov a dev/test dependency
+  [cyberark/conjur#2564](https://github.com/cyberark/conjur/pull/2564)  
 - Added configuration for token TTL
   [cyberark/conjur#2510](https://github.com/cyberark/conjur/pull/2510)
 
 ### Security
+- Update rack to 2.2.3.1 to resolve CVE-2022-3023
+  [cyberark/conjur#2564](https://github.com/cyberark/conjur/pull/2564)
 - Update nokogiri to 1.13.6 to resolve un-numbered libxml CVEs (both in main
   Gemfile.lock and in docs/Gemfile.lock)
   [cyberark/conjur#2558](https://github.com/cyberark/conjur/pull/2558)

Gemfile

@@ -53,8 +53,6 @@ gem 'rack-rewrite'
 # Putting this here currently confuses debify, so instead load it in
 # application.rb gem 'conjur_audit', path: 'engines/conjur_audit'
 
-gem 'simplecov', '0.21.2', require: false
-
 gem 'dry-struct'
 gem 'dry-types'
 gem 'net-ldap'
@@ -100,6 +98,7 @@ group :development, :test do
   gem 'rspec-core'
   gem 'rspec-rails'
   gem 'ruby-debug-ide'
+  gem 'simplecov', require: false
   gem 'spring'
   gem 'spring-commands-cucumber'
   gem 'spring-commands-rspec'

Gemfile.lock

@@ -270,8 +270,6 @@ GEM
     net-ssh (6.1.0)
     netrc (0.11.0)
     nio4r (2.5.8)
-    nokogiri (1.13.6-x86_64-darwin)
-      racc (~> 1.4)
     nokogiri (1.13.6-x86_64-linux)
       racc (~> 1.4)
     openid_connect (1.3.0)
@@ -301,7 +299,7 @@ GEM
     puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
-    rack (2.2.3)
+    rack (2.2.3.1)
     rack-oauth2 (1.19.0)
       activesupport
       attr_required
@@ -528,7 +526,7 @@ DEPENDENCIES
   sequel-pg_advisory_locking
   sequel-postgres-schemata
   sequel-rails
-  simplecov (= 0.21.2)
+  simplecov
   slosilo (~> 3.0)
   spring
   spring-commands-cucumber

ci/docker-compose.yml

@@ -35,7 +35,7 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust
 
   conjur:
-    image: "conjur:${TAG}"
+    image: "conjur-test:${TAG}"
     environment:
       DATABASE_URL: postgres://postgres@pg/postgres
       CONJUR_ADMIN_PASSWORD: ADmin123!!!!

ci/test_suites/authenticators_k8s/dev/Dockerfile.test

@@ -1,4 +1,4 @@
-FROM google/cloud-sdk:241.0.0
+FROM google/cloud-sdk:388.0.0
 
 RUN mkdir -p /src
 WORKDIR /src

ci/test_suites/authenticators_k8s/dev/dev_conjur.template.yaml

@@ -81,7 +81,7 @@ spec:
         app: conjur-authn-k8s
     spec:
       containers:
-      - image: {{ CONJUR_AUTHN_K8S_TAG }}
+      - image: {{ CONJUR_TEST_AUTHN_K8S_TAG }}
         imagePullPolicy: IfNotPresent
         name: conjur
         command: ["conjurctl", "server"]

ci/test_suites/authenticators_k8s/dev/dev_conjur_http_proxy.template.yaml

@@ -15,7 +15,7 @@ spec:
         app: conjur-authn-k8s
     spec:
       containers:
-      - image: {{ CONJUR_AUTHN_K8S_TAG }}
+      - image: {{ CONJUR_TEST_AUTHN_K8S_TAG }}
         imagePullPolicy: Always
         name: conjur
         command: ["conjurctl", "server"]

ci/test_suites/authenticators_k8s/dev/dev_conjur_sni.template.yaml

@@ -19,7 +19,7 @@ spec:
           hostnames:
             - "{{ KUBERNETES_API_FQDN }}"
       containers:
-      - image: {{ CONJUR_AUTHN_K8S_TAG }}
+      - image: {{ CONJUR_TEST_AUTHN_K8S_TAG }}
         imagePullPolicy: Always
         name: conjur
         command: ["conjurctl", "server"]

ci/test_suites/authenticators_k8s/test_gke_entrypoint.sh

@@ -243,7 +243,7 @@ function runTests() {
 
   conjurcmd mkdir -p /opt/conjur-server/output
 
-  run_cucumber "~@skip --tags ~@k8s_skip --tags ~@sni_fails --tags ~@sni_success"
+  run_cucumber "--tags 'not @skip' --tags 'not @k8s_skip' --tags 'not @sni_fails' --tags 'not @sni_success'"
 }
 
 retrieve_pod() {
@@ -296,7 +296,7 @@ function run_conjur_master() {
 }
 
 function run_cucumber() {
-  tags=$1
+  cucumber_args=$1
   echo "./bin/cucumber \
     K8S_VERSION=1.7 \
     PLATFORM=kubernetes \
@@ -308,7 +308,7 @@ function run_cucumber() {
     -r ./cucumber/authenticators_k8s/features/support/world.rb \
     -r ./cucumber/authenticators_k8s/features/support/hooks.rb \
     -r ./cucumber/authenticators_k8s/features/support/conjur_token.rb \
-    --tags $tags ./cucumber/authenticators_k8s/features" | cucumbercmd -i bash || true
+    $cucumber_args ./cucumber/authenticators_k8s/features" | cucumbercmd -i bash
 }
 
 main

ci/test_suites/authenticators_k8s/test_oc_entrypoint.sh

@@ -224,7 +224,7 @@ function runTests() {
 
   conjurcmd mkdir -p /opt/conjur-server/output
 
-  run_cucumber "~@skip --tags ~@k8s_skip --tags ~@sni_fails --tags ~@sni_success --tags ~@http_proxy"
+  run_cucumber "--tags 'not @skip' --tags 'not @k8s_skip' --tags 'not @sni_fails' --tags 'not @sni_success' --tags 'not @http_proxy'"
 
   printLogs
 
@@ -284,7 +284,7 @@ function run_conjur_master() {
 }
 
 function run_cucumber() {
-  tags=$1
+  cucumber_args=$1
   echo "./bin/cucumber \
     K8S_VERSION=$K8S_VERSION \
     PLATFORM=openshift \
@@ -294,7 +294,7 @@ function run_cucumber() {
     -r ./cucumber/authenticators_k8s/features/support/world.rb \
     -r ./cucumber/authenticators_k8s/features/support/hooks.rb \
     -r ./cucumber/authenticators_k8s/features/support/conjur_token.rb \
-    --tags $tags ./cucumber/authenticators_k8s/features" | cucumbercmd -i bash || true
+    $cucumber_args ./cucumber/authenticators_k8s/features" | cucumbercmd -i bash || true
 }
 
 main