From a58218562555c32bd0ec6c2ca2cc19ac4984904c Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 6 Oct 2019 22:11:29 +0200
Subject: [PATCH] Fix `GET /api/v1/instance` REST APIs being unavailable in
secure mode (#12089)
---
app/controllers/api/v1/instances/activity_controller.rb | 1 +
app/controllers/api/v1/instances/peers_controller.rb | 1 +
app/controllers/api/v1/instances_controller.rb | 1 +
3 files changed, 3 insertions(+)
diff --git a/app/controllers/api/v1/instances/activity_controller.rb b/app/controllers/api/v1/instances/activity_controller.rb
index 4fb5a69d8b..b30e8464c3 100644
--- a/app/controllers/api/v1/instances/activity_controller.rb
+++ b/app/controllers/api/v1/instances/activity_controller.rb
@@ -4,6 +4,7 @@ class Api::V1::Instances::ActivityController < Api::BaseController
before_action :require_enabled_api!
skip_before_action :set_cache_headers
+ skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
respond_to :json
diff --git a/app/controllers/api/v1/instances/peers_controller.rb b/app/controllers/api/v1/instances/peers_controller.rb
index 75c3cb4ba8..cc00d8a6bc 100644
--- a/app/controllers/api/v1/instances/peers_controller.rb
+++ b/app/controllers/api/v1/instances/peers_controller.rb
@@ -4,6 +4,7 @@ class Api::V1::Instances::PeersController < Api::BaseController
before_action :require_enabled_api!
skip_before_action :set_cache_headers
+ skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
respond_to :json
diff --git a/app/controllers/api/v1/instances_controller.rb b/app/controllers/api/v1/instances_controller.rb
index 8d8231423e..c323b60b42 100644
--- a/app/controllers/api/v1/instances_controller.rb
+++ b/app/controllers/api/v1/instances_controller.rb
@@ -4,6 +4,7 @@ class Api::V1::InstancesController < Api::BaseController
respond_to :json
skip_before_action :set_cache_headers
+ skip_before_action :require_authenticated_user!, unless: :whitelist_mode?
def show
expires_in 3.minutes, public: true
--
GitLab