bugfix in mod_ood_proxy and keep clean_nginx_env idempotent (#2570)

bugfix in mod_ood_proxy and keep clean_nginx_env idempotent
OSC · Feb 16, 2023 · d9292c1 · d9292c1
1 parent b6cedd0
commit d9292c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/mod_ood_proxy/lib/ood/nginx_stage.lua b/mod_ood_proxy/lib/ood/nginx_stage.lua
@@ -15,7 +15,8 @@ function pun(r, bin, user, app_init_url, exports, pre_hook_root_cmd, allowed_hos
   if pre_hook_root_cmd then
     local env_table = exports_to_table(r, exports)
     if allowed_hosts then
-      env_table["OOD_ALLOWED_HOSTS"] = allowed_hosts
+      -- capture2e_with_env will prefix OOD_
+      env_table["ALLOWED_HOSTS"] = allowed_hosts
     end
     cmd = cmd .. " -P '" .. r:escape(pre_hook_root_cmd) .. "'"
     err = capture2e_with_env(cmd, env_table)

diff --git a/nginx_stage/lib/nginx_stage.rb b/nginx_stage/lib/nginx_stage.rb
@@ -145,6 +145,8 @@ def self.clean_nginx_env(user:)
       "RAILS_LOG_TO_STDOUT" => "true",
       # name change here because only OOD_* from apache is allowed through sudo rules
       "ALLOWED_HOSTS" => ENV['OOD_ALLOWED_HOSTS'],
+      # set the duplicate to keep clean_nginx_env impepodent
+      "OOD_ALLOWED_HOSTS" => ENV['OOD_ALLOWED_HOSTS'],
     }.merge(pun_custom_env).merge(preserve_env_declarations.map { |k| [ k, ENV[k] ] }.to_h))
   end