Fix Runner access for programming groups

* We also rename the corresponding columns in the Runner model, so that for polymorphic association gets clear.
This commit is contained in:
Sebastian Serth
2023-08-20 20:32:41 +02:00
committed by Sebastian Serth
parent 977fa4539e
commit a1941336d9
8 changed files with 36 additions and 25 deletions

View File

@ -15,7 +15,7 @@ class LiveStreamsController < ApplicationController
redirect_back(fallback_location: root_path, allow_other_host: true, alert: t('exercises.download_file_tree.gone'))
else
desired_file = params[:filename].to_s
runner = Runner.for(current_user, @submission.exercise.execution_environment)
runner = Runner.for(current_contributor, @submission.exercise.execution_environment)
fallback_location = implement_exercise_path(@submission.exercise)
send_runner_file(runner, desired_file, fallback_location)
end

View File

@ -7,6 +7,7 @@ class ProgrammingGroup < ApplicationRecord
has_many :external_users, through: :programming_group_memberships, source_type: 'ExternalUser', source: :user
has_many :internal_users, through: :programming_group_memberships, source_type: 'InternalUser', source: :user
has_many :testruns, through: :submissions
has_many :runners, as: :contributor, dependent: :destroy
belongs_to :exercise
validate :group_size

View File

@ -1,11 +1,10 @@
# frozen_string_literal: true
class Runner < ApplicationRecord
include Creation
include ContributorCreation
belongs_to :execution_environment
before_validation :request_id
validates :runner_id, presence: true
attr_accessor :strategy
@ -30,10 +29,10 @@ class Runner < ApplicationRecord
end
end
def self.for(user, execution_environment)
runner = find_by(user:, execution_environment:)
def self.for(contributor, execution_environment)
runner = find_by(contributor:, execution_environment:)
if runner.nil?
runner = Runner.create(user:, execution_environment:)
runner = Runner.create(contributor:, execution_environment:)
# The `strategy` is added through the before_validation hook `:request_id`.
raise Runner::Error::Unknown.new("Runner could not be saved: #{runner.errors.inspect}") unless runner.persisted?
else
@ -84,7 +83,7 @@ class Runner < ApplicationRecord
end
def attach_to_execution(command, privileged_execution: false, &block)
Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Starting execution with Runner #{id} for #{user_type} #{user_id}." }
Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Starting execution with Runner #{id} for #{contributor_type} #{contributor_id}." }
starting_time = Time.zone.now
begin
# As the EventMachine reactor is probably shared with other threads, we cannot use EventMachine.run with
@ -101,7 +100,7 @@ class Runner < ApplicationRecord
e.execution_duration = Time.zone.now - starting_time
raise
end
Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Stopped execution with Runner #{id} for #{user_type} #{user_id}." }
Rails.logger.debug { "#{Time.zone.now.getutc.inspect}: Stopped execution with Runner #{id} for #{contributor_type} #{contributor_id}." }
Time.zone.now - starting_time # execution duration
end

View File

@ -20,6 +20,7 @@ class User < ApplicationRecord
has_many :testruns, as: :user
has_many :interventions, through: :user_exercise_interventions
has_many :remote_evaluation_mappings, as: :user
has_many :runners, as: :contributor
has_one :codeharbor_link, dependent: :destroy
accepts_nested_attributes_for :user_proxy_exercise_exercises