svn commit: r933831 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java

[johnh]

Author: johnh
Date: Wed Apr 14 01:45:01 2010
New Revision: 933831

URL: http://svn.apache.org/viewvc?rev=933831&view=rev
Log:
Relax JS Uri host verification.

Patch provided by Ziv Horesh.


Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java?rev=933831&r1=933830&r2=933831&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultJsUriManager.java
 Wed Apr 14 01:45:01 2010
@@ -114,14 +114,6 @@ public class DefaultJsUriManager impleme
       return INVALID_URI;
     }
     
-    // We somewhat cheat in that jsHost may contain protocol/scheme as well.
-    Uri hostUri = Uri.parse(jsHost);
-    
-    if (!host.equals(hostUri.getAuthority())) {
-      issueUriFormatError("Js Uri host mismatch, is: " + host + ", expected: " 
+ jsHost);
-      return INVALID_URI;
-    }
-    
     // Pull out the collection of features referenced by the Uri.
     String path = uri.getPath();
     if (path == null) {

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java?rev=933831&r1=933830&r2=933831&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/uri/DefaultJsUriManagerTest.java
 Wed Apr 14 01:45:01 2010
@@ -150,19 +150,6 @@ public class DefaultJsUriManagerTest {
   }
   
   @Test
-  public void processHostMismatch() {
-    String targetHost = "target-host.org";
-    ContainerConfig config = mockConfig("http://"; + targetHost, "/gadgets/js");
-    TestDefaultJsUriManager manager = makeManager(config, null);
-    Uri testUri = Uri.parse("http://other-host.org/gadgets/js/feature"; + 
JS_SUFFIX + '?' +
-        Param.CONTAINER.getKey() + '=' + CONTAINER);
-    JsUri jsUri = manager.processExternJsUri(testUri);
-    assertTrue(manager.hadError());
-    assertEquals(jsUri.getStatus(), UriStatus.BAD_URI);
-    assertSame(DefaultJsUriManager.INVALID_URI, jsUri);
-  }
-  
-  @Test
   public void processPathPrefixMismatch() {
     String targetHost = "target-host.org";
     ContainerConfig config = mockConfig("http://"; + targetHost, "/gadgets/js");