summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/tests/test_integration.py7
-rw-r--r--pyramid/tests/test_static.py1
2 files changed, 6 insertions, 2 deletions
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py
index 42199ef29..b78cddf4f 100644
--- a/pyramid/tests/test_integration.py
+++ b/pyramid/tests/test_integration.py
@@ -148,15 +148,20 @@ class TestStaticAppBase(IntegrationBase):
def test_notfound(self):
self.testapp.get('/static/wontbefound.html', status=404)
- def test_oob_doubledot(self):
+ def test_oob_dotdotslash(self):
self.testapp.get('/static/../../test_integration.py', status=404)
+ def test_oob_dotdotslash_encoded(self):
+ self.testapp.get('/static/%2E%2E%2F/test_integration.py', status=404)
+ # XXX pdb this
+
def test_oob_slash(self):
self.testapp.get('/%2F/test_integration.py', status=404)
def test_oob_dotdotslash_encoded(self):
self.testapp.get('/static/%2E%2E%2F/test_integration.py', status=404)
+
class TestStaticAppUsingAbsPath(TestStaticAppBase, unittest.TestCase):
package = 'pyramid.tests.pkgs.static_abspath'
diff --git a/pyramid/tests/test_static.py b/pyramid/tests/test_static.py
index 81f25b95d..503552a8e 100644
--- a/pyramid/tests/test_static.py
+++ b/pyramid/tests/test_static.py
@@ -1,5 +1,4 @@
import unittest
-import datetime
class Test_static_view_use_subpath_False(unittest.TestCase):
def _getTargetClass(self):