summaryrefslogtreecommitdiffstats
path: root/lib/private/App
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/App')
-rw-r--r--lib/private/App/AppStore/Fetcher/AppFetcher.php18
-rw-r--r--lib/private/App/AppStore/Fetcher/CategoryFetcher.php16
-rw-r--r--lib/private/App/AppStore/Fetcher/Fetcher.php23
-rw-r--r--lib/private/App/CodeChecker/DatabaseSchemaChecker.php105
-rw-r--r--lib/private/App/CodeChecker/LanguageParseChecker.php60
5 files changed, 204 insertions, 18 deletions
diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php
index e020390988e..63f63aaf695 100644
--- a/lib/private/App/AppStore/Fetcher/AppFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php
@@ -22,27 +22,31 @@
namespace OC\App\AppStore\Fetcher;
use OC\App\AppStore\Version\VersionParser;
+use OC\Files\AppData\Factory;
use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Files\IAppData;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
+use OCP\ILogger;
class AppFetcher extends Fetcher {
/**
- * @param IAppData $appData
+ * @param Factory $appDataFactory
* @param IClientService $clientService
* @param ITimeFactory $timeFactory
- * @param IConfig $config;
+ * @param IConfig $config
+ * @param ILogger $logger
*/
- public function __construct(IAppData $appData,
+ public function __construct(Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
- IConfig $config) {
+ IConfig $config,
+ ILogger $logger) {
parent::__construct(
- $appData,
+ $appDataFactory,
$clientService,
$timeFactory,
- $config
+ $config,
+ $logger
);
$this->fileName = 'apps.json';
diff --git a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
index 8b79259a66a..8c3c963462c 100644
--- a/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
+++ b/lib/private/App/AppStore/Fetcher/CategoryFetcher.php
@@ -21,27 +21,31 @@
namespace OC\App\AppStore\Fetcher;
+use OC\Files\AppData\Factory;
use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\Files\IAppData;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
+use OCP\ILogger;
class CategoryFetcher extends Fetcher {
/**
- * @param IAppData $appData
+ * @param Factory $appDataFactory
* @param IClientService $clientService
* @param ITimeFactory $timeFactory
* @param IConfig $config
+ * @param ILogger $logger
*/
- public function __construct(IAppData $appData,
+ public function __construct(Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
- IConfig $config) {
+ IConfig $config,
+ ILogger $logger) {
parent::__construct(
- $appData,
+ $appDataFactory,
$clientService,
$timeFactory,
- $config
+ $config,
+ $logger
);
$this->fileName = 'categories.json';
$this->endpointUrl = 'https://apps.nextcloud.com/api/v1/categories.json';
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php
index 5354d334eb1..e559cf83e6d 100644
--- a/lib/private/App/AppStore/Fetcher/Fetcher.php
+++ b/lib/private/App/AppStore/Fetcher/Fetcher.php
@@ -21,12 +21,15 @@
namespace OC\App\AppStore\Fetcher;
+use OC\Files\AppData\Factory;
+use GuzzleHttp\Exception\ConnectException;
use OCP\AppFramework\Http;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Files\IAppData;
use OCP\Files\NotFoundException;
use OCP\Http\Client\IClientService;
use OCP\IConfig;
+use OCP\ILogger;
abstract class Fetcher {
const INVALIDATE_AFTER_SECONDS = 300;
@@ -39,6 +42,8 @@ abstract class Fetcher {
protected $timeFactory;
/** @var IConfig */
protected $config;
+ /** @var Ilogger */
+ protected $logger;
/** @var string */
protected $fileName;
/** @var string */
@@ -47,19 +52,22 @@ abstract class Fetcher {
protected $version;
/**
- * @param IAppData $appData
+ * @param Factory $appDataFactory
* @param IClientService $clientService
* @param ITimeFactory $timeFactory
* @param IConfig $config
+ * @param ILogger $logger
*/
- public function __construct(IAppData $appData,
+ public function __construct(Factory $appDataFactory,
IClientService $clientService,
ITimeFactory $timeFactory,
- IConfig $config) {
- $this->appData = $appData;
+ IConfig $config,
+ ILogger $logger) {
+ $this->appData = $appDataFactory->get('appstore');
$this->clientService = $clientService;
$this->timeFactory = $timeFactory;
$this->config = $config;
+ $this->logger = $logger;
}
/**
@@ -77,7 +85,9 @@ abstract class Fetcher {
return [];
}
- $options = [];
+ $options = [
+ 'timeout' => 10,
+ ];
if ($ETag !== '') {
$options['headers'] = [
@@ -152,6 +162,9 @@ abstract class Fetcher {
$responseJson = $this->fetch($ETag, $content);
$file->putContent(json_encode($responseJson));
return json_decode($file->getContent(), true)['data'];
+ } catch (ConnectException $e) {
+ $this->logger->logException($e, ['app' => 'appstoreFetcher']);
+ return [];
} catch (\Exception $e) {
return [];
}
diff --git a/lib/private/App/CodeChecker/DatabaseSchemaChecker.php b/lib/private/App/CodeChecker/DatabaseSchemaChecker.php
new file mode 100644
index 00000000000..1255dec25c1
--- /dev/null
+++ b/lib/private/App/CodeChecker/DatabaseSchemaChecker.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @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 OC\App\CodeChecker;
+
+class DatabaseSchemaChecker {
+
+ /**
+ * @param string $appId
+ * @return array
+ */
+ public function analyse($appId) {
+ $appPath = \OC_App::getAppPath($appId);
+ if ($appPath === false) {
+ throw new \RuntimeException("No app with given id <$appId> known.");
+ }
+
+ if (!file_exists($appPath . '/appinfo/database.xml')) {
+ return ['errors' => [], 'warnings' => []];
+ }
+
+ libxml_use_internal_errors(true);
+ $loadEntities = libxml_disable_entity_loader(false);
+ $xml = simplexml_load_file($appPath . '/appinfo/database.xml');
+ libxml_disable_entity_loader($loadEntities);
+
+
+ $errors = $warnings = [];
+
+ foreach ($xml->table as $table) {
+ // Table names
+ if (strpos($table->name, '*dbprefix*') !== 0) {
+ $errors[] = 'Database schema error: name of table ' . $table->name . ' does not start with *dbprefix*';
+ }
+ $tableName = substr($table->name, strlen('*dbprefix*'));
+ if (strpos($tableName, '*dbprefix*') !== false) {
+ $warnings[] = 'Database schema warning: *dbprefix* should only appear once in name of table ' . $table->name;
+ }
+
+ if (strlen($tableName) > 27) {
+ $errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+ }
+
+ $hasAutoIncrement = false;
+
+ // Column names
+ foreach ($table->declaration->field as $column) {
+ if (strpos($column->name, '*dbprefix*') !== false) {
+ $warnings[] = 'Database schema warning: *dbprefix* should not appear in name of column ' . $column->name . ' on table ' . $table->name;
+ }
+
+ if (strlen($column->name) > 30) {
+ $errors[] = 'Database schema error: Name of column ' . $column->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 30 characters allowed';
+ }
+
+ if ($column->autoincrement) {
+ if ($hasAutoIncrement) {
+ $errors[] = 'Database schema error: Table ' . $table->name . ' has multiple autoincrement columns';
+ }
+
+ if (strlen($tableName) > 21) {
+ $errors[] = 'Database schema error: Name of table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters (21 characters for tables with autoincrement) + *dbprefix* allowed';
+ }
+
+ $hasAutoIncrement = true;
+ }
+ }
+
+ // Index names
+ foreach ($table->declaration->index as $index) {
+ $hasPrefix = strpos($index->name, '*dbprefix*');
+ if ($hasPrefix !== false && $hasPrefix !== 0) {
+ $warnings[] = 'Database schema warning: *dbprefix* should only appear at the beginning in name of index ' . $index->name . ' on table ' . $table->name;
+ }
+
+ $indexName = $hasPrefix === 0 ? substr($index->name, strlen('*dbprefix*')) : $index->name;
+ if (strlen($indexName) > 27) {
+ $errors[] = 'Database schema error: Name of index ' . $index->name . ' on table ' . $table->name . ' is too long (' . strlen($tableName) . '), max. 27 characters + *dbprefix* allowed';
+ }
+ }
+ }
+
+ return ['errors' => $errors, 'warnings' => $warnings];
+ }
+}
diff --git a/lib/private/App/CodeChecker/LanguageParseChecker.php b/lib/private/App/CodeChecker/LanguageParseChecker.php
new file mode 100644
index 00000000000..35354869339
--- /dev/null
+++ b/lib/private/App/CodeChecker/LanguageParseChecker.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @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 OC\App\CodeChecker;
+
+class LanguageParseChecker {
+
+ /**
+ * @param string $appId
+ * @return array
+ */
+ public function analyse($appId) {
+ $appPath = \OC_App::getAppPath($appId);
+ if ($appPath === false) {
+ throw new \RuntimeException("No app with given id <$appId> known.");
+ }
+
+ if (!is_dir($appPath . '/l10n/')) {
+ return [];
+ }
+
+ $errors = [];
+ $directory = new \DirectoryIterator($appPath . '/l10n/');
+
+ foreach ($directory as $file) {
+ if ($file->getExtension() !== 'json') {
+ continue;
+ }
+
+ $content = file_get_contents($file->getPathname());
+ json_decode($content, true);
+
+ if (json_last_error() !== JSON_ERROR_NONE) {
+ $errors[] = 'Invalid language file found: l10n/' . $file->getFilename() . ': ' . json_last_error_msg();
+ }
+ }
+
+ return $errors;
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-27 08:09:29 +0000