Commit ca389e1f authored by Gabriel Mazetto's avatar Gabriel Mazetto

Fixes for Geo API and whitelisted it on the readonly middleware

parent 29de1916
...@@ -27,6 +27,7 @@ module API ...@@ -27,6 +27,7 @@ module API
helpers Helpers helpers Helpers
mount Geo
mount Groups mount Groups
mount GroupMembers mount GroupMembers
mount Users mount Users
......
...@@ -10,9 +10,8 @@ module API ...@@ -10,9 +10,8 @@ module API
# Example request: # Example request:
# POST /refresh_projects # POST /refresh_projects
post 'refresh_projects' do post 'refresh_projects' do
attrs = attributes_for_keys [:projects] required_attributes! [:projects]
::Geo::ScheduleRepoUpdateService.new(params[:projects]).execute
Geo::ScheduleRepoUpdateService.new(attrs[:projects]).execute
end end
end end
end end
......
...@@ -25,7 +25,7 @@ module Gitlab ...@@ -25,7 +25,7 @@ module Gitlab
private private
def disallowed_request? def disallowed_request?
DISALLOWED_METHODS.include?(@env['REQUEST_METHOD']) && !logout_route DISALLOWED_METHODS.include?(@env['REQUEST_METHOD']) && !whitelisted_routes
end end
def rack_flash def rack_flash
...@@ -48,6 +48,10 @@ module Gitlab ...@@ -48,6 +48,10 @@ module Gitlab
@route_hash ||= Rails.application.routes.recognize_path(request.url, { method: request.request_method }) rescue {} @route_hash ||= Rails.application.routes.recognize_path(request.url, { method: request.request_method }) rescue {}
end end
def whitelisted_routes
logout_route || @request.path.include?('api/v3/geo/refresh_projects')
end
def logout_route def logout_route
route_hash[:controller] == 'sessions' && route_hash[:action] == 'destroy' route_hash[:controller] == 'sessions' && route_hash[:action] == 'destroy'
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment