Skip to content
Snippets Groups Projects
Commit 0fac2e3f authored by Robin McCorkell's avatar Robin McCorkell
Browse files

Unique exception for invalid autoload paths, better handling

Background jobs are tolerant of stale entries left by disabled apps,
which will cause an autoload exception.
parent 895e6337
Branches
No related tags found
No related merge requests found
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
namespace OC; namespace OC;
use \OCP\AutoloadNotAllowedException;
class Autoloader { class Autoloader {
private $useGlobalClassPath = true; private $useGlobalClassPath = true;
...@@ -129,7 +131,7 @@ class Autoloader { ...@@ -129,7 +131,7 @@ class Autoloader {
return true; return true;
} }
} }
throw new \Exception('Path not allowed: '. $fullPath); throw new AutoloadNotAllowedException($fullPath);
} }
/** /**
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
namespace OC\BackgroundJob; namespace OC\BackgroundJob;
use OCP\BackgroundJob\IJobList; use OCP\BackgroundJob\IJobList;
use OCP\AutoloadNotAllowedException;
class JobList implements IJobList { class JobList implements IJobList {
/** /**
...@@ -185,6 +186,7 @@ class JobList implements IJobList { ...@@ -185,6 +186,7 @@ class JobList implements IJobList {
/** /**
* @var Job $job * @var Job $job
*/ */
try {
if (!class_exists($class)) { if (!class_exists($class)) {
// job from disabled app or old version of an app, no need to do anything // job from disabled app or old version of an app, no need to do anything
return null; return null;
...@@ -194,6 +196,10 @@ class JobList implements IJobList { ...@@ -194,6 +196,10 @@ class JobList implements IJobList {
$job->setLastRun($row['last_run']); $job->setLastRun($row['last_run']);
$job->setArgument(json_decode($row['argument'], true)); $job->setArgument(json_decode($row['argument'], true));
return $job; return $job;
} catch (AutoloadNotAllowedException $e) {
// job is from a disabled app, ignore
}
return null;
} }
/** /**
......
<?php
/**
* @author Robin McCorkell <rmccorkell@owncloud.com>
*
* @copyright Copyright (c) 2015, ownCloud, Inc.
* @license AGPL-3.0
*
* 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 OCP;
/**
* Exception for when a not allowed path is attempted to be autoloaded
* @since 8.2.0
*/
class AutoloadNotAllowedException extends \DomainException {
/**
* @param string $path
* @since 8.2.0
*/
public function __construct($path) {
parent::__construct('Autoload path not allowed: '.$path);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment