Bug 419627 - URITemplate resevered expansion must ignore percent encoded literalsorigin/ggayedTestBranch

2 files changed, 12 insertions, 3 deletions

diff --git a/bundles/org.eclipse.orion.client.core/web/orion/URITemplate.js b/bundles/org.eclipse.orion.client.core/web/orion/URITemplate.js
index a398e57..d4d020a 100644
--- a/bundles/org.eclipse.orion.client.core/web/orion/URITemplate.js
+++ b/bundles/org.eclipse.orion.client.core/web/orion/URITemplate.js
@@ -26,6 +26,7 @@ define(function(){
 	};

 

 	var VARSPEC_REGEXP = /^((?:(?:[a-zA-Z0-9_])|(?:%[0-9A-F][0-9A-F]))(?:(?:[a-zA-Z0-9_.])|(?:%[0-9A-F][0-9A-F]))*)(?:(\*)|:([0-9]+))?$/;

+	var PCT_ENCODED_G = /%25[0-9A-F][0-9A-F]/g;

 

 	function Literal(text) {

 		this._text = text;

@@ -37,6 +38,10 @@ define(function(){
 		}

 	};

 	

+	function decodePercent(str) {

+		return str.replace("%25", "%");

+	}

+	

 	function encodeString(value, encoding) {

 		if (encoding === "U") { //$NON-NLS-0$

 			return encodeURIComponent(value).replace(/[!'()*]/g, function(str) {

@@ -44,10 +49,10 @@ define(function(){
 			});

 		}

 		if (encoding === "U+R") { //$NON-NLS-0$

-			return encodeURI(value).replace(/%5B/g, '[').replace(/%5D/g, ']'); //$NON-NLS-1$ //$NON-NLS-0$

+			return encodeURI(value).replace(/%5B/g, '[').replace(/%5D/g, ']').replace(PCT_ENCODED_G, decodePercent); //$NON-NLS-1$ //$NON-NLS-0$

 		}

 		if (encoding === "U+R-,") { //$NON-NLS-0$

-			return encodeURI(value).replace(/%5B/g, '[').replace(/%5D/g, ']').replace(/,/g, '%2C'); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$

+			return encodeURI(value).replace(/%5B/g, '[').replace(/%5D/g, ']').replace(PCT_ENCODED_G, decodePercent).replace(/,/g, '%2C'); //$NON-NLS-2$ //$NON-NLS-1$ //$NON-NLS-0$

 		}

 		throw new Error("Unknown allowed character set: " + encoding);

 	}

diff --git a/bundles/org.eclipse.orion.client.ui/web/js-tests/URITemplate/testcase.js b/bundles/org.eclipse.orion.client.ui/web/js-tests/URITemplate/testcase.js
index b434f93..4e80f83 100644
--- a/bundles/org.eclipse.orion.client.ui/web/js-tests/URITemplate/testcase.js
+++ b/bundles/org.eclipse.orion.client.ui/web/js-tests/URITemplate/testcase.js
@@ -30,7 +30,8 @@ define(["orion/assert", "orion/URITemplate"], function(assert, URITemplate) {
 		y: "768",
 		empty: "",
 		empty_keys: {},
-		undef: null
+		undef: null,
+		encodedpct: "%25%A2"
 	};
 	
 	tests.testLiteralTemplate = function() {
@@ -55,6 +56,7 @@ define(["orion/assert", "orion/URITemplate"], function(assert, URITemplate) {
 		assert.equal(new URITemplate("{list*}").expand(variables), "red,green,blue");
 		assert.equal(new URITemplate("{keys}").expand(variables), "semi,%3B,dot,.,comma,%2C");
 		assert.equal(new URITemplate("{keys*}").expand(variables), "semi=%3B,dot=.,comma=%2C");
+		assert.equal(new URITemplate("{encodedpct}").expand(variables), "%2525%25A2");
 	};
 	
 	tests.testReservedExpansion = function() {
@@ -75,6 +77,7 @@ define(["orion/assert", "orion/URITemplate"], function(assert, URITemplate) {
 		assert.equal(new URITemplate("{+list*}").expand(variables), "red,green,blue");
 		assert.equal(new URITemplate("{+keys}").expand(variables), "semi,;,dot,.,comma,,");
 		assert.equal(new URITemplate("{+keys*}").expand(variables), "semi=;,dot=.,comma=,");
+		assert.equal(new URITemplate("{+encodedpct}").expand(variables), "%25%A2");
 	};
 	
 	tests.testCommaReservedExpansion = function() {
@@ -95,6 +98,7 @@ define(["orion/assert", "orion/URITemplate"], function(assert, URITemplate) {
 		assert.equal(new URITemplate("{,list*}").expand(variables), "red,green,blue");
 		assert.equal(new URITemplate("{,keys}").expand(variables), "semi,;,dot,.,comma,%2C");
 		assert.equal(new URITemplate("{,keys*}").expand(variables), "semi=;,dot=.,comma=%2C");
+		assert.equal(new URITemplate("{,encodedpct}").expand(variables), "%25%A2");
 	};
 	return tests;
 });