Skip to content

Remove type parameter #1305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PGijsbers wants to merge 2 commits into
base: develop
Choose a base branch
from
+22 −2
Open

Remove type parameter #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
462a821
Whitelist specific functions, provide clearer error codes
PGijsbers Aug 4, 2026
be53c90
Allow arbitrary arguments for v1 to avoid PHP errors
PGijsbers Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion openml_OS/controllers/Api_new.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public function index() {
$this->_show_webpage();
}

public function v1($type) {
public function v1(...$args) {
$this->bootstrap('1');
}

Expand Down
22 changes: 21 additions & 1 deletion openml_OS/controllers/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function __construct() {
}
}

public function v1($type) {
public function v1(...$args) {
$this->load->Model('data/v1/Data_server');
$this->bootstrap('1');
}
Expand All @@ -54,6 +54,26 @@ private function bootstrap($version) {
$controller = array_shift($segs);
$this->version = array_shift($segs);
$function = array_shift($segs);

$function_whitelist = array('download', 'view', 'get_csv');

if (!in_array($function, $function_whitelist)) {
http_response_code(404);
echo 'Function not valid.';
return;
}

if (!$segs) {
http_response_code(400);
echo 'Missing value for argument id.';
return;
}

if (count($segs) > 2) {
http_response_code(400);
echo 'Expected at most two arguments: id (required) and name (optional).';
return;
}

call_user_func_array(array($this->Data_server, $function), $segs);
}
Expand Down