about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-09-27 02:13:34 +0200
committerGitHub <noreply@github.com>2019-09-27 02:13:34 +0200
commitadd4d4118c33562cf196f2045d6ce3aa309a40a0 (patch)
tree88e0403e0a349401806cdf1f11a1937584552ec8 /app/controllers
parent00d7bdcc2adcc15fe1a95862478cb9b43065a4b0 (diff)
Fix relays UI being available in whitelist/secure mode (#11963)
Fix relays UI referencing relay that is not functional
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/relays_controller.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/admin/relays_controller.rb b/app/controllers/admin/relays_controller.rb
index 1b02d3c36..6fbb6e063 100644
--- a/app/controllers/admin/relays_controller.rb
+++ b/app/controllers/admin/relays_controller.rb
@@ -3,6 +3,7 @@
 module Admin
   class RelaysController < BaseController
     before_action :set_relay, except: [:index, :new, :create]
+    before_action :require_signatures_enabled!, only: [:new, :create, :enable]
 
     def index
       authorize :relay, :update?
@@ -11,7 +12,7 @@ module Admin
 
     def new
       authorize :relay, :update?
-      @relay = Relay.new(inbox_url: Relay::PRESET_RELAY)
+      @relay = Relay.new
     end
 
     def create
@@ -54,5 +55,9 @@ module Admin
     def resource_params
       params.require(:relay).permit(:inbox_url)
     end
+
+    def require_signatures_enabled!
+      redirect_to admin_relays_path, alert: I18n.t('admin.relays.signatures_not_enabled') if authorized_fetch_mode?
+    end
   end
 end