Skip to content

Bug: SSL Mode options for Postgres #77

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

Merged
merged 1 commit into from
Apr 21, 2020
Merged

Bug: SSL Mode options for Postgres #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions portal-ui/src/screens/Console/Configurations/ConfPostgres.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import { FormControlLabel, Switch } from "@material-ui/core";
import Grid from "@material-ui/core/Grid";
import InputBoxWrapper from "../Common/FormComponents/InputBoxWrapper/InputBoxWrapper";
import RadioGroupSelector from "../Common/FormComponents/RadioGroupSelector/RadioGroupSelector";
import SelectWrapper from "../Common/FormComponents/SelectWrapper/SelectWrapper";

interface IConfPostgresProps {
onChange: (newValue: Map<string, string>) => void;
Expand All @@ -39,7 +40,7 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
const [port, setPort] = useState<string>("");
const [user, setUser] = useState<string>("");
const [password, setPassword] = useState<string>("");
const [sslMode, setSslMode] = useState<boolean>(true);
const [sslMode, setSslMode] = useState<string>("require");

const [table, setTable] = useState<string>("");
const [format, setFormat] = useState<string>("namespace");
Expand Down Expand Up @@ -120,8 +121,8 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
if (port !== "") {
strValue = `${strValue} port=${port}`;
}
const sslModeVal = sslMode ? "enable" : "disable";
strValue = `${strValue} sslmode=${sslModeVal}`;

strValue = `${strValue} sslmode=${sslMode}`;

return strValue.trim();
}, [host, dbName, user, password, port, sslMode]);
Expand Down Expand Up @@ -208,7 +209,9 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
setPassword(
kv.get("password") ? kv.get("password") + "" : ""
);
setSslMode(kv.get("sslmode") === "true");
setSslMode(
kv.get("sslmode") ? kv.get("sslmode") + "" : "require"
);
}

setUseConnectionString(event.target.checked);
Expand Down Expand Up @@ -271,17 +274,21 @@ const ConfPostgres = ({ onChange, classes }: IConfPostgresProps) => {
</Grid>

<Grid item xs={12}>
<RadioGroupSelector
currentSelection={sslMode + ""}
<SelectWrapper
value={sslMode}
label="SSL Mode"
id="sslmode"
name="sslmode"
label="SSL Mode"
onChange={e => {
setSslMode(e.target.value === "true");
onChange={(e): void => {
if (e.target.value !== undefined) {
setSslMode(e.target.value + "");
}
}}
selectorOptions={[
{ label: "Enabled", value: "true" },
{ label: "Disabled", value: "false" }
options={[
{ label: "Require", value: "require" },
{ label: "Disable", value: "disable" },
{ label: "Verify CA", value: "verify-ca" },
{ label: "Verify Full", value: "verify-full" }
]}
/>
</Grid>
Expand Down