diff --git a/backend/web/src/main/java/org/jumpserver/chen/web/service/impl/JmsSessionService.java b/backend/web/src/main/java/org/jumpserver/chen/web/service/impl/JmsSessionService.java index 306f155..6880e92 100644 --- a/backend/web/src/main/java/org/jumpserver/chen/web/service/impl/JmsSessionService.java +++ b/backend/web/src/main/java/org/jumpserver/chen/web/service/impl/JmsSessionService.java @@ -132,6 +132,10 @@ private Datasource createDatasource(ServiceOuterClass.TokenResponse tokenResp) { var platformSettings = tokenResp.getData().getPlatform().getProtocols(0).getSettingsMap(); applyPlatformSettings(dbConnectInfo, platformSettings); + if (tokenResp.getData().getConnectOptions().getUseSysdba()) { + dbConnectInfo.getOptions().put("internal_logon", "sysdba"); + } + var asset = tokenResp.getData().getAsset(); if (asset.getSpecific().getUseSsl()) { @@ -146,10 +150,6 @@ private Datasource createDatasource(ServiceOuterClass.TokenResponse tokenResp) { } static void applyPlatformSettings(DBConnectInfo dbConnectInfo, Map platformSettings) { - if (platformSettings.containsKey("sysdba") && platformSettings.get("sysdba").equals("true")) { - dbConnectInfo.getOptions().put("internal_logon", "sysdba"); - } - if (platformSettings.containsKey("version")) { dbConnectInfo.getOptions().put("version", platformSettings.get("version")); } 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 f23c973..51a5039 100644 --- a/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java +++ b/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java @@ -18510,6 +18510,441 @@ public org.jumpserver.wisp.Common.TerminalTask getDefaultInstanceForType() { } + public interface ConnectOptionsOrBuilder extends + // @@protoc_insertion_point(interface_extends:message.ConnectOptions) + com.google.protobuf.MessageOrBuilder { + + /** + * bool use_sysdba = 1; + * @return The useSysdba. + */ + boolean getUseSysdba(); + } + /** + * Protobuf type {@code message.ConnectOptions} + */ + public static final class ConnectOptions extends + com.google.protobuf.GeneratedMessage implements + // @@protoc_insertion_point(message_implements:message.ConnectOptions) + ConnectOptionsOrBuilder { + 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= */ "", + ConnectOptions.class.getName()); + } + // Use ConnectOptions.newBuilder() to construct. + private ConnectOptions(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + } + private ConnectOptions() { + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jumpserver.wisp.Common.internal_static_message_ConnectOptions_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jumpserver.wisp.Common.internal_static_message_ConnectOptions_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jumpserver.wisp.Common.ConnectOptions.class, org.jumpserver.wisp.Common.ConnectOptions.Builder.class); + } + + public static final int USE_SYSDBA_FIELD_NUMBER = 1; + private boolean useSysdba_ = false; + /** + * bool use_sysdba = 1; + * @return The useSysdba. + */ + @java.lang.Override + public boolean getUseSysdba() { + return useSysdba_; + } + + 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 (useSysdba_ != false) { + output.writeBool(1, useSysdba_); + } + getUnknownFields().writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (useSysdba_ != false) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(1, useSysdba_); + } + 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.ConnectOptions)) { + return super.equals(obj); + } + org.jumpserver.wisp.Common.ConnectOptions other = (org.jumpserver.wisp.Common.ConnectOptions) obj; + + if (getUseSysdba() + != other.getUseSysdba()) 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) + USE_SYSDBA_FIELD_NUMBER; + hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean( + getUseSysdba()); + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.jumpserver.wisp.Common.ConnectOptions parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.Common.ConnectOptions 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.ConnectOptions parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.Common.ConnectOptions 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.ConnectOptions parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jumpserver.wisp.Common.ConnectOptions parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jumpserver.wisp.Common.ConnectOptions parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); + } + public static org.jumpserver.wisp.Common.ConnectOptions 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.ConnectOptions parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input); + } + + public static org.jumpserver.wisp.Common.ConnectOptions 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.ConnectOptions parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); + } + public static org.jumpserver.wisp.Common.ConnectOptions 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.ConnectOptions 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.ConnectOptions} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder implements + // @@protoc_insertion_point(builder_implements:message.ConnectOptions) + org.jumpserver.wisp.Common.ConnectOptionsOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jumpserver.wisp.Common.internal_static_message_ConnectOptions_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jumpserver.wisp.Common.internal_static_message_ConnectOptions_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jumpserver.wisp.Common.ConnectOptions.class, org.jumpserver.wisp.Common.ConnectOptions.Builder.class); + } + + // Construct using org.jumpserver.wisp.Common.ConnectOptions.newBuilder() + private Builder() { + + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + + } + @java.lang.Override + public Builder clear() { + super.clear(); + bitField0_ = 0; + useSysdba_ = false; + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jumpserver.wisp.Common.internal_static_message_ConnectOptions_descriptor; + } + + @java.lang.Override + public org.jumpserver.wisp.Common.ConnectOptions getDefaultInstanceForType() { + return org.jumpserver.wisp.Common.ConnectOptions.getDefaultInstance(); + } + + @java.lang.Override + public org.jumpserver.wisp.Common.ConnectOptions build() { + org.jumpserver.wisp.Common.ConnectOptions result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public org.jumpserver.wisp.Common.ConnectOptions buildPartial() { + org.jumpserver.wisp.Common.ConnectOptions result = new org.jumpserver.wisp.Common.ConnectOptions(this); + if (bitField0_ != 0) { buildPartial0(result); } + onBuilt(); + return result; + } + + private void buildPartial0(org.jumpserver.wisp.Common.ConnectOptions result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.useSysdba_ = useSysdba_; + } + } + + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jumpserver.wisp.Common.ConnectOptions) { + return mergeFrom((org.jumpserver.wisp.Common.ConnectOptions)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jumpserver.wisp.Common.ConnectOptions other) { + if (other == org.jumpserver.wisp.Common.ConnectOptions.getDefaultInstance()) return this; + if (other.getUseSysdba() != false) { + setUseSysdba(other.getUseSysdba()); + } + 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 8: { + useSysdba_ = input.readBool(); + bitField0_ |= 0x00000001; + break; + } // case 8 + 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 boolean useSysdba_ ; + /** + * bool use_sysdba = 1; + * @return The useSysdba. + */ + @java.lang.Override + public boolean getUseSysdba() { + return useSysdba_; + } + /** + * bool use_sysdba = 1; + * @param value The useSysdba to set. + * @return This builder for chaining. + */ + public Builder setUseSysdba(boolean value) { + + useSysdba_ = value; + bitField0_ |= 0x00000001; + onChanged(); + return this; + } + /** + * bool use_sysdba = 1; + * @return This builder for chaining. + */ + public Builder clearUseSysdba() { + bitField0_ = (bitField0_ & ~0x00000001); + useSysdba_ = false; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:message.ConnectOptions) + } + + // @@protoc_insertion_point(class_scope:message.ConnectOptions) + private static final org.jumpserver.wisp.Common.ConnectOptions DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new org.jumpserver.wisp.Common.ConnectOptions(); + } + + public static org.jumpserver.wisp.Common.ConnectOptions getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public ConnectOptions 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.ConnectOptions getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + public interface TokenAuthInfoOrBuilder extends // @@protoc_insertion_point(interface_extends:message.TokenAuthInfo) com.google.protobuf.MessageOrBuilder { @@ -18726,6 +19161,21 @@ org.jumpserver.wisp.Common.GatewayOrBuilder getGatewaysOrBuilder( */ org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder getDataMaskingRulesOrBuilder( int index); + + /** + * .message.ConnectOptions connect_options = 14; + * @return Whether the connectOptions field is set. + */ + boolean hasConnectOptions(); + /** + * .message.ConnectOptions connect_options = 14; + * @return The connectOptions. + */ + org.jumpserver.wisp.Common.ConnectOptions getConnectOptions(); + /** + * .message.ConnectOptions connect_options = 14; + */ + org.jumpserver.wisp.Common.ConnectOptionsOrBuilder getConnectOptionsOrBuilder(); } /** * Protobuf type {@code message.TokenAuthInfo} @@ -19193,6 +19643,32 @@ public org.jumpserver.wisp.Common.DataMaskingRuleOrBuilder getDataMaskingRulesOr return dataMaskingRules_.get(index); } + public static final int CONNECT_OPTIONS_FIELD_NUMBER = 14; + private org.jumpserver.wisp.Common.ConnectOptions connectOptions_; + /** + * .message.ConnectOptions connect_options = 14; + * @return Whether the connectOptions field is set. + */ + @java.lang.Override + public boolean hasConnectOptions() { + return ((bitField0_ & 0x00000080) != 0); + } + /** + * .message.ConnectOptions connect_options = 14; + * @return The connectOptions. + */ + @java.lang.Override + public org.jumpserver.wisp.Common.ConnectOptions getConnectOptions() { + return connectOptions_ == null ? org.jumpserver.wisp.Common.ConnectOptions.getDefaultInstance() : connectOptions_; + } + /** + * .message.ConnectOptions connect_options = 14; + */ + @java.lang.Override + public org.jumpserver.wisp.Common.ConnectOptionsOrBuilder getConnectOptionsOrBuilder() { + return connectOptions_ == null ? org.jumpserver.wisp.Common.ConnectOptions.getDefaultInstance() : connectOptions_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -19246,6 +19722,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < dataMaskingRules_.size(); i++) { output.writeMessage(13, dataMaskingRules_.get(i)); } + if (((bitField0_ & 0x00000080) != 0)) { + output.writeMessage(14, getConnectOptions()); + } getUnknownFields().writeTo(output); } @@ -19304,6 +19783,10 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream .computeMessageSize(13, dataMaskingRules_.get(i)); } + if (((bitField0_ & 0x00000080) != 0)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(14, getConnectOptions()); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -19366,6 +19849,11 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getFaceMonitorToken())) return false; if (!getDataMaskingRulesList() .equals(other.getDataMaskingRulesList())) return false; + if (hasConnectOptions() != other.hasConnectOptions()) return false; + if (hasConnectOptions()) { + if (!getConnectOptions() + .equals(other.getConnectOptions())) return false; + } if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -19423,6 +19911,10 @@ public int hashCode() { hash = (37 * hash) + DATA_MASKING_RULES_FIELD_NUMBER; hash = (53 * hash) + getDataMaskingRulesList().hashCode(); } + if (hasConnectOptions()) { + hash = (37 * hash) + CONNECT_OPTIONS_FIELD_NUMBER; + hash = (53 * hash) + getConnectOptions().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -19563,6 +20055,7 @@ private void maybeForceBuilderInitialization() { internalGetSettingFieldBuilder(); internalGetPlatformFieldBuilder(); internalGetDataMaskingRulesFieldBuilder(); + internalGetConnectOptionsFieldBuilder(); } } @java.lang.Override @@ -19628,6 +20121,11 @@ public Builder clear() { dataMaskingRulesBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00001000); + connectOptions_ = null; + if (connectOptionsBuilder_ != null) { + connectOptionsBuilder_.dispose(); + connectOptionsBuilder_ = null; + } return this; } @@ -19744,6 +20242,12 @@ private void buildPartial0(org.jumpserver.wisp.Common.TokenAuthInfo result) { if (((from_bitField0_ & 0x00000800) != 0)) { result.faceMonitorToken_ = faceMonitorToken_; } + if (((from_bitField0_ & 0x00002000) != 0)) { + result.connectOptions_ = connectOptionsBuilder_ == null + ? connectOptions_ + : connectOptionsBuilder_.build(); + to_bitField0_ |= 0x00000080; + } result.bitField0_ |= to_bitField0_; } @@ -19873,6 +20377,9 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.TokenAuthInfo other) { } } } + if (other.hasConnectOptions()) { + mergeConnectOptions(other.getConnectOptions()); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -20002,6 +20509,13 @@ public Builder mergeFrom( } break; } // case 106 + case 114: { + input.readMessage( + internalGetConnectOptionsFieldBuilder().getBuilder(), + extensionRegistry); + bitField0_ |= 0x00002000; + break; + } // case 114 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -21802,6 +22316,127 @@ public org.jumpserver.wisp.Common.DataMaskingRule.Builder addDataMaskingRulesBui return dataMaskingRulesBuilder_; } + private org.jumpserver.wisp.Common.ConnectOptions connectOptions_; + private com.google.protobuf.SingleFieldBuilder< + org.jumpserver.wisp.Common.ConnectOptions, org.jumpserver.wisp.Common.ConnectOptions.Builder, org.jumpserver.wisp.Common.ConnectOptionsOrBuilder> connectOptionsBuilder_; + /** + * .message.ConnectOptions connect_options = 14; + * @return Whether the connectOptions field is set. + */ + public boolean hasConnectOptions() { + return ((bitField0_ & 0x00002000) != 0); + } + /** + * .message.ConnectOptions connect_options = 14; + * @return The connectOptions. + */ + public org.jumpserver.wisp.Common.ConnectOptions getConnectOptions() { + if (connectOptionsBuilder_ == null) { + return connectOptions_ == null ? org.jumpserver.wisp.Common.ConnectOptions.getDefaultInstance() : connectOptions_; + } else { + return connectOptionsBuilder_.getMessage(); + } + } + /** + * .message.ConnectOptions connect_options = 14; + */ + public Builder setConnectOptions(org.jumpserver.wisp.Common.ConnectOptions value) { + if (connectOptionsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + connectOptions_ = value; + } else { + connectOptionsBuilder_.setMessage(value); + } + bitField0_ |= 0x00002000; + onChanged(); + return this; + } + /** + * .message.ConnectOptions connect_options = 14; + */ + public Builder setConnectOptions( + org.jumpserver.wisp.Common.ConnectOptions.Builder builderForValue) { + if (connectOptionsBuilder_ == null) { + connectOptions_ = builderForValue.build(); + } else { + connectOptionsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00002000; + onChanged(); + return this; + } + /** + * .message.ConnectOptions connect_options = 14; + */ + public Builder mergeConnectOptions(org.jumpserver.wisp.Common.ConnectOptions value) { + if (connectOptionsBuilder_ == null) { + if (((bitField0_ & 0x00002000) != 0) && + connectOptions_ != null && + connectOptions_ != org.jumpserver.wisp.Common.ConnectOptions.getDefaultInstance()) { + getConnectOptionsBuilder().mergeFrom(value); + } else { + connectOptions_ = value; + } + } else { + connectOptionsBuilder_.mergeFrom(value); + } + if (connectOptions_ != null) { + bitField0_ |= 0x00002000; + onChanged(); + } + return this; + } + /** + * .message.ConnectOptions connect_options = 14; + */ + public Builder clearConnectOptions() { + bitField0_ = (bitField0_ & ~0x00002000); + connectOptions_ = null; + if (connectOptionsBuilder_ != null) { + connectOptionsBuilder_.dispose(); + connectOptionsBuilder_ = null; + } + onChanged(); + return this; + } + /** + * .message.ConnectOptions connect_options = 14; + */ + public org.jumpserver.wisp.Common.ConnectOptions.Builder getConnectOptionsBuilder() { + bitField0_ |= 0x00002000; + onChanged(); + return internalGetConnectOptionsFieldBuilder().getBuilder(); + } + /** + * .message.ConnectOptions connect_options = 14; + */ + public org.jumpserver.wisp.Common.ConnectOptionsOrBuilder getConnectOptionsOrBuilder() { + if (connectOptionsBuilder_ != null) { + return connectOptionsBuilder_.getMessageOrBuilder(); + } else { + return connectOptions_ == null ? + org.jumpserver.wisp.Common.ConnectOptions.getDefaultInstance() : connectOptions_; + } + } + /** + * .message.ConnectOptions connect_options = 14; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jumpserver.wisp.Common.ConnectOptions, org.jumpserver.wisp.Common.ConnectOptions.Builder, org.jumpserver.wisp.Common.ConnectOptionsOrBuilder> + internalGetConnectOptionsFieldBuilder() { + if (connectOptionsBuilder_ == null) { + connectOptionsBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jumpserver.wisp.Common.ConnectOptions, org.jumpserver.wisp.Common.ConnectOptions.Builder, org.jumpserver.wisp.Common.ConnectOptionsOrBuilder>( + getConnectOptions(), + getParentForChildren(), + isClean()); + connectOptions_ = null; + } + return connectOptionsBuilder_; + } + // @@protoc_insertion_point(builder_scope:message.TokenAuthInfo) } @@ -28345,12 +28980,12 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_User_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_User_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_Account_descriptor; - private static final + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_Account_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor @@ -28418,6 +29053,11 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_message_TerminalTask_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_message_ConnectOptions_descriptor; + private static final + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_message_ConnectOptions_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_message_TokenAuthInfo_descriptor; private static final @@ -28526,51 +29166,53 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { "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" + "atus\"$\n\016ConnectOptions\022\022\n\nuse_sysdba\030\001 \001" + + "(\010\"\207\004\n\rTokenAuthInfo\022\016\n\006key_id\030\001 \001(\t\022\022\n\n" + + "secrete_id\030\002 \001(\t\022\035\n\005asset\030\003 \001(\0132\016.messag" + + "e.Asset\022\033\n\004user\030\004 \001(\0132\r.message.User\022!\n\007" + + "account\030\005 \001(\0132\020.message.Account\022\'\n\npermi" + + "ssion\030\006 \001(\0132\023.message.Permission\022(\n\013expi" + + "re_info\030\007 \001(\0132\023.message.ExpireInfo\022)\n\014fi" + + "lter_rules\030\010 \003(\0132\023.message.CommandACL\022\"\n" + + "\010gateways\030\t \003(\0132\020.message.Gateway\022*\n\007set" + + "ting\030\n \001(\0132\031.message.ComponentSetting\022#\n" + + "\010platform\030\013 \001(\0132\021.message.Platform\022\030\n\020Fa" + + "ceMonitorToken\030\014 \001(\t\0224\n\022data_masking_rul" + + "es\030\r \003(\0132\030.message.DataMaskingRule\0220\n\017co" + + "nnect_options\030\016 \001(\0132\027.message.ConnectOpt" + + "ions\"\203\001\n\010Platform\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.messag" + + "e.PlatformProtocol\"\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\022" + + "9\n\010settings\030\004 \003(\0132\'.message.PlatformProt" + + "ocol.SettingsEntry\032/\n\rSettingsEntry\022\013\n\003k" + + "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"C\n\020Component" + + "Setting\022\025\n\rmax_idle_time\030\001 \001(\005\022\030\n\020max_se" + + "ssion_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\rPublicSe" + + "tting\022\025\n\rxpack_enabled\030\001 \001(\010\022\025\n\rvalid_li" + + "cense\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" + + "\020LifecycleLogData\0223\n\005event\030\001 \001(\0162$.messa" + + "ge.LifecycleLogData.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\023A" + + "ssetConnectSuccess\020\000\022\030\n\024AssetConnectFini" + + "shed\020\001\022\023\n\017CreateShareLink\020\002\022\023\n\017UserJoinS" + + "ession\020\003\022\024\n\020UserLeaveSession\020\004\022\024\n\020AdminJ" + + "oinMonitor\020\005\022\024\n\020AdminExitMonitor\020\006\022\026\n\022Re" + + "playConvertStart\020\007\022\030\n\024ReplayConvertSucce" + + "ss\020\010\022\030\n\024ReplayConvertFailure\020\t\022\025\n\021Replay" + + "UploadStart\020\n\022\027\n\023ReplayUploadSuccess\020\013\022\027" + + "\n\023ReplayUploadFailure\020\014*k\n\nTaskAction\022\017\n" + + "\013KillSession\020\000\022\017\n\013LockSession\020\001\022\021\n\rUnloc" + + "kSession\020\002\022\024\n\020TokenPermExpired\020\003\022\022\n\016Toke" + + "nPermValid\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\014ReviewAccept\020\004\022\020\n\014ReviewCancel\020\005B \n\023" + + "org.jumpserver.wispZ\t/protobufb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -28666,20 +29308,26 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { 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 = + internal_static_message_ConnectOptions_descriptor = getDescriptor().getMessageTypes().get(14); + internal_static_message_ConnectOptions_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_message_ConnectOptions_descriptor, + new java.lang.String[] { "UseSysdba", }); + internal_static_message_TokenAuthInfo_descriptor = + getDescriptor().getMessageTypes().get(15); 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", "DataMaskingRules", }); + new java.lang.String[] { "KeyId", "SecreteId", "Asset", "User", "Account", "Permission", "ExpireInfo", "FilterRules", "Gateways", "Setting", "Platform", "FaceMonitorToken", "DataMaskingRules", "ConnectOptions", }); internal_static_message_Platform_descriptor = - getDescriptor().getMessageTypes().get(15); + getDescriptor().getMessageTypes().get(16); 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(16); + getDescriptor().getMessageTypes().get(17); internal_static_message_PlatformProtocol_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_PlatformProtocol_descriptor, @@ -28691,31 +29339,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(17); + getDescriptor().getMessageTypes().get(18); 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(18); + getDescriptor().getMessageTypes().get(19); 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(19); + getDescriptor().getMessageTypes().get(20); 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(20); + getDescriptor().getMessageTypes().get(21); 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(21); + getDescriptor().getMessageTypes().get(22); internal_static_message_LifecycleLogData_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_LifecycleLogData_descriptor,