From 1292771d2cc34561fb95e4436afde3f68cbab88d Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Fri, 13 Sep 2024 18:11:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=20pg=20ssl=20?= =?UTF-8?q?=E7=9A=84=20mode=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile-base | 2 +- .../PostgresqlConnectionManager.java | 4 +- .../web/service/impl/JmsSessionService.java | 1 + .../main/java/org/jumpserver/wisp/Common.java | 408 ++++++++++++------ .../jumpserver/wisp/ServiceOuterClass.java | 171 ++++---- 5 files changed, 368 insertions(+), 218 deletions(-) diff --git a/Dockerfile-base b/Dockerfile-base index 7e775c7..538b906 100644 --- a/Dockerfile-base +++ b/Dockerfile-base @@ -29,7 +29,7 @@ RUN set -ex \ && chmod 755 /usr/local/bin/check \ && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz -ARG WISP_VERSION=v0.2.0 +ARG WISP_VERSION=v0.2.1 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/modules/src/main/java/org.jumpserver.chen.modules/postgresql/PostgresqlConnectionManager.java b/backend/modules/src/main/java/org.jumpserver.chen.modules/postgresql/PostgresqlConnectionManager.java index b2be539..9f2fd1f 100644 --- a/backend/modules/src/main/java/org.jumpserver.chen.modules/postgresql/PostgresqlConnectionManager.java +++ b/backend/modules/src/main/java/org.jumpserver.chen.modules/postgresql/PostgresqlConnectionManager.java @@ -8,6 +8,7 @@ import java.sql.SQLException; import java.util.Properties; + public class PostgresqlConnectionManager extends BaseConnectionManager { private static final String jdbcUrlTemplate = "jdbc:postgresql://${host}:${port}/${db}?useUnicode=true&characterEncoding=UTF-8"; @@ -38,6 +39,7 @@ protected void setSSLProps(Properties props) { var caCert = (String) this.getConnectInfo().getOptions().get("caCert"); var clientCert = (String) this.getConnectInfo().getOptions().get("clientCert"); var clientKey = (String) this.getConnectInfo().getOptions().get("clientKey"); + var sslMode = (String) this.getConnectInfo().getOptions().get("pgSSLMode"); var sslManager = new SSLCertManager(); sslManager.setCaCert(caCert); @@ -47,7 +49,7 @@ protected void setSSLProps(Properties props) { try { props.setProperty("ssl", "true"); - props.setProperty("sslmode", "verify-full"); + props.setProperty("sslmode", sslMode); props.setProperty("sslrootcert", sslManager.getCaCertPath()); props.setProperty("sslcert", sslManager.getClientCertPath()); props.setProperty("sslkey", sslManager.getClientCertKeyPath()); 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 3046a62..017f941 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 @@ -108,6 +108,7 @@ private Datasource createDatasource(ServiceOuterClass.TokenResponse tokenResp) { dbConnectInfo.getOptions().put("caCert", asset.getSpecific().getCaCert()); dbConnectInfo.getOptions().put("clientCert", asset.getSpecific().getClientCert()); dbConnectInfo.getOptions().put("clientKey", asset.getSpecific().getClientKey()); + dbConnectInfo.getOptions().put("pgSSLMode", asset.getSpecific().getPgSslMode()); } return DatasourceFactory.fromConnectInfo(dbConnectInfo); } 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 1d9b488..4cc4d21 100644 --- a/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java +++ b/backend/wisp/src/main/java/org/jumpserver/wisp/Common.java @@ -1,7 +1,6 @@ // 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.26.1 package org.jumpserver.wisp; @@ -11,8 +10,8 @@ private Common() {} com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", Common.class.getName()); } @@ -49,8 +48,8 @@ public enum TaskAction com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", TaskAction.class.getName()); } @@ -187,8 +186,8 @@ public enum RiskLevel com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", RiskLevel.class.getName()); } @@ -380,8 +379,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= */ 26, + /* patch= */ 1, /* suffix= */ "", User.class.getName()); } @@ -1483,8 +1482,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Account.class.getName()); } @@ -2606,8 +2605,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= */ 26, + /* patch= */ 1, /* suffix= */ "", LabelValue.class.getName()); } @@ -3339,8 +3338,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Asset.class.getName()); } @@ -3505,6 +3504,18 @@ public interface SpecificOrBuilder extends */ com.google.protobuf.ByteString getHttpProxyBytes(); + + /** + * string pg_ssl_mode = 13; + * @return The pgSslMode. + */ + java.lang.String getPgSslMode(); + /** + * string pg_ssl_mode = 13; + * @return The bytes for pgSslMode. + */ + com.google.protobuf.ByteString + getPgSslModeBytes(); } /** * Protobuf type {@code message.Asset.Specific} @@ -3518,8 +3529,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Specific.class.getName()); } @@ -3538,6 +3549,7 @@ private Specific() { submitSelector_ = ""; script_ = ""; httpProxy_ = ""; + pgSslMode_ = ""; } public static final com.google.protobuf.Descriptors.Descriptor @@ -3965,6 +3977,45 @@ public java.lang.String getHttpProxy() { } } + public static final int PG_SSL_MODE_FIELD_NUMBER = 13; + @SuppressWarnings("serial") + private volatile java.lang.Object pgSslMode_ = ""; + /** + * string pg_ssl_mode = 13; + * @return The pgSslMode. + */ + @java.lang.Override + public java.lang.String getPgSslMode() { + java.lang.Object ref = pgSslMode_; + 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(); + pgSslMode_ = s; + return s; + } + } + /** + * string pg_ssl_mode = 13; + * @return The bytes for pgSslMode. + */ + @java.lang.Override + public com.google.protobuf.ByteString + getPgSslModeBytes() { + java.lang.Object ref = pgSslMode_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + pgSslMode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -4015,6 +4066,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) if (!com.google.protobuf.GeneratedMessage.isStringEmpty(httpProxy_)) { com.google.protobuf.GeneratedMessage.writeString(output, 12, httpProxy_); } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(pgSslMode_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 13, pgSslMode_); + } getUnknownFields().writeTo(output); } @@ -4062,6 +4116,9 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessage.isStringEmpty(httpProxy_)) { size += com.google.protobuf.GeneratedMessage.computeStringSize(12, httpProxy_); } + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(pgSslMode_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(13, pgSslMode_); + } size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; @@ -4101,6 +4158,8 @@ public boolean equals(final java.lang.Object obj) { .equals(other.getScript())) return false; if (!getHttpProxy() .equals(other.getHttpProxy())) return false; + if (!getPgSslMode() + .equals(other.getPgSslMode())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -4138,6 +4197,8 @@ public int hashCode() { hash = (53 * hash) + getScript().hashCode(); hash = (37 * hash) + HTTP_PROXY_FIELD_NUMBER; hash = (53 * hash) + getHttpProxy().hashCode(); + hash = (37 * hash) + PG_SSL_MODE_FIELD_NUMBER; + hash = (53 * hash) + getPgSslMode().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -4281,6 +4342,7 @@ public Builder clear() { submitSelector_ = ""; script_ = ""; httpProxy_ = ""; + pgSslMode_ = ""; return this; } @@ -4350,6 +4412,9 @@ private void buildPartial0(org.jumpserver.wisp.Common.Asset.Specific result) { if (((from_bitField0_ & 0x00000800) != 0)) { result.httpProxy_ = httpProxy_; } + if (((from_bitField0_ & 0x00001000) != 0)) { + result.pgSslMode_ = pgSslMode_; + } } @java.lang.Override @@ -4420,6 +4485,11 @@ public Builder mergeFrom(org.jumpserver.wisp.Common.Asset.Specific other) { bitField0_ |= 0x00000800; onChanged(); } + if (!other.getPgSslMode().isEmpty()) { + pgSslMode_ = other.pgSslMode_; + bitField0_ |= 0x00001000; + onChanged(); + } this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; @@ -4506,6 +4576,11 @@ public Builder mergeFrom( bitField0_ |= 0x00000800; break; } // case 98 + case 106: { + pgSslMode_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00001000; + break; + } // case 106 default: { if (!super.parseUnknownField(input, extensionRegistry, tag)) { done = true; // was an endgroup tag @@ -5307,6 +5382,78 @@ public Builder setHttpProxyBytes( return this; } + private java.lang.Object pgSslMode_ = ""; + /** + * string pg_ssl_mode = 13; + * @return The pgSslMode. + */ + public java.lang.String getPgSslMode() { + java.lang.Object ref = pgSslMode_; + if (!(ref instanceof java.lang.String)) { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + pgSslMode_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * string pg_ssl_mode = 13; + * @return The bytes for pgSslMode. + */ + public com.google.protobuf.ByteString + getPgSslModeBytes() { + java.lang.Object ref = pgSslMode_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + pgSslMode_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * string pg_ssl_mode = 13; + * @param value The pgSslMode to set. + * @return This builder for chaining. + */ + public Builder setPgSslMode( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } + pgSslMode_ = value; + bitField0_ |= 0x00001000; + onChanged(); + return this; + } + /** + * string pg_ssl_mode = 13; + * @return This builder for chaining. + */ + public Builder clearPgSslMode() { + pgSslMode_ = getDefaultInstance().getPgSslMode(); + bitField0_ = (bitField0_ & ~0x00001000); + onChanged(); + return this; + } + /** + * string pg_ssl_mode = 13; + * @param value The bytes for pgSslMode to set. + * @return This builder for chaining. + */ + public Builder setPgSslModeBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } + checkByteStringIsUtf8(value); + pgSslMode_ = value; + bitField0_ |= 0x00001000; + onChanged(); + return this; + } + // @@protoc_insertion_point(builder_scope:message.Asset.Specific) } @@ -6941,8 +7088,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Protocol.class.getName()); } @@ -7661,8 +7808,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Gateway.class.getName()); } @@ -9071,8 +9218,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Permission.class.getName()); } @@ -9839,8 +9986,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= */ 26, + /* patch= */ 1, /* suffix= */ "", CommandACL.class.getName()); } @@ -9904,8 +10051,8 @@ public enum Action com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", Action.class.getName()); } @@ -11273,8 +11420,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= */ 26, + /* patch= */ 1, /* suffix= */ "", CommandGroup.class.getName()); } @@ -12388,8 +12535,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ExpireInfo.class.getName()); } @@ -12954,8 +13101,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Session.class.getName()); } @@ -13018,8 +13165,8 @@ public enum LoginFrom com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", LoginFrom.class.getName()); } @@ -15031,8 +15178,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TerminalTask.class.getName()); } @@ -16208,8 +16355,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TokenAuthInfo.class.getName()); } @@ -18929,8 +19076,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Platform.class.getName()); } @@ -20313,8 +20460,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PlatformProtocol.class.getName()); } @@ -21234,8 +21381,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ComponentSetting.class.getName()); } @@ -21758,8 +21905,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Forward.class.getName()); } @@ -22518,8 +22665,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PublicSetting.class.getName()); } @@ -23582,8 +23729,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Cookie.class.getName()); } @@ -24251,8 +24398,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= */ 26, + /* patch= */ 1, /* suffix= */ "", LifecycleLogData.class.getName()); } @@ -24343,8 +24490,8 @@ public enum event_type com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", event_type.class.getName()); } @@ -25305,87 +25452,88 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { "\001(\t\022\020\n\010username\030\004 \001(\t\022\016\n\006secret\030\005 \001(\t\022\'\n" + "\nsecretType\030\006 \001(\0132\023.message.LabelValue\"*" + "\n\nLabelValue\022\r\n\005label\030\001 \001(\t\022\r\n\005value\030\002 \001" + - "(\t\"\260\003\n\005Asset\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\017" + + "(\t\"\305\003\n\005Asset\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\017" + "\n\007address\030\003 \001(\t\022\016\n\006org_id\030\004 \001(\t\022\020\n\010org_n" + "ame\030\005 \001(\t\022$\n\tprotocols\030\006 \003(\0132\021.message.P" + "rotocol\022)\n\010specific\030\007 \001(\0132\027.message.Asse" + - "t.Specific\032\210\002\n\010Specific\022\017\n\007db_name\030\001 \001(\t" + + "t.Specific\032\235\002\n\010Specific\022\017\n\007db_name\030\001 \001(\t" + "\022\017\n\007use_ssl\030\002 \001(\010\022\017\n\007ca_cert\030\003 \001(\t\022\023\n\013cl" + "ient_cert\030\004 \001(\t\022\022\n\nclient_key\030\005 \001(\t\022\032\n\022a" + "llow_invalid_cert\030\006 \001(\010\022\021\n\tauto_fill\030\007 \001" + "(\t\022\031\n\021username_selector\030\010 \001(\t\022\031\n\021passwor" + "d_selector\030\t \001(\t\022\027\n\017submit_selector\030\n \001(" + - "\t\022\016\n\006script\030\013 \001(\t\022\022\n\nhttp_proxy\030\014 \001(\t\"2\n" + - "\010Protocol\022\014\n\004name\030\002 \001(\t\022\n\n\002id\030\001 \001(\005\022\014\n\004p" + - "ort\030\003 \001(\005\"\210\001\n\007Gateway\022\n\n\002id\030\001 \001(\t\022\014\n\004nam" + - "e\030\002 \001(\t\022\n\n\002ip\030\003 \001(\t\022\014\n\004port\030\004 \001(\005\022\020\n\010pro" + - "tocol\030\005 \001(\t\022\020\n\010username\030\006 \001(\t\022\020\n\010passwor" + - "d\030\007 \001(\t\022\023\n\013private_key\030\010 \001(\t\"\177\n\nPermissi" + - "on\022\026\n\016enable_connect\030\001 \001(\010\022\027\n\017enable_dow" + - "nload\030\002 \001(\010\022\025\n\renable_upload\030\003 \001(\010\022\023\n\013en" + - "able_copy\030\004 \001(\010\022\024\n\014enable_paste\030\005 \001(\010\"\201\002" + - "\n\nCommandACL\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*\n\006action\030\005 \001(\0162\032.messa" + - "ge.CommandACL.Action\022\021\n\tis_active\030\006 \001(\010\022" + - "-\n\016command_groups\030\007 \003(\0132\025.message.Comman" + - "dGroup\"Y\n\006Action\022\n\n\006Reject\020\000\022\n\n\006Accept\020\001" + - "\022\n\n\006Review\020\002\022\013\n\007Warning\020\003\022\021\n\rNotifyWarni" + - "ng\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\004" + - "Type\030\004 \001(\t\022\017\n\007pattern\030\005 \001(\t\022\023\n\013ignore_ca" + - "se\030\006 \001(\010\"\037\n\nExpireInfo\022\021\n\texpire_at\030\001 \001(" + - "\003\"\242\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.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\007us" + - "er_id\030\n \001(\t\022\020\n\010asset_id\030\013 \001(\t\022\022\n\naccount" + - "_id\030\014 \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\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_by\030\005 \001(\t\"\205\003\n\rTokenAuthInfo" + - "\022\016\n\006key_id\030\001 \001(\t\022\022\n\nsecrete_id\030\002 \001(\t\022\035\n\005" + - "asset\030\003 \001(\0132\016.message.Asset\022\033\n\004user\030\004 \001(" + - "\0132\r.message.User\022!\n\007account\030\005 \001(\0132\020.mess" + - "age.Account\022\'\n\npermission\030\006 \001(\0132\023.messag" + - "e.Permission\022(\n\013expire_info\030\007 \001(\0132\023.mess" + - "age.ExpireInfo\022)\n\014filter_rules\030\010 \003(\0132\023.m" + - "essage.CommandACL\022\"\n\010gateways\030\t \003(\0132\020.me" + - "ssage.Gateway\022*\n\007setting\030\n \001(\0132\031.message" + - ".ComponentSetting\022#\n\010platform\030\013 \001(\0132\021.me" + - "ssage.Platform\"\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\007chars" + - "et\030\004 \001(\t\022\014\n\004type\030\005 \001(\t\022,\n\tprotocols\030\006 \003(" + - "\0132\031.message.PlatformProtocol\"\246\001\n\020Platfor" + - "mProtocol\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\014\n\004p" + - "ort\030\003 \001(\005\0229\n\010settings\030\004 \003(\0132\'.message.Pl" + - "atformProtocol.SettingsEntry\032/\n\rSettings" + - "Entry\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_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\"\216\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\"%\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*A\n\nTaskAction\022\017\n\013KillSession\020\000\022" + - "\017\n\013LockSession\020\001\022\021\n\rUnlockSession\020\002*f\n\tR" + - "iskLevel\022\n\n\006Normal\020\000\022\013\n\007Warning\020\001\022\n\n\006Rej" + - "ect\020\002\022\020\n\014ReviewReject\020\003\022\020\n\014ReviewAccept\020" + - "\004\022\020\n\014ReviewCancel\020\005B \n\023org.jumpserver.wi" + - "spZ\t/protobufb\006proto3" + "\t\022\016\n\006script\030\013 \001(\t\022\022\n\nhttp_proxy\030\014 \001(\t\022\023\n" + + "\013pg_ssl_mode\030\r \001(\t\"2\n\010Protocol\022\014\n\004name\030\002" + + " \001(\t\022\n\n\002id\030\001 \001(\005\022\014\n\004port\030\003 \001(\005\"\210\001\n\007Gatew" + + "ay\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022\n\n\002ip\030\003 \001(\t" + + "\022\014\n\004port\030\004 \001(\005\022\020\n\010protocol\030\005 \001(\t\022\020\n\010user" + + "name\030\006 \001(\t\022\020\n\010password\030\007 \001(\t\022\023\n\013private_" + + "key\030\010 \001(\t\"\177\n\nPermission\022\026\n\016enable_connec" + + "t\030\001 \001(\010\022\027\n\017enable_download\030\002 \001(\010\022\025\n\renab" + + "le_upload\030\003 \001(\010\022\023\n\013enable_copy\030\004 \001(\010\022\024\n\014" + + "enable_paste\030\005 \001(\010\"\201\002\n\nCommandACL\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*\n" + + "\006action\030\005 \001(\0162\032.message.CommandACL.Actio" + + "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\"\242\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\"+\n\tLoginF" + + "rom\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\014T" + + "erminalTask\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_by\030\005 " + + "\001(\t\"\205\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.messa" + + "ge.Asset\022\033\n\004user\030\004 \001(\0132\r.message.User\022!\n" + + "\007account\030\005 \001(\0132\020.message.Account\022\'\n\nperm" + + "ission\030\006 \001(\0132\023.message.Permission\022(\n\013exp" + + "ire_info\030\007 \001(\0132\023.message.ExpireInfo\022)\n\014f" + + "ilter_rules\030\010 \003(\0132\023.message.CommandACL\022\"" + + "\n\010gateways\030\t \003(\0132\020.message.Gateway\022*\n\007se" + + "tting\030\n \001(\0132\031.message.ComponentSetting\022#" + + "\n\010platform\030\013 \001(\0132\021.message.Platform\"\203\001\n\010" + + "Platform\022\n\n\002id\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\020\n\010ca" + + "tegory\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.Platfor" + + "mProtocol\"\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\010settin" + + "gs\030\004 \003(\0132\'.message.PlatformProtocol.Sett" + + "ingsEntry\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_tim" + + "e\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\"\216\001\n\rPublicSetting\022\025\n\r" + + "xpack_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\"%\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$" + + ".message.LifecycleLogData.event_type\022\016\n\006" + + "reason\030\002 \001(\t\022\014\n\004user\030\003 \001(\t\"\300\002\n\nevent_typ" + + "e\022\027\n\023AssetConnectSuccess\020\000\022\030\n\024AssetConne" + + "ctFinished\020\001\022\023\n\017CreateShareLink\020\002\022\023\n\017Use" + + "rJoinSession\020\003\022\024\n\020UserLeaveSession\020\004\022\024\n\020" + + "AdminJoinMonitor\020\005\022\024\n\020AdminExitMonitor\020\006" + + "\022\026\n\022ReplayConvertStart\020\007\022\030\n\024ReplayConver" + + "tSuccess\020\010\022\030\n\024ReplayConvertFailure\020\t\022\025\n\021" + + "ReplayUploadStart\020\n\022\027\n\023ReplayUploadSucce" + + "ss\020\013\022\027\n\023ReplayUploadFailure\020\014*A\n\nTaskAct" + + "ion\022\017\n\013KillSession\020\000\022\017\n\013LockSession\020\001\022\021\n" + + "\rUnlockSession\020\002*f\n\tRiskLevel\022\n\n\006Normal\020" + + "\000\022\013\n\007Warning\020\001\022\n\n\006Reject\020\002\022\020\n\014ReviewReje" + + "ct\020\003\022\020\n\014ReviewAccept\020\004\022\020\n\014ReviewCancel\020\005" + + "B \n\023org.jumpserver.wispZ\t/protobufb\006prot" + + "o3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -25420,7 +25568,7 @@ public org.jumpserver.wisp.Common.LifecycleLogData getDefaultInstanceForType() { internal_static_message_Asset_Specific_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_message_Asset_Specific_descriptor, - new java.lang.String[] { "DbName", "UseSsl", "CaCert", "ClientCert", "ClientKey", "AllowInvalidCert", "AutoFill", "UsernameSelector", "PasswordSelector", "SubmitSelector", "Script", "HttpProxy", }); + new java.lang.String[] { "DbName", "UseSsl", "CaCert", "ClientCert", "ClientKey", "AllowInvalidCert", "AutoFill", "UsernameSelector", "PasswordSelector", "SubmitSelector", "Script", "HttpProxy", "PgSslMode", }); internal_static_message_Protocol_descriptor = getDescriptor().getMessageTypes().get(4); internal_static_message_Protocol_fieldAccessorTable = new 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 0de1f19..67a816e 100644 --- a/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceOuterClass.java +++ b/backend/wisp/src/main/java/org/jumpserver/wisp/ServiceOuterClass.java @@ -1,7 +1,6 @@ // 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.26.1 package org.jumpserver.wisp; @@ -11,8 +10,8 @@ private ServiceOuterClass() {} com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", ServiceOuterClass.class.getName()); } @@ -77,8 +76,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= */ 26, + /* patch= */ 1, /* suffix= */ "", AssetLoginTicketRequest.class.getName()); } @@ -895,8 +894,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= */ 26, + /* patch= */ 1, /* suffix= */ "", AssetLoginTicketResponse.class.getName()); } @@ -1856,8 +1855,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Status.class.getName()); } @@ -2433,8 +2432,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TokenRequest.class.getName()); } @@ -2961,8 +2960,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TokenResponse.class.getName()); } @@ -3716,8 +3715,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= */ 26, + /* patch= */ 1, /* suffix= */ "", SessionCreateRequest.class.getName()); } @@ -4301,8 +4300,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= */ 26, + /* patch= */ 1, /* suffix= */ "", SessionCreateResponse.class.getName()); } @@ -5077,8 +5076,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= */ 26, + /* patch= */ 1, /* suffix= */ "", SessionFinishRequest.class.getName()); } @@ -5860,8 +5859,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= */ 26, + /* patch= */ 1, /* suffix= */ "", SessionFinishResp.class.getName()); } @@ -6439,8 +6438,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ReplayRequest.class.getName()); } @@ -7088,8 +7087,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ReplayResponse.class.getName()); } @@ -7768,8 +7767,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= */ 26, + /* patch= */ 1, /* suffix= */ "", CommandRequest.class.getName()); } @@ -9530,8 +9529,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= */ 26, + /* patch= */ 1, /* suffix= */ "", CommandResponse.class.getName()); } @@ -10097,8 +10096,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= */ 26, + /* patch= */ 1, /* suffix= */ "", FinishedTaskRequest.class.getName()); } @@ -10610,8 +10609,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TaskResponse.class.getName()); } @@ -11177,8 +11176,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= */ 26, + /* patch= */ 1, /* suffix= */ "", RemainReplayRequest.class.getName()); } @@ -11765,8 +11764,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= */ 26, + /* patch= */ 1, /* suffix= */ "", RemainReplayResponse.class.getName()); } @@ -12902,8 +12901,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= */ 26, + /* patch= */ 1, /* suffix= */ "", StatusResponse.class.getName()); } @@ -13493,8 +13492,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= */ 26, + /* patch= */ 1, /* suffix= */ "", CommandConfirmRequest.class.getName()); } @@ -14287,8 +14286,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ReqInfo.class.getName()); } @@ -14951,8 +14950,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= */ 26, + /* patch= */ 1, /* suffix= */ "", CommandConfirmResponse.class.getName()); } @@ -15758,8 +15757,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TicketInfo.class.getName()); } @@ -16838,8 +16837,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TicketRequest.class.getName()); } @@ -17423,8 +17422,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TicketStateResponse.class.getName()); } @@ -18186,8 +18185,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= */ 26, + /* patch= */ 1, /* suffix= */ "", TicketState.class.getName()); } @@ -18241,8 +18240,8 @@ public enum State com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", State.class.getName()); } @@ -18955,8 +18954,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ForwardRequest.class.getName()); } @@ -19885,8 +19884,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ForwardDeleteRequest.class.getName()); } @@ -20428,8 +20427,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ForwardResponse.class.getName()); } @@ -21351,8 +21350,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PublicSettingResponse.class.getName()); } @@ -22091,8 +22090,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= */ 26, + /* patch= */ 1, /* suffix= */ "", Empty.class.getName()); } @@ -22478,8 +22477,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= */ 26, + /* patch= */ 1, /* suffix= */ "", ListenPortResponse.class.getName()); } @@ -23214,8 +23213,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PortInfoRequest.class.getName()); } @@ -23672,8 +23671,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PortInfoResponse.class.getName()); } @@ -24451,8 +24450,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PortInfo.class.getName()); } @@ -25379,8 +25378,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PortFailure.class.getName()); } @@ -25967,8 +25966,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= */ 26, + /* patch= */ 1, /* suffix= */ "", PortFailureRequest.class.getName()); } @@ -26707,8 +26706,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= */ 26, + /* patch= */ 1, /* suffix= */ "", CookiesRequest.class.getName()); } @@ -27453,8 +27452,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= */ 26, + /* patch= */ 1, /* suffix= */ "", UserResponse.class.getName()); } @@ -28240,8 +28239,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= */ 26, + /* patch= */ 1, /* suffix= */ "", SessionLifecycleLogRequest.class.getName()); } @@ -28333,8 +28332,8 @@ public enum EventType com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 28, - /* patch= */ 0, + /* minor= */ 26, + /* patch= */ 1, /* suffix= */ "", EventType.class.getName()); } From 774e1912be135cf173bb56d89f5c1843754ef837 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Sep 2024 10:26:34 +0000 Subject: [PATCH 2/2] perf: Update Dockerfile with new base image tag --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b09b844..25dd65c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM jumpserver/chen-base:20240911_113149 AS stage-build +FROM jumpserver/chen-base:20240913_102042 AS stage-build ENV LANG=en_US.UTF-8 WORKDIR /opt/chen/