added setRawSecret() and getRawSecret() methods

(cherry picked from commit 9194706)

# Conflicts:
#	src/Authenticators/AuthenticatorAbstract.php
#	tests/Authenticators/AuthenticatorInterfaceTestAbstract.php
#	tests/Authenticators/SteamGuardTest.php

Author: codemasher

src/Authenticator.php

@@ -66,7 +66,7 @@ public function setOptions(SettingsContainerInterface $options):self{
 	}
 
 	/**
-	 * Sets a secret phrase from a Base32 representation
+	 * Sets a secret phrase from an encoded representation
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -77,14 +77,34 @@ public function setSecret(string $encodedSecret):self{
 	}
 
 	/**
-	 * Returns a Base32 representation of the current secret phrase
+	 * Sets a secret phrase from a a raw binary representation
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function setRawSecret(string $rawSecret):self{
+		$this->authenticator->setRawSecret($rawSecret);
+
+		return $this;
+	}
+
+	/**
+	 * Returns an encoded representation of the current secret phrase
 	 *
 	 * @codeCoverageIgnore
 	 */
 	public function getSecret():string{
 		return $this->authenticator->getSecret();
 	}
 
+	/**
+	 * Returns the raw representation of the current secret phrase
+	 *
+	 * @codeCoverageIgnore
+	 */
+	public function getRawSecret():string{
+		return $this->authenticator->getRawSecret();
+	}
+
 	/**
 	 * Generates a new (secure random) secret phrase
 	 *

src/Authenticators/AuthenticatorAbstract.php

@@ -54,6 +54,17 @@ public function setSecret(string $encodedSecret):AuthenticatorInterface{
 		return $this;
 	}
 
+	public function setRawSecret(string $rawSecret):AuthenticatorInterface{
+
+		if($rawSecret === ''){
+			throw new InvalidArgumentException('The given secret string is empty');
+		}
+
+		$this->secret = $rawSecret;
+
+		return $this;
+	}
+
 	public function getSecret():string{
 
 		if($this->secret === null){
@@ -63,6 +74,15 @@ public function getSecret():string{
 		return Base32::encode($this->secret);
 	}
 
+	public function getRawSecret():string{
+
+		if($this->secret === null){
+			throw new RuntimeException('No secret set');
+		}
+
+		return $this->secret;
+	}
+
 	public function createSecret(?int $length = null):string{
 		$length ??= $this->options->secret_length;
 

src/Authenticators/AuthenticatorInterface.php

@@ -54,13 +54,27 @@ public function setOptions(SettingsContainerInterface $options):AuthenticatorInt
 	 */
 	public function setSecret(string $encodedSecret):AuthenticatorInterface;
 
+	/**
+	 * Sets a secret phrase from a a raw binary representation
+	 *
+	 * @throws \RuntimeException
+	 */
+	public function setRawSecret(string $rawSecret):AuthenticatorInterface;
+
 	/**
 	 * Returns an encoded representation of the current secret phrase
 	 *
 	 * @throws \RuntimeException
 	 */
 	public function getSecret():string;
 
+	/**
+	 * Returns the raw representation of the current secret phrase
+	 *
+	 * @throws \RuntimeException
+	 */
+	public function getRawSecret():string;
+
 	/**
 	 * Generates a new (secure random) secret phrase
 	 *

tests/Authenticators/AuthenticatorInterfaceTestAbstract.php

@@ -43,13 +43,29 @@ public function testSetGetSecret():void{
 		$this::assertSame($this::rawsecret, Base32::decode($secret));
 	}
 
+	public function testSetGetRawSecret():void{
+		$this->authenticatorInterface->setRawSecret($this::rawsecret);
+
+		$secret = $this->authenticatorInterface->getRawSecret();
+
+		$this::assertSame($this::secret, Base32::encode($secret));
+		$this::assertSame($this::rawsecret, $secret);
+	}
+
 	public function testSetEmptySecretException():void{
 		$this->expectException(InvalidArgumentException::class);
 		$this->expectExceptionMessage('The given secret string is empty');
 
 		$this->authenticatorInterface->setSecret('');
 	}
 
+	public function testSetEmptyRawSecretException():void{
+		$this->expectException(InvalidArgumentException::class);
+		$this->expectExceptionMessage('The given secret string is empty');
+
+		$this->authenticatorInterface->setRawSecret('');
+	}
+
 	public function testSetInvalidSecretException():void{
 		$this->expectException(InvalidArgumentException::class);
 
@@ -63,6 +79,13 @@ public function testGetSecretException():void{
 		$this->authenticatorInterface->getSecret();
 	}
 
+	public function testGetRawSecretException():void{
+		$this->expectException(RuntimeException::class);
+		$this->expectExceptionMessage('No secret set');
+
+		$this->authenticatorInterface->getRawSecret();
+	}
+
 	public function testCreateSecretDefaultLength():void{
 		$this::assertSame(
 			$this->options->secret_length,

tests/Authenticators/SteamGuardTest.php

@@ -28,8 +28,12 @@ class SteamGuardTest extends AuthenticatorInterfaceTestAbstract{
 
 	protected const secret  = 'MTIzNDU2Nzg5MDEyMzQ1Njc4OTA=';
 
+	/**
+	 * Timestamps and -slices from the RFC6238 page, codes from a verified implementation
+	 *
+	 * @see https://tools.ietf.org/html/rfc6238#page-14
+	 */
 	protected const SteamGuardVectors = [
-		// timestamps and time slices from RFC 6238, see https://tools.ietf.org/html/rfc6238#page-14
 		[         59,        '1', 'PV9M4'],
 		[ 1111111109,  '23523ec', 'PY4YB'],
 		[ 1111111111,  '23523ed', '5PP3V'],
@@ -52,6 +56,15 @@ public function testSetGetSecret():void{
 		$this::assertSame($this::rawsecret, Base64::decode($secret));
 	}
 
+	public function testSetGetRawSecret():void{
+		$this->authenticatorInterface->setRawSecret($this::rawsecret);
+
+		$secret = $this->authenticatorInterface->getRawSecret();
+
+		$this::assertSame($this::secret, Base64::encode($secret));
+		$this::assertSame($this::rawsecret, $secret);
+	}
+
 	public function testCreateSecretDefaultLength():void{
 		$this::assertSame(
 			$this->options->secret_length,
@@ -75,11 +88,6 @@ public function testCreateSecretCheckCharacterSet():void{
 		$this::assertMatchesRegularExpression('#^['.Base64::CHARSET.']+$#', $secret);
 	}
 
-	/**
-	 * Timestamps and -slices from the RFC6238 page, codes from a verified implementation
-	 *
-	 * @see https://tools.ietf.org/html/rfc6238#page-14
-	 */
 	public static function steamGuardVectors():Generator{
 		foreach(self::SteamGuardVectors as [$timestamp, $timeslice, $totp]){
 			// skip 64bit numbers on 32bit PHP