[ISSUE-alibaba#3005] fix ClusterController 403 and some display wrong (…

…alibaba#4512) * fix 3005 * fix 3005
showkawa · Dec 23, 2020 · ce57b98 · ce57b98
1 parent 638d89b
commit ce57b98
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 26 deletions.
diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/healthcheck/AbstractHealthChecker.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/healthcheck/AbstractHealthChecker.java
@@ -35,7 +35,8 @@
 @JsonTypeInfo(use = Id.NAME, property = "type", defaultImpl = None.class)
 @JsonSubTypes({@JsonSubTypes.Type(name = Http.TYPE, value = Http.class),
         @JsonSubTypes.Type(name = Mysql.TYPE, value = Mysql.class),
-        @JsonSubTypes.Type(name = Tcp.TYPE, value = Tcp.class)})
+        @JsonSubTypes.Type(name = Tcp.TYPE, value = Tcp.class),
+        @JsonSubTypes.Type(name = None.TYPE, value = None.class)})
 public abstract class AbstractHealthChecker implements Cloneable, Serializable {
 
     private static final long serialVersionUID = 3848305577423336421L;

diff --git a/console-ui/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js b/console-ui/src/pages/ServiceManagement/ServiceDetail/EditClusterDialog.js
@@ -63,7 +63,7 @@ class EditClusterDialog extends React.Component {
       name,
       serviceName,
       metadataText,
-      defaultCheckPort,
+      defCkport,
       useIPPort4Check,
       healthChecker,
     } = this.state.editCluster;
@@ -74,7 +74,7 @@ class EditClusterDialog extends React.Component {
         serviceName,
         clusterName: name,
         metadata: metadataText,
-        checkPort: defaultCheckPort,
+        checkPort: defCkport,
         useInstancePort4Check: useIPPort4Check,
         healthChecker: JSON.stringify(healthChecker),
       },
@@ -106,7 +106,7 @@ class EditClusterDialog extends React.Component {
     const {
       healthChecker = {},
       useIPPort4Check,
-      defaultCheckPort = '80',
+      defCkport = '80',
       metadataText = '',
     } = editCluster;
     const { type, path, headers } = healthChecker;
@@ -139,8 +139,8 @@ class EditClusterDialog extends React.Component {
           <Form.Item label={`${checkPort}:`}>
             <Input
               className="in-text"
-              value={defaultCheckPort}
-              onChange={defaultCheckPort => this.onChangeCluster({ defaultCheckPort })}
+              value={defCkport}
+              onChange={defCkport => this.onChangeCluster({ defCkport })}
             />
           </Form.Item>
           <Form.Item label={`${useIpPortCheck}:`}>

diff --git a/console/src/main/resources/static/css/main.css b/console/src/main/resources/static/css/main.css
diff --git a/console/src/main/resources/static/js/main.js b/console/src/main/resources/static/js/main.js
diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/CatalogController.java
@@ -19,7 +19,6 @@
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.api.exception.NacosException;
 import com.alibaba.nacos.api.naming.CommonParams;
-import com.alibaba.nacos.api.naming.pojo.Cluster;
 import com.alibaba.nacos.api.naming.utils.NamingUtils;
 import com.alibaba.nacos.auth.annotation.Secured;
 import com.alibaba.nacos.auth.common.ActionTypes;
@@ -93,22 +92,7 @@ public ObjectNode serviceDetail(@RequestParam(defaultValue = Constants.DEFAULT_N
 
         ObjectNode detailView = JacksonUtils.createEmptyJsonNode();
         detailView.replace("service", serviceObject);
-
-        List<Cluster> clusters = new ArrayList<>();
-
-        for (com.alibaba.nacos.naming.core.Cluster cluster : detailedService.getClusterMap().values()) {
-            Cluster clusterView = new Cluster();
-            clusterView.setName(cluster.getName());
-            clusterView.setHealthChecker(cluster.getHealthChecker());
-            clusterView.setMetadata(cluster.getMetadata());
-            clusterView.setUseIPPort4Check(cluster.isUseIPPort4Check());
-            clusterView.setDefaultPort(cluster.getDefaultPort());
-            clusterView.setDefaultCheckPort(cluster.getDefaultCheckPort());
-            clusterView.setServiceName(cluster.getService().getName());
-            clusters.add(clusterView);
-        }
-
-        detailView.replace("clusters", JacksonUtils.transferToJsonNode(clusters));
+        detailView.replace("clusters", JacksonUtils.transferToJsonNode(detailedService.getClusterMap().values()));
 
         return detailView;
     }

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/ClusterController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/ClusterController.java
@@ -29,6 +29,7 @@
 import com.alibaba.nacos.naming.core.ServiceManager;
 import com.alibaba.nacos.naming.misc.Loggers;
 import com.alibaba.nacos.naming.misc.UtilsAndCommons;
+import com.alibaba.nacos.naming.web.NamingResourceParser;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -59,7 +60,7 @@ public class ClusterController {
      * @throws Exception if failed
      */
     @PutMapping
-    @Secured(action = ActionTypes.WRITE)
+    @Secured(action = ActionTypes.WRITE, parser = NamingResourceParser.class)
     public String update(HttpServletRequest request) throws Exception {
 
         String namespaceId = WebUtils.optional(request, CommonParams.NAMESPACE_ID, Constants.DEFAULT_NAMESPACE_ID);