Merge branch 'release/2.9'

* release/2.9: Translate Yubikey OTP error messages Open up /csp/report in the Symfony firewall
OpenConext · Jul 3, 2018 · 5b362b6 · 5b362b6
2 parents 9d2893e + ceed432
commit 5b362b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/config/security.yml b/app/config/security.yml
@@ -16,6 +16,10 @@ security:
             pattern: ^/(info|health)$
             security: false
 
+        csp_report:
+            pattern: ^/csp/report$
+            security: false
+
         saml_based:
             saml: true
             logout:

diff --git a/src/Surfnet/StepupRa/RaBundle/Controller/Vetting/YubikeyController.php b/src/Surfnet/StepupRa/RaBundle/Controller/Vetting/YubikeyController.php
@@ -61,9 +61,9 @@ public function verifyAction(Request $request, $procedureId)
             }
 
             if ($result->wasOtpInvalid()) {
-                $form->get('otp')->addError(new FormError('ra.verify_yubikey_command.otp.otp_invalid'));
+                $form->addError(new FormError('ra.verify_yubikey_command.otp.otp_invalid'));
             } elseif ($result->didOtpVerificationFail()) {
-                $form->get('otp')->addError(new FormError('ra.verify_yubikey_command.otp.verification_error'));
+                $form->addError(new FormError('ra.verify_yubikey_command.otp.verification_error'));
             } else {
                 $form->addError(new FormError('ra.prove_yubikey_possession.different_yubikey_used'));
             }