Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 增加 pg ssl 的 mode 字段 #42

Merged
merged 2 commits into from
Sep 13, 2024
Merged

feat: 增加 pg ssl 的 mode 字段 #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1292771
feat: 增加 pg ssl 的 mode 字段
Aaron3S Sep 13, 2024
774e191
perf: Update Dockerfile with new base image tag
github-actions[bot] Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 3 additions & 1 deletion ...les/src/main/java/org.jumpserver.chen.modules/postgresql/PostgresqlConnectionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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);
Expand All @@ -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());
Expand Down
1 change: 1 addition & 0 deletions backend/web/src/main/java/org/jumpserver/chen/web/service/impl/JmsSessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading