From 5f43a9804302f79831f647af39d38118feeb009b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Tue, 19 Nov 2024 17:38:25 +0800
Subject: [PATCH] feat: add razor web

---
 charts/jumpserver/configs/jms-web/default.conf      | 13 +++++++++++++
 .../templates/razor/deployment-razor.yaml           |  7 +++++++
 .../jumpserver/templates/razor/service-razor.yaml   |  4 ++++
 charts/jumpserver/values.yaml                       |  2 ++
 4 files changed, 26 insertions(+)

diff --git a/charts/jumpserver/configs/jms-web/default.conf b/charts/jumpserver/configs/jms-web/default.conf
index dce5c3c..8d6eafb 100644
--- a/charts/jumpserver/configs/jms-web/default.conf
+++ b/charts/jumpserver/configs/jms-web/default.conf
@@ -3,6 +3,7 @@
 {{ $core := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-core" ($.Values.core.service.web.port | toString) }}
 {{ $chen := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-chen" ($.Values.chen.service.web.port | toString) }}
 {{ $kael := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-kael" ($.Values.kael.service.web.port | toString) }}
+{{ $razor := printf "http://%s-%s:%s" (include "jumpserver.fullname" $) "jms-razor" ($.Values.razor.service.web.port | toString) }}
 server {
     listen {{ $.Values.web.service.web.port }};
     server_name  _;
@@ -28,6 +29,18 @@ server {
     location /static/ {
         root /opt/jumpserver/data/;
     }
+    {{- if .Values.xpack.enabled }}
+    location /razor/ {
+        proxy_pass {{ $razor }};
+        proxy_buffering off;
+        proxy_http_version 1.1;
+        proxy_request_buffering off;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_ignore_client_abort on;
+    {{- end }}
     {{- if .Values.koko.enabled }}
     location /koko/ {
         proxy_pass {{ $koko }};
diff --git a/charts/jumpserver/templates/razor/deployment-razor.yaml b/charts/jumpserver/templates/razor/deployment-razor.yaml
index 05f09b8..44f10bf 100644
--- a/charts/jumpserver/templates/razor/deployment-razor.yaml
+++ b/charts/jumpserver/templates/razor/deployment-razor.yaml
@@ -49,6 +49,10 @@ spec:
               value: {{ $.Values.core.config.bootstrapToken | quote }}
             - name: LOG_LEVEL
               value: {{ .config.log.level | quote }}
+            - name: RAZOR_HTTP_PORT
+              value: {{ .service.web.port | quote }}
+            - name: RDP_PORT
+              value: {{ .service.rdp.port | quote }}
             {{- if include "jumpserver.sentinel.hosts" $ }}
             - name: REDIS_SENTINEL_HOSTS
               value: {{ include "jumpserver.sentinel.hosts" $ | quote }}
@@ -78,6 +82,9 @@ spec:
               value: {{ $val | quote }}
             {{- end }}
           ports:
+            - name: web
+              containerPort: {{ .service.web.port }}
+              protocol: TCP
             - name: rdp
               containerPort: {{ .service.rdp.port }}
               protocol: TCP
diff --git a/charts/jumpserver/templates/razor/service-razor.yaml b/charts/jumpserver/templates/razor/service-razor.yaml
index baa3c4b..20c3931 100644
--- a/charts/jumpserver/templates/razor/service-razor.yaml
+++ b/charts/jumpserver/templates/razor/service-razor.yaml
@@ -14,6 +14,10 @@ metadata:
 spec:
   type: {{ .service.type }}
   ports:
+    - port: {{ .service.web.port }}
+      targetPort: web
+      protocol: TCP
+      name: web
     - port: {{ .service.rdp.port }}
       targetPort: rdp
       {{- if eq .service.type "NodePort" }}
diff --git a/charts/jumpserver/values.yaml b/charts/jumpserver/values.yaml
index 7425885..9e21b8f 100644
--- a/charts/jumpserver/values.yaml
+++ b/charts/jumpserver/values.yaml
@@ -604,6 +604,8 @@ xrdp:
 
   service:
     type: ClusterIP
+    web:
+      port: 8084
     rdp:
       port: 3390