Merge branch 'c-0' into 'feature-zsv-5.0.0-vm-support-vtpm-and-secuceboot'

<feature>[log]: add LongText type for logging long content safely

See merge request zstackio/zstack!9528

Author: gitlab

core/src/main/java/org/zstack/core/log/LogSafeGson.java

@@ -99,6 +99,10 @@ String getMaskedValue(String raw) {
                 return "*****";
             } else if (annotation.type().tag()) {
                 return tagInfoHider.call(raw);
+            } else if (annotation.type().longText()) {
+                if (raw == null)
+                    return null;
+                return (raw.length() < 20) ? raw : raw.substring(0, 10) + "..." + raw.substring(raw.length() - 10);
             } else {
                 return Utils.getLogMaskWords().getOrDefault(raw, uriPattern.matcher(raw).replaceFirst(":*****@"));
             }

header/src/main/java/org/zstack/header/log/NoLogging.java

@@ -26,7 +26,9 @@ public boolean mask() {
     enum Type {
         Simple,
         Tag,
-        Uri;
+        Uri,
+        LongText,
+        ;
 
         public boolean simple() {
             return this == Simple;
@@ -39,6 +41,10 @@ public boolean tag() {
         public boolean uri() {
             return this == Uri;
         }
+
+        public boolean longText() {
+            return this == LongText;
+        }
     }
 
     Behavior behavior() default Behavior.Mask;

header/src/main/java/org/zstack/header/vm/APITakeVmConsoleScreenshotEvent.java

@@ -1,5 +1,6 @@
 package org.zstack.header.vm;
 
+import org.zstack.header.log.NoLogging;
 import org.zstack.header.message.APIEvent;
 import org.zstack.header.rest.RestResponse;
 
@@ -9,6 +10,7 @@
  */
 @RestResponse(fieldsTo = {"imageData"})
 public class APITakeVmConsoleScreenshotEvent extends APIEvent {
+    @NoLogging(type = NoLogging.Type.LongText)
     private String imageData;
 
     public APITakeVmConsoleScreenshotEvent() {

header/src/main/java/org/zstack/header/vm/TakeVmConsoleScreenshotReply.java

@@ -1,12 +1,14 @@
 package org.zstack.header.vm;
 
+import org.zstack.header.log.NoLogging;
 import org.zstack.header.message.MessageReply;
 
 /**
  * @author shanshan.ning
  * @date 2023-09-11
  */
 public class TakeVmConsoleScreenshotReply extends MessageReply {
+    @NoLogging(type = NoLogging.Type.LongText)
     private String imageData;
 
     public String getImageData() {

plugin/kvm/src/main/java/org/zstack/kvm/KVMAgentCommands.java

@@ -2844,7 +2844,7 @@ public static class VmHostFileTO {
         /**
          * null if operation is Prepare or Delete
          */
-        @NoLogging
+        @NoLogging(type = NoLogging.Type.LongText)
         private String contentBase64;
         private String error;
 
@@ -4760,6 +4760,7 @@ public void setVmUuid(String vmUuid) {
     }
 
     public static class TakeVmConsoleScreenshotRsp extends AgentResponse {
+        @NoLogging(type = NoLogging.Type.LongText)
         private String imageData;
 
         public String getImageData() {