feat: 增加 public setting 接口

Author: LeeEirc

.github/workflows/jms-generic-action-handler.yml

@@ -0,0 +1,12 @@
+on: [push, pull_request, release]
+
+name: JumpServer repos generic handler
+
+jobs:
+  generic_handler:
+    name: Run generic handler
+    runs-on: ubuntu-latest
+    steps:
+      - uses: jumpserver/action-generic-handler@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.PRIVATE_TOKEN }}

cmd/impl/jms.go

@@ -347,3 +347,21 @@ func (j *JMServer) DeleteForward(ctx context.Context, req *pb.ForwardDeleteReque
 	logger.Errorf("Forward not found id %s", id)
 	return &pb.StatusResponse{Status: &status}, nil
 }
+
+func (j *JMServer) GetPublicSetting(ctx context.Context, empty *pb.Empty) (*pb.PublicSettingResponse, error) {
+	var (
+		status pb.Status
+	)
+	data, err := j.apiClient.GetPublicSetting()
+	if err != nil {
+		logger.Errorf("Get public setting err: %s", err)
+		status.Err = err.Error()
+		return &pb.PublicSettingResponse{Status: &status}, nil
+	}
+	status.Ok = true
+	pbSetting := pb.PublicSetting{
+		XpackEnabled: data.XpackEnabled,
+		ValidLicense: data.ValidLicense,
+	}
+	return &pb.PublicSettingResponse{Status: &status, Data: &pbSetting}, nil
+}

pkg/jms-sdk-go/model/setting.go

@@ -8,44 +8,67 @@ type PublicSetting struct {
 		Image   string `json:"login_image"`
 		Favicon string `json:"favicon"`
 	} `json:"LOGO_URLS"`
-	EnableWatermark bool `json:"SECURITY_WATERMARK_ENABLED"`
+	EnableWatermark    bool `json:"SECURITY_WATERMARK_ENABLED"`
 	EnableSessionShare bool `json:"SECURITY_SESSION_SHARE"`
+
+	XpackEnabled bool `json:"XPACK_ENABLED"`
+	ValidLicense bool `json:"XPACK_LICENSE_IS_VALID"`
 }
 
 /*
+
 {
-	"WINDOWS_SKIP_ALL_MANUAL_PASSWORD": false,
-	"SECURITY_MAX_IDLE_TIME": 3,
-	"XPACK_ENABLED": true,
-	"LOGIN_CONFIRM_ENABLE": true,
-	"SECURITY_VIEW_AUTH_NEED_MFA": true,
-	"SECURITY_MFA_VERIFY_TTL": 60,
-	"OLD_PASSWORD_HISTORY_LIMIT_COUNT": 2,
-	"SECURITY_COMMAND_EXECUTION": true,
-	"SECURITY_PASSWORD_EXPIRATION_TIME": 10000,
-	"SECURITY_LUNA_REMEMBER_AUTH": true,
-	"XPACK_LICENSE_IS_VALID": true,
-	"LOGIN_TITLE": "欢迎使用JumpServer开源堡垒机",
-	"LOGO_URLS": {
-		"logo_logout": "/static/img/logo.png",
-		"logo_index": "/static/img/logo_text.png",
-		"login_image": "/static/img/login_image.jpg",
-		"favicon": "/static/img/facio.ico"
-	},
-	"TICKETS_ENABLED": true,
-	"PASSWORD_RULE": {
-		"SECURITY_PASSWORD_MIN_LENGTH": 6,
-		"SECURITY_ADMIN_USER_PASSWORD_MIN_LENGTH": 6,
-		"SECURITY_PASSWORD_UPPER_CASE": false,
-		"SECURITY_PASSWORD_LOWER_CASE": false,
-		"SECURITY_PASSWORD_NUMBER": false,
-		"SECURITY_PASSWORD_SPECIAL_CHAR": false
-	},
-	"AUTH_WECOM": true,
-	"AUTH_DINGTALK": true,
-	"AUTH_FEISHU": true,
-	"SECURITY_WATERMARK_ENABLED": true,
-	"SECURITY_SESSION_SHARE": true,
-	"XRDP_ENABLED": true
+    "data":{
+        "WINDOWS_SKIP_ALL_MANUAL_PASSWORD":false,
+        "OLD_PASSWORD_HISTORY_LIMIT_COUNT":3,
+        "SECURITY_MAX_IDLE_TIME":100,
+        "SECURITY_VIEW_AUTH_NEED_MFA":true,
+        "SECURITY_MFA_VERIFY_TTL":60,
+        "SECURITY_COMMAND_EXECUTION":true,
+        "SECURITY_PASSWORD_EXPIRATION_TIME":1000,
+        "SECURITY_LUNA_REMEMBER_AUTH":true,
+        "PASSWORD_RULE":{
+            "SECURITY_PASSWORD_MIN_LENGTH":6,
+            "SECURITY_ADMIN_USER_PASSWORD_MIN_LENGTH":8,
+            "SECURITY_PASSWORD_UPPER_CASE":true,
+            "SECURITY_PASSWORD_LOWER_CASE":true,
+            "SECURITY_PASSWORD_NUMBER":true,
+            "SECURITY_PASSWORD_SPECIAL_CHAR":true
+        },
+        "SECURITY_WATERMARK_ENABLED":true,
+        "SECURITY_SESSION_SHARE":true,
+        "XPACK_ENABLED":true,
+        "XPACK_LICENSE_IS_VALID":true,
+        "XPACK_LICENSE_INFO":{
+            "corporation":"JumpServer"
+        },
+        "LOGIN_TITLE":"JumpServer Open Source Bastion Host",
+        "LOGO_URLS":{
+            "logo_logout":"/static/img/logo.png",
+            "logo_index":"/static/img/logo_text.png",
+            "login_image":"/static/img/login_image.jpg",
+            "favicon":"/static/img/facio.ico"
+        },
+        "HELP_DOCUMENT_URL":"http://docs.jumpserver.org",
+        "HELP_SUPPORT_URL":"",
+        "AUTH_WECOM":true,
+        "AUTH_DINGTALK":true,
+        "AUTH_FEISHU":true,
+        "XRDP_ENABLED":true,
+        "TERMINAL_KOKO_HOST":"",
+        "TERMINAL_KOKO_SSH_PORT":2222,
+        "TERMINAL_MAGNUS_ENABLED":true,
+        "TERMINAL_MAGNUS_HOST":"",
+        "TERMINAL_MAGNUS_MYSQL_PORT":33060,
+        "TERMINAL_MAGNUS_MARIADB_PORT":33061,
+        "TERMINAL_MAGNUS_POSTGRE_PORT":54320,
+        "ANNOUNCEMENT_ENABLED":true,
+        "ANNOUNCEMENT":{
+            "ID":"",
+            "SUBJECT":"",
+            "CONTENT":"",
+            "LINK":""
+        }
+    }
 }
 */