remove rack-cors locking & update test credentials

andykimchris · Jan 9, 2025 · a702897 · a702897
1 parent 209f1aa
commit a702897
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,9 @@
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
 ARG RUBY_VERSION=3.3.6
-FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim as base
+
+# Use the base slim image
+FROM registry.docker.com/library/ruby:$RUBY_VERSION-slim AS base
 
 # Rails app lives here
 WORKDIR /rails
@@ -13,9 +15,8 @@ ENV RAILS_ENV="production" \
     BUNDLE_PATH="/usr/local/bundle" \
     BUNDLE_WITHOUT="development"
 
-
 # Throw-away build stage to reduce size of final image
-FROM base as build
+FROM base AS build
 
 # Install packages needed to build gems
 RUN apt-get update -qq && \

diff --git a/Gemfile b/Gemfile
@@ -34,8 +34,7 @@ gem 'ruby-vips', '>= 2.1.0'
 gem 'aws-sdk-s3', require: false
 
 # Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin Ajax possible
-# gem 'rack-cors'
-gem 'rack-cors', '>= 1.0.5', '< 2.0.1', require: 'rack/cors' # TODO: wait for 2.0.1 fix for CVE bug
+gem 'rack-cors'
 
 gem 'google-cloud-storage', '~> 1.11', require: false
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -316,7 +316,7 @@ GEM
     raabro (1.4.0)
     racc (1.8.1)
     rack (3.1.8)
-    rack-cors (2.0.0)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
@@ -509,7 +509,7 @@ DEPENDENCIES
   pre-commit
   pry
   puma (>= 5.0)
-  rack-cors (>= 1.0.5, < 2.0.1)
+  rack-cors
   rails (~> 7.1.1)
   rspec-rails (~> 6.0.0)
   rspec-sidekiq

