Validate json
This commit is contained in:

committed by
Sebastian Serth

parent
cf1e4d6edf
commit
6e9562c9e1
1
Gemfile
1
Gemfile
@ -17,6 +17,7 @@ gem 'i18n-js'
|
|||||||
gem 'ims-lti', '< 2.0.0'
|
gem 'ims-lti', '< 2.0.0'
|
||||||
gem 'jbuilder'
|
gem 'jbuilder'
|
||||||
gem 'js-routes'
|
gem 'js-routes'
|
||||||
|
gem 'json_schemer'
|
||||||
gem 'kramdown'
|
gem 'kramdown'
|
||||||
gem 'mimemagic'
|
gem 'mimemagic'
|
||||||
gem 'nokogiri'
|
gem 'nokogiri'
|
||||||
|
10
Gemfile.lock
10
Gemfile.lock
@ -157,6 +157,8 @@ GEM
|
|||||||
multi_json
|
multi_json
|
||||||
domain_name (0.5.20190701)
|
domain_name (0.5.20190701)
|
||||||
unf (>= 0.0.5, < 1.0.0)
|
unf (>= 0.0.5, < 1.0.0)
|
||||||
|
ecma-re-validator (0.3.0)
|
||||||
|
regexp_parser (~> 2.0)
|
||||||
erubi (1.10.0)
|
erubi (1.10.0)
|
||||||
eventmachine (1.2.7)
|
eventmachine (1.2.7)
|
||||||
excon (0.87.0)
|
excon (0.87.0)
|
||||||
@ -194,6 +196,7 @@ GEM
|
|||||||
haml (5.2.2)
|
haml (5.2.2)
|
||||||
temple (>= 0.8.0)
|
temple (>= 0.8.0)
|
||||||
tilt
|
tilt
|
||||||
|
hana (1.3.7)
|
||||||
hashdiff (1.0.1)
|
hashdiff (1.0.1)
|
||||||
headless (2.3.1)
|
headless (2.3.1)
|
||||||
highline (2.0.3)
|
highline (2.0.3)
|
||||||
@ -222,6 +225,11 @@ GEM
|
|||||||
js-routes (2.1.1)
|
js-routes (2.1.1)
|
||||||
railties (>= 4)
|
railties (>= 4)
|
||||||
json (2.3.1)
|
json (2.3.1)
|
||||||
|
json_schemer (0.2.18)
|
||||||
|
ecma-re-validator (~> 0.3)
|
||||||
|
hana (~> 1.3)
|
||||||
|
regexp_parser (~> 2.0)
|
||||||
|
uri_template (~> 0.7)
|
||||||
jwt (2.3.0)
|
jwt (2.3.0)
|
||||||
kaminari (1.2.1)
|
kaminari (1.2.1)
|
||||||
activesupport (>= 4.1.0)
|
activesupport (>= 4.1.0)
|
||||||
@ -507,6 +515,7 @@ GEM
|
|||||||
unf_ext
|
unf_ext
|
||||||
unf_ext (0.0.8)
|
unf_ext (0.0.8)
|
||||||
unicode-display_width (2.1.0)
|
unicode-display_width (2.1.0)
|
||||||
|
uri_template (0.7.0)
|
||||||
web-console (4.1.0)
|
web-console (4.1.0)
|
||||||
actionview (>= 6.0.0)
|
actionview (>= 6.0.0)
|
||||||
activemodel (>= 6.0.0)
|
activemodel (>= 6.0.0)
|
||||||
@ -561,6 +570,7 @@ DEPENDENCIES
|
|||||||
ims-lti (< 2.0.0)
|
ims-lti (< 2.0.0)
|
||||||
jbuilder
|
jbuilder
|
||||||
js-routes
|
js-routes
|
||||||
|
json_schemer
|
||||||
kramdown
|
kramdown
|
||||||
listen
|
listen
|
||||||
mimemagic
|
mimemagic
|
||||||
|
44
lib/runner/backend-output.schema.json
Normal file
44
lib/runner/backend-output.schema.json
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
{
|
||||||
|
"$schema": "http://json-schema.org/schema#",
|
||||||
|
"title": "event",
|
||||||
|
"type": "object",
|
||||||
|
"oneOf": [
|
||||||
|
{
|
||||||
|
"properties": {
|
||||||
|
"type": {
|
||||||
|
"const": "exit",
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"data": {
|
||||||
|
"type": "integer",
|
||||||
|
"required": true,
|
||||||
|
"minimum": 0,
|
||||||
|
"maximum": 255
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"additionalProperties": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"properties": {
|
||||||
|
"type": {
|
||||||
|
"enum": [ "stdout", "stderr", "error" ],
|
||||||
|
"required": true
|
||||||
|
},
|
||||||
|
"data": {
|
||||||
|
"type": "string",
|
||||||
|
"required": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"additionalProperties": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"properties": {
|
||||||
|
"type": {
|
||||||
|
"enum": [ "start", "timeout" ],
|
||||||
|
"required": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"additionalProperties": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
@ -1,7 +1,5 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require 'runner_connection'
|
|
||||||
|
|
||||||
class Runner
|
class Runner
|
||||||
BASE_URL = CodeOcean::Config.new(:code_ocean).read[:container_management][:url]
|
BASE_URL = CodeOcean::Config.new(:code_ocean).read[:container_management][:url]
|
||||||
HEADERS = {"Content-Type" => "application/json"}
|
HEADERS = {"Content-Type" => "application/json"}
|
||||||
@ -10,19 +8,19 @@ class Runner
|
|||||||
|
|
||||||
def initialize(execution_environment, time_limit = nil)
|
def initialize(execution_environment, time_limit = nil)
|
||||||
url = "#{BASE_URL}/runners"
|
url = "#{BASE_URL}/runners"
|
||||||
body = {execution_environment_id: execution_environment.id}
|
body = {executionEnvironmentId: execution_environment.id}
|
||||||
if time_limit
|
if time_limit
|
||||||
body[:time_limit] = time_limit
|
body[:timeLimit] = time_limit
|
||||||
end
|
end
|
||||||
response = Faraday.post(url, body.to_json, HEADERS)
|
response = Faraday.post(url, body.to_json, HEADERS)
|
||||||
response = parse response
|
response = parse response
|
||||||
@id = response[:id]
|
@id = response[:runnerId]
|
||||||
end
|
end
|
||||||
|
|
||||||
def copy_files(files)
|
def copy_files(files)
|
||||||
url = runner_url + "/files"
|
url = runner_url + "/files"
|
||||||
body = { files: files.map{ |filename, content| { filename: filename, content: content } } }
|
body = { files: files.map { |filename, content| { filepath: filename, content: content } } }
|
||||||
Faraday.post(url, body.to_json, HEADERS)
|
Faraday.patch(url, body.to_json, HEADERS)
|
||||||
end
|
end
|
||||||
|
|
||||||
def copy_submission_files(submission)
|
def copy_submission_files(submission)
|
||||||
@ -42,7 +40,7 @@ class Runner
|
|||||||
|
|
||||||
def execute_interactively(command)
|
def execute_interactively(command)
|
||||||
starting_time = Time.now
|
starting_time = Time.now
|
||||||
websocket_url = execute_command(command)[:websocket_url]
|
websocket_url = execute_command(command)[:websocketUrl]
|
||||||
EventMachine.run do
|
EventMachine.run do
|
||||||
socket = RunnerConnection.new(websocket_url)
|
socket = RunnerConnection.new(websocket_url)
|
||||||
yield(self, socket) if block_given?
|
yield(self, socket) if block_given?
|
||||||
@ -55,7 +53,9 @@ class Runner
|
|||||||
end
|
end
|
||||||
|
|
||||||
def status
|
def status
|
||||||
parse(Faraday.get(runner_url))[:status].to_sym
|
# parse(Faraday.get(runner_url))[:status].to_sym
|
||||||
|
# TODO return actual state retrieved via websocket
|
||||||
|
:timeouted
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
@ -1,7 +1,9 @@
|
|||||||
require 'faye/websocket/client'
|
require 'faye/websocket/client'
|
||||||
|
require 'json_schemer'
|
||||||
|
|
||||||
class RunnerConnection
|
class RunnerConnection
|
||||||
EVENTS = %i[start output exit stdout stderr].freeze
|
EVENTS = %i[start output exit stdout stderr].freeze
|
||||||
|
BACKEND_OUTPUT_SCHEMA = JSONSchemer.schema(JSON.parse(File.read("lib/runner/backend-output.schema.json")))
|
||||||
|
|
||||||
def initialize(url)
|
def initialize(url)
|
||||||
@socket = Faye::WebSocket::Client.new(url, [], ping: 5)
|
@socket = Faye::WebSocket::Client.new(url, [], ping: 5)
|
||||||
@ -36,7 +38,11 @@ class RunnerConnection
|
|||||||
end
|
end
|
||||||
|
|
||||||
def on_message(event)
|
def on_message(event)
|
||||||
|
return unless BACKEND_OUTPUT_SCHEMA.valid?(JSON.parse(event.data))
|
||||||
|
|
||||||
event = decode(event.data)
|
event = decode(event.data)
|
||||||
|
|
||||||
|
# TODO handle other events like timeout
|
||||||
case event[:type].to_sym
|
case event[:type].to_sym
|
||||||
when :exit_code
|
when :exit_code
|
||||||
@exit_code = event[:data]
|
@exit_code = event[:data]
|
Reference in New Issue
Block a user