From 618ce941647177b560fb3f5b677325bb964edae3 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Tue, 14 Feb 2017 23:52:02 +0100 Subject: Add Runner registration/deletion API --- lib/api/helpers/ci.rb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 lib/api/helpers/ci.rb (limited to 'lib/api/helpers') diff --git a/lib/api/helpers/ci.rb b/lib/api/helpers/ci.rb new file mode 100644 index 00000000000..24669eba4bb --- /dev/null +++ b/lib/api/helpers/ci.rb @@ -0,0 +1,24 @@ +module API + module Helpers + module Ci + def runner_registration_token_valid? + ActiveSupport::SecurityUtils.variable_size_secure_compare( + params[:token], + current_application_settings.runners_registration_token) + end + + def get_runner_version_from_params + return unless params['info'].present? + attributes_for_keys(%w(name version revision platform architecture), params['info']) + end + + def authenticate_runner! + forbidden! unless current_runner + end + + def current_runner + @runner ||= ::Ci::Runner.find_by_token(params[:token].to_s) + end + end + end +end \ No newline at end of file -- cgit v1.2.1 From 22c983d7a0219e48856800405aec7d9b930fc9a1 Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Thu, 16 Feb 2017 01:20:17 +0100 Subject: Fix rubocop offenses --- lib/api/helpers/ci.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/api/helpers') diff --git a/lib/api/helpers/ci.rb b/lib/api/helpers/ci.rb index 24669eba4bb..e928d7c874a 100644 --- a/lib/api/helpers/ci.rb +++ b/lib/api/helpers/ci.rb @@ -2,9 +2,8 @@ module API module Helpers module Ci def runner_registration_token_valid? - ActiveSupport::SecurityUtils.variable_size_secure_compare( - params[:token], - current_application_settings.runners_registration_token) + ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token], + current_application_settings.runners_registration_token) end def get_runner_version_from_params @@ -21,4 +20,4 @@ module API end end end -end \ No newline at end of file +end -- cgit v1.2.1 From e25f26e5503a5aa07f5cfc436e10b92254185f9a Mon Sep 17 00:00:00 2001 From: Tomasz Maczukin Date: Thu, 16 Feb 2017 01:30:46 +0100 Subject: Rename API::Ci to API::Runner --- lib/api/helpers/ci.rb | 23 ----------------------- lib/api/helpers/runner.rb | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 23 deletions(-) delete mode 100644 lib/api/helpers/ci.rb create mode 100644 lib/api/helpers/runner.rb (limited to 'lib/api/helpers') diff --git a/lib/api/helpers/ci.rb b/lib/api/helpers/ci.rb deleted file mode 100644 index e928d7c874a..00000000000 --- a/lib/api/helpers/ci.rb +++ /dev/null @@ -1,23 +0,0 @@ -module API - module Helpers - module Ci - def runner_registration_token_valid? - ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token], - current_application_settings.runners_registration_token) - end - - def get_runner_version_from_params - return unless params['info'].present? - attributes_for_keys(%w(name version revision platform architecture), params['info']) - end - - def authenticate_runner! - forbidden! unless current_runner - end - - def current_runner - @runner ||= ::Ci::Runner.find_by_token(params[:token].to_s) - end - end - end -end diff --git a/lib/api/helpers/runner.rb b/lib/api/helpers/runner.rb new file mode 100644 index 00000000000..119ca81b883 --- /dev/null +++ b/lib/api/helpers/runner.rb @@ -0,0 +1,23 @@ +module API + module Helpers + module Runner + def runner_registration_token_valid? + ActiveSupport::SecurityUtils.variable_size_secure_compare(params[:token], + current_application_settings.runners_registration_token) + end + + def get_runner_version_from_params + return unless params['info'].present? + attributes_for_keys(%w(name version revision platform architecture), params['info']) + end + + def authenticate_runner! + forbidden! unless current_runner + end + + def current_runner + @runner ||= ::Ci::Runner.find_by_token(params[:token].to_s) + end + end + end +end -- cgit v1.2.1