Skip to content

Commit 3f60df9

Browse files
Alevskdvaldivia
andauthored
Validate provided external certificates during tenant creation (#1245)
Signed-off-by: Lenin Alevski <alevsk.8772@gmail.com> Co-authored-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
1 parent 0bbd4f0 commit 3f60df9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

operatorapi/operator_tenants_helper.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package operatorapi
1919
import (
2020
"context"
2121
"crypto"
22+
"crypto/tls"
2223
"encoding/base64"
2324
"encoding/hex"
2425
"fmt"
@@ -307,6 +308,10 @@ func createOrReplaceExternalCertSecrets(ctx context.Context, clientSet K8sClient
307308
if err != nil {
308309
return nil, err
309310
}
311+
// check if the key pair is valid
312+
if _, err = tls.X509KeyPair(tlsCrt, tlsKey); err != nil {
313+
return nil, err
314+
}
310315
externalTLSCertificateSecret := &corev1.Secret{
311316
ObjectMeta: metav1.ObjectMeta{
312317
Name: keyPairSecretName,

portal-ui/src/screens/Console/Speedtest/STResults.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ const STResults = ({ classes, results, start, autotune }: ISTResults) => {
312312
{clnMetrics.length <= 1 && (
313313
<Grid container>
314314
<Grid item xs={12} className={classes.initialResults}>
315-
Please wait while we get {autotune? "the initial" : "the system"} results...
315+
Please wait while we get {autotune ? "the initial" : "the system"}{" "}
316+
results...
316317
</Grid>
317318
</Grid>
318319
)}
@@ -391,9 +392,7 @@ const STResults = ({ classes, results, start, autotune }: ISTResults) => {
391392
<Grid container>
392393
<Grid item xs={12} md={6} className={classes.descriptorLabel}>
393394
{start ? (
394-
<Fragment>
395-
Preliminar Results:
396-
</Fragment>
395+
<Fragment>Preliminar Results:</Fragment>
397396
) : (
398397
<Fragment>
399398
{jsonView ? "JSON Results:" : "Detailed Results:"}

0 commit comments

Comments
 (0)