Updates for change request (#1156)

pavel-d · web-flow · commit 18264ef23e74 · 2020-10-20T15:24:47.000+03:00
diff --git a/lib/travis/api/enqueue/services/restart_model.rb b/lib/travis/api/enqueue/services/restart_model.rb
@@ -4,7 +4,7 @@ module Services
 
       class RestartModel
         attr_reader :current_user, :target
-        ABUSE_DETECTED = "abuse_detected"
+        ABUSE_DETECTED = 'abuse_detected'
 
         def initialize(current_user, params)
           @current_user = current_user
@@ -15,23 +15,43 @@ def initialize(current_user, params)
         def push(event, payload)
           if current_user && target && accept?
             ::Sidekiq::Client.push(
-                  'queue'   => 'hub',
-                  'class'   => 'Travis::Hub::Sidekiq::Worker',
-                  'args'    => [event, payload]
-                )
+              'queue'   => 'hub',
+              'class'   => 'Travis::Hub::Sidekiq::Worker',
+              'args'    => [event, payload]
+            )
+
+            Result.new(value: payload)
           else
-            @cause_of_denial
+            Result.new(error: @cause_of_denial || 'restart failed')
           end
         end
 
         def accept?
-          current_user && permission? && resetable?
+          current_user && permission? && resetable? && billing?
+        end
+
+        def billing?
+          @_billing_ok ||= begin
+            jobs = target.is_a?(Job) ? [target] : target.matrix
+
+            jobs_attrs = jobs.map do |job|
+              job.config ? job.config.slice(:os) : {}
+            end
+
+            client = Travis::API::V3::BillingClient.new(current_user.id)
+            client.authorize_build(repository, current_user.id, jobs_attrs)
+            true
+          rescue Travis::API::V3::InsufficientAccess => e
+            @cause_of_denial = e.message
+            false
+          end
         end
 
         def messages
           messages = []
           messages << { notice: "The #{type} was successfully restarted." } if accept?
           messages << { error:  'You do not seem to have sufficient permissions.' } unless permission?
+          messages << { error:  'You do not have enough credits.' } unless billing?
           messages << { error:  "This #{type} currently can not be restarted." } unless resetable?
           messages
         end
@@ -54,23 +74,36 @@ def target
 
         private
 
-          def permission?
-            current_user && current_user.permission?(required_role, repository_id: target.repository_id) && !abusive?
-          end
+        def permission?
+          current_user && current_user.permission?(required_role, repository_id: target.repository_id) && !abusive?
+        end
 
-          def abusive?
-            abusive = Travis.redis.sismember("abuse:offenders", "#{@target.owner.class.name}:#{@target.owner_id}")
-            @cause_of_denial = ABUSE_DETECTED if abusive
-            abusive
-          end
+        def abusive?
+          abusive = Travis.redis.sismember("abuse:offenders", "#{@target.owner.class.name}:#{@target.owner_id}")
+          @cause_of_denial = ABUSE_DETECTED if abusive
+          abusive
+        end
+
+        def resetable?
+          target.resetable?
+        end
 
-          def resetable?
-            target.resetable?
+        def required_role
+          Travis.config.roles.reset_model
+        end
+
+        class Result
+          attr_reader :error, :value
+
+          def initialize(value: nil, error: nil)
+            @value = value
+            @error = error
           end
 
-          def required_role
-            Travis.config.roles.reset_model
+          def success?
+            !@error
           end
+        end
       end
     end
   end
diff --git a/lib/travis/api/v3/billing_client.rb b/lib/travis/api/v3/billing_client.rb
@@ -2,19 +2,26 @@ module Travis::API::V3
   class BillingClient
     class ConfigurationError < StandardError; end
 
+    ALLOWANCE_TIMEOUT = 1 # second
+
     def initialize(user_id)
       @user_id = user_id
     end
 
     def allowance(owner_type, owner_id)
-      response = connection.get("/usage/#{owner_type.downcase}s/#{owner_id}/allowance")
+      response = connection(timeout: ALLOWANCE_TIMEOUT).get("/usage/#{owner_type.downcase}s/#{owner_id}/allowance")
       return BillingClient.default_allowance_response unless response.status == 200
 
       Travis::API::V3::Models::Allowance.new(2, owner_id, response.body)
     end
 
