Merge pull request #4894 from nextcloud/generic-security-activities

Change 2FA activities to more generic security activities

4 files changed, 292 insertions, 4 deletions

diff --git a/tests/Settings/Activity/SecurityFilterTest.php b/tests/Settings/Activity/SecurityFilterTest.php
new file mode 100644
index 00000000000..44345b83fa5
--- /dev/null
+++ b/tests/Settings/Activity/SecurityFilterTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/**
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace Tests\Settings\Activity;
+
+use OC\Settings\Activity\SecurityFilter;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use Test\TestCase;
+
+class SecurityFilterTest extends TestCase {
+
+	private $urlGenerator;
+	private $l10n;
+
+	/** @var SecurityFilter */
+	private $filter;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->l10n = $this->createMock(IL10N::class);
+
+		$this->filter = new SecurityFilter($this->urlGenerator, $this->l10n);
+	}
+
+	public function testAllowedApps() {
+		$this->assertEquals([], $this->filter->allowedApps());
+	}
+
+	public function testFilterTypes() {
+		$this->assertEquals(['security'], $this->filter->filterTypes(['comments', 'security']));
+	}
+
+	public function testGetIcon() {
+		$this->urlGenerator->expects($this->once())
+			->method('imagePath')
+			->with('core', 'actions/password.svg')
+			->will($this->returnValue('path/to/icon.svg'));
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('path/to/icon.svg')
+			->will($this->returnValue('abs/path/to/icon.svg'));
+		$this->assertEquals('abs/path/to/icon.svg', $this->filter->getIcon());
+	}
+
+	public function testGetIdentifier() {
+		$this->assertEquals('security', $this->filter->getIdentifier());
+	}
+
+	public function testGetName() {
+		$this->l10n->expects($this->once())
+			->method('t')
+			->with('Security')
+			->will($this->returnValue('translated'));
+		$this->assertEquals('translated', $this->filter->getName());
+	}
+
+	public function testGetPriority() {
+		$this->assertEquals(30, $this->filter->getPriority());
+	}
+
+}
diff --git a/tests/Settings/Activity/SecurityProviderTest.php b/tests/Settings/Activity/SecurityProviderTest.php
new file mode 100644
index 00000000000..2abc14654f1
--- /dev/null
+++ b/tests/Settings/Activity/SecurityProviderTest.php
@@ -0,0 +1,132 @@
+<?php
+
+/**
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * Two-factor backup codes
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Tests\Settings\Activity;
+
+use InvalidArgumentException;
+use OC\Settings\Activity\SecurityProvider;
+use OCP\Activity\IEvent;
+use OCP\IL10N;
+use OCP\ILogger;
+use OCP\IURLGenerator;
+use OCP\L10N\IFactory;
+use PHPUnit_Framework_MockObject_MockObject;
+use Test\TestCase;
+
+class SecurityProviderTest extends TestCase {
+
+	/** @var IL10N|PHPUnit_Framework_MockObject_MockObject */
+	private $l10n;
+
+	/** @var IURLGenerator|PHPUnit_Framework_MockObject_MockObject */
+	private $urlGenerator;
+
+	/** @var ILogger|PHPUnit_Framework_MockObject_MockObject */
+	private $logger;
+
+	/** @var SecurityProvider */
+	private $provider;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->l10n = $this->createMock(IFactory::class);
+		$this->urlGenerator = $this->createMock(IURLGenerator::class);
+		$this->logger = $this->createMock(ILogger::class);
+
+		$this->provider = new SecurityProvider($this->l10n, $this->urlGenerator, $this->logger);
+	}
+
+	public function testParseUnrelated() {
+		$lang = 'ru';
+		$event = $this->createMock(IEvent::class);
+		$event->expects($this->once())
+			->method('getType')
+			->willReturn('comments');
+		$this->setExpectedException(InvalidArgumentException::class);
+
+		$this->provider->parse($lang, $event);
+	}
+
+	public function subjectData() {
+		return [
+			['twofactor_success'],
+			['twofactor_failed'],
+		];
+	}
+
+	/**
+	 * @dataProvider subjectData
+	 */
+	public function testParse($subject) {
+		$lang = 'ru';
+		$event = $this->createMock(IEvent::class);
+		$l = $this->createMock(IL10N::class);
+
+		$event->expects($this->once())
+			->method('getType')
+			->willReturn('security');
+		$this->l10n->expects($this->once())
+			->method('get')
+			->with('core', $lang)
+			->willReturn($l);
+		$this->urlGenerator->expects($this->once())
+			->method('imagePath')
+			->with('core', 'actions/password.svg')
+			->willReturn('path/to/image');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('path/to/image')
+			->willReturn('absolute/path/to/image');
+		$event->expects($this->once())
+			->method('setIcon')
+			->with('absolute/path/to/image');
+		$event->expects($this->once())
+			->method('getSubject')
+			->willReturn($subject);
+		$event->expects($this->once())
+			->method('setParsedSubject');
+
+		$this->provider->parse($lang, $event);
+	}
+
+	public function testParseInvalidSubject() {
+		$lang = 'ru';
+		$l = $this->createMock(IL10N::class);
+		$event = $this->createMock(IEvent::class);
+
+		$event->expects($this->once())
+			->method('getType')
+			->willReturn('security');
+		$this->l10n->expects($this->once())
+			->method('get')
+			->with('core', $lang)
+			->willReturn($l);
+		$event->expects($this->once())
+			->method('getSubject')
+			->willReturn('unrelated');
+
+		$this->expectException(InvalidArgumentException::class);
+		$this->provider->parse($lang, $event);
+	}
+
+}
diff --git a/tests/Settings/Activity/SecuritySettingTest.php b/tests/Settings/Activity/SecuritySettingTest.php
new file mode 100644
index 00000000000..4e9ce1a0897
--- /dev/null
+++ b/tests/Settings/Activity/SecuritySettingTest.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * @author Christoph Wurst <christoph@winzerhof-wurst.at>
+ * @copyright Copyright (c) 2016 Christoph Wurst <christoph@winzerhof-wurst.at>
+ *
+ * Two-factor backup codes
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace Tests\Settings\Activity;
+
+use OC\Settings\Activity\SecuritySetting;
+use OCP\IL10N;
+use Test\TestCase;
+
+class SecuritySettingTest extends TestCase {
+
+	private $l10n;
+
+	/** @var SecuritySetting */
+	private $setting;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->l10n = $this->createMock(IL10N::class);
+
+		$this->setting = new SecuritySetting($this->l10n);
+	}
+
+	public function testCanChangeMail() {
+		$this->assertFalse($this->setting->canChangeMail());
+	}
+
+	public function testCanChangeStream() {
+		$this->assertFalse($this->setting->canChangeStream());
+	}
+
+	public function testGetIdentifier() {
+		$this->assertEquals('security', $this->setting->getIdentifier());
+	}
+
+	public function testGetName() {
+		$this->l10n->expects($this->once())
+			->method('t')
+			->with('Security')
+			->will($this->returnValue('Sicherheit'));
+		$this->assertEquals('Sicherheit', $this->setting->getName());
+	}
+
+	public function testGetPriority() {
+		$this->assertEquals(30, $this->setting->getPriority());
+	}
+
+	public function testIsDefaultEnabled() {
+		$this->assertTrue($this->setting->isDefaultEnabledMail());
+		$this->assertTrue($this->setting->isDefaultEnabledStream());
+	}
+
+}
diff --git a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
index c031c39b5f2..1b5bd9a9e54 100644
--- a/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
+++ b/tests/lib/Authentication/TwoFactorAuth/ManagerTest.php
@@ -260,11 +260,11 @@ class ManagerTest extends TestCase {
 			->willReturn('jos');
 		$event->expects($this->once())
 			->method('setApp')
-			->with($this->equalTo('twofactor_generic'))
+			->with($this->equalTo('core'))
 			->willReturnSelf();
 		$event->expects($this->once())
 			->method('setType')
-			->with($this->equalTo('twofactor'))
+			->with($this->equalTo('security'))
 			->willReturnSelf();
 		$event->expects($this->once())
 			->method('setAuthor')
@@ -319,11 +319,11 @@ class ManagerTest extends TestCase {
 			->willReturn('jos');
 		$event->expects($this->once())
 			->method('setApp')
-			->with($this->equalTo('twofactor_generic'))
+			->with($this->equalTo('core'))
 			->willReturnSelf();
 		$event->expects($this->once())
 			->method('setType')
-			->with($this->equalTo('twofactor'))
+			->with($this->equalTo('security'))
 			->willReturnSelf();
 		$event->expects($this->once())
 			->method('setAuthor')