Skip to content

support for custom headers in Access-Control-Allow-Headers #122

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
dron23 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

support for custom headers in Access-Control-Allow-Headers #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6145330
support for custom headers in Access-Control-Allow-Headers
dron23 Aug 21, 2020
601ce75
Merge branch 'jacwright:master' into master
dron23 Aug 20, 2025
7f2818b
Allow add also class in addClass instead of just class name. Useful f…
dron23 Aug 20, 2025
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
.idea
composer.lock
vendor
/nbproject/private/
/nbproject/project.properties
/nbproject/project.xml
22 changes: 18 additions & 4 deletions source/Jacwright/RestServer/RestServer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ class RestServer {

public $useCors = false;
public $allowedOrigin = '*';
public $allowedHeaders = '';

protected $data = null; // special parameter for post data
protected $query = null; // special parameter for query string
Expand Down Expand Up @@ -135,11 +136,19 @@ public function handle() {
list($obj, $method, $params, $this->params, $noAuth) = $this->findUrl();

if ($obj) {
if (is_string($obj) && !($obj = $this->instantiateClass($obj))) {
throw new Exception("Class $obj does not exist");
if (is_string($obj)) {
$newObj = $this->instantiateClass($obj);
if (!$newObj) {
throw new Exception("Class $obj does not exist");
}
$obj = $newObj;
}

$obj->server = $this;
if (is_object($obj)) {
$obj->server = $this;
} else {
throw new Exception("Class $obj does not exist");
}

try {
$this->initClass($obj);
Expand Down Expand Up @@ -567,12 +576,17 @@ private function corsHeaders() {
if (in_array($currentOrigin, $allowedOrigin)) {
$allowedOrigin = array($currentOrigin); // array ; if there is a match then only one is enough
}
// test if we want to add custome headers to Access-Control-Allow-Headers
$customHeaders = '';
if (is_array($this->allowedHeaders) && !empty($this->allowedHeaders)) {
$customHeaders = ", ".implode(", ",$this->allowedHeaders);
}
foreach($allowedOrigin as $allowed_origin) { // to support multiple origins
header("Access-Control-Allow-Origin: $allowed_origin");
}
header('Access-Control-Allow-Methods: GET,POST,PUT,DELETE,OPTIONS');
header('Access-Control-Allow-Credential: true');
header('Access-Control-Allow-Headers: X-Requested-With, content-type, access-control-allow-origin, access-control-allow-methods, access-control-allow-headers, Authorization');
header('Access-Control-Allow-Headers: X-Requested-With, content-type, access-control-allow-origin, access-control-allow-methods, access-control-allow-headers, Authorization'.$customHeaders);
}

private $codes = array(
Expand Down