Skip to content

#RI-2727 - UI for SNI #548

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 19, 2022
Merged

#RI-2727 - UI for SNI #548

Show file tree
Hide file tree
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
68 changes: 68 additions & 0 deletions redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,74 @@ describe('InstanceForm', () => {
)
})

it('should change "Use SNI" with prepopulated with host', async () => {
const handleSubmit = jest.fn()
render(
<div id="footerDatabaseForm">
<InstanceForm
{...instance(mockedProps)}
isEditMode
formFields={{
...formFields,
tls: {},
connectionType: ConnectionType.Cluster,
}}
onSubmit={handleSubmit}
/>
</div>
)
fireEvent.click(screen.getByTestId('sni'))

const submitBtn = screen.getByTestId(BTN_SUBMIT)
await waitFor(() => {
fireEvent.click(submitBtn)
})

expect(handleSubmit).toBeCalledWith(
expect.objectContaining({
sni: true,
servername: formFields.host
})
)
})

it('should change "Use SNI"', async () => {
const handleSubmit = jest.fn()
render(
<div id="footerDatabaseForm">
<InstanceForm
{...instance(mockedProps)}
isEditMode
formFields={{
...formFields,
tls: {},
connectionType: ConnectionType.Cluster,
}}
onSubmit={handleSubmit}
/>
</div>
)
fireEvent.click(screen.getByTestId('sni'))

await waitFor(() => {
fireEvent.change(screen.getByTestId('sni-servername'), {
target: { value: '12' },
})
})

const submitBtn = screen.getByTestId(BTN_SUBMIT)
await waitFor(() => {
fireEvent.click(submitBtn)
})

expect(handleSubmit).toBeCalledWith(
expect.objectContaining({
sni: true,
servername: '12'
})
)
})

