A platform for community discussion. Free, open, simple.
DEV: allow granular api keys access to about.json
awesomerobot480a052a1016
diff --git a/app/models/api_key.rb b/app/models/api_key.rbindex 26dd829bf03..24f4443775a 100644--- a/app/models/api_key.rb+++ b/app/models/api_key.rb@@ -101,7 +101,9 @@ class ApiKey < ActiveRecord::Baseif allowed_ips.present? && allowed_ips.none? { |ip| ip.include?(Rack::Request.new(env).ip) }return falseend- return true if RouteMatcher.new(methods: :get, actions: "session#scopes").match?(env: env)+ if RouteMatcher.new(methods: :get, actions: %w[session#scopes about#index]).match?(env: env)+ return true+ endapi_key_scopes.blank? || api_key_scopes.any? { |s| s.permits?(env) }enddiff --git a/spec/models/api_key_spec.rb b/spec/models/api_key_spec.rbindex 607ff488a9f..e768b282d39 100644--- a/spec/models/api_key_spec.rb+++ b/spec/models/api_key_spec.rb@@ -195,6 +195,12 @@ RSpec.describe ApiKey dorequest.path_parameters = { controller: "topics", action: "create" }expect(key.request_allowed?(env)).to eq(false)end++ it "always allows about#index" do+ request.path_parameters = { controller: "about", action: "index" }+ request.request_method = "GET"+ expect(key.request_allowed?(env)).to eq(true)+ endendcontext "with global:read scope" do