Merge pull request #283 from OWASP/fix-and-update

Fixes for react components and other items

Author: commjoen

helm/wrongsecrets-ctf-party/values.yaml

@@ -39,7 +39,7 @@ balancer:
     # -- Set this to a fixed random alpa-numeric string (recommended length 24 chars). If not set this get randomly generated with every helm upgrade, each rotation invalidates all active cookies / sessions requirering users to login again.
     cookieParserSecret: null
   repository: jeroenwillemsen/wrongsecrets-balancer
-  tag: 1.6.5aws
+  tag: 1.6.6aws
   # -- Number of replicas of the wrongsecrets-balancer deployment. Changing this in a commit? PLEASE UPDATE THE GITHUB WORKLFOWS THEN!(NUMBER OF "TRUE")
   replicas: 2
   # -- Port to expose on the balancer pods which the container listens on
@@ -142,7 +142,7 @@ wrongsecrets:
   maxInstances: 500
   # -- Wrongsecrets Image to use
   image: jeroenwillemsen/wrongsecrets
-  tag: 1.6.5-no-vault
+  tag: 1.6.7RC1-no-vault
   # -- Change the key when hosting a CTF event. This key gets used to generate the challenge flags. See: https://github.com/OWASP/wrongsecrets#ctf
   ctfKey: "[email protected]!9uR_K!NfkkTr"
   # -- Specify a custom Wrongsecrets config.yaml. See the Wrongsecrets Docs for any needed ENVs: https://github.com/OWASP/wrongsecrets
@@ -204,7 +204,7 @@ virtualdesktop:
   maxInstances: 500
   # -- Juice Shop Image to use
   image: jeroenwillemsen/wrongsecrets-desktop-k8s
-  tag: 1.6.5
+  tag: 1.6.6
   repository: commjoenie/wrongSecrets
   resources:
     request:

wrongsecrets-balancer/src/proxy/proxy.js

@@ -105,7 +105,7 @@ async function updateLastConnectTimestamp(req, res, next) {
  */
 function proxyTrafficToJuiceShop(req, res) {
   const teamname = req.teamname;
-  const regex = new RegExp('^[a-z0-9]([-a-z0-9])+[a-z0-9]$', 'i');
+  const regex = new RegExp('^[a-z0-9-]+$');
   if (!regex.test(teamname)) {
     logger.info(`Got malformed teamname: ${teamname}s`);
     return res.redirect('/balancer/');

wrongsecrets-balancer/ui/src/App.test.js

@@ -1,9 +1,10 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import App from './App';
 
 it('renders without crashing', () => {
-  const div = document.createElement('div');
-  ReactDOM.render(<App />, div);
-  ReactDOM.unmountComponentAtNode(div);
+  const container = document.getElementById('div');
+  const root = createRoot(container); // createRoot(container!) if you use TypeScript
+  root.render(<App tab="home" />);
+
 });

wrongsecrets-balancer/ui/src/cards/InstanceRestartingCard.js

@@ -6,7 +6,7 @@ import { FormattedMessage } from 'react-intl';
 import { BodyCard, CenteredCard, Button } from '../Components';
 import { Spinner } from '../Spinner';
 
-const LinkButton = Button.withComponent('a');
+const LinkButton = styled(Button).attrs({ as: 'a' })``;;
 
 const CenteredText = styled.span`
   text-align: center;

wrongsecrets-balancer/ui/src/cards/InstanceStatusCard.js

@@ -7,7 +7,7 @@ import promiseRetry from 'promise-retry';
 import { BodyCard, CenteredCard, Button } from '../Components';
 import { Spinner } from '../Spinner';
 
-const LinkButton = Button.withComponent('a');
+const LinkButton = styled(Button).attrs({ as: 'a' })``;;
 
 const CenteredText = styled.span`
   text-align: center;

wrongsecrets-balancer/ui/src/index.js

@@ -1,4 +1,7 @@
 import React from 'react';
-import ReactDOM from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import App from './App';
-ReactDOM.render(<App />, document.getElementById('root'));
+
+const container = document.getElementById('root');
+const root = createRoot(container);
+root.render(<App tab="home" />);

wrongsecrets-balancer/ui/src/pages/JoinPage.js

@@ -229,7 +229,7 @@ export const JoinPage = injectIntl(({ intl }) => {
             name="teamname"
             value={teamname}
             title={formatMessage(messages.teamnameValidationConstraints)}
-            pattern="^[a-z0-9]([-a-z0-9])+[a-z0-9]$"
+            pattern="^[a-z0-9][a-z0-9\-]+[a-z0-9]$"
             maxLength="16"
             onChange={({ target }) => setTeamname(target.value)}
           />

wrongsecrets-balancer/ui/src/translations/de-DE.js

@@ -4,8 +4,7 @@ const germanTranslations = {
   getting_started: "Los geht's",
   join_failed_text: 'Das team konnte nicht erstellt / beigetreten werden.',
   teamname: 'Teamname',
-  teamname_validation_constraints:
-    "Teamname muss aus kleinen Buchstaben, Nummern oder einem '-' bestehen",
+  teamname_validation_constraints: 'Teamname muss aus kleinen Buchstaben, Nummern oder einem - bestehen',
   create_or_join_team_label: 'Team erstellen / beitreten',
   change_language: 'Sprache ändern',
   joining_team: 'Team {team} beitreten',
@@ -37,6 +36,7 @@ const germanTranslations = {
   'admin_table.noActiveTeams': 'Keine aktiven Teams',
   'admin_table.restarting': 'Wird neu gestartet',
   'admin_table.restart': 'Neustarten',
+  'welcome_title': 'Wilkommen!'
 };
 
 export default germanTranslations;

wrongsecrets-balancer/ui/src/translations/nl-NL.js

@@ -4,7 +4,7 @@ const dutchTranslations = {
   getting_started: 'Starten',
   join_failed_text: 'Het team kan niet hersteld of bereikt worden.',
   teamname: 'Teamnaam',
-  teamname_validation_constraints: "Teamnaam moet uit kleine letters, nummers of '-' bestaan",
+  teamname_validation_constraints: 'Teamnaam moet uit kleine letters, nummers of - bestaan',
   create_or_join_team_label: 'Team aanmaken of joinen',
   change_language: 'Kies taal',
   joining_team: 'Team {team} joinen',
@@ -30,6 +30,7 @@ const dutchTranslations = {
   'admin_table.noActiveTeams': 'Geen actieve teams',
   'admin_table.restarting': 'Wordt nu opnieuw gestart',
   'admin_table.restart': 'Herstarten',
+  'welcome_title': "Welkom!",
 };
 
 export default dutchTranslations;