Changeset 1985

Timestamp:

Sep 1, 2011, 2:38:54 PM (8 years ago)

Author:

work@…

Message:

• the restcontoller's getAssays method compares the module url with the assay module url. However, it is frequently the case that while correct, they do not match entirely. For example when using a named host, localhost or a named host in the hosts file. Now the hostname will be resolved to ip which will be matched instead

Location:

trunk

Files:

• . (modified) (1 prop)
• application.properties (modified) (1 diff)
• grails-app/controllers/RestController.groovy (modified) (4 diffs)

trunk

@@ -12 +12 @@
 dtd
 *.mp4
+dump

@@ -12 +12 @@
 dtd
 *.mp4
+dump

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Fri Jul 01 16:43:44 CEST 2011
+#Thu Sep 01 11:36:46 CEST 2011
 app.build.display.info=1
 app.build.svn.revision=1079

trunk/grails-app/controllers/RestController.groovy

@@ -366 +366 @@
          */
         def getAssays = {
+                def moduleURL, moduleInet, assayModuleURL, assayModuleInet
+
                 // Check which user has been logged in
                 def user = authenticationService.getRemotelyLoggedInUser( params.consumer, params.token )
@@ -381 +383 @@
                         return
                 }
-                
+
                 def assays = []
                 
                 if( params.studyToken ) {
-
                         def study = Study.findByStudyUUID(params.studyToken)
 
@@ -424 +425 @@
 
                 // Create data for all assays
+                moduleURL = new URL(params.moduleURL)
+                moduleInet = InetAddress.getByName(moduleURL.getHost())
                 assays.each{ assay ->
-                        if (assay.module?.url && assay.module.url.equals(params.moduleURL)) {
-                                if(assay) {
+                        /**
+                         * assay.module.url does not necessarily have to match the moduleURL
+                         * completely (e.g. when using a hosts file vs ip), especially when using
+                         * localhost, 127.0.01 or a host name that aliasses localhost.
+                         *
+                         * Therefore we will resolve the host names and compare the resulting ip
+                         * addresses and see if they match
+                         *
+                         * future improvement: do not use the module URL for matching at all. Perhaps
+                         * a module identifier or a 'module token' would be better as this is not
+                         * url dependant.
+                         */
+                        if (assay.module?.url) {
+                                assayModuleURL = new URL(assay.module.url)
+                                assayModuleInet = InetAddress.getByName(assayModuleURL.getHost())
+
+                                if (
+                                        moduleInet.hostAddress == assayModuleInet.hostAddress &&        // match ip addresses
+                                        moduleURL.path == assayModuleURL.path &&                                        // match host path
+                                        assay                                                       // got assay?
+                                ) {
                                         def map = [assayToken : assay.giveUUID()]
+
                                         assay.giveFields().each { field ->
                                                 def name = field.name
@@ -433 +456 @@
                                                 map[name] = value
                                         }
+
                                         map["parentStudyToken"] = assay.parent.giveUUID()
                                         returnList.push( map )

@@ -12 +12 @@
 dtd
 *.mp4
+dump