htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove ws_client_protocol option

Browse Source 
* The correct setting will be determined automatically
This commit is contained in:
Sebastian Serth
2021-10-24 10:23:28 +02:00
parent 0db6f20933
commit 541afa92f3
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/editor/execution.js.erb → app/assets/javascripts/editor/execution.js
View File

@ -2,11 +2,11 @@ CodeOceanEditorWebsocket = {
websocket: null, websocket: null,
createSocketUrl: function(url) { createSocketUrl: function(url) {
var sockURL = new URL(url, window.location); const sockURL = new URL(url, window.location);
// not needed any longer, we put it directly into the url: sockURL.pathname = url; // not needed any longer, we put it directly into the url: sockURL.pathname = url;
// sanitize socket protocol string, strip trailing slash and other malicious chars if they are there // replace `http` with `ws` for the WebSocket connection. This also works with `https` and `wss`.
sockURL.protocol = '<%= DockerClient.config['ws_client_protocol']&.match(/(\w+):*\/*/)&.to_a&.at(1) %>:'; sockURL.protocol = sockURL.protocol.replace("http", "ws");
// strip anchor if it is in the url // strip anchor if it is in the url
sockURL.hash = ''; sockURL.hash = '';

4
config/docker.yml.erb.ci
View File

@ -10,7 +10,6 @@ development:
<<: *default <<: *default
host: tcp://127.0.0.1:2376 host: tcp://127.0.0.1:2376
ws_host: ws://127.0.0.1:2376 #url to connect rails server to docker host ws_host: ws://127.0.0.1:2376 #url to connect rails server to docker host
ws_client_protocol: 'ws:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
pool: pool:
location: http://localhost:7100 location: http://localhost:7100
@ -35,7 +34,6 @@ production:
timeout: 60 timeout: 60
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
ws_host: ws://localhost:4243 #url to connect rails server to docker host ws_host: ws://localhost:4243 #url to connect rails server to docker host
ws_client_protocol: 'wss:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
staging: staging:
<<: *default <<: *default
@ -50,10 +48,8 @@ staging:
timeout: 60 timeout: 60
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
ws_host: ws://localhost:4243 #url to connect rails server to docker host ws_host: ws://localhost:4243 #url to connect rails server to docker host
ws_client_protocol: 'wss:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
test: test:
<<: *default <<: *default
host: tcp://127.0.0.1:2376 host: tcp://127.0.0.1:2376
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
ws_client_protocol: 'ws:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)

3
config/docker.yml.erb.example
View File

@ -10,7 +10,6 @@ development:
<<: *default <<: *default
host: tcp://127.0.0.1:2376 host: tcp://127.0.0.1:2376
ws_host: ws://127.0.0.1:2376 #url to connect rails server to docker host ws_host: ws://127.0.0.1:2376 #url to connect rails server to docker host
ws_client_protocol: 'ws:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
pool: pool:
active: true active: true
@ -35,7 +34,6 @@ production:
timeout: 60 timeout: 60
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
ws_host: ws://localhost:4243 #url to connect rails server to docker host ws_host: ws://localhost:4243 #url to connect rails server to docker host
ws_client_protocol: 'wss:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
staging: staging:
<<: *default <<: *default
@ -50,7 +48,6 @@ staging:
timeout: 60 timeout: 60
workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %> workspace_root: <%= Rails.root.join('tmp', 'files', Rails.env) %>
ws_host: ws://localhost:4243 #url to connect rails server to docker host ws_host: ws://localhost:4243 #url to connect rails server to docker host
ws_client_protocol: 'wss:' #set the websocket protocol to be used by the client to connect to the rails server (ws on development, wss on production)
test: test:
<<: *default <<: *default