Created a new action which will be used to serve all requests passed to the builder service.

The new action serves both compilation and library-info-fetching requests. Depending on the request type ('compiler' or 'library'),
the main action will call the respective function and the pass the response to the caller.
Every request should have the correct API settings (auth-key and API version) and must include the must include the type of
request in the body. Every other combination of these will be rejected.

Author: fpapadopou

Symfony/src/Codebender/ApiBundle/Controller/DefaultController.php

@@ -23,14 +23,18 @@ public function statusAction()
     }
 
     /**
-     * compile action
+     * Gets a request for compilation or library fetching (depends on the 'type' field of the request)
+     * and passes the request to either the compiler or the library manager.
      *
-     * @return Response Response intance.
+     * Includes several checks in order to ensure the validity of the data provided as well
+     * as authentication.
      *
+     * @param $auth_key
+     * @param $version
+     * @return Response
      */
-    public function compileAction($auth_key, $version)
+    public function handleRequestAction($auth_key, $version)
     {
-
         if ($auth_key !== $this->container->getParameter('auth_key'))
         {
             return new Response(json_encode(array("success" => false, "message" => "Invalid authorization key.")));
@@ -49,18 +53,48 @@ public function compileAction($auth_key, $version)
 
         $contents = json_decode($request, true);
 
+        if ($contents === NULL)
+        {
+            return new Response(json_encode(array("success" => false, "message" => "Wrong data.")));
+        }
+
+        if (!array_key_exists("data", $contents))
+        {
+            return new Response(json_encode(array("success" => false, "message" => "Insufficient data provided.")));
+        }
+
+        if ($contents["type"] == "compiler") {
+            return new Response($this->compile($contents["data"]));
+        }
+
+        if ($contents["type"] == "library")
+        {
+            return new Response($this->getLibraryInfo(json_encode($contents["data"])));
+        }
+
+        return new Response(json_encode(array("success" => false, "message" => "Invalid request type (can handle only 'compiler' or 'library' requests)")));
+    }
+
+    /**
+     * Gets the data from the handleRequestAction and proceeds with the compilation
+     *
+     * @param $contents
+     * @return Response
+     */
+    protected function compile($contents)
+    {
         $apihandler = $this->get('codebender_api.handler');
 
         $files = $contents["files"];
 
         $this->checkForUserProject($files);
 
-        $userlibs = array();
+        $userLibs = array();
 
         if (array_key_exists('libraries', $contents))
-            $userlibs = $contents['libraries'];
+            $userLibs = $contents['libraries'];
 
-        $parsedLibs = $this->checkHeaders($files, $userlibs);
+        $parsedLibs = $this->checkHeaders($files, $userLibs);
 
         $contents["libraries"] = $parsedLibs['libraries'];
 
@@ -70,18 +104,37 @@ public function compileAction($auth_key, $version)
         $data = $apihandler->post_raw_data($this->container->getParameter('compiler'), $request_content);
 
         $decoded = json_decode($data, true);
-        if ($decoded == null)
+        if ($decoded === NULL)
         {
-            return new Response(json_encode(array("success" => false, "message"=> "Failed to get compiler response.")));
+            return json_encode(array("success" => false, "message"=> "Failed to get compiler response."));
         }
 
         if ($decoded["success"] === false && !array_key_exists("step", $decoded))
+        {
             $decoded["step"] = "unknown";
+        }
 
         unset($parsedLibs['libraries']);
         $decoded['additionalCode'] = $parsedLibs;
 
-        return new Response(json_encode($decoded));
+        return json_encode($decoded);
+    }
+
+    /**
+     * Gets a request for library information from the handleRequestAction and makes the
+     * actual call to the library manager.
+     * The data must be already json encoded before passing them to this function.
+     *
+     * @param $data
+     * @return mixed
+     */
+    protected function getLibraryInfo($data)
+    {
+        $handler = $this->get('codebender_api.handler');
+
+        $libraryManager = $this->container->getParameter('library');
+
+        return $handler->post_raw_data($libraryManager, $data);
     }
 
     /**
@@ -91,7 +144,7 @@ public function compileAction($auth_key, $version)
      *
      * @return array
      */
-    protected function checkHeaders($files,  array $userlibs)
+    protected function checkHeaders($files, $userLibs)
     {
         $apiHandler = $this->get('codebender_api.handler');
 
@@ -100,17 +153,14 @@ protected function checkHeaders($files,  array $userlibs)
         // declare arrays
         $libraries = $notFoundHeaders = $foundHeaders = $fetchedLibs = $providedLibs = array();
 
-        $providedLibs = array_keys($userlibs);
-
-        // get library manager url
-        $libmanager_url = $this->container->getParameter('library');
+        $providedLibs = array_keys($userLibs);
 
-        $libraries = $userlibs;
+        $libraries = $userLibs;
 
         foreach ($headers as $header) {
 
             $exists_in_request = false;
-            foreach ($userlibs as $lib){
+            foreach ($userLibs as $lib){
                 foreach ($lib as $libcontent){
                     if ($libcontent["filename"] == $header.".h") {
                         $exists_in_request = true;
@@ -120,7 +170,8 @@ protected function checkHeaders($files,  array $userlibs)
             }
             if ($exists_in_request === false) {
 
-                $data = $apiHandler->get($libmanager_url . "/fetch?library=" . urlencode($header));
+                $requestContent = array("type" => "fetch", "library" => $header);
+                $data = $this->getLibraryInfo(json_encode($requestContent));
                 $data = json_decode($data, true);
 
                 if ($data["success"]) {

Symfony/src/Codebender/ApiBundle/Resources/config/routing.yml

@@ -3,7 +3,7 @@ CodebenderApiBundle_status_check:
     defaults: { _controller: CodebenderApiBundle:Default:status }
 
 CodebenderApiBundle_compile:
-    pattern:    /{auth_key}/{version}/compile
-    defaults: { _controller: CodebenderApiBundle:Default:compile }
+    pattern:    /{auth_key}/{version}
+    defaults: { _controller: CodebenderApiBundle:Default:handleRequest }
     requirements:
       _method: POST