Merge pull request #1 from Hootsworth/fix-localhost-method-parsing

fix(cli): prevent purely alphabetic hostnames like localhost from being parsed as HTTP method

Author: Hootsworth

httpie/cli/argparser.py

@@ -420,7 +420,10 @@ def _guess_method(self):
                 self.args.method = HTTP_GET
 
         # FIXME: False positive, e.g., "localhost" matches but is a valid URL.
-        elif not re.match('^[a-zA-Z]+$', self.args.method):
+        elif self.args.method.upper() not in {
+            'GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'CONNECT', 'TRACE',
+            'PROPFIND', 'PROPPATCH', 'MKCOL', 'COPY', 'MOVE', 'LOCK', 'UNLOCK', 'PURGE'
+        } or not re.match('^[a-zA-Z]+$', self.args.method):
             # Invoked as `http URL item+'. The URL is now in `args.method`
             # and the first ITEM is now incorrectly in `args.url`.
             try:

tests/test_cli.py

@@ -235,6 +235,16 @@ def test_dont_expand_full_ipv6_as_shorthand(self):
         )
         assert args.url == 'http://0000:0000:0000:0000:0000:0000:0000:0001'
 
+    def test_localhost_with_request_items_does_not_parse_as_method(self):
+        args = parser.parse_args(
+            args=['localhost', 'foo=bar'],
+            env=MockEnvironment()
+        )
+        assert args.url == 'http://localhost'
+        assert args.method == 'POST'
+        assert args.request_items[0].key == 'foo'
+        assert args.request_items[0].value == 'bar'
+
 
 class TestArgumentParser: