Merge branch '3.4RC'3.4

4 files changed, 139 insertions, 8 deletions

diff --git a/tests/travis/prepare_pgsql.sh b/tests/travis/prepare_pgsql.sh
index 0175b9858..c6b12e4d6 100755
--- a/tests/travis/prepare_pgsql.sh
+++ b/tests/travis/prepare_pgsql.sh
@@ -27,14 +27,19 @@ set -e
 
 echo "Preparing for PostgreSQL ..."
 
+if [[ "$POSTGRESQL_VERSION" == "10" ]]; then
+	echo "Using PostgreSQL in Docker container, need to use TCP"
+	export PROTO="-h localhost"
+fi
+
 # Print out some PostgreSQL information
 psql --version
 # Why does this hang further execution of the job?
-psql -U postgres -c "SELECT VERSION();"
+psql $PROTO -U postgres -c "SELECT VERSION();"
 
 # Create Hubzilla database
-psql -U postgres -c "DROP DATABASE IF EXISTS travis_hubzilla;"
-psql -U postgres -v ON_ERROR_STOP=1 <<-EOSQL
+psql $PROTO -U postgres -c "DROP DATABASE IF EXISTS travis_hubzilla;"
+psql $PROTO -U postgres -v ON_ERROR_STOP=1 <<-EOSQL
     CREATE USER travis_hz WITH PASSWORD 'hubzilla';
     CREATE DATABASE travis_hubzilla;
     ALTER DATABASE travis_hubzilla OWNER TO travis_hz;
@@ -42,8 +47,8 @@ psql -U postgres -v ON_ERROR_STOP=1 <<-EOSQL
 EOSQL
 
 # Import table structure
-psql -U travis_hz -v ON_ERROR_STOP=1 travis_hubzilla < ./install/schema_postgres.sql
+psql $PROTO -U travis_hz -v ON_ERROR_STOP=1 travis_hubzilla < ./install/schema_postgres.sql
 
 # Show databases and tables
-psql -U postgres -l
-psql -U postgres -d travis_hubzilla -c "\dt;"
+psql $PROTO -U postgres -l
+psql $PROTO -U postgres -d travis_hubzilla -c "\dt;"
diff --git a/tests/unit/Access/PermissionLimitsTest.php b/tests/unit/Access/PermissionLimitsTest.php
index 58595111a..57ad42a19 100644
--- a/tests/unit/Access/PermissionLimitsTest.php
+++ b/tests/unit/Access/PermissionLimitsTest.php
@@ -66,7 +66,7 @@ class PermissionLimitsTest extends UnitTestCase {
 		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_pages']);
 		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['write_wiki']);
 		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_wall']);
-		$this->assertEquals(PERMS_PUBLIC,   $stdlimits['post_comments']);
+		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_comments']);
 		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_mail']);
 		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['post_like']);
 		$this->assertEquals(PERMS_SPECIFIC, $stdlimits['tag_deliver']);
diff --git a/tests/unit/Access/PermissionRolesTest.php b/tests/unit/Access/PermissionRolesTest.php
index 5e64e773a..58fd88bb1 100644
--- a/tests/unit/Access/PermissionRolesTest.php
+++ b/tests/unit/Access/PermissionRolesTest.php
@@ -62,6 +62,7 @@ class PermissionRolesTest extends UnitTestCase {
 		$this->assertEquals($roles, $r->roles());
 
 		$socialNetworking = [
+				'social_federation' => 'Social - Federation',
 				'social' => 'Social - Mostly Public',
 				'social_restricted' => 'Social - Restricted',
 				'social_private' => 'Social - Private'
@@ -97,4 +98,4 @@ class PermissionRolesTest extends UnitTestCase {
 		$this->assertEquals(['role' => 'nonexistent'], $rp_nonexistent);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/tests/unit/Web/HttpSigTest.php b/tests/unit/Web/HttpSigTest.php
new file mode 100644
index 000000000..18f2ce92b
--- /dev/null
+++ b/tests/unit/Web/HttpSigTest.php
@@ -0,0 +1,125 @@
+<?php
+/*
+ * Copyright (c) 2018 Hubzilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+namespace Zotlabs\Tests\Unit\Web;
+
+use phpmock\phpunit\PHPMock;
+use Zotlabs\Tests\Unit\UnitTestCase;
+
+use Zotlabs\Web\HTTPSig;
+
+/**
+ * @brief Unit Test case for HTTPSig class.
+ *
+ * @covers Zotlabs\Web\HTTPSig
+ */
+class PermissionDescriptionTest extends UnitTestCase {
+
+	use PHPMock;
+
+	/**
+	 * @dataProvider generate_digestProvider
+	 */
+	function testGenerate_digest($text, $digest) {
+		$this->assertSame(
+				$digest,
+				HTTPSig::generate_digest($text, false)
+		);
+	}
+	public function generate_digestProvider() {
+		return [
+				'empty body text' => [
+						'',
+						'47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
+				],
+				'sample body text' => [
+						'body text',
+						'2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI='
+				],
+				'NULL body text' => [
+						null,
+						'47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU='
+				],
+		];
+	}
+
+	function testGeneratedDigestsOfDifferentTextShouldNotBeEqual() {
+		$this->assertNotSame(
+				HTTPSig::generate_digest('text1', false),
+				HTTPSig::generate_digest('text2', false)
+		);
+	}
+
+	/**
+	 * Process separation needed for header() check.
+	 * @runInSeparateProcess
+	 */
+	function testGenerate_digestSendsHttpHeader() {
+		$ret = HTTPSig::generate_digest('body text', true);
+
+		$this->assertSame('2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=', $ret);
+		$this->assertContains(
+				'Digest: SHA-256=2fu8kUkvuzuo5XyhWwORNOcJgDColXgxWkw1T5EXzPI=',
+				xdebug_get_headers(),
+				'HTTP header Digest does not match'
+		);
+	}
+
+	/**
+	 * @uses ::crypto_unencapsulate
+	 */
+	function testDecrypt_sigheader() {
+		$header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
+		$result = [
+				'iv' => 'value_iv',
+				'key' => 'value_key',
+				'alg' => 'value_alg',
+				'data' => 'value_data'
+		];
+
+		$this->assertSame($result, HTTPSig::decrypt_sigheader($header, 'site private key'));
+	}
+	/**
+	 * @uses ::crypto_unencapsulate
+	 */
+	function testDecrypt_sigheaderUseSitePrivateKey() {
+		// Create a stub for global function get_config() with expectation
+		$t = $this->getFunctionMock('Zotlabs\Web', 'get_config');
+		$t->expects($this->once())->willReturn('system.prvkey');
+
+		$header = 'Header: iv="value_iv" key="value_key" alg="value_alg" data="value_data"';
+		$result = [
+				'iv' => 'value_iv',
+				'key' => 'value_key',
+				'alg' => 'value_alg',
+				'data' => 'value_data'
+		];
+
+		$this->assertSame($result, HTTPSig::decrypt_sigheader($header));
+	}
+	function testDecrypt_sigheaderIncompleteHeaderShouldReturnEmptyString() {
+		$header = 'Header: iv="value_iv" key="value_key"';
+
+		$this->assertEmpty(HTTPSig::decrypt_sigheader($header, 'site private key'));
+	}
+}