From 566442fad11a25ba7872feb2a05216bf2634d422 Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Tue, 14 Oct 2025 16:25:09 +0100 Subject: [PATCH 1/2] turn off basic auth --- app/controllers/application_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 68382af6..8f052fda 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -54,6 +54,7 @@ def is_staging def authenticate_if_needed # Disable this extra authentication in test mode return true if Rails.env.test? + return true # any hint of basic auth will stop BL staff from accessing site so instead we open all the "private" demo sites if (is_hidden || is_staging) && !is_api_or_pdf authenticate_or_request_with_http_basic do |username, password| username == ENV.fetch("HYKU_DEMO_USER", "bl_demo_user") && password == ENV.fetch("HYKU_DEMO_PASSWORD", "resu_omed_lb") From 6e4d5338b8e7986a7dab45a790876aaa7a05f716 Mon Sep 17 00:00:00 2001 From: Rory McNicholl Date: Tue, 14 Oct 2025 21:28:33 +0100 Subject: [PATCH 2/2] fix build fail --- Dockerfile | 14 +++++++------- bin/worker | 3 ++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index e3509d81..72d829e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,8 @@ USER root RUN apk --no-cache upgrade && \ apk --no-cache add \ bash \ - clamav \ - clamav-daemon \ +# clamav \ +# clamav-daemon \ cmake \ exiftool \ ffmpeg \ @@ -37,10 +37,10 @@ RUN apk --no-cache upgrade && \ # cargo install rbspy && \ echo "******** Packages Installed *********" -RUN sed -i 's/User clamav/User app/g' /etc/clamav/clamd.conf -RUN mkdir -p /var/run/clamav && chown -R app:app /var/run/clamav -RUN mkdir -p /var/log/clamav && chown -R app:app /var/log/clamav -RUN chown -R app:app /var/lib/clamav +#RUN sed -i 's/User clamav/User app/g' /etc/clamav/clamd.conf +#RUN mkdir -p /var/run/clamav && chown -R app:app /var/run/clamav +#RUN mkdir -p /var/log/clamav && chown -R app:app /var/log/clamav +#RUN chown -R app:app /var/lib/clamav RUN wget https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-57.tar.gz \ && tar xf 7.1.0-57.tar.gz \ @@ -105,6 +105,6 @@ RUN RAILS_ENV=production SECRET_KEY_BASE=`bin/rake secret` DB_ADAPTER=nulldb DAT CMD ./bin/web FROM hyku-web AS hyku-worker -RUN freshclam +#RUN freshclam ENV MALLOC_ARENA_MAX=2 CMD ./bin/worker diff --git a/bin/worker b/bin/worker index 2d33ecb7..82e255bf 100755 --- a/bin/worker +++ b/bin/worker @@ -9,4 +9,5 @@ else puts 'DATABASE_URL not set, no pool change needed' end -exec "echo $DATABASE_URL && clamd && bundle exec sidekiq" +#exec "echo $DATABASE_URL && clamd && bundle exec sidekiq" +exec "echo $DATABASE_URL && bundle exec sidekiq"