Merge pull request #8 from lapwil/feature/55387

[FEATURE#55387] Lock public key

.drone.yml

@@ -6,8 +6,9 @@ script:
   - mkdir -p tmp/keys
   - openssl genrsa  -out tmp/keys/private.key 2048
   - openssl rsa -in tmp/keys/private.key -pubout -out tmp/keys/public.key
-  - composer install --dev --prefer-source
-  - bin/behat -f progress
+  - composer self-update
+  - composer install --dev --no-interaction --prefer-source
+  - vendor/bin/behat -f progress
 notify:
   slack:
     team : {{slackTeam}}

behat.yml

@@ -9,3 +9,8 @@ default:
                 - tests/features
     formatters:
         progress: true
+wip:
+    suites:
+        default:
+            filters:
+                tags: '@wip'

composer.json

@@ -34,7 +34,7 @@
     "repositories": [
        {
            "type": "composer",
-           "url": "http://blu-composer.herokuapp.com"
+           "url": "https://blu-composer.herokuapp.com"
        }
    ]
 }

src/AuthServiceProvider.php

@@ -50,10 +50,16 @@ public function boot(Application $app)
             $app["auth.authenticator_url"] = \trim($app["auth.authenticator_url"], "/");
 
             $file = $app["auth.public_key.tmp_path"];
-            if (!file_exists($file) || filemtime($file) < strtotime("-30seconds")) {
-                $key = file_get_contents("{$app["auth.authenticator_url"]}/public.key");
-
-                file_put_contents($file, $key);
+            if (!file_exists($file)) {
+                // On lock l'accès au fichier, sinon accès concurrentiel et ttkc
+                // La suite est bloqué tant que le fichier n'est pas accessible
+                $fp = fopen($file, "w+");
+                if (flock($fp, LOCK_EX) || filemtime($file) < strtotime("-30seconds")) {
+                    $key = file_get_contents("{$app["auth.authenticator_url"]}/public.key");
+
+                    file_put_contents($file, $key);
+                }
+                fclose($fp);
             }
             $this->rsa = RSA::loadPublicKey("file://" . $file);
         }

tests/bootstrap/FeatureContext.php

@@ -55,9 +55,9 @@ public   function setupApplication()
     }
 
     /**
-     * @Given /^que j\'instancie un nouvel objet$/
+     * @Given /^j\'instancie un nouvel objet$/
      */
-    public function queJInstancieUnNouvelObjet()
+    public function jInstancieUnNouvelObjet()
     {
         $this->app->register(new AuthServiceProvider());
     }