fix #31: decode URI, process files, and encode URI again

rstudio · May 3, 2017 · 143f0b7 · 143f0b7
1 parent a1cfb49
commit 143f0b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/R/render.R b/R/render.R
@@ -160,7 +160,7 @@ decode_paths = function(x, dcur, env, root) {
   m = gregexpr(r, x)
   regmatches(x, m) = lapply(regmatches(x, m), function(p) {
     if (length(p) == 0) return(p)
-    path = gsub(r, '\\2', p)
+    path = decode_uri(gsub(r, '\\2', p))
     path = file.path(root, path)
     d0 = gsub('^(.+_files)/.+', '\\1', path)
 
@@ -184,7 +184,7 @@ decode_paths = function(x, dcur, env, root) {
 
     env$dirs = c(env$dirs, unique(d0))
 
-    paste0(gsub(r, '\\1="', p), path, '"')
+    paste0(gsub(r, '\\1="', p), encode_uri(path), '"')
   })
   x
 }

diff --git a/R/utils.R b/R/utils.R
@@ -357,3 +357,6 @@ clean_widget_html = function(x) {
   }
   x
 }
+
+decode_uri = function(...) httpuv::decodeURIComponent(...)
+encode_uri = function(...) httpuv::encodeURIComponent(...)