summaryrefslogtreecommitdiffstats
path: root/application/controllers/api/v2
diff options
context:
space:
mode:
authorSimon Schuster <git@rationality.eu>2020-10-06 22:50:11 +0200
committerFlorian Pritz <bluewind@xinu.at>2020-10-07 14:02:48 +0200
commit4bdbb005a9b214d5355d4f2036d510f898bc8a87 (patch)
tree46cf3c0643189e28b530aafb5a9a68d1913d6e40 /application/controllers/api/v2
parent60d497ff685a581cf63b4840af372d8613bd3f81 (diff)
API: Add `minimum-id-length` post parameter
This parameter controls the generated id for files (file/upload) and multipastes (file/create_multipaste). The post parameter has to be a positive integer value >= 2. Changes by Florian Pritz: - minor style and typo fixes - NEWS entry - check expected error reply content in tests Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to 'application/controllers/api/v2')
-rw-r--r--application/controllers/api/v2/file.php20
1 files changed, 18 insertions, 2 deletions
diff --git a/application/controllers/api/v2/file.php b/application/controllers/api/v2/file.php
index 6da0d8155..2e792e577 100644
--- a/application/controllers/api/v2/file.php
+++ b/application/controllers/api/v2/file.php
@@ -29,7 +29,7 @@ class file extends \controllers\api\api_controller {
\service\files::verify_uploaded_files($files);
- $limits = $this->CI->muser->get_upload_id_limits();
+ $limits = $this->determine_id_limits();
$userid = $this->CI->muser->get_userid();
$urls = array();
@@ -87,10 +87,26 @@ class file extends \controllers\api\api_controller {
$this->CI->muser->require_access("basic");
$ids = $this->CI->input->post_array("ids");
$userid = $this->CI->muser->get_userid();
- $limits = $this->CI->muser->get_upload_id_limits();
+ $limits = $this->determine_id_limits();
return \service\files::create_multipaste($ids, $userid, $limits);
}
+
+ private function determine_id_limits()
+ {
+ $posted_minlength = $this->CI->input->post('minimum-id-length');
+ if (is_null($posted_minlength)) {
+ $limits = $this->CI->muser->get_upload_id_limits();
+ } else {
+ if ((!preg_match("/^\d+$/", $posted_minlength)) || intval($posted_minlength) <= 1 ) {
+ throw new \exceptions\UserInputException("file/bad-minimum-id-length", "Passed parameter 'minimum-id-length' is not a valid integer or too small (min value: 2)");
+ }
+
+ $limits = [$posted_minlength, null];
+ }
+
+ return $limits;
+ }
}
# vim: set noet: