Merge branch 'feature.prequest_login'

3 files changed, 69 insertions, 4 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index ba8aae559..0156b24fd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,8 +4,11 @@ next release
 Features
 --------
 
-- ``scripts/prequest.py``:  add support for submitting ``PUT`` and ``PATCH``
-  requests.  See https://github.com/Pylons/pyramid/pull/1033.
+- ``scripts/prequest.py``: add support for submitting ``PUT`` and ``PATCH``
+  requests.  See https://github.com/Pylons/pyramid/pull/1033.  add support for
+  submitting ``OPTIONS`` and ``PROPFIND`` requests, and allow users to specify
+  basic authentication credentials in the request via a ``--login`` argument to
+  the script.  See https://github.com/Pylons/pyramid/pull/1039.
 
 - ``ACLAuthorizationPolicy`` supports ``__acl__`` as a callable. This
   removes the ambiguity between the potential ``AttributeError`` that would
diff --git a/pyramid/scripts/prequest.py b/pyramid/scripts/prequest.py
index 3d8921b15..8628d5a5a 100644
--- a/pyramid/scripts/prequest.py
+++ b/pyramid/scripts/prequest.py
@@ -1,3 +1,4 @@
+import base64
 import optparse
 import sys
 import textwrap
@@ -29,6 +30,12 @@ class PRequestCommand(object):
     Use "prequest --method=PATCH config.ini /path < data" to do a
     PATCH with the given request body.
 
+    Use "prequest --method=OPTIONS config.ini /path" to do an
+    OPTIONS request.
+
+    Use "prequest --method=PROPFIND config.ini /path" to do a
+    PROPFIND request.
+
     If the path is relative (doesn't begin with "/") it is interpreted as
     relative to "/".  The path passed to this script should be URL-quoted.
     The path can be succeeded with a query string (e.g. `/path?a=1&=b2').
@@ -66,9 +73,17 @@ class PRequestCommand(object):
     parser.add_option(
         '-m', '--method',
         dest='method',
-        choices=['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'],
+        choices=['GET', 'HEAD', 'POST', 'PUT', 'PATCH','DELETE',
+                 'PROPFIND', 'OPTIONS'],
         type='choice',
-        help='Request method type',
+        help='Request method type (GET, POST, PUT, PATCH, DELETE, '
+             'PROPFIND, OPTIONS)',
+        )
+    parser.add_option(
+        '-l', '--login',
+        dest='login',
+        type='string',
+        help='HTTP basic auth username:password pair',
         )
 
     get_app = staticmethod(get_app)
@@ -99,6 +114,10 @@ class PRequestCommand(object):
         path = url_unquote(path)
 
         headers = {}
+        if self.options.login:
+            enc = base64.b64encode(self.options.login.encode('ascii'))
+            headers['Authorization'] = 'Basic ' + enc.decode('ascii')
+
         if self.options.headers:
             for item in self.options.headers:
                 if ':' not in item:
diff --git a/pyramid/tests/test_scripts/test_prequest.py b/pyramid/tests/test_scripts/test_prequest.py
index 64a7c3045..37f1d3c0f 100644
--- a/pyramid/tests/test_scripts/test_prequest.py
+++ b/pyramid/tests/test_scripts/test_prequest.py
@@ -68,6 +68,19 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
+    def test_command_w_basic_auth(self):
+        command = self._makeOne(
+            ['', '--login=user:password',
+                 '--header=name:value','development.ini', '/'])
+        command.run()
+        self.assertEqual(self._environ['HTTP_NAME'], 'value')
+        self.assertEqual(self._environ['HTTP_AUTHORIZATION'],
+                        'Basic dXNlcjpwYXNzd29yZA==')
+        self.assertEqual(self._path_info, '/')
+        self.assertEqual(self._spec, 'development.ini')
+        self.assertEqual(self._app_name, None)
+        self.assertEqual(self._out, ['abc'])
+
     def test_command_has_content_type_header_var(self):
         command = self._makeOne(
             ['', '--header=content-type:app/foo','development.ini', '/'])
@@ -96,6 +109,7 @@ class TestPRequestCommand(unittest.TestCase):
     def test_command_method_get(self):
         command = self._makeOne(['', '--method=GET', 'development.ini', '/'])
         command.run()
+        self.assertEqual(self._environ['REQUEST_METHOD'], 'GET')
         self.assertEqual(self._path_info, '/')
         self.assertEqual(self._spec, 'development.ini')
         self.assertEqual(self._app_name, None)
@@ -107,6 +121,7 @@ class TestPRequestCommand(unittest.TestCase):
         stdin = NativeIO()
         command.stdin = stdin
         command.run()
+        self.assertEqual(self._environ['REQUEST_METHOD'], 'POST')
         self.assertEqual(self._environ['CONTENT_LENGTH'], '-1')
         self.assertEqual(self._environ['wsgi.input'], stdin)
         self.assertEqual(self._path_info, '/')
@@ -120,6 +135,7 @@ class TestPRequestCommand(unittest.TestCase):
         stdin = NativeIO()
         command.stdin = stdin
         command.run()
+        self.assertEqual(self._environ['REQUEST_METHOD'], 'PUT')
         self.assertEqual(self._environ['CONTENT_LENGTH'], '-1')
         self.assertEqual(self._environ['wsgi.input'], stdin)
         self.assertEqual(self._path_info, '/')
@@ -133,6 +149,7 @@ class TestPRequestCommand(unittest.TestCase):
         stdin = NativeIO()
         command.stdin = stdin
         command.run()
+        self.assertEqual(self._environ['REQUEST_METHOD'], 'PATCH')
         self.assertEqual(self._environ['CONTENT_LENGTH'], '-1')
         self.assertEqual(self._environ['wsgi.input'], stdin)
         self.assertEqual(self._path_info, '/')
@@ -140,6 +157,32 @@ class TestPRequestCommand(unittest.TestCase):
         self.assertEqual(self._app_name, None)
         self.assertEqual(self._out, ['abc'])
 
+    def test_command_method_propfind(self):
+        from pyramid.compat import NativeIO
+        command = self._makeOne(['', '--method=PROPFIND', 'development.ini',
+                                '/'])
+        stdin = NativeIO()
+        command.stdin = stdin
+        command.run()
+        self.assertEqual(self._environ['REQUEST_METHOD'], 'PROPFIND')
+        self.assertEqual(self._path_info, '/')
+        self.assertEqual(self._spec, 'development.ini')
+        self.assertEqual(self._app_name, None)
+        self.assertEqual(self._out, ['abc'])
+
+    def test_command_method_options(self):
+        from pyramid.compat import NativeIO
+        command = self._makeOne(['', '--method=OPTIONS', 'development.ini',
+                                '/'])
+        stdin = NativeIO()
+        command.stdin = stdin
+        command.run()
+        self.assertEqual(self._environ['REQUEST_METHOD'], 'OPTIONS')
+        self.assertEqual(self._path_info, '/')
+        self.assertEqual(self._spec, 'development.ini')
+        self.assertEqual(self._app_name, None)
+        self.assertEqual(self._out, ['abc'])
+
     def test_command_with_query_string(self):
         command = self._makeOne(['', 'development.ini', '/abc?a=1&b=2&c'])
         command.run()