summaryrefslogtreecommitdiffstats
path: root/application/controllers
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-02-10 23:32:23 +0100
committerFlorian Pritz <bluewind@xinu.at>2015-02-10 23:32:23 +0100
commitcb2df59b45d4cb35790472f76b06c59b22c6213b (patch)
tree806c5853512d3ea1a50778d11f6265985c73af13 /application/controllers
parentc8ff6f56b9b971f88fed840c2af50df11b7dc948 (diff)
api: Require the version to start with v
Makes the URL easier to understand (especially the v1 case). Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers')
-rw-r--r--application/controllers/api.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/application/controllers/api.php b/application/controllers/api.php
index 3297f0614..837f62e89 100644
--- a/application/controllers/api.php
+++ b/application/controllers/api.php
@@ -22,6 +22,13 @@ class Api extends MY_Controller {
$requested_version = $this->uri->segment(2);
$controller = $this->uri->segment(3);
$function = $this->uri->segment(4);
+
+ if (!preg_match("/^v([0-9]+)(.[0-9]+){0,2}$/", $requested_version)) {
+ throw new \exceptions\PublicApiException("api/invalid-version", "Invalid API version requested");
+ }
+
+ $requested_version = substr($requested_version, 1);
+
$major = intval(explode(".", $requested_version)[0]);
if (!preg_match("/^[a-zA-Z-_]+$/", $controller)) {