diff --git a/config/credentials/test.yml.enc b/config/credentials/test.yml.enc
@@ -1 +1 @@
-/yxyaSzL8D6Al5AxBZEvIh0o3GnjwBZWzHTDA8SW93aS3HfNOqIMQ0+GX6TIMy2RYrmflj6Ek6fZo1cFYYvSIx9I2nhGoVihBdD619nZZNGYXz/vICf8yypx/+YOj7AjFmE67gLBdF/DHPKxBOmFcjCp14EDolHEegr607WMhYe74NYCZME5PIH+zWInZCqtbEzCs9Ee17lbopVpGq9f+o3eu/fzKJ/YosoIo6JmytPMvRJ/pQG71Y1OeMDVbX7zDi7FHDDBKsBDqfX5yub/H8Pc6z65hgbNMGvn1p5GraoIs1JfSQZdQQYC0OKQeOSPiRootEkK9IoS1ZbvC9rvH8yRyAcUekMYtpA+8KrttQdPLGu105g9tc5kcTyy2SkUUr8DDOpf65TdYk1Al4yfb9P900sPQ/DluhhxeX/Nutp0Uw1IQDz834NsnmBF1+If+jXa8wHb8dQkxxkY8g2tma/5pUi5tTPpRgiK9QbieaFssyN2XUitlS+dZmBDQpa6mZODwkofcN3LYsZrmb2evEcnfgespcPhoPhZHceAKGAFO2aD8U8Rb83bnI2FjzO2cbukNSpwL+uLn7lc5QqxOyHKaKCnlJ+Uql5N2133fsCeNMcpXE2BX52fAMsEcuxCz7pLsp3Abfg985S+K3QsTltluW3YGGce8/kc5dZkNnKbQOrfYqhfqmo3W553gNaLYxHa--jZS9YmC9S90SP2VF--PWZWxuBQb4HC6SQkMHuVQg==
+YnG0oWXYCB3YofrPA05tazQzeuPVlMnPZ/wTwBT/NiVlytkcrwJJr+t9ixnRLlmPOs9oyi4x/Icr3dT4gwu2/Y5HPzxgMXfIOb733Yw2mDlmwPAOD+HvEqCE/ovwNtYue/4euwJW2yft0hMwmS+3iZrlC1VAmk9psXlMwBqu3zrI+hGyD+TYh938AmzYaCjyYwSpjepXlrRGnEfPQRy/nW3n02HjXJjpyI/ZS7l0l8f48EszGvmnyDs8lyP4b3P0U8PSc5KLo0/PHrnfixmoDVip3ZRM8z482vA8ywlOBPSXMTvQ6pdvMOgs0s/ASQMlag9oLG0fM025x4RGQuKoAH5EyLqFGWS1jvnKTjp3q54wpOM1bGj4IZhwXh+ENAoles+SLBDPGSJJNwacrA+ZOHxz38Zn9NqN5eFlQ0CEE+bJQCg08zu9idVoSTKsi7ZnoROyiEz8ClRNdvIjDlI5aG3nhuonoE3MLjJYOf+kRyTiw9pXeltMhapW/1cZdL2DgS9wB95HBHKBJPXnHiHeaaPVBYp4+N+YbtBIX3SgDIpIdnEZfNtJTI8wRrLB334NhAeal0EzSp9BWYcmIBQB1mrntiBb7UbZTChIP6CTmUcscxg2pmj4QXo/yAYx3pqGsN0AoWkf7HOgg6Ulv/6lCiK5dBf/dEFNl/pDd1AGBts0X2MfmPcCZlM+0ny8Q1b54GaM8LKT6UqA9XVrRHDkk8AIlC98Z4EvKKGocQghHuMUnfZKVIm3l74ZNbgE5BsYz7H/NVcLXRTaU1KgT9IGWIO8DhdVhefuX+hF1oaqBF9bjT9Jdz3BpWJmAtUMWiMaZ/g8j2yP5aMK/eoAUiigyuPetRj817OdstkqMA==--PBB0AovRov+9uArp--U0qOKviFFi4ptyhQNofncw==
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		/yxyaSzL8D6Al5AxBZEvIh0o3GnjwBZWzHTDA8SW93aS3HfNOqIMQ0+GX6TIMy2RYrmflj6Ek6fZo1cFYYvSIx9I2nhGoVihBdD619nZZNGYXz/vICf8yypx/+YOj7AjFmE67gLBdF/DHPKxBOmFcjCp14EDolHEegr607WMhYe74NYCZME5PIH+zWInZCqtbEzCs9Ee17lbopVpGq9f+o3eu/fzKJ/YosoIo6JmytPMvRJ/pQG71Y1OeMDVbX7zDi7FHDDBKsBDqfX5yub/H8Pc6z65hgbNMGvn1p5GraoIs1JfSQZdQQYC0OKQeOSPiRootEkK9IoS1ZbvC9rvH8yRyAcUekMYtpA+8KrttQdPLGu105g9tc5kcTyy2SkUUr8DDOpf65TdYk1Al4yfb9P900sPQ/DluhhxeX/Nutp0Uw1IQDz834NsnmBF1+If+jXa8wHb8dQkxxkY8g2tma/5pUi5tTPpRgiK9QbieaFssyN2XUitlS+dZmBDQpa6mZODwkofcN3LYsZrmb2evEcnfgespcPhoPhZHceAKGAFO2aD8U8Rb83bnI2FjzO2cbukNSpwL+uLn7lc5QqxOyHKaKCnlJ+Uql5N2133fsCeNMcpXE2BX52fAMsEcuxCz7pLsp3Abfg985S+K3QsTltluW3YGGce8/kc5dZkNnKbQOrfYqhfqmo3W553gNaLYxHa--jZS9YmC9S90SP2VF--PWZWxuBQb4HC6SQkMHuVQg==
		YnG0oWXYCB3YofrPA05tazQzeuPVlMnPZ/wTwBT/NiVlytkcrwJJr+t9ixnRLlmPOs9oyi4x/Icr3dT4gwu2/Y5HPzxgMXfIOb733Yw2mDlmwPAOD+HvEqCE/ovwNtYue/4euwJW2yft0hMwmS+3iZrlC1VAmk9psXlMwBqu3zrI+hGyD+TYh938AmzYaCjyYwSpjepXlrRGnEfPQRy/nW3n02HjXJjpyI/ZS7l0l8f48EszGvmnyDs8lyP4b3P0U8PSc5KLo0/PHrnfixmoDVip3ZRM8z482vA8ywlOBPSXMTvQ6pdvMOgs0s/ASQMlag9oLG0fM025x4RGQuKoAH5EyLqFGWS1jvnKTjp3q54wpOM1bGj4IZhwXh+ENAoles+SLBDPGSJJNwacrA+ZOHxz38Zn9NqN5eFlQ0CEE+bJQCg08zu9idVoSTKsi7ZnoROyiEz8ClRNdvIjDlI5aG3nhuonoE3MLjJYOf+kRyTiw9pXeltMhapW/1cZdL2DgS9wB95HBHKBJPXnHiHeaaPVBYp4+N+YbtBIX3SgDIpIdnEZfNtJTI8wRrLB334NhAeal0EzSp9BWYcmIBQB1mrntiBb7UbZTChIP6CTmUcscxg2pmj4QXo/yAYx3pqGsN0AoWkf7HOgg6Ulv/6lCiK5dBf/dEFNl/pDd1AGBts0X2MfmPcCZlM+0ny8Q1b54GaM8LKT6UqA9XVrRHDkk8AIlC98Z4EvKKGocQghHuMUnfZKVIm3l74ZNbgE5BsYz7H/NVcLXRTaU1KgT9IGWIO8DhdVhefuX+hF1oaqBF9bjT9Jdz3BpWJmAtUMWiMaZ/g8j2yP5aMK/eoAUiigyuPetRj817OdstkqMA==--PBB0AovRov+9uArp--U0qOKviFFi4ptyhQNofncw==