| ... | @@ -6,6 +6,8 @@ module Ci |
... | @@ -6,6 +6,8 @@ module Ci |
|
|
class BuildRunnerSession < ApplicationRecord
|
|
class BuildRunnerSession < ApplicationRecord
|
|
|
extend Gitlab::Ci::Model
|
|
extend Gitlab::Ci::Model
|
|
|
|
|
|
|
|
|
TERMINAL_SUBPROTOCOL = 'terminal.gitlab.com'.freeze
|
|
|
|
|
|
|
self.table_name = 'ci_builds_runner_session'
|
|
self.table_name = 'ci_builds_runner_session'
|
|
|
|
|
|
|
|
belongs_to :build, class_name: 'Ci::Build', inverse_of: :runner_session
|
|
belongs_to :build, class_name: 'Ci::Build', inverse_of: :runner_session
|
| ... | @@ -14,11 +16,21 @@ module Ci |
... | @@ -14,11 +16,21 @@ module Ci |
|
|
validates :url, url: { protocols: %w(https) }
|
|
validates :url, url: { protocols: %w(https) }
|
|
|
|
|
|
|
|
def terminal_specification
|
|
def terminal_specification
|
|
|
return {} unless url.present?
|
|
wss_url = Gitlab::UrlHelpers.as_wss(self.url)
|
|
|
|
return {} unless wss_url.present?
|
|
|
|
|
|
|
|
wss_url = "#{wss_url}/exec"
|
|
|
|
channel_specification(wss_url, TERMINAL_SUBPROTOCOL)
|
|
|
|
end
|
|
|
|
|
|
|
|
private
|
|
|
|
|
|
|
|
def channel_specification(url, subprotocol)
|
|
|
|
return {} if subprotocol.blank? || url.blank?
|
|
|
|
|
|
|
|
{
|
|
{
|
|
|
subprotocols: ['terminal.gitlab.com'].freeze,
|
|
subprotocols: Array(subprotocol),
|
|
|
url: "#{url}/exec".sub("https://", "wss://"),
|
|
url: url,
|
|
|
headers: { Authorization: [authorization.presence] }.compact,
|
|
headers: { Authorization: [authorization.presence] }.compact,
|
|
|
ca_pem: certificate.presence
|
|
ca_pem: certificate.presence
|
|
|
}
|
|
}
|
| ... | |
... | |
| ... | | ... | |