Merge remote-tracking branch 'upstream/master'

tests/Utils/CryptKeyTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace LeagueTests\Utils;
+
+use League\OAuth2\Server\CryptKey;
+use PHPUnit\Framework\TestCase;
+
+class CryptKeyTest extends TestCase
+{
+    /**
+     * @expectedException \LogicException
+     */
+    public function testNoFile()
+    {
+        new CryptKey('undefined file');
+    }
+
+    public function testKeyCreation()
+    {
+        $keyFile = __DIR__ . '/../Stubs/public.key';
+        $key = new CryptKey($keyFile, 'secret');
+
+        $this->assertEquals('file://' . $keyFile, $key->getKeyPath());
+        $this->assertEquals('secret', $key->getPassPhrase());
+    }
+
+    public function testKeyFileCreation()
+    {
+        $keyContent = file_get_contents(__DIR__ . '/../Stubs/public.key');
+        $key = new CryptKey($keyContent);
+
+        $this->assertEquals(
+            'file://' . sys_get_temp_dir() . '/' . sha1($keyContent) . '.key',
+            $key->getKeyPath()
+        );
+
+        $keyContent = file_get_contents(__DIR__ . '/../Stubs/private.key.crlf');
+        $key = new CryptKey($keyContent);
+
+        $this->assertEquals(
+            'file://' . sys_get_temp_dir() . '/' . sha1($keyContent) . '.key',
+            $key->getKeyPath()
+        );
+    }
+}

tests/Utils/CryptTraitTest.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace LeagueTests\Utils;
+
+use Defuse\Crypto\Key;
+use LeagueTests\Stubs\CryptTraitStub;
+use PHPUnit\Framework\TestCase;
+
+class CryptTraitTest extends TestCase
+{
+    public function testEncryptDecryptWithPassword()
+    {
+        $cryptStub = new CryptTraitStub();
+        $cryptStub->setEncryptionKey(base64_encode(random_bytes(36)));
+
+        return $this->encryptDecrypt($cryptStub);
+    }
+
+    public function testEncryptDecryptWithKey()
+    {
+        $cryptStub = new CryptTraitStub();
+        $cryptStub->setEncryptionKey(Key::createNewRandomKey());
+
+        return $this->encryptDecrypt($cryptStub);
+    }
+
+    protected function encryptDecrypt(CryptTraitStub $cryptStub) {
+
+        $payload = 'alex loves whisky';
+        $encrypted = $cryptStub->doEncrypt($payload);
+        $plainText = $cryptStub->doDecrypt($encrypted);
+
+        $this->assertNotEquals($payload, $encrypted);
+        $this->assertEquals($payload, $plainText);
+    }
+}