summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-09-22 10:26:02 +0200
committerVijay Bellur <vijay@gluster.com>2011-09-22 05:25:14 -0700
commiteede6ce87fc19878873e8320c172d1acb2deaa33 (patch)
treebf00a41b8bb63e51c6dcee07362f75553bffb459
parent21eabe9bae81b3cc732fcf773fb5c1995f19d0d7 (diff)
geo-rep: disallow some special characters in url syntax
- space is disallowed to make rsync target unambigous for gsyncd wrapper - *, ?, [ is disallowed so that we can tell away globs from urls Nothing too bad would happen without these restrictions, but this way gluster errs out early instead of producing some mystical error further down on the way. Change-Id: Idd4e68f7d91598a7a8e30ccbc6d395da570cdf2e BUG: 3610 Reviewed-on: http://review.gluster.com/490 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
-rw-r--r--xlators/features/marker/utils/syncdaemon/resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/features/marker/utils/syncdaemon/resource.py b/xlators/features/marker/utils/syncdaemon/resource.py
index 821c51a1434..3595f428fdd 100644
--- a/xlators/features/marker/utils/syncdaemon/resource.py
+++ b/xlators/features/marker/utils/syncdaemon/resource.py
@@ -20,7 +20,7 @@ from master import GMaster
import syncdutils
from syncdutils import GsyncdError
-UrlRX = re.compile('\A(\w+)://(.*)')
+UrlRX = re.compile('\A(\w+)://([^ *?[]*)\Z')
HostRX = re.compile('[a-z\d](?:[a-z\d.-]*[a-z\d])?', re.I)
UserRX = re.compile("[\w!\#$%&'*+-\/=?^_`{|}~]+")