Merge pull request #26 from telefonicaid/task/IOTCORE-122_FRN_Composi…

…tion Task/iotcore 122 frn composition
telefonicaid · Sep 22, 2014 · 8616acb · 8616acb
2 parents 4cc85e0 + 741ab18
commit 8616acb
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 24 deletions.
diff --git a/lib/fiware-orion-pep.js b/lib/fiware-orion-pep.js
@@ -148,6 +148,32 @@ function xmlRawBody(req, res, next) {
     }
 }
 
+function generateFRN(req, res, next) {
+    var frn = 'frn:' + config.componentName + ':';
+
+    if (req.organization) {
+        frn += req.organization + ':';
+    } else {
+        frn += ':';
+    }
+
+    if (req.headers[constants.PATH_HEADER]) {
+        frn += req.headers[constants.PATH_HEADER] + ':';
+    } else {
+        frn += ':';
+    }
+
+    if (req.entityType) {
+        frn += req.entityType;
+    } else {
+        frn += ':';
+    }
+
+    req.frn = frn;
+
+    next();
+}
+
 /**
  * Start a new proxy for the configured target. All the configuration is picked up from the config file.
  *
@@ -194,6 +220,7 @@ function startProxy(callback) {
     proxyObj.proxy.use(extractOrganization);
     proxyObj.proxy.use(extractUserId);
     proxyObj.proxy.use(executeDynamicMiddlewares);
+    proxyObj.proxy.use(generateFRN);
     proxyObj.proxy.use(validation.extractRoles);
     proxyObj.proxy.use(validation.validate);
     proxyObj.proxy.use(sendRequest);

diff --git a/lib/services/accessValidation.js b/lib/services/accessValidation.js
@@ -165,7 +165,7 @@ function sendAccessRequest(accessPayload, callback) {
  */
 function validationProcess(req, res, next) {
     async.waterfall([
-        apply(createAccessRequest, req.roles, req.organization, req.action),
+        apply(createAccessRequest, req.roles, req.frn, req.action),
         sendAccessRequest
     ], next);
 }

diff --git a/test/authorizationResponses/rolesOfUser.json b/test/authorizationResponses/rolesOfUser.json
@@ -12,7 +12,7 @@
     ],
     "organizations": [
         {
-            "id": 551,
+            "id": 833,
             "actorId": 4230,
             "displayName": "VlciBasuras",
             "roles": [

diff --git a/test/unit/validate_user_action_test.js b/test/unit/validate_user_action_test.js
@@ -61,6 +61,11 @@ describe('Validate action with Access Control', function() {
                             res.json(200, utils.readExampleFile('./test/authorizationResponses/rolesOfUser.json'));
                         };
 
+                        mockAccessApp.handler = function(req, res) {
+                            res.set('Content-Type', 'application/xml');
+                            res.send(utils.readExampleFile('./test/accessControlResponses/permitResponse.xml', true));
+                        };
+
                         done();
                     });
                 });
@@ -85,8 +90,8 @@ describe('Validate action with Access Control', function() {
             headers: {
                 'Content-Type': 'application/json',
                 'Accept': 'application/json',
-                'Fiware-Service': 'frn:contextbroker:551:::',
-                'fiware-servicepath': '551',
+                'Fiware-Service': '551',
+                'fiware-servicepath': '833',
                 'X-Auth-Token': 'UAidNA9uQJiIVYSCg0IQ8Q'
             },
             json: utils.readExampleFile('./test/orionRequests/entityCreation.json')
@@ -117,22 +122,6 @@ describe('Validate action with Access Control', function() {
             });
         });
 
-        it('should send a validation request to Access Control', function(done) {
-            var mockExecuted = false;
-
-            mockAccessApp.handler = function(req, res) {
-                req.rawBody.should.match(/8907(.|\n)*4937(.|\n)*frn:contextbroker:551:::(.|\n)*create/);
-                res.set('Content-Type', 'application/xml');
-                res.send(utils.readExampleFile('./test/accessControlResponses/permitResponse.xml', true));
-                mockExecuted = true;
-            };
-
-            request(options, function(error, response, body) {
-                mockExecuted.should.equal(true);
-                done();
-            });
-        });
-
         it('should proxy the request to the destination', function(done) {
             var mockExecuted = false;
 
@@ -160,8 +149,8 @@ describe('Validate action with Access Control', function() {
             headers: {
                 'Content-Type': 'application/json',
                 'Accept': 'application/json',
-                'Fiware-Service': 'frn:contextbroker:551:::',
-                'fiware-servicepath': '551',
+                'Fiware-Service': '551',
+                'fiware-servicepath': '833',
                 'X-Auth-Token': 'UAidNA9uQJiIVYSCg0IQ8Q'
             },
             json: utils.readExampleFile('./test/orionRequests/entityCreation.json')
@@ -203,7 +192,8 @@ describe('Validate action with Access Control', function() {
             headers: {
                 'Content-Type': 'application/json',
                 'Accept': 'application/json',
-                'Fiware-Service': 'frn:contextbroker:551:::',
+                'Fiware-Service': '551',
+                'Fiware-Path': '833',
                 'X-Auth-Token': 'UAidNA9uQJiIVYSCg0IQ8Q'
             },
             json: utils.readExampleFile('./test/orionRequests/entityCreation.json')
@@ -248,7 +238,8 @@ describe('Validate action with Access Control', function() {
             headers: {
                 'Content-Type': 'application/json',
                 'Accept': 'application/json',
-                'Fiware-Service': 'frn:contextbroker:551:::',
+                'Fiware-Service': '551',
+                'Fiware-Path': '833',
                 'X-Auth-Token': 'UAidNA9uQJiIVYSCg0IQ8Q'
             },
             json: utils.readExampleFile('./test/orionRequests/entityCreation.json')