Fix CI variable lookup for terminal

1 files changed, 4 insertions, 3 deletions

diff --git a/app/controllers/projects/deployments_controller.rb b/app/controllers/projects/deployments_controller.rb
index 321f8324866..e376c717f2f 100644
--- a/app/controllers/projects/deployments_controller.rb
+++ b/app/controllers/projects/deployments_controller.rb
@@ -8,11 +8,12 @@ class Projects::DeploymentsController < Projects::ApplicationController
 
   def terminal_websocket_authorize
     Gitlab::Workhorse.verify_api_request!(request.headers)
-    openshift_project = project.variables.find('CI_PROJECT_NAME').to_s
-    openshift_app = project.variables.find('APP').to_s
+    openshift_project = project.variables.find_by(key: 'CI_PROJECT_NAME')
+    openshift_app = project.variables.find_by(key: 'APP')
+    # TODO: restrict access: this allows even 'guests' to have terminal access
     if openshift_project.present? && openshift_app.present?
       set_workhorse_internal_api_content_type
-      render json: {openshift_app: openshift_app, openshift_project: openshift_project}
+      render json: {openshift_app: openshift_app.value, openshift_project: openshift_project.value}
     else
       render text: 'Not found', status: 404
     end