summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-02 19:45:11 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-02 19:45:11 +0100
commit33efe571e3e7ebd607e92345c2e94e7fd8ae27f0 (patch)
tree6d24b9e3e62d92e9d5fbbdb3507bcff5be79462f /application/controllers
parent0bed4fd5c9f67b60173df6638dc524d7b833c4e1 (diff)
Rework api error handling
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/api.php62
-rw-r--r--application/controllers/api/v1/file.php4
2 files changed, 35 insertions, 31 deletions
diff --git a/application/controllers/api.php b/application/controllers/api.php
index 7557c6c99..490f59c2c 100644
--- a/application/controllers/api.php
+++ b/application/controllers/api.php
@@ -18,35 +18,39 @@ class Api extends MY_Controller {
}
public function route() {
- $requested_version = $this->uri->segment(2);
- $controller = $this->uri->segment(3);
- $function = $this->uri->segment(4);
- $major = intval(explode(".", $requested_version)[0]);
-
- if (!preg_match("/^[a-zA-Z-_]+$/", $controller)) {
- return send_json_error_reply("api/invalid-controller-value", "Invalid controller requested");
- }
-
- if (!preg_match("/^[a-zA-Z-_]+$/", $function)) {
- return send_json_error_reply("api/invalid-function-value", "Invalid function requested");
- }
-
- $namespace = "controllers\\api\\v".$major;
- $class = $namespace."\\".$controller;
- $class_info = $namespace."\\api_info";
-
- if (!class_exists($class_info) || version_compare($class_info::get_version(), $requested_version, "<")) {
- return send_json_error_reply("api/version-not-supported", "Requested API version is not supported");
- }
-
- if (!class_exists($class)) {
- return send_json_error_reply("api/unknown-controller", "Unknown controller requested");
- }
-
- $c= new $class;
- if (!method_exists($c, $function)) {
- return send_json_error_reply("api/unknown-function", "Unknown function requested");
+ try {
+ $requested_version = $this->uri->segment(2);
+ $controller = $this->uri->segment(3);
+ $function = $this->uri->segment(4);
+ $major = intval(explode(".", $requested_version)[0]);
+
+ if (!preg_match("/^[a-zA-Z-_]+$/", $controller)) {
+ throw new \exceptions\PublicApiException("api/invalid-controller-value", "Invalid controller requested");
+ }
+
+ if (!preg_match("/^[a-zA-Z-_]+$/", $function)) {
+ throw new \exceptions\PublicApiException("api/invalid-function-value", "Invalid function requested");
+ }
+
+ $namespace = "controllers\\api\\v".$major;
+ $class = $namespace."\\".$controller;
+ $class_info = $namespace."\\api_info";
+
+ if (!class_exists($class_info) || version_compare($class_info::get_version(), $requested_version, "<")) {
+ throw new \exceptions\PublicApiException("api/version-not-supported", "Requested API version is not supported");
+ }
+
+ if (!class_exists($class)) {
+ throw new \exceptions\PublicApiException("api/unknown-controller", "Unknown controller requested");
+ }
+
+ $c= new $class;
+ if (!method_exists($c, $function)) {
+ throw new \exceptions\PublicApiException("api/unknown-function", "Unknown function requested");
+ }
+ return $c->$function();
+ } catch (\exceptions\PublicApiException $e) {
+ return send_json_error_reply($e->get_error_id(), $e->getMessage(), $e->get_data());
}
- return $c->$function();
}
}
diff --git a/application/controllers/api/v1/file.php b/application/controllers/api/v1/file.php
index 56455c01e..c291ae879 100644
--- a/application/controllers/api/v1/file.php
+++ b/application/controllers/api/v1/file.php
@@ -24,12 +24,12 @@ class file extends \controllers\api\api_controller {
$files = getNormalizedFILES();
if (empty($files)) {
- show_error("No file was uploaded or unknown error occured.");
+ throw new \exceptions\PublicApiException("file/no-file", "No file was uploaded or unknown error occured.");
}
$errors = \service\files::verify_uploaded_files($files);
if (!empty($errors)) {
- return send_json_error_reply("file/upload-verify-failed", "Failed to verify uploaded file", $errors);
+ throw new \exceptions\PublicApiException("file/upload-verify-failed", "Failed to verify uploaded file", $errors);
}
$limits = $this->muser->get_upload_id_limits();