diff options
Diffstat (limited to 'application')
| -rw-r--r-- | application/controllers/api/v2/file.php | 20 | ||||
| -rw-r--r-- | application/test/tests/api_v2/test_file_create_multipaste.php | 23 | ||||
| -rw-r--r-- | application/test/tests/api_v2/test_file_upload.php | 41 |
3 files changed, 82 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: diff --git a/application/test/tests/api_v2/test_file_create_multipaste.php b/application/test/tests/api_v2/test_file_create_multipaste.php index 8556616d1..2b6e9d8de 100644 --- a/application/test/tests/api_v2/test_file_create_multipaste.php +++ b/application/test/tests/api_v2/test_file_create_multipaste.php @@ -122,4 +122,27 @@ class test_file_create_multipaste extends common { $this->t->is($ret["data"]["total_count"], 1, "total_count correct"); $this->t->is($ret["data"]["deleted_count"], 1, "deleted_count correct"); } + + public function test_create_multipaste_minidlength() + { + $apikey = $this->createUserAndApikey("basic"); + $ret = $this->uploadFile($apikey, "data/tests/small-file"); + $id = $ret["data"]["ids"][0]; + + $ret = $this->uploadFile($apikey, "data/tests/small-file"); + $id2 = $ret["data"]["ids"][0]; + + $ret = $this->CallEndpoint("POST", "file/create_multipaste", array( + "apikey" => $apikey, + "ids[1]" => $id, + "ids[2]" => $id2, + "minimum-id-length" => 42, + )); + $this->expectSuccess("create multipaste", $ret); + + $this->t->isnt($ret["data"]["url_id"], "", "got a multipaste ID"); + $this->t->isnt($ret["data"]["url"], "", "got a multipaste URL"); + + $this->t->ok(strlen($ret["data"]["url_id"]) >= 42, "minimum url length upheld"); + } } diff --git a/application/test/tests/api_v2/test_file_upload.php b/application/test/tests/api_v2/test_file_upload.php index e8717b074..07769774f 100644 --- a/application/test/tests/api_v2/test_file_upload.php +++ b/application/test/tests/api_v2/test_file_upload.php @@ -68,4 +68,45 @@ class test_file_upload extends common { ), $ret, "expected reply"); } + public function test_upload_minidlength() + { + $apikey = $this->createUserAndApikey(); + $ret = $this->CallEndpoint("POST", "file/upload", array( + "apikey" => $apikey, + "file[1]" => curl_file_create("data/tests/small-file"), + "minimum-id-length" => 42, + )); + $this->expectSuccess("upload file", $ret); + + foreach ($ret["data"]["urls"] as $url) { + $matches = array(); + preg_match('/\/([^\/]+)\/$/', $url, $matches); + $this->t->ok(strlen($matches[1]) >= 42, "minimum url length upheld"); + } + } + + public function test_upload_bad_minidlength() + { + $apikey = $this->createUserAndApikey(); + + $combinations = [ + "non-numberic minimum-id-length" => "nonumber", + "negative minimum-id-length (-42)" => -42, + "minimum-id-length=0" => 0, + "minimum-id-length=1" => 1, + ]; + foreach ($combinations as $msg => $input) { + $ret = $this->CallEndpoint("POST", "file/upload", array( + "apikey" => $apikey, + "file[1]" => curl_file_create("data/tests/small-file"), + "minimum-id-length" => $input, + )); + $this->expectError("upload file with bad minimum-id-length. Test value: $msg", $ret); + $this->t->is_deeply(array( + 'status' => 'error', + 'error_id' => 'file/bad-minimum-id-length', + 'message' => "Passed parameter 'minimum-id-length' is not a valid integer or too small (min value: 2)", + ), $ret, "expected reply"); + } + } } |