+    def authorize_build(repo, sender_id, jobs)
+      response = connection.post("/#{repo.owner.class.name.downcase.pluralize}/#{repo.owner.id}/authorize_build", { repository: { private: repo.private? }, sender_id: sender_id, jobs: jobs })
+      handle_errors_and_respond(response)
+    end
+
     def self.default_allowance_response(id = 0)
-      Travis::API::V3::Models::Allowance.new(1, id, { 
+      Travis::API::V3::Models::Allowance.new(1, id, {
         "public_repos" => true,
         "private_repos" => false,
         "concurrency_limit" => 1,
@@ -221,24 +228,28 @@ def handle_errors_and_respond(response)
         true
       when 204
         true
-      when 404
-        raise Travis::API::V3::NotFound, response.body['error']
       when 400
         raise Travis::API::V3::ClientError, response.body['error']
+      when 403
+        raise Travis::API::V3::InsufficientAccess, response.body['rejection_code']
+      when 404
+        raise Travis::API::V3::NotFound, response.body['error']
       when 422
         raise Travis::API::V3::UnprocessableEntity, response.body['error']
       else
         raise Travis::API::V3::ServerError, 'Billing system failed'
       end
     end
 
-    def connection
+    def connection(timeout: 10)
       @connection ||= Faraday.new(url: billing_url, ssl: { ca_path: '/usr/lib/ssl/certs' }) do |conn|
         conn.basic_auth '_', billing_auth_key
         conn.headers['X-Travis-User-Id'] = @user_id.to_s
         conn.headers['Content-Type'] = 'application/json'
         conn.request :json
         conn.response :json
+        conn.options[:open_timeout] = timeout
+        conn.options[:timeout] = timeout
         conn.use OpenCensus::Trace::Integrations::FaradayMiddleware if Travis::Api::App::Middleware::OpenCensus.enabled?
         conn.adapter :net_http
       end
diff --git a/lib/travis/api/v3/models/v2_plan_config.rb b/lib/travis/api/v3/models/v2_plan_config.rb
@@ -1,7 +1,7 @@
 module Travis::API::V3
   class Models::V2PlanConfig
-    attr_reader :id, :name, :private_repos, :starting_price, :starting_users, :private_credits, :public_credits,
-                :addon_configs, :available_standalone_addons
+    attr_reader :id, :name, :private_repos, :starting_price, :starting_users, :plan_type,
+                :private_credits, :public_credits, :addon_configs, :concurrency_limit, :available_standalone_addons
 
     def initialize(attrs)
       @id = attrs.fetch('id')
@@ -12,6 +12,8 @@ def initialize(attrs)
       @private_credits = attrs.fetch('private_credits')
       @public_credits = attrs.fetch('public_credits')
       @addon_configs = attrs.fetch('addon_configs')
+      @plan_type = attrs.fetch('plan_type')
+      @concurrency_limit = attrs.fetch('concurrency_limit')
       @available_standalone_addons = attrs.fetch('available_standalone_addons')
     end
   end
diff --git a/lib/travis/api/v3/models/v2_subscription.rb b/lib/travis/api/v3/models/v2_subscription.rb
@@ -2,7 +2,8 @@ module Travis::API::V3
   class Models::V2Subscription
     include Models::Owner
 
-    attr_reader :id, :plan, :permissions, :source, :billing_info, :credit_card_info, :owner, :client_secret, :payment_intent, :addons, :available_standalone_addons, :created_at
+    attr_reader :id, :plan, :permissions, :source, :billing_info, :credit_card_info, :owner, :status, :valid_to, :canceled_at,
+                :client_secret, :payment_intent, :addons, :available_standalone_addons, :created_at
 
     def initialize(attributes = {})
       @id = attributes.fetch('id')
@@ -16,6 +17,9 @@ def initialize(attributes = {})
       @client_secret = attributes.fetch('client_secret')
       @addons = attributes['addons'].select { |addon| addon['current_usage']['status'] != 'expired' }.map { |addon| Models::V2Addon.new(addon) }
       @created_at = attributes.fetch('created_at')
+      @status = attributes.fetch('status')
+      @valid_to = attributes.fetch('valid_to')
+      @canceled_at = attributes.fetch('canceled_at')
     end
   end
 
diff --git a/lib/travis/api/v3/queries/build.rb b/lib/travis/api/v3/queries/build.rb
@@ -25,13 +25,7 @@ def restart(user)
       service = Travis::Enqueue::Services::RestartModel.new(user, { build_id: id })
       payload = { id: id, user_id: user.id }
 
-      restart_status = service.push("build:restart", payload)
-
-      if restart_status == "abuse_detected"
-        restart_status
-      else
-        payload
-      end
+      service.push("build:restart", payload)
     end
   end
 end
diff --git a/lib/travis/api/v3/queries/job.rb b/lib/travis/api/v3/queries/job.rb
@@ -25,13 +25,7 @@ def restart(user)
       service = Travis::Enqueue::Services::RestartModel.new(user, { job_id: id })
       payload = { id: id, user_id: user.id }
 
-      restart_status = service.push("job:restart", payload)
-
-      if restart_status == "abuse_detected"
-        restart_status
-      else
-        payload
-      end
+      service.push("job:restart", payload)
     end
   end
 end
diff --git a/lib/travis/api/v3/renderer/v2_plan_config.rb b/lib/travis/api/v3/renderer/v2_plan_config.rb
@@ -1,8 +1,8 @@
 module Travis::API::V3
   class Renderer::V2PlanConfig < ModelRenderer
     representation(:standard, :id, :name, :private_repos, :starting_price, :starting_users, :private_credits,
-                   :public_credits, :addon_configs, :available_standalone_addons)
+                   :public_credits, :addon_configs, :plan_type, :concurrency_limit, :available_standalone_addons)
     representation(:minimal, :id, :name, :private_repos, :starting_price, :starting_users, :private_credits,
-                   :public_credits, :addon_configs)
+                   :public_credits, :addon_configs, :plan_type, :concurrency_limit)
   end
 end
diff --git a/lib/travis/api/v3/renderer/v2_subscription.rb b/lib/travis/api/v3/renderer/v2_subscription.rb
@@ -1,6 +1,6 @@
 module Travis::API::V3
   class Renderer::V2Subscription < ModelRenderer
-    representation(:standard, :id, :plan, :addons, :source, :owner, :client_secret, :billing_info, :credit_card_info, :payment_intent, :created_at)
+    representation(:standard, :id, :plan, :addons, :status, :valid_to, :canceled_at, :source, :owner, :client_secret, :billing_info, :credit_card_info, :payment_intent, :created_at)
 
     def billing_info
       Renderer.render_model(model.billing_info, mode: :standard) unless model.billing_info.nil?
diff --git a/lib/travis/api/v3/service.rb b/lib/travis/api/v3/service.rb
@@ -192,6 +192,10 @@ def abuse_detected(message = 'Abuse detected. Restart disabled. If you think you
       rejected(Error.new(message, status: 403))
     end
 
+    def insufficient_balance(message = 'Builds have been temporarily disabled for private repositories due to a insufficient credit balance')
+      rejected(Error.new(message, status: 403))
+    end
+
     def not_implemented
       raise NotImplemented
     end
diff --git a/lib/travis/api/v3/services/build/restart.rb b/lib/travis/api/v3/services/build/restart.rb
@@ -8,11 +8,14 @@ def run
       access_control.permissions(build).restart!
       build.clear_debug_options!
 
-      restart_status = query.restart(access_control.user)
-      if restart_status == "abuse_detected"
+      result = query.restart(access_control.user)
+
+      if result.success?
+        accepted(build: build, state_change: :restart)
+      elsif result.error == Travis::Enqueue::Services::RestartModel::ABUSE_DETECTED
         abuse_detected
       else
-        accepted(build: build, state_change: :restart)
+        insufficient_balance
       end
     end
   end
diff --git a/lib/travis/api/v3/services/job/restart.rb b/lib/travis/api/v3/services/job/restart.rb
@@ -8,12 +8,14 @@ def run
       return repo_migrated if migrated?(job.repository)
 
       job.update_attribute(:debug_options, nil)
-      restart_status = query.restart(access_control.user)
+      result = query.restart(access_control.user)
 
-      if restart_status == "abuse_detected"
+      if result.success?
+        accepted(job: job, state_change: :restart)
+      elsif result.error == Travis::Enqueue::Services::RestartModel::ABUSE_DETECTED
         abuse_detected
       else
-        accepted(job: job, state_change: :restart)
+        insufficient_balance
       end
     end
   end
diff --git a/spec/auth/v1/builds_spec.rb b/spec/auth/v1/builds_spec.rb
@@ -3,6 +3,20 @@
   let(:repo)  { Repository.by_slug('svenfuchs/minimal').first }
   let(:build) { repo.builds.first }
 
+  before do
+    Travis.config.billing.url = 'http://localhost:9292/'
+    Travis.config.billing.auth_key = 'secret'
+
+    stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+      body: MultiJson.dump(allowed: true, rejection_code: nil)
+    )
+  end
+
+  after do
+    Travis.config.billing.url = nil
+    Travis.config.billing.auth_key = nil
+  end
+
   describe 'in public mode, with a private repo', mode: :public, repo: :private do
     describe 'GET /builds' do
       it(:with_permission)    { should auth status: 200, type: :json, empty: false }
diff --git a/spec/integration/v2/builds_spec.rb b/spec/integration/v2/builds_spec.rb
@@ -3,6 +3,20 @@
   let(:build) { repo.builds.first }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json' } }
 
+  before do
+    Travis.config.billing.url = 'http://localhost:9292/'
+    Travis.config.billing.auth_key = 'secret'
+
+    stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+      body: MultiJson.dump(allowed: true, rejection_code: nil)
+    )
+  end
+
+  after do
+    Travis.config.billing.url = nil
+    Travis.config.billing.auth_key = nil
+  end
+
   it 'GET /builds?repository_id=1' do
     response = get '/builds', { repository_id: repo.id }, headers
     expect(response).to deliver_json_for(repo.builds.order('id DESC'), version: 'v2')
diff --git a/spec/integration/v2/jobs_spec.rb b/spec/integration/v2/jobs_spec.rb
@@ -39,6 +39,20 @@
     allow(remote).to receive(:send).and_return(remote) # ignore attribute updates
   end
 
+  before do
+    Travis.config.billing.url = 'http://localhost:9292/'
+    Travis.config.billing.auth_key = 'secret'
+
+    stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+      body: MultiJson.dump(allowed: true, rejection_code: nil)
+    )
+  end
+
+  after do
+    Travis.config.billing.url = nil
+    Travis.config.billing.auth_key = nil
+  end
+
   it '/jobs?queue=builds.common' do
     skip('querying with a queue does not appear to be used anymore')
     response = get '/jobs', { queue: 'builds.common' }, headers
diff --git a/spec/integration/v2/requests_spec.rb b/spec/integration/v2/requests_spec.rb
@@ -8,6 +8,20 @@
   let(:token)   { Travis::Api::App::AccessToken.create(user: user, app_id: -1) }
   let(:headers) { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json', 'HTTP_AUTHORIZATION' => "token #{token}" } }
 
+  before do
+    Travis.config.billing.url = 'http://localhost:9292/'
+    Travis.config.billing.auth_key = 'secret'
+
+    stub_request(:post, /http:\/\/localhost:9292\/(users|organizations)\/(.+)\/authorize_build/).to_return(
+      body: MultiJson.dump(allowed: true, rejection_code: nil)
+    )
+  end
+
+  after do
+    Travis.config.billing.url = nil
+    Travis.config.billing.auth_key = nil
+  end
+
   describe 'GET /requests' do
     it 'fetches requests' do
       response = get '/requests', { repository_id: repo.id }, headers
diff --git a/spec/support/billing_spec_helper.rb b/spec/support/billing_spec_helper.rb
diff --git a/spec/v3/models/v2_subscription_spec.rb b/spec/v3/models/v2_subscription_spec.rb
diff --git a/spec/v3/services/build/restart_spec.rb b/spec/v3/services/build/restart_spec.rb
diff --git a/spec/v3/services/job/debug_spec.rb b/spec/v3/services/job/debug_spec.rb
diff --git a/spec/v3/services/job/restart_spec.rb b/spec/v3/services/job/restart_spec.rb
diff --git a/spec/v3/services/v2_subscriptions/all_spec.rb b/spec/v3/services/v2_subscriptions/all_spec.rb
diff --git a/spec/v3/services/v2_subscriptions/create_spec.rb b/spec/v3/services/v2_subscriptions/create_spec.rb
