Make script treat headers in case-insensitive way

dmitryablecanyon · Jul 22, 2015 · 461636a · 461636a
1 parent 89353b2
commit 461636a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "dintel/php-github-webhook",
     "description": "Simple class for handling GitHub webhook calls",
-    "version": "0.1.0",
+    "version": "0.1.1",
     "keywords": ["git","webhook"],
     "license": "BSD-3-Clause",
     "authors": [

diff --git a/src/Handler.php b/src/Handler.php
@@ -65,16 +65,22 @@ public function handle()
 
     public function validate()
     {
-        $headers = apache_request_headers();
+        $signature = @$_SERVER['HTTP_X_HUB_SIGNATURE'];
+        $event = @$_SERVER['HTTP_X_GITHUB_EVENT'];
+        $delivery = @$_SERVER['HTTP_X_GITHUB_DELIVERY'];
         $payload = file_get_contents('php://input');
 
-        if (!$this->validateSignature($headers['X-Hub-Signature'], $payload)) {
+        if (!isset($signature, $event, $delivery)) {
+            return false;
+        }
+
+        if (!$this->validateSignature($signature, $payload)) {
             return false;
         }
 
         $this->data = json_decode($payload,true);
-        $this->event = $headers['X-GitHub-Event'];
-        $this->delivery = $headers['X-GitHub-Delivery'];
+        $this->event = $event;
+        $this->delivery = $delivery;
         return true;
     }