svn commit: r926391 - in /shindig/trunk/java: common/conf/shindig.properties gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java

[li...@apache.org]

Author: lindner
Date: Mon Mar 22 23:11:38 2010
New Revision: 926391

URL: http://svn.apache.org/viewvc?rev=926391&view=rev
Log:
Add in container=default portions of URIs, make strict checking more specific

Modified:
    shindig/trunk/java/common/conf/shindig.properties
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java

Modified: shindig/trunk/java/common/conf/shindig.properties
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/conf/shindig.properties?rev=926391&r1=926390&r2=926391&view=diff
==============================================================================
--- shindig/trunk/java/common/conf/shindig.properties (original)
+++ shindig/trunk/java/common/conf/shindig.properties Mon Mar 22 23:11:38 2010
@@ -53,8 +53,8 @@ shindig.content-rewrite.include-urls=.*
 shindig.content-rewrite.exclude-urls=
 shindig.content-rewrite.include-tags=link,script,embed,img,style
 shindig.content-rewrite.expires=86400
-shindig.content-rewrite.proxy-url=/gadgets/proxy?url=
-shindig.content-rewrite.concat-url=/gadgets/concat?
+shindig.content-rewrite.proxy-url=/gadgets/proxy?container=default&url=
+shindig.content-rewrite.concat-url=/gadgets/concat?container=default&
 shindig.content-rewrite.enable-split-js-concat=false
 
 #

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java?rev=926391&r1=926390&r2=926391&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/uri/DefaultProxyUriManager.java Mon Mar 22 23:11:38 2010
@@ -227,10 +227,11 @@ public class DefaultProxyUriManager impl
     }
     
     String queryHost = config.getString(container, PROXY_HOST_PARAM);
-    if (queryHost == null ||
-        (strictParsing && !queryHost.equalsIgnoreCase(uriIn.getAuthority()))) {
-      throw new GadgetException(GadgetException.Code.INVALID_PATH, "Invalid proxy host",
-          HttpResponse.SC_BAD_REQUEST);
+    if (strictParsing) {
+      if (queryHost == null || !queryHost.equalsIgnoreCase(uriIn.getAuthority())) {
+        throw new GadgetException(GadgetException.Code.INVALID_PATH, "Invalid proxy host",
+            HttpResponse.SC_BAD_REQUEST);
+      }
     }
     
     try {