From 7bd84b5cfbeeb2c2c66da0b47bbe1200b64fbaec Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Wed, 8 Oct 2025 00:46:24 +0800 Subject: [PATCH 01/13] feat: data masking --- .../datasource/base/BaseSQLActuator.java | 88 +- .../chen/framework/session/Session.java | 4 + .../framework/session/impl/BaseSession.java | 7 + .../framework/session/impl/JMSSession.java | 3 + backend/web/pom.xml | 6 + backend/wisp/pom.xml | 2 +- .../main/java/org/jumpserver/wisp/Common.java | 2125 +++++++++++++++-- .../java/org/jumpserver/wisp/ServiceGrpc.java | 76 +- .../jumpserver/wisp/ServiceOuterClass.java | 1591 ++++++++---- 9 files changed, 3248 insertions(+), 654 deletions(-) diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java index 84c9032..f4b730c 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java @@ -18,11 +18,13 @@ import org.jumpserver.chen.framework.utils.HexUtils; import org.jumpserver.chen.framework.utils.PageUtils; import org.jumpserver.chen.framework.utils.ReflectUtils; +import org.jumpserver.wisp.Common; import java.math.BigDecimal; import java.math.BigInteger; import java.sql.*; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -167,7 +169,7 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery fs.add(HexUtils.bytesToHex((byte[]) obj)); } else if (obj instanceof Blob) { fs.add(HexUtils.bytesToHex(((Blob) obj).getBytes(1, (int) ((Blob) obj).length()))); - } else if (obj!= null && obj.getClass().getSimpleName().equalsIgnoreCase("pgobject")) { + } else if (obj != null && obj.getClass().getSimpleName().equalsIgnoreCase("pgobject")) { fs.add(obj.toString()); } else { fs.add(obj); @@ -181,6 +183,36 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery resultSet.close(); result.setFetchFinishedTime(new Time(System.currentTimeMillis())); + // 数据脱敏 + + var rules = SessionManager.getCurrentSession().getDataMaskingRules(); + var maskIndexes = new ArrayList<>(); + var maskRules = new HashMap(); + for (var i = 0; i < result.getFields().size(); i++) { + for (Common.DataMaskingRule rule : rules) { + if (result.getFields().get(i).getName().equalsIgnoreCase(rule.getFieldsPattern())) { + maskIndexes.add(i); + maskRules.put(i, rule); + } + } + } + + for (var i = 0; i < result.getData().size(); i++) { + for (var j = 0; j < result.getData().get(i).size(); j++) { + if (maskIndexes.contains(j)) { + var rule = maskRules.get(j); + var val = result.getData().get(i).get(j); + if (val instanceof String) { + var rep = this.replaceColumnVal(rule, (String) val); + result.getData().get(i).set(j, rep); + } else { + result.getData().get(i).set(j, rule.getMaskPattern()); + } + } + } + } + + var total = this.count(plan); if (total < 0) { result.setTotal(result.getData().size()); @@ -198,6 +230,60 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery } } + + + public String replaceColumnVal(Common.DataMaskingRule rule, String val) { + if (rule == null) { + return "####"; + } else { + rule.getMaskingMethod(); + } + + String method = rule.getMaskingMethod(); + rule.getMaskPattern(); + String pattern = rule.getMaskPattern(); + + switch (method) { + case "fixed_char": + // 固定字符替换 + if (pattern.isEmpty()) { + return "####"; + } + return pattern; + + case "hide_middle": + // 隐藏中间 + if (val == null || val.length() < 3) { + return pattern.isEmpty() ? "####" : pattern; + } + return val.charAt(0) + + "*".repeat(val.length() - 2) + + val.substring(val.length() - 1); + + case "keep_prefix": + // 保留前缀 + int prefix = 2; + if (val == null || prefix >= val.length()) { + return "####"; + } + return val.substring(0, prefix) + + "*".repeat(val.length() - prefix); + + case "keep_suffix": + // 保留后缀 + int suffix = 2; + if (val == null || suffix >= val.length()) { + return "####"; + } + return "*".repeat(val.length() - suffix) + + val.substring(val.length() - suffix); + + default: + // 未知策略 + return pattern.isEmpty() ? "####" : pattern; + } + } + @Override public SQLQueryResult executeWithAudit(SQL sql) throws SQLException { var plan = this.createPlan(sql); diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java index 86d59de..fa04fa4 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java @@ -8,17 +8,21 @@ import org.jumpserver.chen.framework.jms.exception.CommandRejectException; import org.jumpserver.chen.framework.session.controller.Controller; import org.jumpserver.chen.framework.ws.io.PacketIO; +import org.jumpserver.wisp.Common; import java.io.File; import java.nio.file.Path; import java.sql.Connection; import java.sql.SQLException; import java.time.LocalDateTime; +import java.util.List; import java.util.Locale; import java.util.Map; public interface Session { + List getDataMaskingRules(); + void refreshLastActiveTime(); LocalDateTime getLastActiveTime(); diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java index d013aa9..89adf97 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java @@ -15,6 +15,7 @@ import org.jumpserver.chen.framework.session.controller.Controller; import org.jumpserver.chen.framework.session.controller.impl.BaseController; import org.jumpserver.chen.framework.ws.io.PacketIO; +import org.jumpserver.wisp.Common; import java.io.File; import java.nio.file.Path; @@ -22,6 +23,7 @@ import java.sql.Connection; import java.sql.SQLException; import java.time.LocalDateTime; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -68,6 +70,11 @@ public BaseSession(Datasource datasource, String remoteAddr) { } + @Override + public List getDataMaskingRules() { + return List.of(); + } + @Override public void refreshLastActiveTime() { this.lastActiveTime = LocalDateTime.now(); diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java index 3ba5b8d..66e375b 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java @@ -41,6 +41,8 @@ public class JMSSession extends BaseSession { @Getter private final Common.Session jmsSession; + @Getter + private List dataMaskingRules; private ACLFilter aclFilter; private CommandHandler commandHandler; private ReplayHandler replayHandler; @@ -103,6 +105,7 @@ public JMSSession(Common.Session session, this.canDownload = tokenResp.getData().getPermission().getEnableDownload(); this.canCopy = tokenResp.getData().getPermission().getEnableCopy(); this.canPaste = tokenResp.getData().getPermission().getEnablePaste(); + this.dataMaskingRules = tokenResp.getData().getDataMaskingRulesList(); } diff --git a/backend/web/pom.xml b/backend/web/pom.xml index 1aadc0d..c0b563f 100644 --- a/backend/web/pom.xml +++ b/backend/web/pom.xml @@ -107,6 +107,12 @@ ${revision} + + org.jumpserver + sqlparser + ${revision} + + diff --git a/backend/wisp/pom.xml b/backend/wisp/pom.xml index 2e046b8..746c043 100644 --- a/backend/wisp/pom.xml +++ b/backend/wisp/pom.xml @@ -20,7 +20,7 @@ com.google.protobuf protobuf-java - 4.28.0 + 4.32.1 org.springframework diff --git a/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java b/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java index ecb3113..f23c973 100644 --- a/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java +++ b/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: common.proto -// Protobuf Java Version: 4.28.0 +// Protobuf Java Version: 4.32.1 package org.jumpserver.wisp; -public final class Common { +@com.google.protobuf.Generated +public final class Common extends com.google.protobuf.GeneratedFile { private Common() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Common.class.getName()); } @@ -57,8 +58,8 @@ public enum TaskAction com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TaskAction.class.getName()); } @@ -141,7 +142,7 @@ public TaskAction findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return org.jumpserver.wisp.Common.getDescriptor().getEnumTypes().get(0); } @@ -205,8 +206,8 @@ public enum RiskLevel com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", RiskLevel.class.getName()); } @@ -294,7 +295,7 @@ public RiskLevel findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return org.jumpserver.wisp.Common.getDescriptor().getEnumTypes().get(1); } @@ -398,8 +399,8 @@ public static final class User extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", User.class.getName()); } @@ -1501,8 +1502,8 @@ public static final class Account extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Account.class.getName()); } @@ -1948,7 +1949,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getSecretTypeFieldBuilder(); + internalGetSecretTypeFieldBuilder(); } } @java.lang.Override @@ -2102,7 +2103,7 @@ public Builder mergeFrom( } // case 42 case 50: { input.readMessage( - getSecretTypeFieldBuilder().getBuilder(), + internalGetSecretTypeFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000010; break; @@ -2503,7 +2504,7 @@ public Builder clearSecretType() { public org.jumpserver.wisp.Common.LabelValue.Builder getSecretTypeBuilder() { bitField0_ |= 0x00000010; onChanged(); - return getSecretTypeFieldBuilder().getBuilder(); + return internalGetSecretTypeFieldBuilder().getBuilder(); } /** * .message.LabelValue secretType = 6; @@ -2521,7 +2522,7 @@ public org.jumpserver.wisp.Common.LabelValueOrBuilder getSecretTypeOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.LabelValue, org.jumpserver.wisp.Common.LabelValue.Builder, org.jumpserver.wisp.Common.LabelValueOrBuilder> - getSecretTypeFieldBuilder() { + internalGetSecretTypeFieldBuilder() { if (secretTypeBuilder_ == null) { secretTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.LabelValue, org.jumpserver.wisp.Common.LabelValue.Builder, org.jumpserver.wisp.Common.LabelValueOrBuilder>( @@ -2624,8 +2625,8 @@ public static final class LabelValue extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", LabelValue.class.getName()); } @@ -3357,8 +3358,8 @@ public static final class Asset extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Asset.class.getName()); } @@ -3548,8 +3549,8 @@ public static final class Specific extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Specific.class.getName()); } @@ -6045,8 +6046,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getProtocolsFieldBuilder(); - getSpecificFieldBuilder(); + internalGetProtocolsFieldBuilder(); + internalGetSpecificFieldBuilder(); } } @java.lang.Override @@ -6198,7 +6199,7 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.Asset other) { bitField0_ = (bitField0_ & ~0x00000020); protocolsBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getProtocolsFieldBuilder() : null; + internalGetProtocolsFieldBuilder() : null; } else { protocolsBuilder_.addAllMessages(other.protocols_); } @@ -6273,7 +6274,7 @@ public Builder mergeFrom( } // case 50 case 58: { input.readMessage( - getSpecificFieldBuilder().getBuilder(), + internalGetSpecificFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000040; break; @@ -6835,7 +6836,7 @@ public Builder removeProtocols(int index) { */ public org.jumpserver.wisp.Common.Protocol.Builder getProtocolsBuilder( int index) { - return getProtocolsFieldBuilder().getBuilder(index); + return internalGetProtocolsFieldBuilder().getBuilder(index); } /** * repeated .message.Protocol protocols = 6; @@ -6862,7 +6863,7 @@ public org.jumpserver.wisp.Common.ProtocolOrBuilder getProtocolsOrBuilder( * repeated .message.Protocol protocols = 6; */ public org.jumpserver.wisp.Common.Protocol.Builder addProtocolsBuilder() { - return getProtocolsFieldBuilder().addBuilder( + return internalGetProtocolsFieldBuilder().addBuilder( org.jumpserver.wisp.Common.Protocol.getDefaultInstance()); } /** @@ -6870,7 +6871,7 @@ public org.jumpserver.wisp.Common.Protocol.Builder addProtocolsBuilder() { */ public org.jumpserver.wisp.Common.Protocol.Builder addProtocolsBuilder( int index) { - return getProtocolsFieldBuilder().addBuilder( + return internalGetProtocolsFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.Protocol.getDefaultInstance()); } /** @@ -6878,11 +6879,11 @@ public org.jumpserver.wisp.Common.Protocol.Builder addProtocolsBuilder( */ public java.util.List getProtocolsBuilderList() { - return getProtocolsFieldBuilder().getBuilderList(); + return internalGetProtocolsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Protocol, org.jumpserver.wisp.Common.Protocol.Builder, org.jumpserver.wisp.Common.ProtocolOrBuilder> - getProtocolsFieldBuilder() { + internalGetProtocolsFieldBuilder() { if (protocolsBuilder_ == null) { protocolsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Protocol, org.jumpserver.wisp.Common.Protocol.Builder, org.jumpserver.wisp.Common.ProtocolOrBuilder>( @@ -6986,7 +6987,7 @@ public Builder clearSpecific() { public org.jumpserver.wisp.Common.Asset.Specific.Builder getSpecificBuilder() { bitField0_ |= 0x00000040; onChanged(); - return getSpecificFieldBuilder().getBuilder(); + return internalGetSpecificFieldBuilder().getBuilder(); } /** * .message.Asset.Specific specific = 7; @@ -7004,7 +7005,7 @@ public org.jumpserver.wisp.Common.Asset.SpecificOrBuilder getSpecificOrBuilder() */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Asset.Specific, org.jumpserver.wisp.Common.Asset.Specific.Builder, org.jumpserver.wisp.Common.Asset.SpecificOrBuilder> - getSpecificFieldBuilder() { + internalGetSpecificFieldBuilder() { if (specificBuilder_ == null) { specificBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Asset.Specific, org.jumpserver.wisp.Common.Asset.Specific.Builder, org.jumpserver.wisp.Common.Asset.SpecificOrBuilder>( @@ -7107,8 +7108,8 @@ public static final class Protocol extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Protocol.class.getName()); } @@ -7827,8 +7828,8 @@ public static final class Gateway extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Gateway.class.getName()); } @@ -9237,8 +9238,8 @@ public static final class Permission extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Permission.class.getName()); } @@ -10005,8 +10006,8 @@ public static final class CommandACL extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", CommandACL.class.getName()); } @@ -10070,8 +10071,8 @@ public enum Action com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Action.class.getName()); } @@ -10159,7 +10160,7 @@ public Action findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return org.jumpserver.wisp.Common.CommandACL.getDescriptor().getEnumTypes().get(0); } @@ -10718,7 +10719,7 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.CommandACL other) { bitField0_ = (bitField0_ & ~0x00000020); commandGroupsBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getCommandGroupsFieldBuilder() : null; + internalGetCommandGroupsFieldBuilder() : null; } else { commandGroupsBuilder_.addAllMessages(other.commandGroups_); } @@ -11015,9 +11016,7 @@ public org.jumpserver.wisp.Common.CommandACL.Action getAction() { * @return This builder for chaining. */ public Builder setAction(org.jumpserver.wisp.Common.CommandACL.Action value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000008; action_ = value.getNumber(); onChanged(); @@ -11246,7 +11245,7 @@ public Builder removeCommandGroups(int index) { */ public org.jumpserver.wisp.Common.CommandGroup.Builder getCommandGroupsBuilder( int index) { - return getCommandGroupsFieldBuilder().getBuilder(index); + return internalGetCommandGroupsFieldBuilder().getBuilder(index); } /** * repeated .message.CommandGroup command_groups = 7; @@ -11273,7 +11272,7 @@ public org.jumpserver.wisp.Common.CommandGroupOrBuilder getCommandGroupsOrBuilde * repeated .message.CommandGroup command_groups = 7; */ public org.jumpserver.wisp.Common.CommandGroup.Builder addCommandGroupsBuilder() { - return getCommandGroupsFieldBuilder().addBuilder( + return internalGetCommandGroupsFieldBuilder().addBuilder( org.jumpserver.wisp.Common.CommandGroup.getDefaultInstance()); } /** @@ -11281,7 +11280,7 @@ public org.jumpserver.wisp.Common.CommandGroup.Builder addCommandGroupsBuilder() */ public org.jumpserver.wisp.Common.CommandGroup.Builder addCommandGroupsBuilder( int index) { - return getCommandGroupsFieldBuilder().addBuilder( + return internalGetCommandGroupsFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.CommandGroup.getDefaultInstance()); } /** @@ -11289,40 +11288,1287 @@ public org.jumpserver.wisp.Common.CommandGroup.Builder addCommandGroupsBuilder( */ public java.util.List getCommandGroupsBuilderList() { - return getCommandGroupsFieldBuilder().getBuilderList(); + return internalGetCommandGroupsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jumpserver.wisp.Common.CommandGroup, org.jumpserver.wisp.Common.CommandGroup.Builder, org.jumpserver.wisp.Common.CommandGroupOrBuilder> + internalGetCommandGroupsFieldBuilder() { + if (commandGroupsBuilder_ == null) { + commandGroupsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jumpserver.wisp.Common.CommandGroup, org.jumpserver.wisp.Common.CommandGroup.Builder, org.jumpserver.wisp.Common.CommandGroupOrBuilder>( + commandGroups_, + ((bitField0_ & 0x00000020) != 0), + getParentForChildren(), + isClean()); + commandGroups_ = null; + } + return commandGroupsBuilder_; + } + + // @@protoc_insertion_point(builder_scope:message.CommandACL) + } + + // @@protoc_insertion_point(class_scope:message.CommandACL) + private static final org.jumpserver.wisp.Common.CommandACL DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jumpserver.wisp.Common.CommandACL(); + } + + public static org.jumpserver.wisp.Common.CommandACL getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public CommandACL parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.jumpserver.wisp.Common.CommandACL getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + + public interface DataMaskingRuleOrBuilder extends + // @@protoc_insertion_point(interface_extends:message.DataMaskingRule) + com.google.protobuf.MessageOrBuilder { + + /** + * string id = 1; + * @return The id. + */ + java.lang.String getId(); + /** + * string id = 1; + * @return The bytes for id. + */ + com.google.protobuf.ByteString + getIdBytes(); + + /** + * string name = 2; + * @return The name. + */ + java.lang.String getName(); + /** + * string name = 2; + * @return The bytes for name. + */ + com.google.protobuf.ByteString + getNameBytes(); + + /** + * int32 priority = 3; + * @return The priority. + */ + int getPriority(); + + /** + * bool is_active = 4; + * @return The isActive. + */ + boolean getIsActive(); + + /** + * string masking_method = 5; + * @return The maskingMethod. + */ + java.lang.String getMaskingMethod(); + /** + * string masking_method = 5; + * @return The bytes for maskingMethod. + */ + com.google.protobuf.ByteString + getMaskingMethodBytes(); + + /** + * string mask_pattern = 6; + * @return The maskPattern. + */ + java.lang.String getMaskPattern(); + /** + * string mask_pattern = 6; + * @return The bytes for maskPattern. + */ + com.google.protobuf.ByteString + getMaskPatternBytes(); + + /** + * string fields_pattern = 7; + * @return The fieldsPattern. + */ + java.lang.String getFieldsPattern(); + /** + * string fields_pattern = 7; + * @return The bytes for fieldsPattern. + */ + com.google.protobuf.ByteString + getFieldsPatternBytes(); + } + /** + * Protobuf type {@code message.DataMaskingRule} + */ + public static final class DataMaskingRule extends + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:message.DataMaskingRule) + DataMaskingRuleOrBuilder { + private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 32, + /* patch= */ 1, + /* suffix= */ "", + DataMaskingRule.class.getName()); + } + // Use DataMaskingRule.newBuilder() to construct. + private DataMaskingRule(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + } + private DataMaskingRule() { + id_ = ""; + name_ = ""; + maskingMethod_ = ""; + maskPattern_ = ""; + fieldsPattern_ = ""; + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jumpserver.wisp.Common.internal_static_message_DataMaskingRule_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jumpserver.wisp.Common.internal_static_message_DataMaskingRule_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jumpserver.wisp.Common.DataMaskingRule.class, org.jumpserver.wisp.Common.DataMaskingRule.Builder.class); + } + + public static final int ID_FIELD_NUMBER = 1; + @SuppressWarnings("serial") + private volatile java.lang.Object id_ = ""; + /** + * string id = 1; + * @return The id. + */ + @java.lang.Override + public java.lang.String getId() { + java.lang.Object ref = id_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + id_ = s; + return s; + } + } + /** + * string id = 1; + * @return The bytes for id. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getIdBytes() { + java.lang.Object ref = id_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + id_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int NAME_FIELD_NUMBER = 2; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + @java.lang.Override + public java.lang.String getName() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } + } + /** + * string name = 2; + * @return The bytes for name. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int PRIORITY_FIELD_NUMBER = 3; + private int priority_ = 0; + /** + * int32 priority = 3; + * @return The priority. + */ + @java.lang.Override + public int getPriority() { + return priority_; + } + + public static final int IS_ACTIVE_FIELD_NUMBER = 4; + private boolean isActive_ = false; + /** + * bool is_active = 4; + * @return The isActive. + */ + @java.lang.Override + public boolean getIsActive() { + return isActive_; + } + + public static final int MASKING_METHOD_FIELD_NUMBER = 5; + @SuppressWarnings("serial") + private volatile java.lang.Object maskingMethod_ = ""; + /** + * string masking_method = 5; + * @return The maskingMethod. + */ + @java.lang.Override + public java.lang.String getMaskingMethod() { + java.lang.Object ref = maskingMethod_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + maskingMethod_ = s; + return s; + } + } + /** + * string masking_method = 5; + * @return The bytes for maskingMethod. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getMaskingMethodBytes() { + java.lang.Object ref = maskingMethod_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + maskingMethod_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int MASK_PATTERN_FIELD_NUMBER = 6; + @SuppressWarnings("serial") + private volatile java.lang.Object maskPattern_ = ""; + /** + * string mask_pattern = 6; + * @return The maskPattern. + */ + @java.lang.Override + public java.lang.String getMaskPattern() { + java.lang.Object ref = maskPattern_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + maskPattern_ = s; + return s; + } + } + /** + * string mask_pattern = 6; + * @return The bytes for maskPattern. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getMaskPatternBytes() { + java.lang.Object ref = maskPattern_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + maskPattern_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + public static final int FIELDS_PATTERN_FIELD_NUMBER = 7; + @SuppressWarnings("serial") + private volatile java.lang.Object fieldsPattern_ = ""; + /** + * string fields_pattern = 7; + * @return The fieldsPattern. + */ + @java.lang.Override + public java.lang.String getFieldsPattern() { + java.lang.Object ref = fieldsPattern_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + fieldsPattern_ = s; + return s; + } + } + /** + * string fields_pattern = 7; + * @return The bytes for fieldsPattern. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getFieldsPatternBytes() { + java.lang.Object ref = fieldsPattern_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + fieldsPattern_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(id_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 1, id_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 2, name_); + } + if (priority_ != 0) { + output.writeInt32(3, priority_); + } + if (isActive_ != false) { + output.writeBool(4, isActive_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(maskingMethod_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 5, maskingMethod_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(maskPattern_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 6, maskPattern_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(fieldsPattern_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 7, fieldsPattern_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(id_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, id_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(2, name_); + } + if (priority_ != 0) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, priority_); + } + if (isActive_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(4, isActive_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(maskingMethod_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(5, maskingMethod_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(maskPattern_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(6, maskPattern_); + } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(fieldsPattern_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(7, fieldsPattern_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.jumpserver.wisp.Common.DataMaskingRule)) { + return super.equals(obj); + } + org.jumpserver.wisp.Common.DataMaskingRule other = (org.jumpserver.wisp.Common.DataMaskingRule) obj; + + if (!getId() + .equals(other.getId())) return false; + if (!getName() + .equals(other.getName())) return false; + if (getPriority() + != other.getPriority()) return false; + if (getIsActive() + != other.getIsActive()) return false; + if (!getMaskingMethod() + .equals(other.getMaskingMethod())) return false; + if (!getMaskPattern() + .equals(other.getMaskPattern())) return false; + if (!getFieldsPattern() + .equals(other.getFieldsPattern())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + ID_FIELD_NUMBER; + hash = (53 * hash) + getId().hashCode(); + hash = (37 * hash) + NAME_FIELD_NUMBER; + hash = (53 * hash) + getName().hashCode(); + hash = (37 * hash) + PRIORITY_FIELD_NUMBER; + hash = (53 * hash) + getPriority(); + hash = (37 * hash) + IS_ACTIVE_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getIsActive()); + hash = (37 * hash) + MASKING_METHOD_FIELD_NUMBER; + hash = (53 * hash) + getMaskingMethod().hashCode(); + hash = (37 * hash) + MASK_PATTERN_FIELD_NUMBER; + hash = (53 * hash) + getMaskPattern().hashCode(); + hash = (37 * hash) + FIELDS_PATTERN_FIELD_NUMBER; + hash = (53 * hash) + getFieldsPattern().hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.jumpserver.wisp.Common.DataMaskingRule parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.jumpserver.wisp.Common.DataMaskingRule parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); + } + public static org.jumpserver.wisp.Common.DataMaskingRule parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.jumpserver.wisp.Common.DataMaskingRule prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code message.DataMaskingRule} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:message.DataMaskingRule) + org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jumpserver.wisp.Common.internal_static_message_DataMaskingRule_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jumpserver.wisp.Common.internal_static_message_DataMaskingRule_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jumpserver.wisp.Common.DataMaskingRule.class, org.jumpserver.wisp.Common.DataMaskingRule.Builder.class); + } + + // Construct using org.jumpserver.wisp.Common.DataMaskingRule.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + id_ = ""; + name_ = ""; + priority_ = 0; + isActive_ = false; + maskingMethod_ = ""; + maskPattern_ = ""; + fieldsPattern_ = ""; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jumpserver.wisp.Common.internal_static_message_DataMaskingRule_descriptor; + } + + @java.lang.Override + public org.jumpserver.wisp.Common.DataMaskingRule getDefaultInstanceForType() { + return org.jumpserver.wisp.Common.DataMaskingRule.getDefaultInstance(); + } + + @java.lang.Override + public org.jumpserver.wisp.Common.DataMaskingRule build() { + org.jumpserver.wisp.Common.DataMaskingRule result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.jumpserver.wisp.Common.DataMaskingRule buildPartial() { + org.jumpserver.wisp.Common.DataMaskingRule result = new org.jumpserver.wisp.Common.DataMaskingRule(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.jumpserver.wisp.Common.DataMaskingRule result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.id_ = id_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000004) != 0)) { + result.priority_ = priority_; + } + if (((from_bitField0_ & 0x00000008) != 0)) { + result.isActive_ = isActive_; + } + if (((from_bitField0_ & 0x00000010) != 0)) { + result.maskingMethod_ = maskingMethod_; + } + if (((from_bitField0_ & 0x00000020) != 0)) { + result.maskPattern_ = maskPattern_; + } + if (((from_bitField0_ & 0x00000040) != 0)) { + result.fieldsPattern_ = fieldsPattern_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jumpserver.wisp.Common.DataMaskingRule) { + return mergeFrom((org.jumpserver.wisp.Common.DataMaskingRule)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jumpserver.wisp.Common.DataMaskingRule other) { + if (other == org.jumpserver.wisp.Common.DataMaskingRule.getDefaultInstance()) return this; + if (!other.getId().isEmpty()) { + id_ = other.id_; + bitField0_ |= 0x00000001; + onChanged(); + } + if (!other.getName().isEmpty()) { + name_ = other.name_; + bitField0_ |= 0x00000002; + onChanged(); + } + if (other.getPriority() != 0) { + setPriority(other.getPriority()); + } + if (other.getIsActive() != false) { + setIsActive(other.getIsActive()); + } + if (!other.getMaskingMethod().isEmpty()) { + maskingMethod_ = other.maskingMethod_; + bitField0_ |= 0x00000010; + onChanged(); + } + if (!other.getMaskPattern().isEmpty()) { + maskPattern_ = other.maskPattern_; + bitField0_ |= 0x00000020; + onChanged(); + } + if (!other.getFieldsPattern().isEmpty()) { + fieldsPattern_ = other.fieldsPattern_; + bitField0_ |= 0x00000040; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + id_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 24: { + priority_ = input.readInt32(); + bitField0_ |= 0x00000004; + break; + } // case 24 + case 32: { + isActive_ = input.readBool(); + bitField0_ |= 0x00000008; + break; + } // case 32 + case 42: { + maskingMethod_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000010; + break; + } // case 42 + case 50: { + maskPattern_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000020; + break; + } // case 50 + case 58: { + fieldsPattern_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000040; + break; + } // case 58 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private java.lang.Object id_ = ""; + /** + * string id = 1; + * @return The id. + */ + public java.lang.String getId() { + java.lang.Object ref = id_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + id_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string id = 1; + * @return The bytes for id. + */ + public com.google.protobuf.ByteString + getIdBytes() { + java.lang.Object ref = id_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + id_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string id = 1; + * @param value The id to set. + * @return This builder for chaining. + */ + public Builder setId( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + id_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * string id = 1; + * @return This builder for chaining. + */ + public Builder clearId() { + id_ = getDefaultInstance().getId(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * string id = 1; + * @param value The bytes for id to set. + * @return This builder for chaining. + */ + public Builder setIdBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + id_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + + private java.lang.Object name_ = ""; + /** + * string name = 2; + * @return The name. + */ + public java.lang.String getName() { + java.lang.Object ref = name_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + name_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string name = 2; + * @return The bytes for name. + */ + public com.google.protobuf.ByteString + getNameBytes() { + java.lang.Object ref = name_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + name_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string name = 2; + * @param value The name to set. + * @return This builder for chaining. + */ + public Builder setName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + name_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * string name = 2; + * @return This builder for chaining. + */ + public Builder clearName() { + name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + /** + * string name = 2; + * @param value The bytes for name to set. + * @return This builder for chaining. + */ + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + name_ = value; + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + + private int priority_ ; + /** + * int32 priority = 3; + * @return The priority. + */ + @java.lang.Override + public int getPriority() { + return priority_; + } + /** + * int32 priority = 3; + * @param value The priority to set. + * @return This builder for chaining. + */ + public Builder setPriority(int value) { + + priority_ = value; + bitField0_ |= 0x00000004; + onChanged(); + return this; + } + /** + * int32 priority = 3; + * @return This builder for chaining. + */ + public Builder clearPriority() { + bitField0_ = (bitField0_ & ~0x00000004); + priority_ = 0; + onChanged(); + return this; + } + + private boolean isActive_ ; + /** + * bool is_active = 4; + * @return The isActive. + */ + @java.lang.Override + public boolean getIsActive() { + return isActive_; + } + /** + * bool is_active = 4; + * @param value The isActive to set. + * @return This builder for chaining. + */ + public Builder setIsActive(boolean value) { + + isActive_ = value; + bitField0_ |= 0x00000008; + onChanged(); + return this; + } + /** + * bool is_active = 4; + * @return This builder for chaining. + */ + public Builder clearIsActive() { + bitField0_ = (bitField0_ & ~0x00000008); + isActive_ = false; + onChanged(); + return this; + } + + private java.lang.Object maskingMethod_ = ""; + /** + * string masking_method = 5; + * @return The maskingMethod. + */ + public java.lang.String getMaskingMethod() { + java.lang.Object ref = maskingMethod_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + maskingMethod_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string masking_method = 5; + * @return The bytes for maskingMethod. + */ + public com.google.protobuf.ByteString + getMaskingMethodBytes() { + java.lang.Object ref = maskingMethod_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + maskingMethod_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string masking_method = 5; + * @param value The maskingMethod to set. + * @return This builder for chaining. + */ + public Builder setMaskingMethod( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + maskingMethod_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + /** + * string masking_method = 5; + * @return This builder for chaining. + */ + public Builder clearMaskingMethod() { + maskingMethod_ = getDefaultInstance().getMaskingMethod(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + return this; + } + /** + * string masking_method = 5; + * @param value The bytes for maskingMethod to set. + * @return This builder for chaining. + */ + public Builder setMaskingMethodBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + maskingMethod_ = value; + bitField0_ |= 0x00000010; + onChanged(); + return this; + } + + private java.lang.Object maskPattern_ = ""; + /** + * string mask_pattern = 6; + * @return The maskPattern. + */ + public java.lang.String getMaskPattern() { + java.lang.Object ref = maskPattern_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + maskPattern_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string mask_pattern = 6; + * @return The bytes for maskPattern. + */ + public com.google.protobuf.ByteString + getMaskPatternBytes() { + java.lang.Object ref = maskPattern_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + maskPattern_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string mask_pattern = 6; + * @param value The maskPattern to set. + * @return This builder for chaining. + */ + public Builder setMaskPattern( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + maskPattern_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + /** + * string mask_pattern = 6; + * @return This builder for chaining. + */ + public Builder clearMaskPattern() { + maskPattern_ = getDefaultInstance().getMaskPattern(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + return this; + } + /** + * string mask_pattern = 6; + * @param value The bytes for maskPattern to set. + * @return This builder for chaining. + */ + public Builder setMaskPatternBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + maskPattern_ = value; + bitField0_ |= 0x00000020; + onChanged(); + return this; + } + + private java.lang.Object fieldsPattern_ = ""; + /** + * string fields_pattern = 7; + * @return The fieldsPattern. + */ + public java.lang.String getFieldsPattern() { + java.lang.Object ref = fieldsPattern_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + fieldsPattern_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string fields_pattern = 7; + * @return The bytes for fieldsPattern. + */ + public com.google.protobuf.ByteString + getFieldsPatternBytes() { + java.lang.Object ref = fieldsPattern_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + fieldsPattern_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string fields_pattern = 7; + * @param value The fieldsPattern to set. + * @return This builder for chaining. + */ + public Builder setFieldsPattern( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + fieldsPattern_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; + } + /** + * string fields_pattern = 7; + * @return This builder for chaining. + */ + public Builder clearFieldsPattern() { + fieldsPattern_ = getDefaultInstance().getFieldsPattern(); + bitField0_ = (bitField0_ & ~0x00000040); + onChanged(); + return this; } - private com.google.protobuf.RepeatedFieldBuilder< - org.jumpserver.wisp.Common.CommandGroup, org.jumpserver.wisp.Common.CommandGroup.Builder, org.jumpserver.wisp.Common.CommandGroupOrBuilder> - getCommandGroupsFieldBuilder() { - if (commandGroupsBuilder_ == null) { - commandGroupsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jumpserver.wisp.Common.CommandGroup, org.jumpserver.wisp.Common.CommandGroup.Builder, org.jumpserver.wisp.Common.CommandGroupOrBuilder>( - commandGroups_, - ((bitField0_ & 0x00000020) != 0), - getParentForChildren(), - isClean()); - commandGroups_ = null; - } - return commandGroupsBuilder_; + /** + * string fields_pattern = 7; + * @param value The bytes for fieldsPattern to set. + * @return This builder for chaining. + */ + public Builder setFieldsPatternBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + fieldsPattern_ = value; + bitField0_ |= 0x00000040; + onChanged(); + return this; } - // @@protoc_insertion_point(builder_scope:message.CommandACL) + // @@protoc_insertion_point(builder_scope:message.DataMaskingRule) } - // @@protoc_insertion_point(class_scope:message.CommandACL) - private static final org.jumpserver.wisp.Common.CommandACL DEFAULT_INSTANCE; + // @@protoc_insertion_point(class_scope:message.DataMaskingRule) + private static final org.jumpserver.wisp.Common.DataMaskingRule DEFAULT_INSTANCE; static { - DEFAULT_INSTANCE = new org.jumpserver.wisp.Common.CommandACL(); + DEFAULT_INSTANCE = new org.jumpserver.wisp.Common.DataMaskingRule(); } - public static org.jumpserver.wisp.Common.CommandACL getDefaultInstance() { + public static org.jumpserver.wisp.Common.DataMaskingRule getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { @java.lang.Override - public CommandACL parsePartialFrom( + public DataMaskingRule parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -11341,17 +12587,17 @@ public CommandACL parsePartialFrom( } }; - public static com.google.protobuf.Parser parser() { + public static com.google.protobuf.Parser parser() { return PARSER; } @java.lang.Override - public com.google.protobuf.Parser getParserForType() { + public com.google.protobuf.Parser getParserForType() { return PARSER; } @java.lang.Override - public org.jumpserver.wisp.Common.CommandACL getDefaultInstanceForType() { + public org.jumpserver.wisp.Common.DataMaskingRule getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -11439,8 +12685,8 @@ public static final class CommandGroup extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", CommandGroup.class.getName()); } @@ -12554,8 +13800,8 @@ public static final class ExpireInfo extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ExpireInfo.class.getName()); } @@ -13132,8 +14378,8 @@ public static final class Session extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Session.class.getName()); } @@ -13197,8 +14443,8 @@ public enum LoginFrom com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", LoginFrom.class.getName()); } @@ -13276,7 +14522,7 @@ public LoginFrom findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return org.jumpserver.wisp.Common.Session.getDescriptor().getEnumTypes().get(0); } @@ -14664,9 +15910,7 @@ public org.jumpserver.wisp.Common.Session.LoginFrom getLoginFrom() { * @return This builder for chaining. */ public Builder setLoginFrom(org.jumpserver.wisp.Common.Session.LoginFrom value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000010; loginFrom_ = value.getNumber(); onChanged(); @@ -15316,8 +16560,8 @@ public static final class TokenStatus extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TokenStatus.class.getName()); } @@ -16091,8 +17335,8 @@ public static final class TerminalTask extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TerminalTask.class.getName()); } @@ -16567,7 +17811,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getTokenStatusFieldBuilder(); + internalGetTokenStatusFieldBuilder(); } } @java.lang.Override @@ -16733,7 +17977,7 @@ public Builder mergeFrom( } // case 42 case 50: { input.readMessage( - getTokenStatusFieldBuilder().getBuilder(), + internalGetTokenStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000020; break; @@ -16861,9 +18105,7 @@ public org.jumpserver.wisp.Common.TaskAction getAction() { * @return This builder for chaining. */ public Builder setAction(org.jumpserver.wisp.Common.TaskAction value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000002; action_ = value.getNumber(); onChanged(); @@ -17187,7 +18429,7 @@ public Builder clearTokenStatus() { public org.jumpserver.wisp.Common.TokenStatus.Builder getTokenStatusBuilder() { bitField0_ |= 0x00000020; onChanged(); - return getTokenStatusFieldBuilder().getBuilder(); + return internalGetTokenStatusFieldBuilder().getBuilder(); } /** * .message.TokenStatus token_status = 6; @@ -17205,7 +18447,7 @@ public org.jumpserver.wisp.Common.TokenStatusOrBuilder getTokenStatusOrBuilder() */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.TokenStatus, org.jumpserver.wisp.Common.TokenStatus.Builder, org.jumpserver.wisp.Common.TokenStatusOrBuilder> - getTokenStatusFieldBuilder() { + internalGetTokenStatusFieldBuilder() { if (tokenStatusBuilder_ == null) { tokenStatusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.TokenStatus, org.jumpserver.wisp.Common.TokenStatus.Builder, org.jumpserver.wisp.Common.TokenStatusOrBuilder>( @@ -17460,6 +18702,30 @@ org.jumpserver.wisp.Common.GatewayOrBuilder getGatewaysOrBuilder( */ com.google.protobuf.ByteString getFaceMonitorTokenBytes(); + + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + java.util.List + getDataMaskingRulesList(); + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + org.jumpserver.wisp.Common.DataMaskingRule getDataMaskingRules(int index); + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + int getDataMaskingRulesCount(); + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + java.util.List + getDataMaskingRulesOrBuilderList(); + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder getDataMaskingRulesOrBuilder( + int index); } /** * Protobuf type {@code message.TokenAuthInfo} @@ -17473,8 +18739,8 @@ public static final class TokenAuthInfo extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TokenAuthInfo.class.getName()); } @@ -17488,6 +18754,7 @@ private TokenAuthInfo() { filterRules_ = java.util.Collections.emptyList(); gateways_ = java.util.Collections.emptyList(); faceMonitorToken_ = ""; + dataMaskingRules_ = java.util.Collections.emptyList(); } public static final com.google.protobuf.Descriptors.Descriptor @@ -17885,6 +19152,47 @@ public java.lang.String getFaceMonitorToken() { } } + public static final int DATA_MASKING_RULES_FIELD_NUMBER = 13; + @SuppressWarnings("serial") + private java.util.List dataMaskingRules_; + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + @java.lang.Override + public java.util.List getDataMaskingRulesList() { + return dataMaskingRules_; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + @java.lang.Override + public java.util.List + getDataMaskingRulesOrBuilderList() { + return dataMaskingRules_; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + @java.lang.Override + public int getDataMaskingRulesCount() { + return dataMaskingRules_.size(); + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + @java.lang.Override + public org.jumpserver.wisp.Common.DataMaskingRule getDataMaskingRules(int index) { + return dataMaskingRules_.get(index); + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + @java.lang.Override + public org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder getDataMaskingRulesOrBuilder( + int index) { + return dataMaskingRules_.get(index); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -17935,6 +19243,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessage.isStringEmpty(faceMonitorToken_)) { com.google.protobuf.GeneratedMessage.writeString(output, 12, faceMonitorToken_); } + for (int i = 0; i < dataMaskingRules_.size(); i++) { + output.writeMessage(13, dataMaskingRules_.get(i)); + } getUnknownFields().writeTo(output); } @@ -17989,6 +19300,10 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessage.isStringEmpty(faceMonitorToken_)) { size += com.google.protobuf.GeneratedMessage.computeStringSize(12, faceMonitorToken_); } + for (int i = 0; i < dataMaskingRules_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(13, dataMaskingRules_.get(i)); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -18049,6 +19364,8 @@ public boolean equals(final java.lang.Object obj) { } if (!getFaceMonitorToken() .equals(other.getFaceMonitorToken())) return false; + if (!getDataMaskingRulesList() + .equals(other.getDataMaskingRulesList())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -18102,6 +19419,10 @@ public int hashCode() { } hash = (37 * hash) + FACEMONITORTOKEN_FIELD_NUMBER; hash = (53 * hash) + getFaceMonitorToken().hashCode(); + if (getDataMaskingRulesCount() > 0) { + hash = (37 * hash) + DATA_MASKING_RULES_FIELD_NUMBER; + hash = (53 * hash) + getDataMaskingRulesList().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -18232,15 +19553,16 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getAssetFieldBuilder(); - getUserFieldBuilder(); - getAccountFieldBuilder(); - getPermissionFieldBuilder(); - getExpireInfoFieldBuilder(); - getFilterRulesFieldBuilder(); - getGatewaysFieldBuilder(); - getSettingFieldBuilder(); - getPlatformFieldBuilder(); + internalGetAssetFieldBuilder(); + internalGetUserFieldBuilder(); + internalGetAccountFieldBuilder(); + internalGetPermissionFieldBuilder(); + internalGetExpireInfoFieldBuilder(); + internalGetFilterRulesFieldBuilder(); + internalGetGatewaysFieldBuilder(); + internalGetSettingFieldBuilder(); + internalGetPlatformFieldBuilder(); + internalGetDataMaskingRulesFieldBuilder(); } } @java.lang.Override @@ -18299,6 +19621,13 @@ public Builder clear() { platformBuilder_ = null; } faceMonitorToken_ = ""; + if (dataMaskingRulesBuilder_ == null) { + dataMaskingRules_ = java.util.Collections.emptyList(); + } else { + dataMaskingRules_ = null; + dataMaskingRulesBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00001000); return this; } @@ -18350,6 +19679,15 @@ private void buildPartialRepeatedFields(org.jumpserver.wisp.Common.TokenAuthInfo } else { result.gateways_ = gatewaysBuilder_.build(); } + if (dataMaskingRulesBuilder_ == null) { + if (((bitField0_ & 0x00001000) != 0)) { + dataMaskingRules_ = java.util.Collections.unmodifiableList(dataMaskingRules_); + bitField0_ = (bitField0_ & ~0x00001000); + } + result.dataMaskingRules_ = dataMaskingRules_; + } else { + result.dataMaskingRules_ = dataMaskingRulesBuilder_.build(); + } } private void buildPartial0(org.jumpserver.wisp.Common.TokenAuthInfo result) { @@ -18466,7 +19804,7 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.TokenAuthInfo other) { bitField0_ = (bitField0_ & ~0x00000080); filterRulesBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getFilterRulesFieldBuilder() : null; + internalGetFilterRulesFieldBuilder() : null; } else { filterRulesBuilder_.addAllMessages(other.filterRules_); } @@ -18492,7 +19830,7 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.TokenAuthInfo other) { bitField0_ = (bitField0_ & ~0x00000100); gatewaysBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getGatewaysFieldBuilder() : null; + internalGetGatewaysFieldBuilder() : null; } else { gatewaysBuilder_.addAllMessages(other.gateways_); } @@ -18509,6 +19847,32 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.TokenAuthInfo other) { bitField0_ |= 0x00000800; onChanged(); } + if (dataMaskingRulesBuilder_ == null) { + if (!other.dataMaskingRules_.isEmpty()) { + if (dataMaskingRules_.isEmpty()) { + dataMaskingRules_ = other.dataMaskingRules_; + bitField0_ = (bitField0_ & ~0x00001000); + } else { + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.addAll(other.dataMaskingRules_); + } + onChanged(); + } + } else { + if (!other.dataMaskingRules_.isEmpty()) { + if (dataMaskingRulesBuilder_.isEmpty()) { + dataMaskingRulesBuilder_.dispose(); + dataMaskingRulesBuilder_ = null; + dataMaskingRules_ = other.dataMaskingRules_; + bitField0_ = (bitField0_ & ~0x00001000); + dataMaskingRulesBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + internalGetDataMaskingRulesFieldBuilder() : null; + } else { + dataMaskingRulesBuilder_.addAllMessages(other.dataMaskingRules_); + } + } + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -18547,35 +19911,35 @@ public Builder mergeFrom( } // case 18 case 26: { input.readMessage( - getAssetFieldBuilder().getBuilder(), + internalGetAssetFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage( - getUserFieldBuilder().getBuilder(), + internalGetUserFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000008; break; } // case 34 case 42: { input.readMessage( - getAccountFieldBuilder().getBuilder(), + internalGetAccountFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000010; break; } // case 42 case 50: { input.readMessage( - getPermissionFieldBuilder().getBuilder(), + internalGetPermissionFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000020; break; } // case 50 case 58: { input.readMessage( - getExpireInfoFieldBuilder().getBuilder(), + internalGetExpireInfoFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000040; break; @@ -18608,14 +19972,14 @@ public Builder mergeFrom( } // case 74 case 82: { input.readMessage( - getSettingFieldBuilder().getBuilder(), + internalGetSettingFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000200; break; } // case 82 case 90: { input.readMessage( - getPlatformFieldBuilder().getBuilder(), + internalGetPlatformFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000400; break; @@ -18625,6 +19989,19 @@ public Builder mergeFrom( bitField0_ |= 0x00000800; break; } // case 98 + case 106: { + org.jumpserver.wisp.Common.DataMaskingRule m = + input.readMessage( + org.jumpserver.wisp.Common.DataMaskingRule.parser(), + extensionRegistry); + if (dataMaskingRulesBuilder_ == null) { + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.add(m); + } else { + dataMaskingRulesBuilder_.addMessage(m); + } + break; + } // case 106 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -18877,7 +20254,7 @@ public Builder clearAsset() { public org.jumpserver.wisp.Common.Asset.Builder getAssetBuilder() { bitField0_ |= 0x00000004; onChanged(); - return getAssetFieldBuilder().getBuilder(); + return internalGetAssetFieldBuilder().getBuilder(); } /** * .message.Asset asset = 3; @@ -18895,7 +20272,7 @@ public org.jumpserver.wisp.Common.AssetOrBuilder getAssetOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Asset, org.jumpserver.wisp.Common.Asset.Builder, org.jumpserver.wisp.Common.AssetOrBuilder> - getAssetFieldBuilder() { + internalGetAssetFieldBuilder() { if (assetBuilder_ == null) { assetBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Asset, org.jumpserver.wisp.Common.Asset.Builder, org.jumpserver.wisp.Common.AssetOrBuilder>( @@ -18998,7 +20375,7 @@ public Builder clearUser() { public org.jumpserver.wisp.Common.User.Builder getUserBuilder() { bitField0_ |= 0x00000008; onChanged(); - return getUserFieldBuilder().getBuilder(); + return internalGetUserFieldBuilder().getBuilder(); } /** * .message.User user = 4; @@ -19016,7 +20393,7 @@ public org.jumpserver.wisp.Common.UserOrBuilder getUserOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.User, org.jumpserver.wisp.Common.User.Builder, org.jumpserver.wisp.Common.UserOrBuilder> - getUserFieldBuilder() { + internalGetUserFieldBuilder() { if (userBuilder_ == null) { userBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.User, org.jumpserver.wisp.Common.User.Builder, org.jumpserver.wisp.Common.UserOrBuilder>( @@ -19119,7 +20496,7 @@ public Builder clearAccount() { public org.jumpserver.wisp.Common.Account.Builder getAccountBuilder() { bitField0_ |= 0x00000010; onChanged(); - return getAccountFieldBuilder().getBuilder(); + return internalGetAccountFieldBuilder().getBuilder(); } /** * .message.Account account = 5; @@ -19137,7 +20514,7 @@ public org.jumpserver.wisp.Common.AccountOrBuilder getAccountOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Account, org.jumpserver.wisp.Common.Account.Builder, org.jumpserver.wisp.Common.AccountOrBuilder> - getAccountFieldBuilder() { + internalGetAccountFieldBuilder() { if (accountBuilder_ == null) { accountBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Account, org.jumpserver.wisp.Common.Account.Builder, org.jumpserver.wisp.Common.AccountOrBuilder>( @@ -19240,7 +20617,7 @@ public Builder clearPermission() { public org.jumpserver.wisp.Common.Permission.Builder getPermissionBuilder() { bitField0_ |= 0x00000020; onChanged(); - return getPermissionFieldBuilder().getBuilder(); + return internalGetPermissionFieldBuilder().getBuilder(); } /** * .message.Permission permission = 6; @@ -19258,7 +20635,7 @@ public org.jumpserver.wisp.Common.PermissionOrBuilder getPermissionOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Permission, org.jumpserver.wisp.Common.Permission.Builder, org.jumpserver.wisp.Common.PermissionOrBuilder> - getPermissionFieldBuilder() { + internalGetPermissionFieldBuilder() { if (permissionBuilder_ == null) { permissionBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Permission, org.jumpserver.wisp.Common.Permission.Builder, org.jumpserver.wisp.Common.PermissionOrBuilder>( @@ -19361,7 +20738,7 @@ public Builder clearExpireInfo() { public org.jumpserver.wisp.Common.ExpireInfo.Builder getExpireInfoBuilder() { bitField0_ |= 0x00000040; onChanged(); - return getExpireInfoFieldBuilder().getBuilder(); + return internalGetExpireInfoFieldBuilder().getBuilder(); } /** * .message.ExpireInfo expire_info = 7; @@ -19379,7 +20756,7 @@ public org.jumpserver.wisp.Common.ExpireInfoOrBuilder getExpireInfoOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.ExpireInfo, org.jumpserver.wisp.Common.ExpireInfo.Builder, org.jumpserver.wisp.Common.ExpireInfoOrBuilder> - getExpireInfoFieldBuilder() { + internalGetExpireInfoFieldBuilder() { if (expireInfoBuilder_ == null) { expireInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.ExpireInfo, org.jumpserver.wisp.Common.ExpireInfo.Builder, org.jumpserver.wisp.Common.ExpireInfoOrBuilder>( @@ -19571,7 +20948,7 @@ public Builder removeFilterRules(int index) { */ public org.jumpserver.wisp.Common.CommandACL.Builder getFilterRulesBuilder( int index) { - return getFilterRulesFieldBuilder().getBuilder(index); + return internalGetFilterRulesFieldBuilder().getBuilder(index); } /** * repeated .message.CommandACL filter_rules = 8; @@ -19598,7 +20975,7 @@ public org.jumpserver.wisp.Common.CommandACLOrBuilder getFilterRulesOrBuilder( * repeated .message.CommandACL filter_rules = 8; */ public org.jumpserver.wisp.Common.CommandACL.Builder addFilterRulesBuilder() { - return getFilterRulesFieldBuilder().addBuilder( + return internalGetFilterRulesFieldBuilder().addBuilder( org.jumpserver.wisp.Common.CommandACL.getDefaultInstance()); } /** @@ -19606,7 +20983,7 @@ public org.jumpserver.wisp.Common.CommandACL.Builder addFilterRulesBuilder() { */ public org.jumpserver.wisp.Common.CommandACL.Builder addFilterRulesBuilder( int index) { - return getFilterRulesFieldBuilder().addBuilder( + return internalGetFilterRulesFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.CommandACL.getDefaultInstance()); } /** @@ -19614,11 +20991,11 @@ public org.jumpserver.wisp.Common.CommandACL.Builder addFilterRulesBuilder( */ public java.util.List getFilterRulesBuilderList() { - return getFilterRulesFieldBuilder().getBuilderList(); + return internalGetFilterRulesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.CommandACL, org.jumpserver.wisp.Common.CommandACL.Builder, org.jumpserver.wisp.Common.CommandACLOrBuilder> - getFilterRulesFieldBuilder() { + internalGetFilterRulesFieldBuilder() { if (filterRulesBuilder_ == null) { filterRulesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.CommandACL, org.jumpserver.wisp.Common.CommandACL.Builder, org.jumpserver.wisp.Common.CommandACLOrBuilder>( @@ -19811,7 +21188,7 @@ public Builder removeGateways(int index) { */ public org.jumpserver.wisp.Common.Gateway.Builder getGatewaysBuilder( int index) { - return getGatewaysFieldBuilder().getBuilder(index); + return internalGetGatewaysFieldBuilder().getBuilder(index); } /** * repeated .message.Gateway gateways = 9; @@ -19838,7 +21215,7 @@ public org.jumpserver.wisp.Common.GatewayOrBuilder getGatewaysOrBuilder( * repeated .message.Gateway gateways = 9; */ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder() { - return getGatewaysFieldBuilder().addBuilder( + return internalGetGatewaysFieldBuilder().addBuilder( org.jumpserver.wisp.Common.Gateway.getDefaultInstance()); } /** @@ -19846,7 +21223,7 @@ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder() { */ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder( int index) { - return getGatewaysFieldBuilder().addBuilder( + return internalGetGatewaysFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.Gateway.getDefaultInstance()); } /** @@ -19854,11 +21231,11 @@ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder( */ public java.util.List getGatewaysBuilderList() { - return getGatewaysFieldBuilder().getBuilderList(); + return internalGetGatewaysFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Gateway, org.jumpserver.wisp.Common.Gateway.Builder, org.jumpserver.wisp.Common.GatewayOrBuilder> - getGatewaysFieldBuilder() { + internalGetGatewaysFieldBuilder() { if (gatewaysBuilder_ == null) { gatewaysBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Gateway, org.jumpserver.wisp.Common.Gateway.Builder, org.jumpserver.wisp.Common.GatewayOrBuilder>( @@ -19962,7 +21339,7 @@ public Builder clearSetting() { public org.jumpserver.wisp.Common.ComponentSetting.Builder getSettingBuilder() { bitField0_ |= 0x00000200; onChanged(); - return getSettingFieldBuilder().getBuilder(); + return internalGetSettingFieldBuilder().getBuilder(); } /** * .message.ComponentSetting setting = 10; @@ -19980,7 +21357,7 @@ public org.jumpserver.wisp.Common.ComponentSettingOrBuilder getSettingOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.ComponentSetting, org.jumpserver.wisp.Common.ComponentSetting.Builder, org.jumpserver.wisp.Common.ComponentSettingOrBuilder> - getSettingFieldBuilder() { + internalGetSettingFieldBuilder() { if (settingBuilder_ == null) { settingBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.ComponentSetting, org.jumpserver.wisp.Common.ComponentSetting.Builder, org.jumpserver.wisp.Common.ComponentSettingOrBuilder>( @@ -20083,7 +21460,7 @@ public Builder clearPlatform() { public org.jumpserver.wisp.Common.Platform.Builder getPlatformBuilder() { bitField0_ |= 0x00000400; onChanged(); - return getPlatformFieldBuilder().getBuilder(); + return internalGetPlatformFieldBuilder().getBuilder(); } /** * .message.Platform platform = 11; @@ -20101,7 +21478,7 @@ public org.jumpserver.wisp.Common.PlatformOrBuilder getPlatformOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Platform, org.jumpserver.wisp.Common.Platform.Builder, org.jumpserver.wisp.Common.PlatformOrBuilder> - getPlatformFieldBuilder() { + internalGetPlatformFieldBuilder() { if (platformBuilder_ == null) { platformBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Platform, org.jumpserver.wisp.Common.Platform.Builder, org.jumpserver.wisp.Common.PlatformOrBuilder>( @@ -20185,6 +21562,246 @@ public Builder setFaceMonitorTokenBytes( return this; } + private java.util.List dataMaskingRules_ = + java.util.Collections.emptyList(); + private void ensureDataMaskingRulesIsMutable() { + if (!((bitField0_ & 0x00001000) != 0)) { + dataMaskingRules_ = new java.util.ArrayList(dataMaskingRules_); + bitField0_ |= 0x00001000; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jumpserver.wisp.Common.DataMaskingRule, org.jumpserver.wisp.Common.DataMaskingRule.Builder, org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder> dataMaskingRulesBuilder_; + + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public java.util.List getDataMaskingRulesList() { + if (dataMaskingRulesBuilder_ == null) { + return java.util.Collections.unmodifiableList(dataMaskingRules_); + } else { + return dataMaskingRulesBuilder_.getMessageList(); + } + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public int getDataMaskingRulesCount() { + if (dataMaskingRulesBuilder_ == null) { + return dataMaskingRules_.size(); + } else { + return dataMaskingRulesBuilder_.getCount(); + } + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public org.jumpserver.wisp.Common.DataMaskingRule getDataMaskingRules(int index) { + if (dataMaskingRulesBuilder_ == null) { + return dataMaskingRules_.get(index); + } else { + return dataMaskingRulesBuilder_.getMessage(index); + } + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder setDataMaskingRules( + int index, org.jumpserver.wisp.Common.DataMaskingRule value) { + if (dataMaskingRulesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.set(index, value); + onChanged(); + } else { + dataMaskingRulesBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder setDataMaskingRules( + int index, org.jumpserver.wisp.Common.DataMaskingRule.Builder builderForValue) { + if (dataMaskingRulesBuilder_ == null) { + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.set(index, builderForValue.build()); + onChanged(); + } else { + dataMaskingRulesBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder addDataMaskingRules(org.jumpserver.wisp.Common.DataMaskingRule value) { + if (dataMaskingRulesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.add(value); + onChanged(); + } else { + dataMaskingRulesBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder addDataMaskingRules( + int index, org.jumpserver.wisp.Common.DataMaskingRule value) { + if (dataMaskingRulesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.add(index, value); + onChanged(); + } else { + dataMaskingRulesBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder addDataMaskingRules( + org.jumpserver.wisp.Common.DataMaskingRule.Builder builderForValue) { + if (dataMaskingRulesBuilder_ == null) { + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.add(builderForValue.build()); + onChanged(); + } else { + dataMaskingRulesBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder addDataMaskingRules( + int index, org.jumpserver.wisp.Common.DataMaskingRule.Builder builderForValue) { + if (dataMaskingRulesBuilder_ == null) { + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.add(index, builderForValue.build()); + onChanged(); + } else { + dataMaskingRulesBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder addAllDataMaskingRules( + java.lang.Iterable values) { + if (dataMaskingRulesBuilder_ == null) { + ensureDataMaskingRulesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll( + values, dataMaskingRules_); + onChanged(); + } else { + dataMaskingRulesBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder clearDataMaskingRules() { + if (dataMaskingRulesBuilder_ == null) { + dataMaskingRules_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00001000); + onChanged(); + } else { + dataMaskingRulesBuilder_.clear(); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public Builder removeDataMaskingRules(int index) { + if (dataMaskingRulesBuilder_ == null) { + ensureDataMaskingRulesIsMutable(); + dataMaskingRules_.remove(index); + onChanged(); + } else { + dataMaskingRulesBuilder_.remove(index); + } + return this; + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public org.jumpserver.wisp.Common.DataMaskingRule.Builder getDataMaskingRulesBuilder( + int index) { + return internalGetDataMaskingRulesFieldBuilder().getBuilder(index); + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder getDataMaskingRulesOrBuilder( + int index) { + if (dataMaskingRulesBuilder_ == null) { + return dataMaskingRules_.get(index); } else { + return dataMaskingRulesBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public java.util.List + getDataMaskingRulesOrBuilderList() { + if (dataMaskingRulesBuilder_ != null) { + return dataMaskingRulesBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(dataMaskingRules_); + } + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public org.jumpserver.wisp.Common.DataMaskingRule.Builder addDataMaskingRulesBuilder() { + return internalGetDataMaskingRulesFieldBuilder().addBuilder( + org.jumpserver.wisp.Common.DataMaskingRule.getDefaultInstance()); + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public org.jumpserver.wisp.Common.DataMaskingRule.Builder addDataMaskingRulesBuilder( + int index) { + return internalGetDataMaskingRulesFieldBuilder().addBuilder( + index, org.jumpserver.wisp.Common.DataMaskingRule.getDefaultInstance()); + } + /** + * repeated .message.DataMaskingRule data_masking_rules = 13; + */ + public java.util.List + getDataMaskingRulesBuilderList() { + return internalGetDataMaskingRulesFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jumpserver.wisp.Common.DataMaskingRule, org.jumpserver.wisp.Common.DataMaskingRule.Builder, org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder> + internalGetDataMaskingRulesFieldBuilder() { + if (dataMaskingRulesBuilder_ == null) { + dataMaskingRulesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jumpserver.wisp.Common.DataMaskingRule, org.jumpserver.wisp.Common.DataMaskingRule.Builder, org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder>( + dataMaskingRules_, + ((bitField0_ & 0x00001000) != 0), + getParentForChildren(), + isClean()); + dataMaskingRules_ = null; + } + return dataMaskingRulesBuilder_; + } + // @@protoc_insertion_point(builder_scope:message.TokenAuthInfo) } @@ -20330,8 +21947,8 @@ public static final class Platform extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Platform.class.getName()); } @@ -20942,7 +22559,7 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.Platform other) { bitField0_ = (bitField0_ & ~0x00000020); protocolsBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getProtocolsFieldBuilder() : null; + internalGetProtocolsFieldBuilder() : null; } else { protocolsBuilder_.addAllMessages(other.protocols_); } @@ -21529,7 +23146,7 @@ public Builder removeProtocols(int index) { */ public org.jumpserver.wisp.Common.PlatformProtocol.Builder getProtocolsBuilder( int index) { - return getProtocolsFieldBuilder().getBuilder(index); + return internalGetProtocolsFieldBuilder().getBuilder(index); } /** * repeated .message.PlatformProtocol protocols = 6; @@ -21556,7 +23173,7 @@ public org.jumpserver.wisp.Common.PlatformProtocolOrBuilder getProtocolsOrBuilde * repeated .message.PlatformProtocol protocols = 6; */ public org.jumpserver.wisp.Common.PlatformProtocol.Builder addProtocolsBuilder() { - return getProtocolsFieldBuilder().addBuilder( + return internalGetProtocolsFieldBuilder().addBuilder( org.jumpserver.wisp.Common.PlatformProtocol.getDefaultInstance()); } /** @@ -21564,7 +23181,7 @@ public org.jumpserver.wisp.Common.PlatformProtocol.Builder addProtocolsBuilder() */ public org.jumpserver.wisp.Common.PlatformProtocol.Builder addProtocolsBuilder( int index) { - return getProtocolsFieldBuilder().addBuilder( + return internalGetProtocolsFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.PlatformProtocol.getDefaultInstance()); } /** @@ -21572,11 +23189,11 @@ public org.jumpserver.wisp.Common.PlatformProtocol.Builder addProtocolsBuilder( */ public java.util.List getProtocolsBuilderList() { - return getProtocolsFieldBuilder().getBuilderList(); + return internalGetProtocolsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.PlatformProtocol, org.jumpserver.wisp.Common.PlatformProtocol.Builder, org.jumpserver.wisp.Common.PlatformProtocolOrBuilder> - getProtocolsFieldBuilder() { + internalGetProtocolsFieldBuilder() { if (protocolsBuilder_ == null) { protocolsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.PlatformProtocol, org.jumpserver.wisp.Common.PlatformProtocol.Builder, org.jumpserver.wisp.Common.PlatformProtocolOrBuilder>( @@ -21714,8 +23331,8 @@ public static final class PlatformProtocol extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PlatformProtocol.class.getName()); } @@ -22635,8 +24252,8 @@ public static final class ComponentSetting extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ComponentSetting.class.getName()); } @@ -23159,8 +24776,8 @@ public static final class Forward extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Forward.class.getName()); } @@ -23931,8 +25548,8 @@ public static final class PublicSetting extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PublicSetting.class.getName()); } @@ -25131,8 +26748,8 @@ public static final class Cookie extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Cookie.class.getName()); } @@ -25800,8 +27417,8 @@ public static final class LifecycleLogData extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", LifecycleLogData.class.getName()); } @@ -25892,8 +27509,8 @@ public enum event_type com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", event_type.class.getName()); } @@ -26016,7 +27633,7 @@ public event_type findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return org.jumpserver.wisp.Common.LifecycleLogData.getDescriptor().getEnumTypes().get(0); } @@ -26514,9 +28131,7 @@ public org.jumpserver.wisp.Common.LifecycleLogData.event_type getEvent() { * @return This builder for chaining. */ public Builder setEvent(org.jumpserver.wisp.Common.LifecycleLogData.event_type value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000001; event_ = value.getNumber(); onChanged(); @@ -26773,6 +28388,11 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_CommandACL_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_message_DataMaskingRule_descriptor; + private static final + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_message_DataMaskingRule_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_CommandGroup_descriptor; private static final @@ -26884,68 +28504,73 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { "n\022\021\n\tis_active\030\006 \001(\010\022-\n\016command_groups\030\007" + " \003(\0132\025.message.CommandGroup\"Y\n\006Action\022\n\n" + "\006Reject\020\000\022\n\n\006Accept\020\001\022\n\n\006Review\020\002\022\013\n\007War" + - "ning\020\003\022\021\n\rNotifyWarning\020\004\022\013\n\007Unknown\020\005\"m" + - "\n\014CommandGroup\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t" + - "\022\017\n\007content\030\003 \001(\t\022\014\n\004Type\030\004 \001(\t\022\017\n\007patte" + - "rn\030\005 \001(\t\022\023\n\013ignore_case\030\006 \001(\010\"\037\n\nExpireI" + - "nfo\022\021\n\texpire_at\030\001 \001(\003\"\264\002\n\007Session\022\n\n\002id" + - "\030\001 \001(\t\022\014\n\004user\030\002 \001(\t\022\r\n\005asset\030\003 \001(\t\022\017\n\007a" + - "ccount\030\004 \001(\t\022.\n\nlogin_from\030\005 \001(\0162\032.messa" + - "ge.Session.LoginFrom\022\023\n\013remote_addr\030\006 \001(" + - "\t\022\020\n\010protocol\030\007 \001(\t\022\022\n\ndate_start\030\010 \001(\003\022" + - "\016\n\006org_id\030\t \001(\t\022\017\n\007user_id\030\n \001(\t\022\020\n\010asse" + - "t_id\030\013 \001(\t\022\022\n\naccount_id\030\014 \001(\t\022\020\n\010token_" + - "id\030\r \001(\t\"+\n\tLoginFrom\022\006\n\002WT\020\000\022\006\n\002ST\020\001\022\006\n" + - "\002RT\020\002\022\006\n\002DT\020\003\"?\n\013TokenStatus\022\014\n\004code\030\001 \001" + - "(\t\022\016\n\006detail\030\002 \001(\t\022\022\n\nis_expired\030\003 \001(\010\"\252" + - "\001\n\014TerminalTask\022\n\n\002id\030\001 \001(\t\022#\n\006action\030\002 " + - "\001(\0162\023.message.TaskAction\022\022\n\nsession_id\030\003" + - " \001(\t\022\025\n\rterminated_by\030\004 \001(\t\022\022\n\ncreated_b" + - "y\030\005 \001(\t\022*\n\014token_status\030\006 \001(\0132\024.message." + - "TokenStatus\"\237\003\n\rTokenAuthInfo\022\016\n\006key_id\030" + - "\001 \001(\t\022\022\n\nsecrete_id\030\002 \001(\t\022\035\n\005asset\030\003 \001(\013" + - "2\016.message.Asset\022\033\n\004user\030\004 \001(\0132\r.message" + - ".User\022!\n\007account\030\005 \001(\0132\020.message.Account" + - "\022\'\n\npermission\030\006 \001(\0132\023.message.Permissio" + - "n\022(\n\013expire_info\030\007 \001(\0132\023.message.ExpireI" + - "nfo\022)\n\014filter_rules\030\010 \003(\0132\023.message.Comm" + - "andACL\022\"\n\010gateways\030\t \003(\0132\020.message.Gatew" + - "ay\022*\n\007setting\030\n \001(\0132\031.message.ComponentS" + - "etting\022#\n\010platform\030\013 \001(\0132\021.message.Platf" + - "orm\022\030\n\020FaceMonitorToken\030\014 \001(\t\"\203\001\n\010Platfo" + - "rm\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\020\n\010category" + - "\030\003 \001(\t\022\017\n\007charset\030\004 \001(\t\022\014\n\004type\030\005 \001(\t\022,\n" + - "\tprotocols\030\006 \003(\0132\031.message.PlatformProto" + - "col\"\246\001\n\020PlatformProtocol\022\n\n\002id\030\001 \001(\005\022\014\n\004" + - "name\030\002 \001(\t\022\014\n\004port\030\003 \001(\005\0229\n\010settings\030\004 \003" + - "(\0132\'.message.PlatformProtocol.SettingsEn" + - "try\032/\n\rSettingsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" + - "ue\030\002 \001(\t:\0028\001\"C\n\020ComponentSetting\022\025\n\rmax_" + - "idle_time\030\001 \001(\005\022\030\n\020max_session_time\030\002 \001(" + - "\005\"1\n\007Forward\022\n\n\002id\030\001 \001(\t\022\014\n\004Host\030\002 \001(\t\022\014" + - "\n\004port\030\003 \001(\005\"\247\001\n\rPublicSetting\022\025\n\rxpack_" + - "enabled\030\001 \001(\010\022\025\n\rvalid_license\030\002 \001(\010\022\024\n\014" + - "gpt_base_url\030\003 \001(\t\022\023\n\013gpt_api_key\030\004 \001(\t\022" + - "\021\n\tgpt_proxy\030\005 \001(\t\022\021\n\tgpt_model\030\006 \001(\t\022\027\n" + - "\017license_content\030\007 \001(\t\"%\n\006Cookie\022\014\n\004name" + - "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\250\003\n\020LifecycleLogDa" + - "ta\0223\n\005event\030\001 \001(\0162$.message.LifecycleLog" + - "Data.event_type\022\016\n\006reason\030\002 \001(\t\022\014\n\004user\030" + - "\003 \001(\t\"\300\002\n\nevent_type\022\027\n\023AssetConnectSucc" + - "ess\020\000\022\030\n\024AssetConnectFinished\020\001\022\023\n\017Creat" + - "eShareLink\020\002\022\023\n\017UserJoinSession\020\003\022\024\n\020Use" + - "rLeaveSession\020\004\022\024\n\020AdminJoinMonitor\020\005\022\024\n" + - "\020AdminExitMonitor\020\006\022\026\n\022ReplayConvertStar" + - "t\020\007\022\030\n\024ReplayConvertSuccess\020\010\022\030\n\024ReplayC" + - "onvertFailure\020\t\022\025\n\021ReplayUploadStart\020\n\022\027" + - "\n\023ReplayUploadSuccess\020\013\022\027\n\023ReplayUploadF" + - "ailure\020\014*k\n\nTaskAction\022\017\n\013KillSession\020\000\022" + - "\017\n\013LockSession\020\001\022\021\n\rUnlockSession\020\002\022\024\n\020T" + - "okenPermExpired\020\003\022\022\n\016TokenPermValid\020\004*f\n" + - "\tRiskLevel\022\n\n\006Normal\020\000\022\013\n\007Warning\020\001\022\n\n\006R" + - "eject\020\002\022\020\n\014ReviewReject\020\003\022\020\n\014ReviewAccep" + - "t\020\004\022\020\n\014ReviewCancel\020\005B \n\023org.jumpserver." + - "wispZ\t/protobufb\006proto3" + "ning\020\003\022\021\n\rNotifyWarning\020\004\022\013\n\007Unknown\020\005\"\226" + + "\001\n\017DataMaskingRule\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002" + + " \001(\t\022\020\n\010priority\030\003 \001(\005\022\021\n\tis_active\030\004 \001(" + + "\010\022\026\n\016masking_method\030\005 \001(\t\022\024\n\014mask_patter" + + "n\030\006 \001(\t\022\026\n\016fields_pattern\030\007 \001(\t\"m\n\014Comma" + + "ndGroup\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\017\n\007con" + + "tent\030\003 \001(\t\022\014\n\004Type\030\004 \001(\t\022\017\n\007pattern\030\005 \001(" + + "\t\022\023\n\013ignore_case\030\006 \001(\010\"\037\n\nExpireInfo\022\021\n\t" + + "expire_at\030\001 \001(\003\"\264\002\n\007Session\022\n\n\002id\030\001 \001(\t\022" + + "\014\n\004user\030\002 \001(\t\022\r\n\005asset\030\003 \001(\t\022\017\n\007account\030" + + "\004 \001(\t\022.\n\nlogin_from\030\005 \001(\0162\032.message.Sess" + + "ion.LoginFrom\022\023\n\013remote_addr\030\006 \001(\t\022\020\n\010pr" + + "otocol\030\007 \001(\t\022\022\n\ndate_start\030\010 \001(\003\022\016\n\006org_" + + "id\030\t \001(\t\022\017\n\007user_id\030\n \001(\t\022\020\n\010asset_id\030\013 " + + "\001(\t\022\022\n\naccount_id\030\014 \001(\t\022\020\n\010token_id\030\r \001(" + + "\t\"+\n\tLoginFrom\022\006\n\002WT\020\000\022\006\n\002ST\020\001\022\006\n\002RT\020\002\022\006" + + "\n\002DT\020\003\"?\n\013TokenStatus\022\014\n\004code\030\001 \001(\t\022\016\n\006d" + + "etail\030\002 \001(\t\022\022\n\nis_expired\030\003 \001(\010\"\252\001\n\014Term" + + "inalTask\022\n\n\002id\030\001 \001(\t\022#\n\006action\030\002 \001(\0162\023.m" + + "essage.TaskAction\022\022\n\nsession_id\030\003 \001(\t\022\025\n" + + "\rterminated_by\030\004 \001(\t\022\022\n\ncreated_by\030\005 \001(\t" + + "\022*\n\014token_status\030\006 \001(\0132\024.message.TokenSt" + + "atus\"\325\003\n\rTokenAuthInfo\022\016\n\006key_id\030\001 \001(\t\022\022" + + "\n\nsecrete_id\030\002 \001(\t\022\035\n\005asset\030\003 \001(\0132\016.mess" + + "age.Asset\022\033\n\004user\030\004 \001(\0132\r.message.User\022!" + + "\n\007account\030\005 \001(\0132\020.message.Account\022\'\n\nper" + + "mission\030\006 \001(\0132\023.message.Permission\022(\n\013ex" + + "pire_info\030\007 \001(\0132\023.message.ExpireInfo\022)\n\014" + + "filter_rules\030\010 \003(\0132\023.message.CommandACL\022" + + "\"\n\010gateways\030\t \003(\0132\020.message.Gateway\022*\n\007s" + + "etting\030\n \001(\0132\031.message.ComponentSetting\022" + + "#\n\010platform\030\013 \001(\0132\021.message.Platform\022\030\n\020" + + "FaceMonitorToken\030\014 \001(\t\0224\n\022data_masking_r" + + "ules\030\r \003(\0132\030.message.DataMaskingRule\"\203\001\n" + + "\010Platform\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\020\n\010c" + + "ategory\030\003 \001(\t\022\017\n\007charset\030\004 \001(\t\022\014\n\004type\030\005" + + " \001(\t\022,\n\tprotocols\030\006 \003(\0132\031.message.Platfo" + + "rmProtocol\"\246\001\n\020PlatformProtocol\022\n\n\002id\030\001 " + + "\001(\005\022\014\n\004name\030\002 \001(\t\022\014\n\004port\030\003 \001(\005\0229\n\010setti" + + "ngs\030\004 \003(\0132\'.message.PlatformProtocol.Set" + + "tingsEntry\032/\n\rSettingsEntry\022\013\n\003key\030\001 \001(\t" + + "\022\r\n\005value\030\002 \001(\t:\0028\001\"C\n\020ComponentSetting\022" + + "\025\n\rmax_idle_time\030\001 \001(\005\022\030\n\020max_session_ti" + + "me\030\002 \001(\005\"1\n\007Forward\022\n\n\002id\030\001 \001(\t\022\014\n\004Host\030" + + "\002 \001(\t\022\014\n\004port\030\003 \001(\005\"\247\001\n\rPublicSetting\022\025\n" + + "\rxpack_enabled\030\001 \001(\010\022\025\n\rvalid_license\030\002 " + + "\001(\010\022\024\n\014gpt_base_url\030\003 \001(\t\022\023\n\013gpt_api_key" + + "\030\004 \001(\t\022\021\n\tgpt_proxy\030\005 \001(\t\022\021\n\tgpt_model\030\006" + + " \001(\t\022\027\n\017license_content\030\007 \001(\t\"%\n\006Cookie\022" + + "\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\"\250\003\n\020Lifecyc" + + "leLogData\0223\n\005event\030\001 \001(\0162$.message.Lifec" + + "ycleLogData.event_type\022\016\n\006reason\030\002 \001(\t\022\014" + + "\n\004user\030\003 \001(\t\"\300\002\n\nevent_type\022\027\n\023AssetConn" + + "ectSuccess\020\000\022\030\n\024AssetConnectFinished\020\001\022\023" + + "\n\017CreateShareLink\020\002\022\023\n\017UserJoinSession\020\003" + + "\022\024\n\020UserLeaveSession\020\004\022\024\n\020AdminJoinMonit" + + "or\020\005\022\024\n\020AdminExitMonitor\020\006\022\026\n\022ReplayConv" + + "ertStart\020\007\022\030\n\024ReplayConvertSuccess\020\010\022\030\n\024" + + "ReplayConvertFailure\020\t\022\025\n\021ReplayUploadSt" + + "art\020\n\022\027\n\023ReplayUploadSuccess\020\013\022\027\n\023Replay" + + "UploadFailure\020\014*k\n\nTaskAction\022\017\n\013KillSes" + + "sion\020\000\022\017\n\013LockSession\020\001\022\021\n\rUnlockSession" + + "\020\002\022\024\n\020TokenPermExpired\020\003\022\022\n\016TokenPermVal" + + "id\020\004*f\n\tRiskLevel\022\n\n\006Normal\020\000\022\013\n\007Warning" + + "\020\001\022\n\n\006Reject\020\002\022\020\n\014ReviewReject\020\003\022\020\n\014Revi" + + "ewAccept\020\004\022\020\n\014ReviewCancel\020\005B \n\023org.jump" + + "server.wispZ\t/protobufb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -27005,50 +28630,56 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_CommandACL_descriptor, new java.lang.String[] { "Id", "Name", "Priority", "Action", "IsActive", "CommandGroups", }); - internal_static_message_CommandGroup_descriptor = + internal_static_message_DataMaskingRule_descriptor = getDescriptor().getMessageTypes().get(8); + internal_static_message_DataMaskingRule_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_message_DataMaskingRule_descriptor, + new java.lang.String[] { "Id", "Name", "Priority", "IsActive", "MaskingMethod", "MaskPattern", "FieldsPattern", }); + internal_static_message_CommandGroup_descriptor = + getDescriptor().getMessageTypes().get(9); internal_static_message_CommandGroup_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_CommandGroup_descriptor, new java.lang.String[] { "Id", "Name", "Content", "Type", "Pattern", "IgnoreCase", }); internal_static_message_ExpireInfo_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(10); internal_static_message_ExpireInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_ExpireInfo_descriptor, new java.lang.String[] { "ExpireAt", }); internal_static_message_Session_descriptor = - getDescriptor().getMessageTypes().get(10); + getDescriptor().getMessageTypes().get(11); internal_static_message_Session_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_Session_descriptor, new java.lang.String[] { "Id", "User", "Asset", "Account", "LoginFrom", "RemoteAddr", "Protocol", "DateStart", "OrgId", "UserId", "AssetId", "AccountId", "TokenId", }); internal_static_message_TokenStatus_descriptor = - getDescriptor().getMessageTypes().get(11); + getDescriptor().getMessageTypes().get(12); internal_static_message_TokenStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_TokenStatus_descriptor, new java.lang.String[] { "Code", "Detail", "IsExpired", }); internal_static_message_TerminalTask_descriptor = - getDescriptor().getMessageTypes().get(12); + getDescriptor().getMessageTypes().get(13); internal_static_message_TerminalTask_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_TerminalTask_descriptor, new java.lang.String[] { "Id", "Action", "SessionId", "TerminatedBy", "CreatedBy", "TokenStatus", }); internal_static_message_TokenAuthInfo_descriptor = - getDescriptor().getMessageTypes().get(13); + getDescriptor().getMessageTypes().get(14); internal_static_message_TokenAuthInfo_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_TokenAuthInfo_descriptor, - new java.lang.String[] { "KeyId", "SecreteId", "Asset", "User", "Account", "Permission", "ExpireInfo", "FilterRules", "Gateways", "Setting", "Platform", "FaceMonitorToken", }); + new java.lang.String[] { "KeyId", "SecreteId", "Asset", "User", "Account", "Permission", "ExpireInfo", "FilterRules", "Gateways", "Setting", "Platform", "FaceMonitorToken", "DataMaskingRules", }); internal_static_message_Platform_descriptor = - getDescriptor().getMessageTypes().get(14); + getDescriptor().getMessageTypes().get(15); internal_static_message_Platform_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_Platform_descriptor, new java.lang.String[] { "Id", "Name", "Category", "Charset", "Type", "Protocols", }); internal_static_message_PlatformProtocol_descriptor = - getDescriptor().getMessageTypes().get(15); + getDescriptor().getMessageTypes().get(16); internal_static_message_PlatformProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_PlatformProtocol_descriptor, @@ -27060,31 +28691,31 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { internal_static_message_PlatformProtocol_SettingsEntry_descriptor, new java.lang.String[] { "Key", "Value", }); internal_static_message_ComponentSetting_descriptor = - getDescriptor().getMessageTypes().get(16); + getDescriptor().getMessageTypes().get(17); internal_static_message_ComponentSetting_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_ComponentSetting_descriptor, new java.lang.String[] { "MaxIdleTime", "MaxSessionTime", }); internal_static_message_Forward_descriptor = - getDescriptor().getMessageTypes().get(17); + getDescriptor().getMessageTypes().get(18); internal_static_message_Forward_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_Forward_descriptor, new java.lang.String[] { "Id", "Host", "Port", }); internal_static_message_PublicSetting_descriptor = - getDescriptor().getMessageTypes().get(18); + getDescriptor().getMessageTypes().get(19); internal_static_message_PublicSetting_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_PublicSetting_descriptor, new java.lang.String[] { "XpackEnabled", "ValidLicense", "GptBaseUrl", "GptApiKey", "GptProxy", "GptModel", "LicenseContent", }); internal_static_message_Cookie_descriptor = - getDescriptor().getMessageTypes().get(19); + getDescriptor().getMessageTypes().get(20); internal_static_message_Cookie_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_Cookie_descriptor, new java.lang.String[] { "Name", "Value", }); internal_static_message_LifecycleLogData_descriptor = - getDescriptor().getMessageTypes().get(20); + getDescriptor().getMessageTypes().get(21); internal_static_message_LifecycleLogData_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_LifecycleLogData_descriptor, diff --git a/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceGrpc.java b/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceGrpc.java index 58a1860..fe16300 100644 --- a/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceGrpc.java +++ b/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceGrpc.java @@ -728,6 +728,37 @@ org.jumpserver.wisp.ServiceOuterClass.JoinFaceMonitorResponse> getJoinFaceMonito return getJoinFaceMonitorMethod; } + private static volatile io.grpc.MethodDescriptor getGetAccountChatMethod; + + @io.grpc.stub.annotations.RpcMethod( + fullMethodName = SERVICE_NAME + '/' + "GetAccountChat", + requestType = org.jumpserver.wisp.ServiceOuterClass.Empty.class, + responseType = org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.class, + methodType = io.grpc.MethodDescriptor.MethodType.UNARY) + public static io.grpc.MethodDescriptor getGetAccountChatMethod() { + io.grpc.MethodDescriptor getGetAccountChatMethod; + if ((getGetAccountChatMethod = ServiceGrpc.getGetAccountChatMethod) == null) { + synchronized (ServiceGrpc.class) { + if ((getGetAccountChatMethod = ServiceGrpc.getGetAccountChatMethod) == null) { + ServiceGrpc.getGetAccountChatMethod = getGetAccountChatMethod = + io.grpc.MethodDescriptor.newBuilder() + .setType(io.grpc.MethodDescriptor.MethodType.UNARY) + .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetAccountChat")) + .setSampledToLocalTracing(true) + .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.jumpserver.wisp.ServiceOuterClass.Empty.getDefaultInstance())) + .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller( + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.getDefaultInstance())) + .setSchemaDescriptor(new ServiceMethodDescriptorSupplier("GetAccountChat")) + .build(); + } + } + } + return getGetAccountChatMethod; + } + /** * Creates a new async stub that supports all call types for the service */ @@ -936,6 +967,13 @@ default void joinFaceMonitor(org.jumpserver.wisp.ServiceOuterClass.JoinFaceMonit io.grpc.stub.StreamObserver responseObserver) { io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getJoinFaceMonitorMethod(), responseObserver); } + + /** + */ + default void getAccountChat(org.jumpserver.wisp.ServiceOuterClass.Empty request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(getGetAccountChatMethod(), responseObserver); + } } /** @@ -1148,6 +1186,14 @@ public void joinFaceMonitor(org.jumpserver.wisp.ServiceOuterClass.JoinFaceMonito io.grpc.stub.ClientCalls.asyncUnaryCall( getChannel().newCall(getJoinFaceMonitorMethod(), getCallOptions()), request, responseObserver); } + + /** + */ + public void getAccountChat(org.jumpserver.wisp.ServiceOuterClass.Empty request, + io.grpc.stub.StreamObserver responseObserver) { + io.grpc.stub.ClientCalls.asyncUnaryCall( + getChannel().newCall(getGetAccountChatMethod(), getCallOptions()), request, responseObserver); + } } /** @@ -1319,6 +1365,13 @@ public org.jumpserver.wisp.ServiceOuterClass.JoinFaceMonitorResponse joinFaceMon return io.grpc.stub.ClientCalls.blockingUnaryCall( getChannel(), getJoinFaceMonitorMethod(), getCallOptions(), request); } + + /** + */ + public org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse getAccountChat(org.jumpserver.wisp.ServiceOuterClass.Empty request) { + return io.grpc.stub.ClientCalls.blockingUnaryCall( + getChannel(), getGetAccountChatMethod(), getCallOptions(), request); + } } /** @@ -1512,6 +1565,14 @@ public com.google.common.util.concurrent.ListenableFuture getAccountChat( + org.jumpserver.wisp.ServiceOuterClass.Empty request) { + return io.grpc.stub.ClientCalls.futureUnaryCall( + getChannel().newCall(getGetAccountChatMethod(), getCallOptions()), request); + } } private static final int METHODID_GET_TOKEN_AUTH_INFO = 0; @@ -1536,7 +1597,8 @@ public com.google.common.util.concurrent.ListenableFuture implements io.grpc.stub.ServerCalls.UnaryMethod, @@ -1643,6 +1705,10 @@ public void invoke(Req request, io.grpc.stub.StreamObserver responseObserv serviceImpl.joinFaceMonitor((org.jumpserver.wisp.ServiceOuterClass.JoinFaceMonitorRequest) request, (io.grpc.stub.StreamObserver) responseObserver); break; + case METHODID_GET_ACCOUNT_CHAT: + serviceImpl.getAccountChat((org.jumpserver.wisp.ServiceOuterClass.Empty) request, + (io.grpc.stub.StreamObserver) responseObserver); + break; default: throw new AssertionError(); } @@ -1825,6 +1891,13 @@ public static final io.grpc.ServerServiceDefinition bindService(AsyncService ser org.jumpserver.wisp.ServiceOuterClass.JoinFaceMonitorRequest, org.jumpserver.wisp.ServiceOuterClass.JoinFaceMonitorResponse>( service, METHODID_JOIN_FACE_MONITOR))) + .addMethod( + getGetAccountChatMethod(), + io.grpc.stub.ServerCalls.asyncUnaryCall( + new MethodHandlers< + org.jumpserver.wisp.ServiceOuterClass.Empty, + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse>( + service, METHODID_GET_ACCOUNT_CHAT))) .build(); } @@ -1896,6 +1969,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() { .addMethod(getFaceRecognitionCallbackMethod()) .addMethod(getFaceMonitorCallbackMethod()) .addMethod(getJoinFaceMonitorMethod()) + .addMethod(getGetAccountChatMethod()) .build(); } } diff --git a/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceOuterClass.java b/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceOuterClass.java index 3b3a9a6..aeee6b7 100644 --- a/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceOuterClass.java +++ b/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceOuterClass.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: service.proto -// Protobuf Java Version: 4.28.0 +// Protobuf Java Version: 4.32.1 package org.jumpserver.wisp; -public final class ServiceOuterClass { +@com.google.protobuf.Generated +public final class ServiceOuterClass extends com.google.protobuf.GeneratedFile { private ServiceOuterClass() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ServiceOuterClass.class.getName()); } @@ -65,8 +66,8 @@ public static final class JoinFaceMonitorRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", JoinFaceMonitorRequest.class.getName()); } @@ -714,8 +715,8 @@ public static final class JoinFaceMonitorResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", JoinFaceMonitorResponse.class.getName()); } @@ -961,7 +962,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -1059,7 +1060,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -1172,7 +1173,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -1190,7 +1191,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -1342,8 +1343,8 @@ public static final class FaceMonitorCallbackRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", FaceMonitorCallbackRequest.class.getName()); } @@ -2450,8 +2451,8 @@ public static final class FaceMonitorCallbackResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", FaceMonitorCallbackResponse.class.getName()); } @@ -2697,7 +2698,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -2795,7 +2796,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -2908,7 +2909,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -2926,7 +2927,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -3047,8 +3048,8 @@ public static final class FaceRecognitionCallbackRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", FaceRecognitionCallbackRequest.class.getName()); } @@ -3899,8 +3900,8 @@ public static final class FaceRecognitionCallbackResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", FaceRecognitionCallbackResponse.class.getName()); } @@ -4146,7 +4147,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -4244,7 +4245,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -4357,7 +4358,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -4375,7 +4376,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -4490,8 +4491,8 @@ public static final class AssetLoginTicketRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", AssetLoginTicketRequest.class.getName()); } @@ -5308,8 +5309,8 @@ public static final class AssetLoginTicketResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", AssetLoginTicketResponse.class.getName()); } @@ -5670,8 +5671,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); - getTicketInfoFieldBuilder(); + internalGetStatusFieldBuilder(); + internalGetTicketInfoFieldBuilder(); } } @java.lang.Override @@ -5799,14 +5800,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getTicketInfoFieldBuilder().getBuilder(), + internalGetTicketInfoFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -5929,7 +5930,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -5947,7 +5948,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -6050,7 +6051,7 @@ public Builder clearTicketInfo() { public org.jumpserver.wisp.ServiceOuterClass.TicketInfo.Builder getTicketInfoBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getTicketInfoFieldBuilder().getBuilder(); + return internalGetTicketInfoFieldBuilder().getBuilder(); } /** * .message.TicketInfo ticket_info = 2; @@ -6068,7 +6069,7 @@ public org.jumpserver.wisp.ServiceOuterClass.TicketInfoOrBuilder getTicketInfoOr */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.TicketInfo, org.jumpserver.wisp.ServiceOuterClass.TicketInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.TicketInfoOrBuilder> - getTicketInfoFieldBuilder() { + internalGetTicketInfoFieldBuilder() { if (ticketInfoBuilder_ == null) { ticketInfoBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.TicketInfo, org.jumpserver.wisp.ServiceOuterClass.TicketInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.TicketInfoOrBuilder>( @@ -6269,8 +6270,8 @@ public static final class Status extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Status.class.getName()); } @@ -6846,8 +6847,8 @@ public static final class TokenRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TokenRequest.class.getName()); } @@ -7374,8 +7375,8 @@ public static final class TokenResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TokenResponse.class.getName()); } @@ -7663,8 +7664,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); - getDataFieldBuilder(); + internalGetStatusFieldBuilder(); + internalGetDataFieldBuilder(); } } @java.lang.Override @@ -7776,14 +7777,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getDataFieldBuilder().getBuilder(), + internalGetDataFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -7896,7 +7897,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -7914,7 +7915,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -8017,7 +8018,7 @@ public Builder clearData() { public org.jumpserver.wisp.Common.TokenAuthInfo.Builder getDataBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getDataFieldBuilder().getBuilder(); + return internalGetDataFieldBuilder().getBuilder(); } /** * .message.TokenAuthInfo data = 2; @@ -8035,7 +8036,7 @@ public org.jumpserver.wisp.Common.TokenAuthInfoOrBuilder getDataOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.TokenAuthInfo, org.jumpserver.wisp.Common.TokenAuthInfo.Builder, org.jumpserver.wisp.Common.TokenAuthInfoOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.TokenAuthInfo, org.jumpserver.wisp.Common.TokenAuthInfo.Builder, org.jumpserver.wisp.Common.TokenAuthInfoOrBuilder>( @@ -8129,8 +8130,8 @@ public static final class SessionCreateRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", SessionCreateRequest.class.getName()); } @@ -8376,7 +8377,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getDataFieldBuilder(); + internalGetDataFieldBuilder(); } } @java.lang.Override @@ -8474,7 +8475,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getDataFieldBuilder().getBuilder(), + internalGetDataFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -8587,7 +8588,7 @@ public Builder clearData() { public org.jumpserver.wisp.Common.Session.Builder getDataBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getDataFieldBuilder().getBuilder(); + return internalGetDataFieldBuilder().getBuilder(); } /** * .message.Session data = 1; @@ -8605,7 +8606,7 @@ public org.jumpserver.wisp.Common.SessionOrBuilder getDataOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Session, org.jumpserver.wisp.Common.Session.Builder, org.jumpserver.wisp.Common.SessionOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Session, org.jumpserver.wisp.Common.Session.Builder, org.jumpserver.wisp.Common.SessionOrBuilder>( @@ -8714,8 +8715,8 @@ public static final class SessionCreateResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", SessionCreateResponse.class.getName()); } @@ -9003,8 +9004,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); - getDataFieldBuilder(); + internalGetStatusFieldBuilder(); + internalGetDataFieldBuilder(); } } @java.lang.Override @@ -9116,14 +9117,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getDataFieldBuilder().getBuilder(), + internalGetDataFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -9236,7 +9237,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -9254,7 +9255,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -9357,7 +9358,7 @@ public Builder clearData() { public org.jumpserver.wisp.Common.Session.Builder getDataBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getDataFieldBuilder().getBuilder(); + return internalGetDataFieldBuilder().getBuilder(); } /** * .message.Session data = 2; @@ -9375,7 +9376,7 @@ public org.jumpserver.wisp.Common.SessionOrBuilder getDataOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Session, org.jumpserver.wisp.Common.Session.Builder, org.jumpserver.wisp.Common.SessionOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Session, org.jumpserver.wisp.Common.Session.Builder, org.jumpserver.wisp.Common.SessionOrBuilder>( @@ -9490,8 +9491,8 @@ public static final class SessionFinishRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", SessionFinishRequest.class.getName()); } @@ -10273,8 +10274,8 @@ public static final class SessionFinishResp extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", SessionFinishResp.class.getName()); } @@ -10520,7 +10521,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -10618,7 +10619,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -10731,7 +10732,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -10749,7 +10750,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -10852,8 +10853,8 @@ public static final class ReplayRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ReplayRequest.class.getName()); } @@ -11501,8 +11502,8 @@ public static final class ReplayResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ReplayResponse.class.getName()); } @@ -11748,7 +11749,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -11846,7 +11847,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -11959,7 +11960,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -11977,7 +11978,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -12181,8 +12182,8 @@ public static final class CommandRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", CommandRequest.class.getName()); } @@ -13698,9 +13699,7 @@ public org.jumpserver.wisp.Common.RiskLevel getRiskLevel() { * @return This builder for chaining. */ public Builder setRiskLevel(org.jumpserver.wisp.Common.RiskLevel value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000100; riskLevel_ = value.getNumber(); onChanged(); @@ -13943,8 +13942,8 @@ public static final class CommandResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", CommandResponse.class.getName()); } @@ -14190,7 +14189,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -14288,7 +14287,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -14401,7 +14400,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -14419,7 +14418,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -14510,8 +14509,8 @@ public static final class FinishedTaskRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", FinishedTaskRequest.class.getName()); } @@ -15023,8 +15022,8 @@ public static final class TaskResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TaskResponse.class.getName()); } @@ -15270,7 +15269,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getTaskFieldBuilder(); + internalGetTaskFieldBuilder(); } } @java.lang.Override @@ -15368,7 +15367,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getTaskFieldBuilder().getBuilder(), + internalGetTaskFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -15481,7 +15480,7 @@ public Builder clearTask() { public org.jumpserver.wisp.Common.TerminalTask.Builder getTaskBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getTaskFieldBuilder().getBuilder(); + return internalGetTaskFieldBuilder().getBuilder(); } /** * .message.TerminalTask task = 1; @@ -15499,7 +15498,7 @@ public org.jumpserver.wisp.Common.TerminalTaskOrBuilder getTaskOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.TerminalTask, org.jumpserver.wisp.Common.TerminalTask.Builder, org.jumpserver.wisp.Common.TerminalTaskOrBuilder> - getTaskFieldBuilder() { + internalGetTaskFieldBuilder() { if (taskBuilder_ == null) { taskBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.TerminalTask, org.jumpserver.wisp.Common.TerminalTask.Builder, org.jumpserver.wisp.Common.TerminalTaskOrBuilder>( @@ -15590,8 +15589,8 @@ public static final class RemainReplayRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", RemainReplayRequest.class.getName()); } @@ -16178,8 +16177,8 @@ public static final class RemainReplayResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", RemainReplayResponse.class.getName()); } @@ -16593,7 +16592,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -16739,7 +16738,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -16870,7 +16869,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -16888,7 +16887,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -17315,8 +17314,8 @@ public static final class StatusResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", StatusResponse.class.getName()); } @@ -17562,7 +17561,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -17660,7 +17659,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -17773,7 +17772,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -17791,7 +17790,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -17906,8 +17905,8 @@ public static final class CommandConfirmRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", CommandConfirmRequest.class.getName()); } @@ -18700,8 +18699,8 @@ public static final class ReqInfo extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ReqInfo.class.getName()); } @@ -19364,8 +19363,8 @@ public static final class CommandConfirmResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", CommandConfirmResponse.class.getName()); } @@ -19653,8 +19652,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); - getInfoFieldBuilder(); + internalGetStatusFieldBuilder(); + internalGetInfoFieldBuilder(); } } @java.lang.Override @@ -19766,14 +19765,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getInfoFieldBuilder().getBuilder(), + internalGetInfoFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -19886,7 +19885,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -19904,7 +19903,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -20007,7 +20006,7 @@ public Builder clearInfo() { public org.jumpserver.wisp.ServiceOuterClass.TicketInfo.Builder getInfoBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getInfoFieldBuilder().getBuilder(); + return internalGetInfoFieldBuilder().getBuilder(); } /** * .message.TicketInfo info = 2; @@ -20025,7 +20024,7 @@ public org.jumpserver.wisp.ServiceOuterClass.TicketInfoOrBuilder getInfoOrBuilde */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.TicketInfo, org.jumpserver.wisp.ServiceOuterClass.TicketInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.TicketInfoOrBuilder> - getInfoFieldBuilder() { + internalGetInfoFieldBuilder() { if (infoBuilder_ == null) { infoBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.TicketInfo, org.jumpserver.wisp.ServiceOuterClass.TicketInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.TicketInfoOrBuilder>( @@ -20171,8 +20170,8 @@ public static final class TicketInfo extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TicketInfo.class.getName()); } @@ -20566,8 +20565,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getCheckReqFieldBuilder(); - getCancelReqFieldBuilder(); + internalGetCheckReqFieldBuilder(); + internalGetCancelReqFieldBuilder(); } } @java.lang.Override @@ -20704,14 +20703,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getCheckReqFieldBuilder().getBuilder(), + internalGetCheckReqFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getCancelReqFieldBuilder().getBuilder(), + internalGetCancelReqFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -20835,7 +20834,7 @@ public Builder clearCheckReq() { public org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder getCheckReqBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getCheckReqFieldBuilder().getBuilder(); + return internalGetCheckReqFieldBuilder().getBuilder(); } /** * .message.ReqInfo check_req = 1; @@ -20853,7 +20852,7 @@ public org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder getCheckReqOrBuild */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.ReqInfo, org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder> - getCheckReqFieldBuilder() { + internalGetCheckReqFieldBuilder() { if (checkReqBuilder_ == null) { checkReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.ReqInfo, org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder>( @@ -20956,7 +20955,7 @@ public Builder clearCancelReq() { public org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder getCancelReqBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getCancelReqFieldBuilder().getBuilder(); + return internalGetCancelReqFieldBuilder().getBuilder(); } /** * .message.ReqInfo cancel_req = 2; @@ -20974,7 +20973,7 @@ public org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder getCancelReqOrBuil */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.ReqInfo, org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder> - getCancelReqFieldBuilder() { + internalGetCancelReqFieldBuilder() { if (cancelReqBuilder_ == null) { cancelReqBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.ReqInfo, org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder>( @@ -21251,8 +21250,8 @@ public static final class TicketRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TicketRequest.class.getName()); } @@ -21498,7 +21497,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getReqFieldBuilder(); + internalGetReqFieldBuilder(); } } @java.lang.Override @@ -21596,7 +21595,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getReqFieldBuilder().getBuilder(), + internalGetReqFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -21709,7 +21708,7 @@ public Builder clearReq() { public org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder getReqBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getReqFieldBuilder().getBuilder(); + return internalGetReqFieldBuilder().getBuilder(); } /** * .message.ReqInfo req = 1; @@ -21727,7 +21726,7 @@ public org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder getReqOrBuilder() */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.ReqInfo, org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder> - getReqFieldBuilder() { + internalGetReqFieldBuilder() { if (reqBuilder_ == null) { reqBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.ReqInfo, org.jumpserver.wisp.ServiceOuterClass.ReqInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.ReqInfoOrBuilder>( @@ -21836,8 +21835,8 @@ public static final class TicketStateResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TicketStateResponse.class.getName()); } @@ -22125,8 +22124,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getDataFieldBuilder(); - getStatusFieldBuilder(); + internalGetDataFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -22238,14 +22237,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getDataFieldBuilder().getBuilder(), + internalGetDataFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -22358,7 +22357,7 @@ public Builder clearData() { public org.jumpserver.wisp.ServiceOuterClass.TicketState.Builder getDataBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getDataFieldBuilder().getBuilder(); + return internalGetDataFieldBuilder().getBuilder(); } /** * .message.TicketState Data = 1; @@ -22376,7 +22375,7 @@ public org.jumpserver.wisp.ServiceOuterClass.TicketStateOrBuilder getDataOrBuild */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.TicketState, org.jumpserver.wisp.ServiceOuterClass.TicketState.Builder, org.jumpserver.wisp.ServiceOuterClass.TicketStateOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.TicketState, org.jumpserver.wisp.ServiceOuterClass.TicketState.Builder, org.jumpserver.wisp.ServiceOuterClass.TicketStateOrBuilder>( @@ -22479,7 +22478,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 2; @@ -22497,7 +22496,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -22599,8 +22598,8 @@ public static final class TicketState extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", TicketState.class.getName()); } @@ -22654,8 +22653,8 @@ public enum State com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", State.class.getName()); } @@ -22733,7 +22732,7 @@ public State findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return org.jumpserver.wisp.ServiceOuterClass.TicketState.getDescriptor().getEnumTypes().get(0); } @@ -23168,9 +23167,7 @@ public org.jumpserver.wisp.ServiceOuterClass.TicketState.State getState() { * @return This builder for chaining. */ public Builder setState(org.jumpserver.wisp.ServiceOuterClass.TicketState.State value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000001; state_ = value.getNumber(); onChanged(); @@ -23368,8 +23365,8 @@ public static final class ForwardRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ForwardRequest.class.getName()); } @@ -23803,7 +23800,7 @@ public Builder mergeFrom(org.jumpserver.wisp.ServiceOuterClass.ForwardRequest ot bitField0_ = (bitField0_ & ~0x00000004); gatewaysBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getGatewaysFieldBuilder() : null; + internalGetGatewaysFieldBuilder() : null; } else { gatewaysBuilder_.addAllMessages(other.gateways_); } @@ -24159,7 +24156,7 @@ public Builder removeGateways(int index) { */ public org.jumpserver.wisp.Common.Gateway.Builder getGatewaysBuilder( int index) { - return getGatewaysFieldBuilder().getBuilder(index); + return internalGetGatewaysFieldBuilder().getBuilder(index); } /** * repeated .message.Gateway gateways = 3; @@ -24186,7 +24183,7 @@ public org.jumpserver.wisp.Common.GatewayOrBuilder getGatewaysOrBuilder( * repeated .message.Gateway gateways = 3; */ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder() { - return getGatewaysFieldBuilder().addBuilder( + return internalGetGatewaysFieldBuilder().addBuilder( org.jumpserver.wisp.Common.Gateway.getDefaultInstance()); } /** @@ -24194,7 +24191,7 @@ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder() { */ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder( int index) { - return getGatewaysFieldBuilder().addBuilder( + return internalGetGatewaysFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.Gateway.getDefaultInstance()); } /** @@ -24202,11 +24199,11 @@ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder( */ public java.util.List getGatewaysBuilderList() { - return getGatewaysFieldBuilder().getBuilderList(); + return internalGetGatewaysFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Gateway, org.jumpserver.wisp.Common.Gateway.Builder, org.jumpserver.wisp.Common.GatewayOrBuilder> - getGatewaysFieldBuilder() { + internalGetGatewaysFieldBuilder() { if (gatewaysBuilder_ == null) { gatewaysBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Gateway, org.jumpserver.wisp.Common.Gateway.Builder, org.jumpserver.wisp.Common.GatewayOrBuilder>( @@ -24298,8 +24295,8 @@ public static final class ForwardDeleteRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ForwardDeleteRequest.class.getName()); } @@ -24841,8 +24838,8 @@ public static final class ForwardResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ForwardResponse.class.getName()); } @@ -25210,7 +25207,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -25333,7 +25330,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -25461,7 +25458,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -25479,7 +25476,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -25764,8 +25761,8 @@ public static final class PublicSettingResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PublicSettingResponse.class.getName()); } @@ -26053,8 +26050,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); - getDataFieldBuilder(); + internalGetStatusFieldBuilder(); + internalGetDataFieldBuilder(); } } @java.lang.Override @@ -26166,14 +26163,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getDataFieldBuilder().getBuilder(), + internalGetDataFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -26286,7 +26283,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -26304,7 +26301,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -26407,7 +26404,7 @@ public Builder clearData() { public org.jumpserver.wisp.Common.PublicSetting.Builder getDataBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getDataFieldBuilder().getBuilder(); + return internalGetDataFieldBuilder().getBuilder(); } /** * .message.PublicSetting data = 2; @@ -26425,7 +26422,7 @@ public org.jumpserver.wisp.Common.PublicSettingOrBuilder getDataOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.PublicSetting, org.jumpserver.wisp.Common.PublicSetting.Builder, org.jumpserver.wisp.Common.PublicSettingOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.PublicSetting, org.jumpserver.wisp.Common.PublicSetting.Builder, org.jumpserver.wisp.Common.PublicSettingOrBuilder>( @@ -26504,8 +26501,8 @@ public static final class Empty extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", Empty.class.getName()); } @@ -26891,8 +26888,8 @@ public static final class ListenPortResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", ListenPortResponse.class.getName()); } @@ -27197,7 +27194,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); + internalGetStatusFieldBuilder(); } } @java.lang.Override @@ -27311,7 +27308,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -27440,7 +27437,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -27458,7 +27455,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -27627,8 +27624,8 @@ public static final class PortInfoRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PortInfoRequest.class.getName()); } @@ -28085,8 +28082,8 @@ public static final class PortInfoResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PortInfoResponse.class.getName()); } @@ -28374,8 +28371,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); - getDataFieldBuilder(); + internalGetStatusFieldBuilder(); + internalGetDataFieldBuilder(); } } @java.lang.Override @@ -28487,14 +28484,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getDataFieldBuilder().getBuilder(), + internalGetDataFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -28607,7 +28604,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -28625,7 +28622,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -28728,7 +28725,7 @@ public Builder clearData() { public org.jumpserver.wisp.ServiceOuterClass.PortInfo.Builder getDataBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getDataFieldBuilder().getBuilder(); + return internalGetDataFieldBuilder().getBuilder(); } /** * .message.PortInfo data = 2; @@ -28746,7 +28743,7 @@ public org.jumpserver.wisp.ServiceOuterClass.PortInfoOrBuilder getDataOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.PortInfo, org.jumpserver.wisp.ServiceOuterClass.PortInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.PortInfoOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.PortInfo, org.jumpserver.wisp.ServiceOuterClass.PortInfo.Builder, org.jumpserver.wisp.ServiceOuterClass.PortInfoOrBuilder>( @@ -28864,8 +28861,8 @@ public static final class PortInfo extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PortInfo.class.getName()); } @@ -29166,8 +29163,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getAssetFieldBuilder(); - getGatewaysFieldBuilder(); + internalGetAssetFieldBuilder(); + internalGetGatewaysFieldBuilder(); } } @java.lang.Override @@ -29277,7 +29274,7 @@ public Builder mergeFrom(org.jumpserver.wisp.ServiceOuterClass.PortInfo other) { bitField0_ = (bitField0_ & ~0x00000002); gatewaysBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getGatewaysFieldBuilder() : null; + internalGetGatewaysFieldBuilder() : null; } else { gatewaysBuilder_.addAllMessages(other.gateways_); } @@ -29311,7 +29308,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getAssetFieldBuilder().getBuilder(), + internalGetAssetFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -29437,7 +29434,7 @@ public Builder clearAsset() { public org.jumpserver.wisp.Common.Asset.Builder getAssetBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getAssetFieldBuilder().getBuilder(); + return internalGetAssetFieldBuilder().getBuilder(); } /** * .message.Asset asset = 1; @@ -29455,7 +29452,7 @@ public org.jumpserver.wisp.Common.AssetOrBuilder getAssetOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Asset, org.jumpserver.wisp.Common.Asset.Builder, org.jumpserver.wisp.Common.AssetOrBuilder> - getAssetFieldBuilder() { + internalGetAssetFieldBuilder() { if (assetBuilder_ == null) { assetBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.Asset, org.jumpserver.wisp.Common.Asset.Builder, org.jumpserver.wisp.Common.AssetOrBuilder>( @@ -29647,7 +29644,7 @@ public Builder removeGateways(int index) { */ public org.jumpserver.wisp.Common.Gateway.Builder getGatewaysBuilder( int index) { - return getGatewaysFieldBuilder().getBuilder(index); + return internalGetGatewaysFieldBuilder().getBuilder(index); } /** * repeated .message.Gateway gateways = 2; @@ -29674,7 +29671,7 @@ public org.jumpserver.wisp.Common.GatewayOrBuilder getGatewaysOrBuilder( * repeated .message.Gateway gateways = 2; */ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder() { - return getGatewaysFieldBuilder().addBuilder( + return internalGetGatewaysFieldBuilder().addBuilder( org.jumpserver.wisp.Common.Gateway.getDefaultInstance()); } /** @@ -29682,7 +29679,7 @@ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder() { */ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder( int index) { - return getGatewaysFieldBuilder().addBuilder( + return internalGetGatewaysFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.Gateway.getDefaultInstance()); } /** @@ -29690,11 +29687,11 @@ public org.jumpserver.wisp.Common.Gateway.Builder addGatewaysBuilder( */ public java.util.List getGatewaysBuilderList() { - return getGatewaysFieldBuilder().getBuilderList(); + return internalGetGatewaysFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Gateway, org.jumpserver.wisp.Common.Gateway.Builder, org.jumpserver.wisp.Common.GatewayOrBuilder> - getGatewaysFieldBuilder() { + internalGetGatewaysFieldBuilder() { if (gatewaysBuilder_ == null) { gatewaysBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Gateway, org.jumpserver.wisp.Common.Gateway.Builder, org.jumpserver.wisp.Common.GatewayOrBuilder>( @@ -29792,8 +29789,8 @@ public static final class PortFailure extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PortFailure.class.getName()); } @@ -30380,8 +30377,8 @@ public static final class PortFailureRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", PortFailureRequest.class.getName()); } @@ -30727,7 +30724,7 @@ public Builder mergeFrom(org.jumpserver.wisp.ServiceOuterClass.PortFailureReques bitField0_ = (bitField0_ & ~0x00000001); dataBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getDataFieldBuilder() : null; + internalGetDataFieldBuilder() : null; } else { dataBuilder_.addAllMessages(other.data_); } @@ -30969,7 +30966,7 @@ public Builder removeData(int index) { */ public org.jumpserver.wisp.ServiceOuterClass.PortFailure.Builder getDataBuilder( int index) { - return getDataFieldBuilder().getBuilder(index); + return internalGetDataFieldBuilder().getBuilder(index); } /** * repeated .message.PortFailure data = 1; @@ -30996,7 +30993,7 @@ public org.jumpserver.wisp.ServiceOuterClass.PortFailureOrBuilder getDataOrBuild * repeated .message.PortFailure data = 1; */ public org.jumpserver.wisp.ServiceOuterClass.PortFailure.Builder addDataBuilder() { - return getDataFieldBuilder().addBuilder( + return internalGetDataFieldBuilder().addBuilder( org.jumpserver.wisp.ServiceOuterClass.PortFailure.getDefaultInstance()); } /** @@ -31004,7 +31001,7 @@ public org.jumpserver.wisp.ServiceOuterClass.PortFailure.Builder addDataBuilder( */ public org.jumpserver.wisp.ServiceOuterClass.PortFailure.Builder addDataBuilder( int index) { - return getDataFieldBuilder().addBuilder( + return internalGetDataFieldBuilder().addBuilder( index, org.jumpserver.wisp.ServiceOuterClass.PortFailure.getDefaultInstance()); } /** @@ -31012,11 +31009,11 @@ public org.jumpserver.wisp.ServiceOuterClass.PortFailure.Builder addDataBuilder( */ public java.util.List getDataBuilderList() { - return getDataFieldBuilder().getBuilderList(); + return internalGetDataFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.PortFailure, org.jumpserver.wisp.ServiceOuterClass.PortFailure.Builder, org.jumpserver.wisp.ServiceOuterClass.PortFailureOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.PortFailure, org.jumpserver.wisp.ServiceOuterClass.PortFailure.Builder, org.jumpserver.wisp.ServiceOuterClass.PortFailureOrBuilder>( @@ -31120,8 +31117,8 @@ public static final class CookiesRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", CookiesRequest.class.getName()); } @@ -31467,7 +31464,7 @@ public Builder mergeFrom(org.jumpserver.wisp.ServiceOuterClass.CookiesRequest ot bitField0_ = (bitField0_ & ~0x00000001); cookiesBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getCookiesFieldBuilder() : null; + internalGetCookiesFieldBuilder() : null; } else { cookiesBuilder_.addAllMessages(other.cookies_); } @@ -31709,7 +31706,7 @@ public Builder removeCookies(int index) { */ public org.jumpserver.wisp.Common.Cookie.Builder getCookiesBuilder( int index) { - return getCookiesFieldBuilder().getBuilder(index); + return internalGetCookiesFieldBuilder().getBuilder(index); } /** * repeated .message.Cookie cookies = 1; @@ -31736,7 +31733,7 @@ public org.jumpserver.wisp.Common.CookieOrBuilder getCookiesOrBuilder( * repeated .message.Cookie cookies = 1; */ public org.jumpserver.wisp.Common.Cookie.Builder addCookiesBuilder() { - return getCookiesFieldBuilder().addBuilder( + return internalGetCookiesFieldBuilder().addBuilder( org.jumpserver.wisp.Common.Cookie.getDefaultInstance()); } /** @@ -31744,7 +31741,7 @@ public org.jumpserver.wisp.Common.Cookie.Builder addCookiesBuilder() { */ public org.jumpserver.wisp.Common.Cookie.Builder addCookiesBuilder( int index) { - return getCookiesFieldBuilder().addBuilder( + return internalGetCookiesFieldBuilder().addBuilder( index, org.jumpserver.wisp.Common.Cookie.getDefaultInstance()); } /** @@ -31752,11 +31749,11 @@ public org.jumpserver.wisp.Common.Cookie.Builder addCookiesBuilder( */ public java.util.List getCookiesBuilderList() { - return getCookiesFieldBuilder().getBuilderList(); + return internalGetCookiesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Cookie, org.jumpserver.wisp.Common.Cookie.Builder, org.jumpserver.wisp.Common.CookieOrBuilder> - getCookiesFieldBuilder() { + internalGetCookiesFieldBuilder() { if (cookiesBuilder_ == null) { cookiesBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.jumpserver.wisp.Common.Cookie, org.jumpserver.wisp.Common.Cookie.Builder, org.jumpserver.wisp.Common.CookieOrBuilder>( @@ -31866,8 +31863,8 @@ public static final class UserResponse extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", UserResponse.class.getName()); } @@ -32155,8 +32152,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getStatusFieldBuilder(); - getDataFieldBuilder(); + internalGetStatusFieldBuilder(); + internalGetDataFieldBuilder(); } } @java.lang.Override @@ -32268,14 +32265,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getStatusFieldBuilder().getBuilder(), + internalGetStatusFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getDataFieldBuilder().getBuilder(), + internalGetDataFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -32388,7 +32385,7 @@ public Builder clearStatus() { public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getStatusFieldBuilder().getBuilder(); + return internalGetStatusFieldBuilder().getBuilder(); } /** * .message.Status status = 1; @@ -32406,7 +32403,7 @@ public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder( */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> - getStatusFieldBuilder() { + internalGetStatusFieldBuilder() { if (statusBuilder_ == null) { statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( @@ -32509,7 +32506,7 @@ public Builder clearData() { public org.jumpserver.wisp.Common.User.Builder getDataBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getDataFieldBuilder().getBuilder(); + return internalGetDataFieldBuilder().getBuilder(); } /** * .message.User data = 2; @@ -32527,7 +32524,7 @@ public org.jumpserver.wisp.Common.UserOrBuilder getDataOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.User, org.jumpserver.wisp.Common.User.Builder, org.jumpserver.wisp.Common.UserOrBuilder> - getDataFieldBuilder() { + internalGetDataFieldBuilder() { if (dataBuilder_ == null) { dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< org.jumpserver.wisp.Common.User, org.jumpserver.wisp.Common.User.Builder, org.jumpserver.wisp.Common.UserOrBuilder>( @@ -32653,8 +32650,8 @@ public static final class SessionLifecycleLogRequest extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", SessionLifecycleLogRequest.class.getName()); } @@ -32746,8 +32743,8 @@ public enum EventType com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 32, + /* patch= */ 1, /* suffix= */ "", EventType.class.getName()); } @@ -32870,7 +32867,7 @@ public EventType findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return org.jumpserver.wisp.ServiceOuterClass.SessionLifecycleLogRequest.getDescriptor().getEnumTypes().get(0); } @@ -33503,9 +33500,7 @@ public org.jumpserver.wisp.ServiceOuterClass.SessionLifecycleLogRequest.EventTyp * @return This builder for chaining. */ public Builder setEvent(org.jumpserver.wisp.ServiceOuterClass.SessionLifecycleLogRequest.EventType value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000002; event_ = value.getNumber(); onChanged(); @@ -33717,6 +33712,776 @@ public org.jumpserver.wisp.ServiceOuterClass.SessionLifecycleLogRequest getDefau } + public interface AccountDetailResponseOrBuilder extends + // @@protoc_insertion_point(interface_extends:message.AccountDetailResponse) + com.google.protobuf.MessageOrBuilder { + + /** + * .message.Status status = 1; + * @return Whether the status field is set. + */ + boolean hasStatus(); + /** + * .message.Status status = 1; + * @return The status. + */ + org.jumpserver.wisp.ServiceOuterClass.Status getStatus(); + /** + * .message.Status status = 1; + */ + org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder(); + + /** + * .google.protobuf.Struct payload = 2; + * @return Whether the payload field is set. + */ + boolean hasPayload(); + /** + * .google.protobuf.Struct payload = 2; + * @return The payload. + */ + com.google.protobuf.Struct getPayload(); + /** + * .google.protobuf.Struct payload = 2; + */ + com.google.protobuf.StructOrBuilder getPayloadOrBuilder(); + } + /** + * Protobuf type {@code message.AccountDetailResponse} + */ + public static final class AccountDetailResponse extends + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:message.AccountDetailResponse) + AccountDetailResponseOrBuilder { + private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 32, + /* patch= */ 1, + /* suffix= */ "", + AccountDetailResponse.class.getName()); + } + // Use AccountDetailResponse.newBuilder() to construct. + private AccountDetailResponse(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + } + private AccountDetailResponse() { + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jumpserver.wisp.ServiceOuterClass.internal_static_message_AccountDetailResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jumpserver.wisp.ServiceOuterClass.internal_static_message_AccountDetailResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.class, org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.Builder.class); + } + + private int bitField0_; + public static final int STATUS_FIELD_NUMBER = 1; + private org.jumpserver.wisp.ServiceOuterClass.Status status_; + /** + * .message.Status status = 1; + * @return Whether the status field is set. + */ + @java.lang.Override + public boolean hasStatus() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .message.Status status = 1; + * @return The status. + */ + @java.lang.Override + public org.jumpserver.wisp.ServiceOuterClass.Status getStatus() { + return status_ == null ? org.jumpserver.wisp.ServiceOuterClass.Status.getDefaultInstance() : status_; + } + /** + * .message.Status status = 1; + */ + @java.lang.Override + public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder() { + return status_ == null ? org.jumpserver.wisp.ServiceOuterClass.Status.getDefaultInstance() : status_; + } + + public static final int PAYLOAD_FIELD_NUMBER = 2; + private com.google.protobuf.Struct payload_; + /** + * .google.protobuf.Struct payload = 2; + * @return Whether the payload field is set. + */ + @java.lang.Override + public boolean hasPayload() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .google.protobuf.Struct payload = 2; + * @return The payload. + */ + @java.lang.Override + public com.google.protobuf.Struct getPayload() { + return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_; + } + /** + * .google.protobuf.Struct payload = 2; + */ + @java.lang.Override + public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { + return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (((bitField0_ & 0x00000001) != 0)) { + output.writeMessage(1, getStatus()); + } + if (((bitField0_ & 0x00000002) != 0)) { + output.writeMessage(2, getPayload()); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, getStatus()); + } + if (((bitField0_ & 0x00000002) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, getPayload()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse)) { + return super.equals(obj); + } + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse other = (org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse) obj; + + if (hasStatus() != other.hasStatus()) return false; + if (hasStatus()) { + if (!getStatus() + .equals(other.getStatus())) return false; + } + if (hasPayload() != other.hasPayload()) return false; + if (hasPayload()) { + if (!getPayload() + .equals(other.getPayload())) return false; + } + if (!getUnknownFields().equals(other.getUnknownFields())) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + if (hasStatus()) { + hash = (37 * hash) + STATUS_FIELD_NUMBER; + hash = (53 * hash) + getStatus().hashCode(); + } + if (hasPayload()) { + hash = (37 * hash) + PAYLOAD_FIELD_NUMBER; + hash = (53 * hash) + getPayload().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); + } + + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); + } + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code message.AccountDetailResponse} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:message.AccountDetailResponse) + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jumpserver.wisp.ServiceOuterClass.internal_static_message_AccountDetailResponse_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jumpserver.wisp.ServiceOuterClass.internal_static_message_AccountDetailResponse_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.class, org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.Builder.class); + } + + // Construct using org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage + .alwaysUseFieldBuilders) { + internalGetStatusFieldBuilder(); + internalGetPayloadFieldBuilder(); + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + status_ = null; + if (statusBuilder_ != null) { + statusBuilder_.dispose(); + statusBuilder_ = null; + } + payload_ = null; + if (payloadBuilder_ != null) { + payloadBuilder_.dispose(); + payloadBuilder_ = null; + } + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jumpserver.wisp.ServiceOuterClass.internal_static_message_AccountDetailResponse_descriptor; + } + + @java.lang.Override + public org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse getDefaultInstanceForType() { + return org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.getDefaultInstance(); + } + + @java.lang.Override + public org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse build() { + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse buildPartial() { + org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse result = new org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse result) { + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.status_ = statusBuilder_ == null + ? status_ + : statusBuilder_.build(); + to_bitField0_ |= 0x00000001; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.payload_ = payloadBuilder_ == null + ? payload_ + : payloadBuilder_.build(); + to_bitField0_ |= 0x00000002; + } + result.bitField0_ |= to_bitField0_; + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse) { + return mergeFrom((org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse other) { + if (other == org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse.getDefaultInstance()) return this; + if (other.hasStatus()) { + mergeStatus(other.getStatus()); + } + if (other.hasPayload()) { + mergePayload(other.getPayload()); + } + this.mergeUnknownFields(other.getUnknownFields()); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + input.readMessage( + internalGetStatusFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + input.readMessage( + internalGetPayloadFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.unwrapIOException(); + } finally { + onChanged(); + } // finally + return this; + } + private int bitField0_; + + private org.jumpserver.wisp.ServiceOuterClass.Status status_; + private com.google.protobuf.SingleFieldBuilder< + org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> statusBuilder_; + /** + * .message.Status status = 1; + * @return Whether the status field is set. + */ + public boolean hasStatus() { + return ((bitField0_ & 0x00000001) != 0); + } + /** + * .message.Status status = 1; + * @return The status. + */ + public org.jumpserver.wisp.ServiceOuterClass.Status getStatus() { + if (statusBuilder_ == null) { + return status_ == null ? org.jumpserver.wisp.ServiceOuterClass.Status.getDefaultInstance() : status_; + } else { + return statusBuilder_.getMessage(); + } + } + /** + * .message.Status status = 1; + */ + public Builder setStatus(org.jumpserver.wisp.ServiceOuterClass.Status value) { + if (statusBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + status_ = value; + } else { + statusBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .message.Status status = 1; + */ + public Builder setStatus( + org.jumpserver.wisp.ServiceOuterClass.Status.Builder builderForValue) { + if (statusBuilder_ == null) { + status_ = builderForValue.build(); + } else { + statusBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * .message.Status status = 1; + */ + public Builder mergeStatus(org.jumpserver.wisp.ServiceOuterClass.Status value) { + if (statusBuilder_ == null) { + if (((bitField0_ & 0x00000001) != 0) && + status_ != null && + status_ != org.jumpserver.wisp.ServiceOuterClass.Status.getDefaultInstance()) { + getStatusBuilder().mergeFrom(value); + } else { + status_ = value; + } + } else { + statusBuilder_.mergeFrom(value); + } + if (status_ != null) { + bitField0_ |= 0x00000001; + onChanged(); + } + return this; + } + /** + * .message.Status status = 1; + */ + public Builder clearStatus() { + bitField0_ = (bitField0_ & ~0x00000001); + status_ = null; + if (statusBuilder_ != null) { + statusBuilder_.dispose(); + statusBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .message.Status status = 1; + */ + public org.jumpserver.wisp.ServiceOuterClass.Status.Builder getStatusBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return internalGetStatusFieldBuilder().getBuilder(); + } + /** + * .message.Status status = 1; + */ + public org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder getStatusOrBuilder() { + if (statusBuilder_ != null) { + return statusBuilder_.getMessageOrBuilder(); + } else { + return status_ == null ? + org.jumpserver.wisp.ServiceOuterClass.Status.getDefaultInstance() : status_; + } + } + /** + * .message.Status status = 1; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder> + internalGetStatusFieldBuilder() { + if (statusBuilder_ == null) { + statusBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jumpserver.wisp.ServiceOuterClass.Status, org.jumpserver.wisp.ServiceOuterClass.Status.Builder, org.jumpserver.wisp.ServiceOuterClass.StatusOrBuilder>( + getStatus(), + getParentForChildren(), + isClean()); + status_ = null; + } + return statusBuilder_; + } + + private com.google.protobuf.Struct payload_; + private com.google.protobuf.SingleFieldBuilder< + com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, com.google.protobuf.StructOrBuilder> payloadBuilder_; + /** + * .google.protobuf.Struct payload = 2; + * @return Whether the payload field is set. + */ + public boolean hasPayload() { + return ((bitField0_ & 0x00000002) != 0); + } + /** + * .google.protobuf.Struct payload = 2; + * @return The payload. + */ + public com.google.protobuf.Struct getPayload() { + if (payloadBuilder_ == null) { + return payload_ == null ? com.google.protobuf.Struct.getDefaultInstance() : payload_; + } else { + return payloadBuilder_.getMessage(); + } + } + /** + * .google.protobuf.Struct payload = 2; + */ + public Builder setPayload(com.google.protobuf.Struct value) { + if (payloadBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + payload_ = value; + } else { + payloadBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .google.protobuf.Struct payload = 2; + */ + public Builder setPayload( + com.google.protobuf.Struct.Builder builderForValue) { + if (payloadBuilder_ == null) { + payload_ = builderForValue.build(); + } else { + payloadBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + onChanged(); + return this; + } + /** + * .google.protobuf.Struct payload = 2; + */ + public Builder mergePayload(com.google.protobuf.Struct value) { + if (payloadBuilder_ == null) { + if (((bitField0_ & 0x00000002) != 0) && + payload_ != null && + payload_ != com.google.protobuf.Struct.getDefaultInstance()) { + getPayloadBuilder().mergeFrom(value); + } else { + payload_ = value; + } + } else { + payloadBuilder_.mergeFrom(value); + } + if (payload_ != null) { + bitField0_ |= 0x00000002; + onChanged(); + } + return this; + } + /** + * .google.protobuf.Struct payload = 2; + */ + public Builder clearPayload() { + bitField0_ = (bitField0_ & ~0x00000002); + payload_ = null; + if (payloadBuilder_ != null) { + payloadBuilder_.dispose(); + payloadBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .google.protobuf.Struct payload = 2; + */ + public com.google.protobuf.Struct.Builder getPayloadBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return internalGetPayloadFieldBuilder().getBuilder(); + } + /** + * .google.protobuf.Struct payload = 2; + */ + public com.google.protobuf.StructOrBuilder getPayloadOrBuilder() { + if (payloadBuilder_ != null) { + return payloadBuilder_.getMessageOrBuilder(); + } else { + return payload_ == null ? + com.google.protobuf.Struct.getDefaultInstance() : payload_; + } + } + /** + * .google.protobuf.Struct payload = 2; + */ + private com.google.protobuf.SingleFieldBuilder< + com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, com.google.protobuf.StructOrBuilder> + internalGetPayloadFieldBuilder() { + if (payloadBuilder_ == null) { + payloadBuilder_ = new com.google.protobuf.SingleFieldBuilder< + com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, com.google.protobuf.StructOrBuilder>( + getPayload(), + getParentForChildren(), + isClean()); + payload_ = null; + } + return payloadBuilder_; + } + + // @@protoc_insertion_point(builder_scope:message.AccountDetailResponse) + } + + // @@protoc_insertion_point(class_scope:message.AccountDetailResponse) + private static final org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse(); + } + + public static org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public AccountDetailResponse parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public org.jumpserver.wisp.ServiceOuterClass.AccountDetailResponse getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_JoinFaceMonitorRequest_descriptor; private static final @@ -33942,6 +34707,11 @@ public org.jumpserver.wisp.ServiceOuterClass.SessionLifecycleLogRequest getDefau private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_SessionLifecycleLogRequest_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_message_AccountDetailResponse_descriptor; + private static final + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_message_AccountDetailResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -33951,154 +34721,160 @@ public org.jumpserver.wisp.ServiceOuterClass.SessionLifecycleLogRequest getDefau descriptor; static { java.lang.String[] descriptorData = { - "\n\rservice.proto\022\007message\032\014common.proto\"H" + - "\n\026JoinFaceMonitorRequest\022\032\n\022face_monitor" + - "_token\030\001 \001(\t\022\022\n\nsession_id\030\002 \001(\t\":\n\027Join" + - "FaceMonitorResponse\022\037\n\006status\030\001 \001(\0132\017.me" + - "ssage.Status\"\214\001\n\032FaceMonitorCallbackRequ" + + "\n\rservice.proto\022\007message\032\014common.proto\032\034" + + "google/protobuf/struct.proto\"H\n\026JoinFace" + + "MonitorRequest\022\032\n\022face_monitor_token\030\001 \001" + + "(\t\022\022\n\nsession_id\030\002 \001(\t\":\n\027JoinFaceMonito" + + "rResponse\022\037\n\006status\030\001 \001(\0132\017.message.Stat" + + "us\"\214\001\n\032FaceMonitorCallbackRequest\022\r\n\005tok" + + "en\030\001 \001(\t\022\017\n\007success\030\002 \001(\010\022\025\n\rerror_messa" + + "ge\030\003 \001(\t\022\023\n\013is_finished\030\004 \001(\010\022\016\n\006action\030" + + "\005 \001(\t\022\022\n\nface_codes\030\006 \003(\t\">\n\033FaceMonitor" + + "CallbackResponse\022\037\n\006status\030\001 \001(\0132\017.messa" + + "ge.Status\"j\n\036FaceRecognitionCallbackRequ" + "est\022\r\n\005token\030\001 \001(\t\022\017\n\007success\030\002 \001(\010\022\025\n\re" + - "rror_message\030\003 \001(\t\022\023\n\013is_finished\030\004 \001(\010\022" + - "\016\n\006action\030\005 \001(\t\022\022\n\nface_codes\030\006 \003(\t\">\n\033F" + - "aceMonitorCallbackResponse\022\037\n\006status\030\001 \001" + - "(\0132\017.message.Status\"j\n\036FaceRecognitionCa" + - "llbackRequest\022\r\n\005token\030\001 \001(\t\022\017\n\007success\030" + - "\002 \001(\010\022\025\n\rerror_message\030\003 \001(\t\022\021\n\tface_cod" + - "e\030\004 \001(\t\"B\n\037FaceRecognitionCallbackRespon" + - "se\022\037\n\006status\030\001 \001(\0132\017.message.Status\"V\n\027A" + - "ssetLoginTicketRequest\022\017\n\007user_id\030\001 \001(\t\022" + - "\020\n\010asset_id\030\002 \001(\t\022\030\n\020account_username\030\004 " + - "\001(\t\"\216\001\n\030AssetLoginTicketResponse\022\037\n\006stat" + - "us\030\001 \001(\0132\017.message.Status\022(\n\013ticket_info" + - "\030\002 \001(\0132\023.message.TicketInfo\022\024\n\014need_conf" + - "irm\030\003 \001(\010\022\021\n\tticket_id\030\004 \001(\t\"!\n\006Status\022\n" + - "\n\002ok\030\001 \001(\010\022\013\n\003err\030\002 \001(\t\"\035\n\014TokenRequest\022" + - "\r\n\005token\030\001 \001(\t\"V\n\rTokenResponse\022\037\n\006statu" + - "s\030\001 \001(\0132\017.message.Status\022$\n\004data\030\002 \001(\0132\026" + - ".message.TokenAuthInfo\"6\n\024SessionCreateR" + - "equest\022\036\n\004data\030\001 \001(\0132\020.message.Session\"X" + - "\n\025SessionCreateResponse\022\037\n\006status\030\001 \001(\0132" + - "\017.message.Status\022\036\n\004data\030\002 \001(\0132\020.message" + - ".Session\"R\n\024SessionFinishRequest\022\n\n\002id\030\001" + - " \001(\t\022\017\n\007success\030\002 \001(\010\022\020\n\010date_end\030\003 \001(\003\022" + - "\013\n\003err\030\004 \001(\t\"4\n\021SessionFinishResp\022\037\n\006sta" + - "tus\030\001 \001(\0132\017.message.Status\"=\n\rReplayRequ" + - "est\022\022\n\nsession_id\030\001 \001(\t\022\030\n\020replay_file_p" + - "ath\030\002 \001(\t\"1\n\016ReplayResponse\022\037\n\006status\030\001 " + - "\001(\0132\017.message.Status\"\337\001\n\016CommandRequest\022" + - "\013\n\003sid\030\001 \001(\t\022\016\n\006org_id\030\002 \001(\t\022\r\n\005input\030\003 " + - "\001(\t\022\016\n\006output\030\004 \001(\t\022\014\n\004user\030\005 \001(\t\022\r\n\005ass" + - "et\030\006 \001(\t\022\017\n\007account\030\007 \001(\t\022\021\n\ttimestamp\030\010" + - " \001(\003\022&\n\nrisk_level\030\t \001(\0162\022.message.RiskL" + - "evel\022\022\n\ncmd_acl_id\030\n \001(\t\022\024\n\014cmd_group_id" + - "\030\013 \001(\t\"2\n\017CommandResponse\022\037\n\006status\030\001 \001(" + - "\0132\017.message.Status\"&\n\023FinishedTaskReques" + - "t\022\017\n\007task_id\030\001 \001(\t\"3\n\014TaskResponse\022#\n\004ta" + - "sk\030\001 \001(\0132\025.message.TerminalTask\")\n\023Remai" + - "nReplayRequest\022\022\n\nreplay_dir\030\001 \001(\t\"{\n\024Re" + - "mainReplayResponse\022\037\n\006status\030\001 \001(\0132\017.mes" + - "sage.Status\022\025\n\rsuccess_files\030\002 \003(\t\022\025\n\rfa" + - "ilure_files\030\003 \003(\t\022\024\n\014failure_errs\030\004 \003(\t\"" + - "1\n\016StatusResponse\022\037\n\006status\030\001 \001(\0132\017.mess" + - "age.Status\"L\n\025CommandConfirmRequest\022\022\n\ns" + - "ession_id\030\001 \001(\t\022\022\n\ncmd_acl_id\030\002 \001(\t\022\013\n\003c" + - "md\030\003 \001(\t\"&\n\007ReqInfo\022\016\n\006method\030\001 \001(\t\022\013\n\003u" + - "rl\030\002 \001(\t\"\\\n\026CommandConfirmResponse\022\037\n\006st" + - "atus\030\001 \001(\0132\017.message.Status\022!\n\004info\030\002 \001(" + - "\0132\023.message.TicketInfo\"\205\001\n\nTicketInfo\022#\n" + - "\tcheck_req\030\001 \001(\0132\020.message.ReqInfo\022$\n\nca" + - "ncel_req\030\002 \001(\0132\020.message.ReqInfo\022\031\n\021tick" + - "et_detail_url\030\003 \001(\t\022\021\n\treviewers\030\004 \003(\t\"." + - "\n\rTicketRequest\022\035\n\003req\030\001 \001(\0132\020.message.R" + - "eqInfo\"Z\n\023TicketStateResponse\022\"\n\004Data\030\001 " + - "\001(\0132\024.message.TicketState\022\037\n\006status\030\002 \001(" + - "\0132\017.message.Status\"\206\001\n\013TicketState\022)\n\005st" + - "ate\030\001 \001(\0162\032.message.TicketState.State\022\021\n" + - "\tprocessor\030\002 \001(\t\"9\n\005State\022\010\n\004Open\020\000\022\014\n\010A" + - "pproved\020\001\022\014\n\010Rejected\020\002\022\n\n\006Closed\020\003\"P\n\016F" + - "orwardRequest\022\014\n\004host\030\001 \001(\t\022\014\n\004port\030\002 \001(" + - "\005\022\"\n\010gateways\030\003 \003(\0132\020.message.Gateway\"\"\n" + - "\024ForwardDeleteRequest\022\n\n\002id\030\001 \001(\t\"Z\n\017For" + - "wardResponse\022\037\n\006status\030\001 \001(\0132\017.message.S" + - "tatus\022\n\n\002id\030\002 \001(\t\022\014\n\004host\030\003 \001(\t\022\014\n\004port\030" + - "\004 \001(\005\"^\n\025PublicSettingResponse\022\037\n\006status" + - "\030\001 \001(\0132\017.message.Status\022$\n\004data\030\002 \001(\0132\026." + - "message.PublicSetting\"\007\n\005Empty\"D\n\022Listen" + - "PortResponse\022\037\n\006status\030\001 \001(\0132\017.message.S" + - "tatus\022\r\n\005ports\030\002 \003(\005\"\037\n\017PortInfoRequest\022" + - "\014\n\004port\030\001 \001(\005\"T\n\020PortInfoResponse\022\037\n\006sta" + - "tus\030\001 \001(\0132\017.message.Status\022\037\n\004data\030\002 \001(\013" + - "2\021.message.PortInfo\"M\n\010PortInfo\022\035\n\005asset" + - "\030\001 \001(\0132\016.message.Asset\022\"\n\010gateways\030\002 \003(\013" + - "2\020.message.Gateway\"+\n\013PortFailure\022\014\n\004por" + - "t\030\001 \001(\005\022\016\n\006reason\030\002 \001(\t\"8\n\022PortFailureRe" + - "quest\022\"\n\004data\030\001 \003(\0132\024.message.PortFailur" + - "e\"2\n\016CookiesRequest\022 \n\007cookies\030\001 \003(\0132\017.m" + - "essage.Cookie\"L\n\014UserResponse\022\037\n\006status\030" + - "\001 \001(\0132\017.message.Status\022\033\n\004data\030\002 \001(\0132\r.m" + - "essage.User\"\316\003\n\032SessionLifecycleLogReque" + - "st\022\022\n\nsession_id\030\001 \001(\t\022<\n\005event\030\002 \001(\0162-." + - "message.SessionLifecycleLogRequest.Event" + - "Type\022\016\n\006reason\030\003 \001(\t\022\014\n\004user\030\004 \001(\t\"\277\002\n\tE" + - "ventType\022\027\n\023AssetConnectSuccess\020\000\022\030\n\024Ass" + - "etConnectFinished\020\001\022\023\n\017CreateShareLink\020\002" + - "\022\023\n\017UserJoinSession\020\003\022\024\n\020UserLeaveSessio" + - "n\020\004\022\024\n\020AdminJoinMonitor\020\005\022\024\n\020AdminExitMo" + - "nitor\020\006\022\026\n\022ReplayConvertStart\020\007\022\030\n\024Repla" + - "yConvertSuccess\020\010\022\030\n\024ReplayConvertFailur" + - "e\020\t\022\025\n\021ReplayUploadStart\020\n\022\027\n\023ReplayUplo" + - "adSuccess\020\013\022\027\n\023ReplayUploadFailure\020\0142\247\016\n" + - "\007Service\022C\n\020GetTokenAuthInfo\022\025.message.T" + - "okenRequest\032\026.message.TokenResponse\"\000\022>\n" + - "\nRenewToken\022\025.message.TokenRequest\032\027.mes" + - "sage.StatusResponse\"\000\022P\n\rCreateSession\022\035" + - ".message.SessionCreateRequest\032\036.message." + - "SessionCreateResponse\"\000\022L\n\rFinishSession" + - "\022\035.message.SessionFinishRequest\032\032.messag" + - "e.SessionFinishResp\"\000\022E\n\020UploadReplayFil" + - "e\022\026.message.ReplayRequest\032\027.message.Repl" + - "ayResponse\"\000\022D\n\rUploadCommand\022\027.message." + - "CommandRequest\032\030.message.CommandResponse" + - "\"\000\022I\n\014DispatchTask\022\034.message.FinishedTas" + - "kRequest\032\025.message.TaskResponse\"\000(\0010\001\022R\n" + - "\021ScanRemainReplays\022\034.message.RemainRepla" + - "yRequest\032\035.message.RemainReplayResponse\"" + - "\000\022X\n\023CreateCommandTicket\022\036.message.Comma" + - "ndConfirmRequest\032\037.message.CommandConfir" + - "mResponse\"\000\022f\n\035CheckOrCreateAssetLoginTi" + - "cket\022 .message.AssetLoginTicketRequest\032!" + - ".message.AssetLoginTicketResponse\"\000\022J\n\020C" + - "heckTicketState\022\026.message.TicketRequest\032" + - "\034.message.TicketStateResponse\"\000\022A\n\014Cance" + - "lTicket\022\026.message.TicketRequest\032\027.messag" + - "e.StatusResponse\"\000\022D\n\rCreateForward\022\027.me" + - "ssage.ForwardRequest\032\030.message.ForwardRe" + - "sponse\"\000\022I\n\rDeleteForward\022\035.message.Forw" + - "ardDeleteRequest\032\027.message.StatusRespons" + - "e\"\000\022D\n\020GetPublicSetting\022\016.message.Empty\032" + - "\036.message.PublicSettingResponse\"\000\022?\n\016Get" + - "ListenPorts\022\016.message.Empty\032\033.message.Li" + - "stenPortResponse\"\000\022D\n\013GetPortInfo\022\030.mess" + - "age.PortInfoRequest\032\031.message.PortInfoRe" + - "sponse\"\000\022K\n\021HandlePortFailure\022\033.message." + - "PortFailureRequest\032\027.message.StatusRespo" + - "nse\"\000\022F\n\022CheckUserByCookies\022\027.message.Co" + - "okiesRequest\032\025.message.UserResponse\"\000\022[\n" + - "\031RecordSessionLifecycleLog\022#.message.Ses" + - "sionLifecycleLogRequest\032\027.message.Status" + - "Response\"\000\022n\n\027FaceRecognitionCallback\022\'." + - "message.FaceRecognitionCallbackRequest\032(" + - ".message.FaceRecognitionCallbackResponse" + - "\"\000\022b\n\023FaceMonitorCallback\022#.message.Face" + - "MonitorCallbackRequest\032$.message.FaceMon" + - "itorCallbackResponse\"\000\022V\n\017JoinFaceMonito" + - "r\022\037.message.JoinFaceMonitorRequest\032 .mes" + - "sage.JoinFaceMonitorResponse\"\000B \n\023org.ju" + - "mpserver.wispZ\t/protobufb\006proto3" + "rror_message\030\003 \001(\t\022\021\n\tface_code\030\004 \001(\t\"B\n" + + "\037FaceRecognitionCallbackResponse\022\037\n\006stat" + + "us\030\001 \001(\0132\017.message.Status\"V\n\027AssetLoginT" + + "icketRequest\022\017\n\007user_id\030\001 \001(\t\022\020\n\010asset_i" + + "d\030\002 \001(\t\022\030\n\020account_username\030\004 \001(\t\"\216\001\n\030As" + + "setLoginTicketResponse\022\037\n\006status\030\001 \001(\0132\017" + + ".message.Status\022(\n\013ticket_info\030\002 \001(\0132\023.m" + + "essage.TicketInfo\022\024\n\014need_confirm\030\003 \001(\010\022" + + "\021\n\tticket_id\030\004 \001(\t\"!\n\006Status\022\n\n\002ok\030\001 \001(\010" + + "\022\013\n\003err\030\002 \001(\t\"\035\n\014TokenRequest\022\r\n\005token\030\001" + + " \001(\t\"V\n\rTokenResponse\022\037\n\006status\030\001 \001(\0132\017." + + "message.Status\022$\n\004data\030\002 \001(\0132\026.message.T" + + "okenAuthInfo\"6\n\024SessionCreateRequest\022\036\n\004" + + "data\030\001 \001(\0132\020.message.Session\"X\n\025SessionC" + + "reateResponse\022\037\n\006status\030\001 \001(\0132\017.message." + + "Status\022\036\n\004data\030\002 \001(\0132\020.message.Session\"R" + + "\n\024SessionFinishRequest\022\n\n\002id\030\001 \001(\t\022\017\n\007su" + + "ccess\030\002 \001(\010\022\020\n\010date_end\030\003 \001(\003\022\013\n\003err\030\004 \001" + + "(\t\"4\n\021SessionFinishResp\022\037\n\006status\030\001 \001(\0132" + + "\017.message.Status\"=\n\rReplayRequest\022\022\n\nses" + + "sion_id\030\001 \001(\t\022\030\n\020replay_file_path\030\002 \001(\t\"" + + "1\n\016ReplayResponse\022\037\n\006status\030\001 \001(\0132\017.mess" + + "age.Status\"\337\001\n\016CommandRequest\022\013\n\003sid\030\001 \001" + + "(\t\022\016\n\006org_id\030\002 \001(\t\022\r\n\005input\030\003 \001(\t\022\016\n\006out" + + "put\030\004 \001(\t\022\014\n\004user\030\005 \001(\t\022\r\n\005asset\030\006 \001(\t\022\017" + + "\n\007account\030\007 \001(\t\022\021\n\ttimestamp\030\010 \001(\003\022&\n\nri" + + "sk_level\030\t \001(\0162\022.message.RiskLevel\022\022\n\ncm" + + "d_acl_id\030\n \001(\t\022\024\n\014cmd_group_id\030\013 \001(\t\"2\n\017" + + "CommandResponse\022\037\n\006status\030\001 \001(\0132\017.messag" + + "e.Status\"&\n\023FinishedTaskRequest\022\017\n\007task_" + + "id\030\001 \001(\t\"3\n\014TaskResponse\022#\n\004task\030\001 \001(\0132\025" + + ".message.TerminalTask\")\n\023RemainReplayReq" + + "uest\022\022\n\nreplay_dir\030\001 \001(\t\"{\n\024RemainReplay" + + "Response\022\037\n\006status\030\001 \001(\0132\017.message.Statu" + + "s\022\025\n\rsuccess_files\030\002 \003(\t\022\025\n\rfailure_file" + + "s\030\003 \003(\t\022\024\n\014failure_errs\030\004 \003(\t\"1\n\016StatusR" + + "esponse\022\037\n\006status\030\001 \001(\0132\017.message.Status" + + "\"L\n\025CommandConfirmRequest\022\022\n\nsession_id\030" + + "\001 \001(\t\022\022\n\ncmd_acl_id\030\002 \001(\t\022\013\n\003cmd\030\003 \001(\t\"&" + + "\n\007ReqInfo\022\016\n\006method\030\001 \001(\t\022\013\n\003url\030\002 \001(\t\"\\" + + "\n\026CommandConfirmResponse\022\037\n\006status\030\001 \001(\013" + + "2\017.message.Status\022!\n\004info\030\002 \001(\0132\023.messag" + + "e.TicketInfo\"\205\001\n\nTicketInfo\022#\n\tcheck_req" + + "\030\001 \001(\0132\020.message.ReqInfo\022$\n\ncancel_req\030\002" + + " \001(\0132\020.message.ReqInfo\022\031\n\021ticket_detail_" + + "url\030\003 \001(\t\022\021\n\treviewers\030\004 \003(\t\".\n\rTicketRe" + + "quest\022\035\n\003req\030\001 \001(\0132\020.message.ReqInfo\"Z\n\023" + + "TicketStateResponse\022\"\n\004Data\030\001 \001(\0132\024.mess" + + "age.TicketState\022\037\n\006status\030\002 \001(\0132\017.messag" + + "e.Status\"\206\001\n\013TicketState\022)\n\005state\030\001 \001(\0162" + + "\032.message.TicketState.State\022\021\n\tprocessor" + + "\030\002 \001(\t\"9\n\005State\022\010\n\004Open\020\000\022\014\n\010Approved\020\001\022" + + "\014\n\010Rejected\020\002\022\n\n\006Closed\020\003\"P\n\016ForwardRequ" + + "est\022\014\n\004host\030\001 \001(\t\022\014\n\004port\030\002 \001(\005\022\"\n\010gatew" + + "ays\030\003 \003(\0132\020.message.Gateway\"\"\n\024ForwardDe" + + "leteRequest\022\n\n\002id\030\001 \001(\t\"Z\n\017ForwardRespon" + + "se\022\037\n\006status\030\001 \001(\0132\017.message.Status\022\n\n\002i" + + "d\030\002 \001(\t\022\014\n\004host\030\003 \001(\t\022\014\n\004port\030\004 \001(\005\"^\n\025P" + + "ublicSettingResponse\022\037\n\006status\030\001 \001(\0132\017.m" + + "essage.Status\022$\n\004data\030\002 \001(\0132\026.message.Pu" + + "blicSetting\"\007\n\005Empty\"D\n\022ListenPortRespon" + + "se\022\037\n\006status\030\001 \001(\0132\017.message.Status\022\r\n\005p" + + "orts\030\002 \003(\005\"\037\n\017PortInfoRequest\022\014\n\004port\030\001 " + + "\001(\005\"T\n\020PortInfoResponse\022\037\n\006status\030\001 \001(\0132" + + "\017.message.Status\022\037\n\004data\030\002 \001(\0132\021.message" + + ".PortInfo\"M\n\010PortInfo\022\035\n\005asset\030\001 \001(\0132\016.m" + + "essage.Asset\022\"\n\010gateways\030\002 \003(\0132\020.message" + + ".Gateway\"+\n\013PortFailure\022\014\n\004port\030\001 \001(\005\022\016\n" + + "\006reason\030\002 \001(\t\"8\n\022PortFailureRequest\022\"\n\004d" + + "ata\030\001 \003(\0132\024.message.PortFailure\"2\n\016Cooki" + + "esRequest\022 \n\007cookies\030\001 \003(\0132\017.message.Coo" + + "kie\"L\n\014UserResponse\022\037\n\006status\030\001 \001(\0132\017.me" + + "ssage.Status\022\033\n\004data\030\002 \001(\0132\r.message.Use" + + "r\"\316\003\n\032SessionLifecycleLogRequest\022\022\n\nsess" + + "ion_id\030\001 \001(\t\022<\n\005event\030\002 \001(\0162-.message.Se" + + "ssionLifecycleLogRequest.EventType\022\016\n\006re" + + "ason\030\003 \001(\t\022\014\n\004user\030\004 \001(\t\"\277\002\n\tEventType\022\027" + + "\n\023AssetConnectSuccess\020\000\022\030\n\024AssetConnectF" + + "inished\020\001\022\023\n\017CreateShareLink\020\002\022\023\n\017UserJo" + + "inSession\020\003\022\024\n\020UserLeaveSession\020\004\022\024\n\020Adm" + + "inJoinMonitor\020\005\022\024\n\020AdminExitMonitor\020\006\022\026\n" + + "\022ReplayConvertStart\020\007\022\030\n\024ReplayConvertSu" + + "ccess\020\010\022\030\n\024ReplayConvertFailure\020\t\022\025\n\021Rep" + + "layUploadStart\020\n\022\027\n\023ReplayUploadSuccess\020" + + "\013\022\027\n\023ReplayUploadFailure\020\014\"b\n\025AccountDet" + + "ailResponse\022\037\n\006status\030\001 \001(\0132\017.message.St" + + "atus\022(\n\007payload\030\002 \001(\0132\027.google.protobuf." + + "Struct2\353\016\n\007Service\022C\n\020GetTokenAuthInfo\022\025" + + ".message.TokenRequest\032\026.message.TokenRes" + + "ponse\"\000\022>\n\nRenewToken\022\025.message.TokenReq" + + "uest\032\027.message.StatusResponse\"\000\022P\n\rCreat" + + "eSession\022\035.message.SessionCreateRequest\032" + + "\036.message.SessionCreateResponse\"\000\022L\n\rFin" + + "ishSession\022\035.message.SessionFinishReques" + + "t\032\032.message.SessionFinishResp\"\000\022E\n\020Uploa" + + "dReplayFile\022\026.message.ReplayRequest\032\027.me" + + "ssage.ReplayResponse\"\000\022D\n\rUploadCommand\022" + + "\027.message.CommandRequest\032\030.message.Comma" + + "ndResponse\"\000\022I\n\014DispatchTask\022\034.message.F" + + "inishedTaskRequest\032\025.message.TaskRespons" + + "e\"\000(\0010\001\022R\n\021ScanRemainReplays\022\034.message.R" + + "emainReplayRequest\032\035.message.RemainRepla" + + "yResponse\"\000\022X\n\023CreateCommandTicket\022\036.mes" + + "sage.CommandConfirmRequest\032\037.message.Com" + + "mandConfirmResponse\"\000\022f\n\035CheckOrCreateAs" + + "setLoginTicket\022 .message.AssetLoginTicke" + + "tRequest\032!.message.AssetLoginTicketRespo" + + "nse\"\000\022J\n\020CheckTicketState\022\026.message.Tick" + + "etRequest\032\034.message.TicketStateResponse\"" + + "\000\022A\n\014CancelTicket\022\026.message.TicketReques" + + "t\032\027.message.StatusResponse\"\000\022D\n\rCreateFo" + + "rward\022\027.message.ForwardRequest\032\030.message" + + ".ForwardResponse\"\000\022I\n\rDeleteForward\022\035.me" + + "ssage.ForwardDeleteRequest\032\027.message.Sta" + + "tusResponse\"\000\022D\n\020GetPublicSetting\022\016.mess" + + "age.Empty\032\036.message.PublicSettingRespons" + + "e\"\000\022?\n\016GetListenPorts\022\016.message.Empty\032\033." + + "message.ListenPortResponse\"\000\022D\n\013GetPortI" + + "nfo\022\030.message.PortInfoRequest\032\031.message." + + "PortInfoResponse\"\000\022K\n\021HandlePortFailure\022" + + "\033.message.PortFailureRequest\032\027.message.S" + + "tatusResponse\"\000\022F\n\022CheckUserByCookies\022\027." + + "message.CookiesRequest\032\025.message.UserRes" + + "ponse\"\000\022[\n\031RecordSessionLifecycleLog\022#.m" + + "essage.SessionLifecycleLogRequest\032\027.mess" + + "age.StatusResponse\"\000\022n\n\027FaceRecognitionC" + + "allback\022\'.message.FaceRecognitionCallbac" + + "kRequest\032(.message.FaceRecognitionCallba" + + "ckResponse\"\000\022b\n\023FaceMonitorCallback\022#.me" + + "ssage.FaceMonitorCallbackRequest\032$.messa" + + "ge.FaceMonitorCallbackResponse\"\000\022V\n\017Join" + + "FaceMonitor\022\037.message.JoinFaceMonitorReq" + + "uest\032 .message.JoinFaceMonitorResponse\"\000" + + "\022B\n\016GetAccountChat\022\016.message.Empty\032\036.mes" + + "sage.AccountDetailResponse\"\000B \n\023org.jump" + + "server.wispZ\t/protobufb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { org.jumpserver.wisp.Common.getDescriptor(), + com.google.protobuf.StructProto.getDescriptor(), }); internal_static_message_JoinFaceMonitorRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -34370,8 +35146,15 @@ public org.jumpserver.wisp.ServiceOuterClass.SessionLifecycleLogRequest getDefau com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_SessionLifecycleLogRequest_descriptor, new java.lang.String[] { "SessionId", "Event", "Reason", "User", }); + internal_static_message_AccountDetailResponse_descriptor = + getDescriptor().getMessageTypes().get(45); + internal_static_message_AccountDetailResponse_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_message_AccountDetailResponse_descriptor, + new java.lang.String[] { "Status", "Payload", }); descriptor.resolveAllFeaturesImmutable(); org.jumpserver.wisp.Common.getDescriptor(); + com.google.protobuf.StructProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) From 36d55c51c0482a09658cb5a5cbc365d448d38062 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Wed, 8 Oct 2025 23:45:10 +0800 Subject: [PATCH 02/13] feat: mask label and column name --- Dockerfile-base | 2 +- .../datasource/base/BaseSQLActuator.java | 84 ++++++++++++------- .../datasource/entity/resource/Field.java | 2 + 3 files changed, 58 insertions(+), 30 deletions(-) diff --git a/Dockerfile-base b/Dockerfile-base index ee6d774..b18453d 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -27,7 +27,7 @@ RUN set -ex \ && chmod 755 /usr/local/bin/check \ && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz -ARG WISP_VERSION=v0.2.7 +ARG WISP_VERSION=v0.2.8 RUN set -ex \ && wget https://github.com/jumpserver/wisp/releases/download/${WISP_VERSION}/wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz \ && tar -xf wisp-${WISP_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ --strip-components=1 \ diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java index f4b730c..41325d7 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java @@ -27,6 +27,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.regex.Pattern; +import java.util.regex.PatternSyntaxException; @Slf4j public abstract class BaseSQLActuator implements SQLActuator { @@ -153,6 +155,8 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery var fieldName = StringUtils.isNotEmpty(resultSet.getMetaData().getColumnLabel(i)) ? resultSet.getMetaData().getColumnLabel(i) : resultSet.getMetaData().getColumnName(i); field.setName(fieldName); + field.setColumnName(resultSet.getMetaData().getColumnName(i)); + field.setLabel(resultSet.getMetaData().getColumnLabel(i)); result.getFields().add(field); } @@ -184,34 +188,7 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery result.setFetchFinishedTime(new Time(System.currentTimeMillis())); // 数据脱敏 - - var rules = SessionManager.getCurrentSession().getDataMaskingRules(); - var maskIndexes = new ArrayList<>(); - var maskRules = new HashMap(); - for (var i = 0; i < result.getFields().size(); i++) { - for (Common.DataMaskingRule rule : rules) { - if (result.getFields().get(i).getName().equalsIgnoreCase(rule.getFieldsPattern())) { - maskIndexes.add(i); - maskRules.put(i, rule); - } - } - } - - for (var i = 0; i < result.getData().size(); i++) { - for (var j = 0; j < result.getData().get(i).size(); j++) { - if (maskIndexes.contains(j)) { - var rule = maskRules.get(j); - var val = result.getData().get(i).get(j); - if (val instanceof String) { - var rep = this.replaceColumnVal(rule, (String) val); - result.getData().get(i).set(j, rep); - } else { - result.getData().get(i).set(j, rule.getMaskPattern()); - } - } - } - } - + this.handleDataMasking(result); var total = this.count(plan); if (total < 0) { @@ -230,9 +207,58 @@ private void executeStatement(SQLExecutePlan plan, Statement statement, SQLQuery } } + private void handleDataMasking(SQLQueryResult result) { + var rules = SessionManager.getCurrentSession().getDataMaskingRules(); + var maskIndexes = new ArrayList<>(); + var maskRules = new HashMap(); + for (var i = 0; i < result.getFields().size(); i++) { + for (Common.DataMaskingRule rule : rules) { + if (matchFiled(result.getFields().get(i), rule.getFieldsPattern())) { + maskIndexes.add(i); + maskRules.put(i, rule); + } + } + } + + for (var i = 0; i < result.getData().size(); i++) { + for (var j = 0; j < result.getData().get(i).size(); j++) { + if (maskIndexes.contains(j)) { + var rule = maskRules.get(j); + var val = result.getData().get(i).get(j); + if (val instanceof String) { + var rep = this.replaceColumnVal(rule, (String) val); + result.getData().get(i).set(j, rep); + } else { + result.getData().get(i).set(j, rule.getMaskPattern()); + } + } + } + } + } + + private boolean matchFiled(Field field, String pattern) { + var names = List.of(field.getColumnName(), field.getLabel()); + var ps = pattern.split(","); + + for (String name : names) { + for (String p : ps) { + + try { + int flags = Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE; + var pa = Pattern.compile(p, flags); + if (pa.matcher(name).find()) { + return true; + } + } catch (PatternSyntaxException e) { + return false; + } + } + } + return false; + } - public String replaceColumnVal(Common.DataMaskingRule rule, String val) { + private String replaceColumnVal(Common.DataMaskingRule rule, String val) { if (rule == null) { return "####"; } else { diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/entity/resource/Field.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/entity/resource/Field.java index 2992b24..34d3ba4 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/entity/resource/Field.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/entity/resource/Field.java @@ -7,6 +7,8 @@ public class Field implements ResourceNode { private String name; + private String label; + private String columnName; private String schema; private String table; private String type; From 9bf6bb819010927c14c2c0f4e77005c37bd9e0d1 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Wed, 8 Oct 2025 23:50:25 +0800 Subject: [PATCH 03/13] feat: update maven --- Dockerfile-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile-base b/Dockerfile-base index b18453d..ebaecfa 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -43,7 +43,7 @@ RUN --mount=type=cache,target=/usr/local/share/.cache/yarn,sharing=locked,id=che npm install # Install Maven dependencies -ARG MAVEN_VERSION=3.9.10 +ARG MAVEN_VERSION=3.9.11 ARG USER_HOME_DIR="/root" ARG BASE_URL=https://downloads.apache.org/maven/maven-3/${MAVEN_VERSION}/binaries ARG MAVEN_MIRROR=https://repo.maven.apache.org/maven2 From beec4c278af810a49c13b1ab8ad3758571a6c495 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Thu, 9 Oct 2025 20:31:02 +0800 Subject: [PATCH 04/13] feat: remove unused deps --- backend/web/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/backend/web/pom.xml b/backend/web/pom.xml index c0b563f..374166c 100644 --- a/backend/web/pom.xml +++ b/backend/web/pom.xml @@ -106,14 +106,5 @@ modules ${revision} - - - org.jumpserver - sqlparser - ${revision} - - - - From 62f6f2961d1be3645c65f1e258a75b49f6696d12 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Thu, 9 Oct 2025 20:34:10 +0800 Subject: [PATCH 05/13] feat: update dockerfile --- Dockerfile-base | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile-base b/Dockerfile-base index ebaecfa..5cf4318 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -70,3 +70,4 @@ RUN set -ex \ && sed -i "s@https://repo.maven.apache.org/maven2@${MAVEN_MIRROR}@g" settings.xml \ && \cp -f settings.xml /root/.m2/ \ && mvn clean install + From 6199bda58cab83ec85f864253fbfe8546b900ae5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 9 Oct 2025 12:42:36 +0000 Subject: [PATCH 06/13] perf: Update Dockerfile with new base image tag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d7afa3a..a039e8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jumpserver/chen-base:20250708_060644 AS stage-build +FROM jumpserver/chen-base:20251009_123506 AS stage-build ENV LANG=en_US.UTF-8 WORKDIR /opt/chen/ From e69abfc69576228380ee5ff727bfe3e6099dc66a Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Fri, 10 Oct 2025 19:05:20 +0800 Subject: [PATCH 07/13] perf: update dockerfile (#132) * perf: update dockerfile perf: fix Dockerfile-base * perf: Update Dockerfile with new base image tag --------- Co-authored-by: Eric Co-authored-by: github-actions[bot] --- Dockerfile | 2 +- Dockerfile-base | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index a039e8b..f720728 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jumpserver/chen-base:20251009_123506 AS stage-build +FROM jumpserver/chen-base:20251010_105539 AS stage-build ENV LANG=en_US.UTF-8 WORKDIR /opt/chen/ diff --git a/Dockerfile-base b/Dockerfile-base index 5cf4318..9afa162 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -19,7 +19,7 @@ RUN set -ex \ && rm -rf /var/lib/apt/lists/* # Install tools and dependencies -ARG CHECK_VERSION=v1.0.4 +ARG CHECK_VERSION=v1.0.5 RUN set -ex \ && wget https://github.com/jumpserver-dev/healthcheck/releases/download/${CHECK_VERSION}/check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz \ && tar -xf check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz -C /usr/local/bin/ check \ @@ -68,6 +68,6 @@ RUN set -ex \ && mkdir -p /root/.m2 \ && mkdir -p /opt/chen/frontend/dist \ && sed -i "s@https://repo.maven.apache.org/maven2@${MAVEN_MIRROR}@g" settings.xml \ - && \cp -f settings.xml /root/.m2/ \ + && cp -f settings.xml /root/.m2/ \ && mvn clean install From b5f98322a1593407f72d3ad96bd525b70e0737b6 Mon Sep 17 00:00:00 2001 From: fit2bot <68588906+fit2bot@users.noreply.github.com> Date: Sat, 11 Oct 2025 16:27:45 +0800 Subject: [PATCH 08/13] perf: upgrade spring-boot (#135) * perf: upgrade spring-boot * perf: Update Dockerfile with new base image tag --------- Co-authored-by: Eric Co-authored-by: github-actions[bot] --- Dockerfile | 2 +- ...resql-42.6.0.jar => postgresql-42.6.2.jar} | Bin 1081604 -> 1082113 bytes pom.xml | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename drivers/postgresql/{postgresql-42.6.0.jar => postgresql-42.6.2.jar} (95%) diff --git a/Dockerfile b/Dockerfile index f720728..14ca700 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jumpserver/chen-base:20251010_105539 AS stage-build +FROM jumpserver/chen-base:20251011_081112 AS stage-build ENV LANG=en_US.UTF-8 WORKDIR /opt/chen/ diff --git a/drivers/postgresql/postgresql-42.6.0.jar b/drivers/postgresql/postgresql-42.6.2.jar similarity index 95% rename from drivers/postgresql/postgresql-42.6.0.jar rename to drivers/postgresql/postgresql-42.6.2.jar index 02f902afc5f8ac114a1a7ce6218e8b5a8ecbb514..c29689209b44944f147a717e17c1a4663c3c011e 100644 GIT binary patch delta 25854 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 TAUuel0YA(kM85C{i}m;)jh0$B delta 25589 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 G#{U37_Vt1Q diff --git a/pom.xml b/pom.xml index 7a4827d..77abf63 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.6 + 3.5.6 @@ -22,7 +22,6 @@ 0.0.1 17 - 3.0.0 3.9.0 17 17 @@ -31,6 +30,7 @@ 1.12.1 v14.18.0 6.14.15 + 10.1.47 From c214338614cacbfbd3887296c08fe6b79853e03d Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Tue, 14 Oct 2025 17:43:43 +0800 Subject: [PATCH 09/13] feat: locked session can not download --- .../chen/framework/console/dataview/DataView.java | 6 ++++++ .../jumpserver/chen/framework/session/Session.java | 4 ++++ .../chen/framework/session/impl/BaseSession.java | 6 ++++++ .../chen/framework/session/impl/JMSSession.java | 12 +++++++++++- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java index 51f959f..5e24175 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/console/dataview/DataView.java @@ -141,6 +141,12 @@ public void export(String scope, String format) throws SQLException { SessionManager.getCurrentSession().getController().showMessage(MessageLevel.ERROR, MessageUtils.get("DownloadNotAllowed")); return; } + + if (SessionManager.getCurrentSession().isLocked()) { + SessionManager.getCurrentSession().getController().showMessage(MessageLevel.ERROR, MessageUtils.get("SessionLockedMessage", SessionManager.getCurrentSession().getLockCreator())); + return; + } + File f = null; switch (scope) { case "current": diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java index fa04fa4..b0ba5e8 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/Session.java @@ -21,6 +21,10 @@ public interface Session { + String getLockCreator(); + + boolean isLocked(); + List getDataMaskingRules(); void refreshLastActiveTime(); diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java index 89adf97..1dd8b52 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/BaseSession.java @@ -63,6 +63,12 @@ public class BaseSession implements Session { @Getter private LocalDateTime lastActiveTime; + @Getter + private boolean locked = false; + + @Getter + private String lockCreator; + public BaseSession(Datasource datasource, String remoteAddr) { this.datasource = datasource; diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java index 66e375b..5f377b1 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/session/impl/JMSSession.java @@ -62,8 +62,13 @@ public class JMSSession extends BaseSession { @Setter private String gatewayId; + + @Getter private boolean locked = false; + @Getter + private String lockCreator; + private boolean canUpload = false; private boolean canDownload = false; @@ -72,16 +77,21 @@ public class JMSSession extends BaseSession { private boolean closed = false; + public void lockSession(String creator) { SessionManager.setContext(this.getWebToken()); - this.getController().showMessage(MessageLevel.ERROR, MessageUtils.get("SessionLockedMessage", creator)); + + this.lockCreator = creator; this.locked = true; + this.getController().showMessage(MessageLevel.ERROR, MessageUtils.get("SessionLockedMessage", this.lockCreator)); } public void unloadSession(String creator) { SessionManager.setContext(this.getWebToken()); + this.getController().showMessage(MessageLevel.SUCCESS, MessageUtils.get("SessionUnlockedMessage", creator)); this.locked = false; + this.lockCreator = null; } From 8c6d6b00d191fba7e3dd747dcd3f88c64ca3b1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 16 Oct 2025 06:37:00 +0000 Subject: [PATCH 10/13] perf: dialog append to body --- frontend/src/components/Main/Explore/DataView/DataView.vue | 2 +- .../src/components/Main/Explore/DataView/ExportDataDialog.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Main/Explore/DataView/DataView.vue b/frontend/src/components/Main/Explore/DataView/DataView.vue index e2f4702..f04325e 100644 --- a/frontend/src/components/Main/Explore/DataView/DataView.vue +++ b/frontend/src/components/Main/Explore/DataView/DataView.vue @@ -7,7 +7,7 @@ style="z-index: 99;position: relative" > - + From 3fb87511f1d7aeed2160f1fbbbc93ffc123b71d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 16 Oct 2025 07:58:07 +0000 Subject: [PATCH 11/13] perf: update thumb --- frontend/src/styles/index.scss | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index 8ac640b..3fbd399 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -5,15 +5,36 @@ body { padding: 0 !important; } -// 滚动条整体部分 +// 滚动条整体部分 — 默认较细，悬停时放大并高亮，便于点击 ::-webkit-scrollbar { width: 6px; height: 6px; + transition: width 0.15s ease; +} + +/* 当用户把鼠标移到页面或特定可滚动区域时放大滚动条，便于交互 */ +body:hover ::-webkit-scrollbar, +.data-view:hover ::-webkit-scrollbar, +.hot-table:hover ::-webkit-scrollbar, +.wtHolder:hover ::-webkit-scrollbar { + width: 10px; + height: 10px; } ::-webkit-scrollbar-thumb { - border-radius: 5px; + border-radius: 6px; background-color: rgba(144, 147, 153, 0.3); + border: 2px solid transparent; /* 防止放大时内容溢出视觉问题 */ + background-clip: padding-box; + transition: background-color 0.15s ease, transform 0.12s ease; +} + +/* 鼠标悬停或按下时更显眼 */ +::-webkit-scrollbar-thumb:hover, +::-webkit-scrollbar-thumb:active { + background-color: rgba(144, 147, 153, 0.6); + transform: scale(1.08); + box-shadow: inset 0 0 0 3px rgba(0,0,0,0.12); } ::-webkit-scrollbar-track { From 8d02ea04699ac9fc4233244945d26cfd8be6b393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= Date: Thu, 16 Oct 2025 08:21:54 +0000 Subject: [PATCH 12/13] perf: remove custom set scrollbar style --- frontend/src/styles/index.scss | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss index 3fbd399..e9a0d28 100644 --- a/frontend/src/styles/index.scss +++ b/frontend/src/styles/index.scss @@ -562,13 +562,14 @@ body:hover ::-webkit-scrollbar, background-color: rgba(62, 162, 223, 0.53) !important; } -.CodeMirror-hscrollbar:hover { - background-color: rgba(0, 0, 0, .5); -} - -.CodeMirror-vscrollbar:hover { - background-color: rgba(0, 0, 0, .5); -} +// 已注释掉，因为全局设置了滚动条样式 +// .CodeMirror-hscrollbar:hover { +// background-color: rgba(0, 0, 0, .5); +// } + +// .CodeMirror-vscrollbar:hover { +// background-color: rgba(0, 0, 0, .5); +// } .splitter-pane { z-index: 99; From 9e6d329bfe5a922bd34a0dbc4dff2a1109e2a73d Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Thu, 16 Oct 2025 16:32:13 +0800 Subject: [PATCH 13/13] feat: rex matched single words --- .../datasource/base/BaseSQLActuator.java | 27 +++++++++++++------ 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java index 41325d7..61a2399 100644 --- a/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java +++ b/backend/framework/src/main/java/org/jumpserver/chen/framework/datasource/base/BaseSQLActuator.java @@ -213,7 +213,7 @@ private void handleDataMasking(SQLQueryResult result) { var maskRules = new HashMap(); for (var i = 0; i < result.getFields().size(); i++) { for (Common.DataMaskingRule rule : rules) { - if (matchFiled(result.getFields().get(i), rule.getFieldsPattern())) { + if (this.matchField(result.getFields().get(i), rule.getFieldsPattern())) { maskIndexes.add(i); maskRules.put(i, rule); } @@ -236,21 +236,32 @@ private void handleDataMasking(SQLQueryResult result) { } } - private boolean matchFiled(Field field, String pattern) { - var names = List.of(field.getColumnName(), field.getLabel()); - var ps = pattern.split(","); + private boolean matchField(Field field, String pattern) { + List names = List.of(field.getColumnName(), field.getLabel()); + String[] ps = pattern.split(","); for (String name : names) { for (String p : ps) { + p = p.trim(); + if (p.isEmpty()) continue; try { - int flags = Pattern.UNICODE_CASE | Pattern.CASE_INSENSITIVE; - var pa = Pattern.compile(p, flags); - if (pa.matcher(name).find()) { + // 先整体转义，避免用户写的正则符号被误解释 + String regex = Pattern.quote(p); + // 把被转义的 \* 恢复为 .* + regex = regex.replace("\\*", ".*"); + // 加上锚点，实现整串匹配 + regex = "^" + regex + "$"; + + int flags = Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE; + Pattern pa = Pattern.compile(regex, flags); + + if (pa.matcher(name).matches()) { // 注意：用 matches() 而不是 find() return true; } } catch (PatternSyntaxException e) { - return false; + // 忽略坏模式，继续下一个 + continue; } } }