re #53

controllers/hooks.php

@@ -8,11 +8,11 @@ final class HooksController extends EventController
     public function system_action()
     {
         if (!$this->verifySecret(Config::get()->getValue('TRAC2GITLAB_GITLAB_SYSTEMHOOK_SECRET'))) {
-            throw new AccessDeniedException();
+            $this->halt('Thou shalt not pass.', 403);
         }
 
         if (!$this->verifyEvent()) {
-            throw new Exception('This is not a valid gitlab event');
+            $this->halt('This is not a valid gitlab event');
         }
 
         $this->processHooks($this->getKnownSystemhooks());
@@ -29,7 +29,7 @@ final class HooksController extends EventController
     public function web_action()
     {
         if (!$this->verifySecret(Config::get()->getValue('TRAC2GITLAB_GITLAB_WEBHOOK_SECRET'))) {
-            throw new AccessDeniedException();
+            $this->halt('Thou shalt not pass.', 403);
         }
 
         $payload = $this->payload();
@@ -39,20 +39,7 @@ final class HooksController extends EventController
             || !isset($payload['project']['id'])
             || $payload['project']['id'] != $this->gitlab_project_id
         ) {
-            $this->set_status(500);
-            $this->render_json([
-                'payload' => $payload['project']['id'] ?? 'NONE!',
-                'id' => $this->gitlab_project_id,
-                'result' => $this->verifyEvent(),
-                'event' => $_SERVER['HTTP_X_GITLAB_EVENT'] ?? 'NONE',
-                'server' => $_SERVER,
-                'names' => [
-                    'event' => $payload['event_name'],
-                    'object_kind' => $payload['object_kind'],
-                ],
-            ]);
-            return;
-            throw new Exception('This is not a valid gitlab event');
+            $this->halt('This is not a valid gitlab event');
         }
 
         $this->processHooks($this->getKnownWebhooks());

lib/EventController.php

@@ -14,7 +14,7 @@ abstract class EventController extends GitlabController
         parent::before_filter($action, $args);
 
         if (!Request::isPost()) {
-            throw new MethodNotAllowedException();
+            $this->halt('Only POST requests are allowed');
         }
     }