Merge pull request #559 from OpenConext/feature/yubikey_autocomplete

rename yubikey entry form to solve #558

Author: kayjoosten

ci/docker/compose.yml

@@ -4,13 +4,13 @@ include:
 services:
 
     selenium:
-       image: selenium/standalone-chrome:latest
+       image: zenika/alpine-chrome:latest
        container_name: gateway-selenium
-       environment:
-           START_XVFB: "false"
+       command: ["--no-sandbox", "--headless", "--disable-gpu", "--remote-debugging-address=0.0.0.0", "--remote-debugging-port=9222", "--ignore-certificate-errors", "--disable-dev-shm-usage"]
        volumes:
             - /dev/shm:/dev/shm
        networks:
          openconextdev:
            aliases:
              - selenium.dev.openconext.local
+             - chrome.dev.openconext.local

ci/docker/init.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 cp ../../devconf/stepup/gateway/surfnet_yubikey.yaml.dist ../../devconf/stepup/gateway/surfnet_yubikey.yaml
 echo "pulling the images"
-docker compose pull gateway selenium haproxy ssp mariadb azuremfa chrome
+docker compose pull gateway selenium haproxy ssp mariadb azuremfa
 echo "starting the images"
-docker compose up gateway selenium haproxy ssp mariadb azuremfa chrome -d
+docker compose up gateway selenium haproxy ssp mariadb azuremfa -d
 echo "intialising the environment"
 docker compose exec -T gateway bash -c '
   cp /var/www/html/devconf/stepup/gateway/surfnet_yubikey.yaml.dist /var/www/html/devconf/stepup/gateway/surfnet_yubikey.yaml && \

public/scss/authentication.scss

@@ -20,7 +20,7 @@ body.authentication {
     }
   }
 
-  form[name="gateway_verify_yubikey_otp"] {
+  form[name="gateway_verify_yubikey"] {
     max-width: 525px;
     padding: 2rem 0 4rem 0;
   }

src/Surfnet/StepupGateway/GatewayBundle/Command/VerifyYubikeyOtpCommand.php

@@ -28,7 +28,7 @@ class VerifyYubikeyOtpCommand
      */
     #[Assert\NotBlank(message: 'gateway.verify_yubikey_command.otp.may_not_be_empty')]
     #[Assert\Type(type: 'string', message: 'gateway.verify_yubikey_command.otp.must_be_string')]
-    public $otp;
+    public $yubikeyInput;
 
     /**
      * @var string

src/Surfnet/StepupGateway/GatewayBundle/Form/Type/VerifyYubikeyOtpType.php

@@ -28,12 +28,11 @@ class VerifyYubikeyOtpType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->add('otp', TextType::class, [
+        $builder->add('yubikeyInput', TextType::class, [
             'label' => /** @Ignore */ false,
             'required' => true,
             'attr' => [
                 'autofocus'    => true,
-                'autocomplete' => 'off',
             ]
         ]);
         // This button is the form's default button, so as to prevent the form being submitted as if the cancel button
@@ -52,6 +51,6 @@ public function configureOptions(OptionsResolver $resolver): void
 
     public function getBlockPrefix(): string
     {
-        return 'gateway_verify_yubikey_otp';
+        return 'gateway_verify_yubikey';
     }
 }

src/Surfnet/StepupGateway/GatewayBundle/Resources/config/services.yml

@@ -206,7 +206,7 @@ services:
 
     gateway.form.verify_yubikey:
         class: Surfnet\StepupGateway\GatewayBundle\Form\Type\VerifyYubikeyOtpType
-        tags: [{ name: form.type, alias: gateway_verify_yubikey_otp }]
+        tags: [{ name: form.type, alias: gateway_verify_yubikey }]
 
     gateway.form.choose_second_factor:
         class: Surfnet\StepupGateway\GatewayBundle\Form\Type\ChooseSecondFactorType

src/Surfnet/StepupGateway/GatewayBundle/Service/StepUpAuthenticationService.php

@@ -328,7 +328,7 @@ public function verifyYubikeyOtp(VerifyYubikeyOtpCommand $command)
         $requester->institution = $secondFactor->institution;
 
         $otp = new ApiOtp();
-        $otp->value = $command->otp;
+        $otp->value = $command->yubikeyInput;
 
         $result = $this->yubikeyService->verifyOtp($otp, $requester);
 

templates/second_factor/verify_yubikey_second_factor.html.twig

@@ -15,7 +15,7 @@
         {% endfor %}
     {% endif %}
 
-    {{ form_row(form.otp, { value: '' }) }}
+    {{ form_row(form.yubikeyInput, { value: '' }) }}
 
     {{ form_end(form) }}
 

tests/features/bootstrap/FeatureContext.php

@@ -152,8 +152,8 @@ public function iShouldSeeTheTiqrAuthenticationScreen(): void
     #[\Behat\Step\When('I enter the OTP')]
     public function iEnterTheOtp(): void
     {
-        $this->minkContext->fillField('gateway_verify_yubikey_otp_otp', 'bogus-otp-we-use-a-mock-yubikey-service');
-        $this->minkContext->pressButton('gateway_verify_yubikey_otp_submit');
+        $this->minkContext->fillField('gateway_verify_yubikey_yubikeyInput', 'bogus-otp-we-use-a-mock-yubikey-service');
+        $this->minkContext->pressButton('gateway_verify_yubikey_submit');
         $this->pressButtonWhenNoJavascriptSupport();
     }