Merge pull request #15 from islamic-network/develop

Develop

Author: Meezaan-ud-Din Abdu Dhil-Jalali Wal-Ikram / مِيزَانُ الْدِّينْ عَبْدُ ذِيْ الْجَلَالِ وَ الْإِكْرَامِ

Dockerfile

@@ -26,7 +26,7 @@ ENV MEMCACHED_HOST "proxy-memcached"
 ENV MEMCACHED_PORT "11211"
 
 # PROXY BASE URL WITHOUT trailing slash
-ENV PROXY_URL "https://some_url.com"
+ENV PROXY_URL "https://some.url"
 ENV WAF_CONFIG_URL "http://vesica.ws/waf.yml"
 ENV WAF_PROXY_NAMESPACE "SomeApiWaf"
 ENV WAF_NAME "VESICA-WAF"

bootstrap/wafMiddleware.php

@@ -11,15 +11,6 @@
 use Monolog\Logger;
 use Vesica\Slim\Middleware\Headers\Validate as HeaderValidationMiddleware;
 
-/** Invoke Middleware for Load Balancer Checks */
-$app->add(new HeaderValidationMiddleware(
-        (bool) getenv('LOAD_BALANCER_MODE'),
-        'X-LOAD-BALANCER',
-        getenv('LOAD_BALANCER_KEY'),
-        'Invalid Load Balancer Key.'
-    )
-);
-
 /** Invoke Middleware for WAF Checks */
 $app->add(function (Request $request, Response $response, $next) {
 

composer.lock

@@ -22,7 +22,9 @@
             ->forward($request)
             ->filter(function (Request $request, Response $response, $next) {
                 // Manipulate the request object.
-                $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                if (!empty($request->getHeader('X-Forwarded-For'))) {
+                    $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                }
 
                 // Call the next item in the middleware.
                 $response = $next($request, $response);

routes/delete.php

@@ -22,7 +22,10 @@
             ->forward($request)
             ->filter(function (Request $request, Response $response, $next) {
                 // Manipulate the request object.
-                $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                if (!empty($request->getHeader('X-Forwarded-For'))) {
+                    $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                }
+                
 
                 // Call the next item in the middleware.
                 $response = $next($request, $response);

routes/get.php

@@ -22,7 +22,9 @@
             ->forward($request)
             ->filter(function (Request $request, Response $response, $next) {
                 // Manipulate the request object.
-                $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                if (!empty($request->getHeader('X-Forwarded-For'))) {
+                    $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                }
 
                 // Call the next item in the middleware.
                 $response = $next($request, $response);

routes/post.php

@@ -22,7 +22,9 @@
             ->forward($request)
             ->filter(function (Request $request, Response $response, $next) {
                 // Manipulate the request object.
-                $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                if (!empty($request->getHeader('X-Forwarded-For'))) {
+                    $request = $request->withHeader('X-Forwarded-For', $request->getHeader('X-Forwarded-For'));
+                }
 
                 // Call the next item in the middleware.
                 $response = $next($request, $response);

routes/put.php

@@ -27,7 +27,7 @@ public function __invoke(Request $request, Response $response, \Exception $excep
 
         if ($exception !== null) {
             $r = [
-                'code' => $exception->getCode(),
+                'code' => 500,
                 'status' => $exception->getMessage(),
                 'data' => $exception->getMessage()
             ];