You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2014/01/24 17:23:02 UTC
[1/2] git commit: [#7035] Bump version of TracWikiImporter for bug fix
Updated Branches:
refs/heads/master 43def0d73 -> 3f90515ee
[#7035] Bump version of TracWikiImporter for bug fix
Signed-off-by: Cory Johns <cj...@slashdotmedia.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3f90515e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3f90515e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3f90515e
Branch: refs/heads/master
Commit: 3f90515eefbdc8f77ccfdf12b42426d6f1aee084
Parents: 7d932b8
Author: Cory Johns <cj...@slashdotmedia.com>
Authored: Thu Jan 23 20:15:13 2014 +0000
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Fri Jan 24 16:20:10 2014 +0000
----------------------------------------------------------------------
requirements-sf.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3f90515e/requirements-sf.txt
----------------------------------------------------------------------
diff --git a/requirements-sf.txt b/requirements-sf.txt
index 1db3bd4..e259937 100644
--- a/requirements-sf.txt
+++ b/requirements-sf.txt
@@ -20,7 +20,7 @@ wsgipreload==1.2
pyzmq==2.1.7
html2text==3.200.3dev-20121112
PyMollom==0.1
-TracWikiImporter==0.3.5
+TracWikiImporter==0.3.6
MediawikiImporter==0.0.2
Unidecode==0.04.14
[2/2] git commit: [#7035] canonicalize URL escaping on of paths
before use in token validation
Posted by jo...@apache.org.
[#7035] canonicalize URL escaping on of paths before use in token validation
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7d932b89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7d932b89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7d932b89
Branch: refs/heads/master
Commit: 7d932b89cf516c33d4ad57a7c23df0583b31349b
Parents: 43def0d
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Jan 14 14:39:33 2014 -0500
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Fri Jan 24 16:20:10 2014 +0000
----------------------------------------------------------------------
Allura/allura/controllers/rest.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7d932b89/Allura/allura/controllers/rest.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/rest.py b/Allura/allura/controllers/rest.py
index 6eb12a8..6e7e452 100644
--- a/Allura/allura/controllers/rest.py
+++ b/Allura/allura/controllers/rest.py
@@ -19,6 +19,7 @@
"""REST Controller"""
import logging
+from urllib import quote, unquote
import oauth2 as oauth
from webob import exc
@@ -56,7 +57,12 @@ class RestController(object):
token = M.ApiToken.get(api_key)
else:
log.info('Authenticating with API ticket')
- if token is not None and token.authenticate_request(request.path, request.params):
+ # Sometimes a path might be only partially escaped like /FAQ-Development,%20Bug%20Reporting,
+ # I don't know why.
+ path = quote(unquote(request.path))
+ if path != request.path:
+ log.info('Canonicalized %s to %s', request.path, path)
+ if token is not None and token.authenticate_request(path, request.params):
return token
else:
log.info('API authentication failure')