You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2020/04/15 21:58:46 UTC
[allura] branch db/8357 created (now 33b242c)
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a change to branch db/8357
in repository https://gitbox.apache.org/repos/asf/allura.git.
at 33b242c [#8357] a few git tests for good measure
This branch includes the following new commits:
new 7418072 [#8357] url encoding fixes for filenames with percents in them
new 33b242c [#8357] a few git tests for good measure
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[allura] 02/02: [#8357] a few git tests for good measure
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8357
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 33b242c65f788d79d47a3937605747e335e1f315
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Wed Apr 15 21:53:18 2020 +0000
[#8357] a few git tests for good measure
---
.../objects/2f/8f57224a14dfd261e5b4ebd760823b105e77cb | Bin 0 -> 28 bytes
.../objects/73/442368bee0c30efa8f67799edb29332d6e3d17 | Bin 0 -> 298 bytes
.../objects/bb/0c25136393d99325cebdb37988f4234c51933c | Bin 0 -> 42 bytes
.../objects/bc/79c9fcfe31ed77d1ef45f5dcf4abf9917dac5d | 4 ++++
.../forgegit/tests/data/weird-chars.git/refs/heads/master | 2 +-
ForgeGit/forgegit/tests/functional/test_controllers.py | 12 ++++++++++++
6 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/ForgeGit/forgegit/tests/data/weird-chars.git/objects/2f/8f57224a14dfd261e5b4ebd760823b105e77cb b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/2f/8f57224a14dfd261e5b4ebd760823b105e77cb
new file mode 100644
index 0000000..51764f4
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/2f/8f57224a14dfd261e5b4ebd760823b105e77cb differ
diff --git a/ForgeGit/forgegit/tests/data/weird-chars.git/objects/73/442368bee0c30efa8f67799edb29332d6e3d17 b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/73/442368bee0c30efa8f67799edb29332d6e3d17
new file mode 100644
index 0000000..3541a73
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/73/442368bee0c30efa8f67799edb29332d6e3d17 differ
diff --git a/ForgeGit/forgegit/tests/data/weird-chars.git/objects/bb/0c25136393d99325cebdb37988f4234c51933c b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/bb/0c25136393d99325cebdb37988f4234c51933c
new file mode 100644
index 0000000..db65981
Binary files /dev/null and b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/bb/0c25136393d99325cebdb37988f4234c51933c differ
diff --git a/ForgeGit/forgegit/tests/data/weird-chars.git/objects/bc/79c9fcfe31ed77d1ef45f5dcf4abf9917dac5d b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/bc/79c9fcfe31ed77d1ef45f5dcf4abf9917dac5d
new file mode 100644
index 0000000..01a7be5
--- /dev/null
+++ b/ForgeGit/forgegit/tests/data/weird-chars.git/objects/bc/79c9fcfe31ed77d1ef45f5dcf4abf9917dac5d
@@ -0,0 +1,4 @@
+x��Aj!E����ʶBC�9Di�t�8j��q��>����V�9=�̮
+;9��CR�����{�* #�W��n��>!�MJ�L��
�L"�bɖ(Dr�#1�3�3��ዟ
+���2�2�K�����6���o���l���Gx�+f������w�
+����;��͚U�
\ No newline at end of file
diff --git a/ForgeGit/forgegit/tests/data/weird-chars.git/refs/heads/master b/ForgeGit/forgegit/tests/data/weird-chars.git/refs/heads/master
index 81ca180..1aad7ec 100644
--- a/ForgeGit/forgegit/tests/data/weird-chars.git/refs/heads/master
+++ b/ForgeGit/forgegit/tests/data/weird-chars.git/refs/heads/master
@@ -1 +1 @@
-b85dfbec3a5d08677bdd402fc0338934f623a234
+bc79c9fcfe31ed77d1ef45f5dcf4abf9917dac5d
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index 3063376..2da7cf8 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -299,6 +299,18 @@ class TestRootController(_TestCase):
assert_equal(resp.headers.get('Content-Disposition').decode('utf-8'),
'attachment;filename="with space.txt"')
+ url = ci + 'tree/' + h.urlquote('with%2Furlquote-literal.txt') + '?format=raw'
+ resp = self.app.get(url)
+ assert_in('%2F means /', resp.body.decode('utf-8'))
+ assert_equal(resp.headers.get('Content-Disposition').decode('utf-8'),
+ 'attachment;filename="with%2Furlquote-literal.txt"')
+
+ url = ci + 'tree/' + h.urlquote('with"&:specials.txt') + '?format=raw'
+ resp = self.app.get(url)
+ assert_in('"&: encodes as %22%26%3A', resp.body.decode('utf-8'))
+ assert_equal(resp.headers.get('Content-Disposition').decode('utf-8'),
+ 'attachment;filename="with"&:specials.txt"')
+
def test_invalid_file(self):
ci = self._get_ci()
self.app.get(ci + 'tree/READMEz', status=404)
[allura] 01/02: [#8357] url encoding fixes for filenames with
percents in them
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch db/8357
in repository https://gitbox.apache.org/repos/asf/allura.git
commit 7418072032099287c25c48caa26edc2e213645e0
Author: Dave Brondsema <db...@slashdotmedia.com>
AuthorDate: Wed Apr 15 20:00:32 2020 +0000
[#8357] url encoding fixes for filenames with percents in them
---
Allura/allura/controllers/repository.py | 4 +--
ForgeSVN/forgesvn/model/svn.py | 2 +-
ForgeSVN/forgesvn/tests/data/.gitignore | 1 +
ForgeSVN/forgesvn/tests/data/testsvn/db/current | 2 +-
.../forgesvn/tests/data/testsvn/db/revprops/0/7 | 13 +++++++
ForgeSVN/forgesvn/tests/data/testsvn/db/revs/0/7 | Bin 0 -> 1445 bytes
.../data/testsvn/db/transactions/6-9.txn/node.0.0 | 9 +++++
.../forgesvn/tests/data/testsvn/db/txn-current | 2 +-
.../forgesvn/tests/functional/test_controllers.py | 39 +++++++++++++++++++--
ForgeSVN/forgesvn/tests/model/test_repository.py | 4 ++-
10 files changed, 66 insertions(+), 10 deletions(-)
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index da8b834..82a8ab1 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -797,9 +797,7 @@ class TreeBrowser(BaseController, DispatchIndex):
next = h.really_unicode(unquote(next))
if not rest:
# Might be a file rather than a dir
- filename = h.really_unicode(
- unquote(
- request.environ['PATH_INFO'].rsplit(str('/'))[-1]))
+ filename = h.really_unicode(request.environ['PATH_INFO'].rsplit(str('/'))[-1])
if filename:
try:
obj = self._tree[filename]
diff --git a/ForgeSVN/forgesvn/model/svn.py b/ForgeSVN/forgesvn/model/svn.py
index b66e1fc..347e152 100644
--- a/ForgeSVN/forgesvn/model/svn.py
+++ b/ForgeSVN/forgesvn/model/svn.py
@@ -576,7 +576,7 @@ class SVNImplementation(M.RepositoryImplementation):
def open_blob(self, blob):
data = self._svn.cat(
- self._url + blob.path(),
+ self._url + h.urlquote(blob.path()),
revision=self._revision(blob.commit._id))
return BytesIO(data)
diff --git a/ForgeSVN/forgesvn/tests/data/.gitignore b/ForgeSVN/forgesvn/tests/data/.gitignore
new file mode 100644
index 0000000..9124e86
--- /dev/null
+++ b/ForgeSVN/forgesvn/tests/data/.gitignore
@@ -0,0 +1 @@
+rep-cache.db-journal
diff --git a/ForgeSVN/forgesvn/tests/data/testsvn/db/current b/ForgeSVN/forgesvn/tests/data/testsvn/db/current
index 1e8b314..7f8f011 100644
--- a/ForgeSVN/forgesvn/tests/data/testsvn/db/current
+++ b/ForgeSVN/forgesvn/tests/data/testsvn/db/current
@@ -1 +1 @@
-6
+7
diff --git a/ForgeSVN/forgesvn/tests/data/testsvn/db/revprops/0/7 b/ForgeSVN/forgesvn/tests/data/testsvn/db/revprops/0/7
new file mode 100644
index 0000000..db6824e
--- /dev/null
+++ b/ForgeSVN/forgesvn/tests/data/testsvn/db/revprops/0/7
@@ -0,0 +1,13 @@
+K 10
+svn:author
+V 4
+root
+K 8
+svn:date
+V 27
+2020-04-15T18:52:27.604943Z
+K 7
+svn:log
+V 37
+files with special characters in them
+END
diff --git a/ForgeSVN/forgesvn/tests/data/testsvn/db/revs/0/7 b/ForgeSVN/forgesvn/tests/data/testsvn/db/revs/0/7
new file mode 100644
index 0000000..ad28179
Binary files /dev/null and b/ForgeSVN/forgesvn/tests/data/testsvn/db/revs/0/7 differ
diff --git a/ForgeSVN/forgesvn/tests/data/testsvn/db/transactions/6-9.txn/node.0.0 b/ForgeSVN/forgesvn/tests/data/testsvn/db/transactions/6-9.txn/node.0.0
new file mode 100644
index 0000000..881c8fc
--- /dev/null
+++ b/ForgeSVN/forgesvn/tests/data/testsvn/db/transactions/6-9.txn/node.0.0
@@ -0,0 +1,9 @@
+id: 0.0.t6-9
+type: dir
+pred: 0.0.r6/412
+count: 7
+text: 6 244 155 155 df663cd5fc8bd5440cd3e8e960663343
+cpath: /
+copyroot: 0 /
+is-fresh-txn-root: y
+
diff --git a/ForgeSVN/forgesvn/tests/data/testsvn/db/txn-current b/ForgeSVN/forgesvn/tests/data/testsvn/db/txn-current
index 45a4fb7..6178079 100644
--- a/ForgeSVN/forgesvn/tests/data/testsvn/db/txn-current
+++ b/ForgeSVN/forgesvn/tests/data/testsvn/db/txn-current
@@ -1 +1 @@
-8
+b
diff --git a/ForgeSVN/forgesvn/tests/functional/test_controllers.py b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
index 97a1fb0..67fdaab 100644
--- a/ForgeSVN/forgesvn/tests/functional/test_controllers.py
+++ b/ForgeSVN/forgesvn/tests/functional/test_controllers.py
@@ -1,3 +1,4 @@
+# coding=utf-8
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -18,15 +19,17 @@
from __future__ import unicode_literals
from __future__ import absolute_import
import json
+import re
import shutil
import os
+import six
import tg
import pkg_resources
from tg import tmpl_context as c
from ming.orm import ThreadLocalORMSession
from mock import patch
-from nose.tools import assert_equal
+from nose.tools import assert_equal, assert_in
from IPython.testing.decorators import onlyif
from allura import model as M
@@ -101,13 +104,13 @@ class TestRootController(SVNTestController):
def test_commit_browser_data(self):
resp = self.app.get('/src/commit_browser_data')
data = json.loads(resp.body)
- assert_equal(data['max_row'], 5)
+ assert_equal(data['max_row'], 6)
assert_equal(data['next_column'], 1)
for val in data['built_tree'].values():
if val['url'] == '/p/test/src/1/':
assert_equal(val['short_id'], '[r1]')
assert_equal(val['column'], 0)
- assert_equal(val['row'], 5)
+ assert_equal(val['row'], 6)
assert_equal(val['message'], 'Create readme')
def test_feed(self):
@@ -142,6 +145,36 @@ class TestRootController(SVNTestController):
resp = self.app.get('/src/3/tree/')
assert len(resp.html.findAll('tr')) == 3, resp.showbrowser()
+ def test_commit_unicode_and_special_chars(self):
+ resp = self.app.get('/src/6/')
+ file_url = resp.html.find("a", string="/ЗРЯЧИЙ_ТА_ПОБАЧИТЬ")['href']
+ resp = self.app.get(file_url)
+ assert_in('This is readme', # same content as the README file actually
+ resp.html.select_one('.codebrowser').text)
+
+ resp = self.app.get('/src/7/')
+ print('file links on /src/7/ are:\n\t{}'.format(
+ '\n\t'.join(six.text_type(t) for t in resp.html.select('.inline-diff a'))))
+ file_url = resp.html.find("a", string="/with%2Furlquote-literal.txt")['href']
+ file_resp = self.app.get(file_url)
+ assert_in('%2F means /',
+ file_resp.html.select_one('.codebrowser').text)
+
+ file_url = resp.html.find("a", string='/with-percent%.txt')['href']
+ file_resp = self.app.get(file_url)
+ assert_in('%%%',
+ file_resp.html.select_one('.codebrowser').text)
+
+ file_url = resp.html.find("a", string="/with space.txt")['href']
+ file_resp = self.app.get(file_url)
+ assert_in('spaces',
+ file_resp.html.select_one('.codebrowser').text)
+
+ file_url = resp.html.find("a", string='/with"&:specials.txt')['href']
+ file_resp = self.app.get(file_url)
+ assert_in('"&: encodes as %22%26%3A',
+ file_resp.html.select_one('.codebrowser').text)
+
def test_tree(self):
resp = self.app.get('/src/1/tree/')
assert len(resp.html.findAll('tr')) == 2, resp.showbrowser()
diff --git a/ForgeSVN/forgesvn/tests/model/test_repository.py b/ForgeSVN/forgesvn/tests/model/test_repository.py
index 7ef9de7..cb6aa87 100644
--- a/ForgeSVN/forgesvn/tests/model/test_repository.py
+++ b/ForgeSVN/forgesvn/tests/model/test_repository.py
@@ -522,7 +522,9 @@ class TestSVNRepo(unittest.TestCase, RepoImplTestBase):
def test_webhook_payload(self):
sender = RepoPushWebhookSender()
- cids = list(self.repo.all_commit_ids())[:2]
+ all_commits = list(self.repo.all_commit_ids())
+ start = len(all_commits) - 6 # only get a few so test doesn't have to change after new testdata commits
+ cids = all_commits[start:start+2]
payload = sender.get_payload(commit_ids=cids)
expected_payload = {
'size': 2,