it('should change "Verify TLS Certificate"', async () => {
const handleSubmit = jest.fn()
render(
Expand Down
75 changes: 63 additions & 12 deletions redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceForm/InstanceForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export interface DbConnectionInfo extends Instance {
newTlsCertPairName?: string;
newTlsClientCert?: string;
newTlsClientKey?: string;
servername?: string;
verifyServerTlsCert?: boolean;
caCertificates?: { name: string; id: string }[];
selectedCaCertName: string | typeof ADD_NEW_CA_CERT | typeof NO_CA_CERT;
Expand All @@ -86,6 +87,7 @@ export interface DbConnectionInfo extends Instance {
username?: string;
password?: string;
showDb?: boolean;
sni?: boolean;
sentinelMasterUsername?: string;
sentinelMasterPassword?: string;
}
Expand Down Expand Up @@ -129,6 +131,7 @@ const fieldDisplayNames: DbConnectionInfo = {
newTlsCertPairName: 'Client Certificate Name',
newTlsClientCert: 'Client Certificate',
newTlsClientKey: 'Private Key',
servername: 'Server Name',
}

const getInitFieldsDisplayNames = ({ host, port, name, instanceType }: any) => {
Expand Down Expand Up @@ -165,7 +168,8 @@ const AddStandaloneForm = (props: Props) => {
modules,
sentinelMasterPassword,
sentinelMasterUsername,
isRediStack
isRediStack,
servername,
},
initialValues: initialValuesProp,
width,
Expand All @@ -191,6 +195,7 @@ const AddStandaloneForm = (props: Props) => {
db,
modules,
showDb: !!db,
sni: !!servername,
newCaCert: '',
newCaCertName: '',
selectedCaCertName,
Expand Down Expand Up @@ -263,6 +268,14 @@ const AddStandaloneForm = (props: Props) => {
errs.newCaCert = fieldDisplayNames.newCaCert
}

if (
values.tls
&& values.sni
&& values.servername === ''
) {
errs.servername = fieldDisplayNames.servername
}

if (
values.tls
&& values.tlsClientAuthRequired
Expand Down Expand Up @@ -593,6 +606,7 @@ const AddStandaloneForm = (props: Props) => {
<EuiFlexItem className={flexItemClassName}>
<EuiFormRow label="Host*">
<EuiFieldText
autoFocus
name="host"
id="host"
data-testid="host"
Expand Down Expand Up @@ -726,7 +740,8 @@ const AddStandaloneForm = (props: Props) => {
<EuiCallOut>
<EuiText size="s" data-testid="db-index-message">
When the database is added, you can select logical databases only in CLI.
To work with other logical databases in Browser and Workbench, add another database with the same host and port,
To work with other logical databases in Browser and Workbench,
add another database with the same host and port,
but a different database index.
</EuiText>
</EuiCallOut>
Expand Down Expand Up @@ -786,16 +801,52 @@ const AddStandaloneForm = (props: Props) => {
</EuiFlexItem>

{formik.values.tls && (
<EuiFlexItem className={flexItemClassName}>
<EuiCheckbox
id={`${htmlIdGenerator()()} verifyServerTlsCert`}
name="verifyServerTlsCert"
label="Verify TLS Certificate"
checked={!!formik.values.verifyServerTlsCert}
onChange={formik.handleChange}
data-testid="verify-tls-cert"
/>
</EuiFlexItem>
<>
<EuiFlexItem className={flexItemClassName}>
<EuiCheckbox
id={`${htmlIdGenerator()()} sni`}
name="sni"
label="Use SNI"
checked={!!formik.values.sni}
onChange={(e: ChangeEvent<HTMLInputElement>) => {
formik.setFieldValue(
'servername',
formik.values.servername ?? formik.values.host ?? ''
)
return formik.handleChange(e)
}}
data-testid="sni"
/>
</EuiFlexItem>
{formik.values.sni && (
<EuiFlexItem className={flexItemClassName}>
<EuiFieldText
name="servername"
id="servername"
fullWidth
maxLength={200}
placeholder="Enter Server Name"
value={formik.values.servername ?? ''}
onChange={(e: ChangeEvent<HTMLInputElement>) =>
formik.setFieldValue(
e.target.name,
validateField(e.target.value.trim())
)}
data-testid="sni-servername"
/>
</EuiFlexItem>
)}
<EuiFlexItem className={flexItemClassName}>
<EuiCheckbox
id={`${htmlIdGenerator()()} verifyServerTlsCert`}
name="verifyServerTlsCert"
label="Verify TLS Certificate"
checked={!!formik.values.verifyServerTlsCert}
onChange={formik.handleChange}
data-testid="verify-tls-cert"
/>
</EuiFlexItem>
</>
)}
</EuiFlexGroup>
{formik.values.tls && (
Expand Down
9 changes: 7 additions & 2 deletions redisinsight/ui/src/pages/home/components/AddInstanceForm/InstanceFormWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ const InstanceFormWrapper = (props: Props) => {

const {
useTls,
servername,
verifyServerCert,
caCert,
clientAuth,
Expand All @@ -229,7 +230,7 @@ const InstanceFormWrapper = (props: Props) => {

if (useTls) {
db.tls = {}

db.tls.servername = servername
db.tls.verifyServerCert = !!verifyServerCert

if (typeof caCert?.new !== 'undefined') {
Expand Down Expand Up @@ -280,6 +281,7 @@ const InstanceFormWrapper = (props: Props) => {

const {
useTls,
servername,
verifyServerCert,
caCert,
clientAuth,
Expand All @@ -288,7 +290,7 @@ const InstanceFormWrapper = (props: Props) => {

if (useTls) {
database.tls = {}

database.tls.servername = servername
database.tls.verifyServerCert = !!verifyServerCert
if (typeof caCert?.new !== 'undefined') {
database.tls.newCaCert = {
Expand Down Expand Up @@ -331,6 +333,8 @@ const InstanceFormWrapper = (props: Props) => {
const {
newCaCert,
tls,
sni,
servername,
newCaCertName,
selectedCaCertName,
tlsClientAuthRequired,
Expand All @@ -343,6 +347,7 @@ const InstanceFormWrapper = (props: Props) => {

const tlsSettings = {
useTls: tls,
servername: (sni && servername) || undefined,
verifyServerCert: verifyServerTlsCert,
caCert:
!tls || selectedCaCertName === NO_CA_CERT
Expand Down