added:

* Nextcloud 12 & 13 support * added SALT support for password algorithms "system" and "password_hash" * added security fix for password length sniffing attacks * moved files to be more on the standard places * renamed some files to be more standard like * source code changes to be more standard like (max 80 characters)
2018-01-28 14:25:04 +01:00
parent 2797f4ba14
commit 2e1179e035
10 changed files with 620 additions and 326 deletions
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * @copyright Copyright (c)
+ *
+ * @author
+ *
+ * @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 OCA\user_sql\Settings;
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Defaults;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\Settings\ISettings;
+use OCA\user_sql\lib\Helper;
+
+class Admin implements ISettings {
+	/** @var IL10N */
+	private $l10n;
+	/** @var Defaults */
+	private $defaults;
+	/** @var IConfig */
+	private $config;
+
+	/**
+	 * @param IL10N $l10n
+	 * @param Defaults $defaults
+	 * @param IConfig $config
+	 */
+	public function __construct(IL10N $l10n,
+								Defaults $defaults,
+								IConfig $config) {
+		$this->l10n = $l10n;
+		$this->defaults = $defaults;
+		$this->config = $config;
+		$this->helper = new \OCA\user_sql\lib\Helper();
+		$this->params = $this->helper->getParameterArray();
+		$this->settings = $this->helper -> loadSettingsForDomain('default');
+	}
+
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getForm() {
+
+		$type = $this->config->getAppValue('user_sql', 'type');
+		$trusted_domains = \OC::$server->getConfig()->getSystemValue('trusted_domains');
+		$inserted = array('default');
+		array_splice($trusted_domains, 0, 0, $inserted);
+
+		$params = [
+			'type' => $type,
+		];
+		$params['allowed_domains']= array_unique($trusted_domains);
+
+		foreach($this->params as $key)
+			{
+			    $value = $this->settings[$key];
+			    $params[$key]=$value;
+			}
+
+		$params["config"]=$this->config;
+		return new TemplateResponse('user_sql', 'admin', $params);
+	}
+
+	/**
+	 * @return string the section ID, e.g. 'sharing'
+	 */
+	public function getSection() {
+		return 'usersql';
+	}
+
+	/**
+	 * @return int whether the form should be rather on the top or bottom of
+	 * the admin section. The forms are arranged in ascending order of the
+	 * priority values. It is required to return a value between 0 and 100.
+	 *
+	 * keep the server setting at the top, right after "server settings"
+	 */
+	public function getPriority() {
+		return 0;
+	}
+
+}
--- a/lib/Settings/Section.php
+++ b/lib/Settings/Section.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @copyright Copyright (c)
+ *
+ * @author
+ *
+ * @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 OCA\user_sql\Settings;
+
+use OCP\IL10N;
+use OCP\Settings\IIconSection;
+use OCP\IURLGenerator;
+
+class Section implements IIconSection {
+	/** @var IL10N */
+	private $l;
+
+	/**
+	 * @param IL10N $l
+	 */
+	public function __construct(IURLGenerator $url,IL10N $l) {
+		$this->l = $l;
+		$this->url = $url;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getID() {
+		return 'usersql';
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getName() {
+		return $this->l->t('User SQL');
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getPriority() {
+		return 75;
+	}
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getIcon() {
+		return $this->url->imagePath('user_sql', 'app-dark.svg');
+	}
+}