Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support UTF8 post body, and leave post body as it without stip or removing # starting lines #19

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Support UTF8 post body, and leave post body as it without stip or removing # starting lines #19

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5142e7
Support UTF8 post body, and leave post body as it without stip or rem…
ashi009 May 29, 2013
e4250f6
Support UTF8 post body, and leave post body as it without stipping or…
ashi009 May 29, 2013
e188bd5
Merge branch 'master' of github.com:ashi009/SublimeHttpRequester
ashi009 May 29, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 43 additions & 56 deletions http_requester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import socket
import types
import threading
import string

gPrevHttpRequest = ""

Expand Down Expand Up @@ -67,15 +68,17 @@ def run(self):

selection = self.selection

lines = selection.split("\n")
requestPOSTBody = ""
POSTBodyPosition = selection.find(self.HTTP_POST_BODY_START)

if POSTBodyPosition < 0:
config = selection
else:
config = selection[0:POSTBodyPosition]
requestPOSTBody = selection[POSTBodyPosition + len(self.HTTP_POST_BODY_START):].encode('utf-8')

# trim any whitespaces for all lines and remove lines starting with a pound character
for idx in range(len(lines) - 1, -1, -1):
lines[idx] = lines[idx].lstrip()
lines[idx] = lines[idx].rstrip()
if (len(lines[idx]) > 0):
if lines[idx][0] == "#":
del lines[idx]
lines = filter(lambda x: x[0] != '#', \
map(string.strip, config.splitlines()))

# get request web address and req. type from the first line
(url, port, request_page, requestType, httpProtocol) = self.extractRequestParams(lines[0])
Expand All @@ -84,7 +87,7 @@ def run(self):
print requestType, " ", httpProtocol, " HOST ", url, " PORT ", port, " PAGE: ", request_page

# get request headers from the lines below the http address
(extra_headers, requestPOSTBody, proxyURL, proxyPort, clientSSLCertificateFile,
(extra_headers, proxyURL, proxyPort, clientSSLCertificateFile,
clientSSLKeyFile) = self.extractExtraHeaders(lines)

headers = {"User-Agent": FAKE_CURL_UA, "Accept": "*/*"}
Expand Down Expand Up @@ -199,39 +202,30 @@ def extractRequestParams(self, requestLine):
return (url, port, request_page, requestType, protocol)

def getHeaderNameAndValueFromLine(self, line):
readingPOSTBody = False

line = line.lstrip()
line = line.rstrip()

if line == self.HTTP_POST_BODY_START:
readingPOSTBody = True
header_parts = line.split(":")
if len(header_parts) == 2:
header_name = header_parts[0].rstrip()
header_value = header_parts[1].lstrip()
return (header_name, header_value, readingPOSTBody)
else:
header_parts = line.split(":")
if len(header_parts) == 2:
# may be proxy address URL:port
if len(header_parts) > 2:
header_name = header_parts[0].rstrip()
header_value = header_parts[1].lstrip()
return (header_name, header_value, readingPOSTBody)
else:
# may be proxy address URL:port
if len(header_parts) > 2:
header_name = header_parts[0].rstrip()
header_value = header_parts[1]
header_value = header_value.lstrip()
header_value = header_value.rstrip()
for idx in range(2, len(header_parts)):
currentValue = header_parts[idx]
currentValue = currentValue.lstrip()
currentValue = currentValue.rstrip()
header_value = header_value + ":" + currentValue

return (header_name, header_value, readingPOSTBody)

return (None, None, readingPOSTBody)
header_value = header_parts[1]
header_value = header_value.lstrip()
header_value = header_value.rstrip()
for idx in range(2, len(header_parts)):
currentValue = header_parts[idx]
currentValue = currentValue.lstrip()
currentValue = currentValue.rstrip()
header_value = header_value + ":" + currentValue

return (header_name, header_value)

return (None, None)

def extractExtraHeaders(self, headerLines):
requestPOSTBody = ""
readingPOSTBody = False
lastLine = False
numLines = len(headerLines)

Expand All @@ -245,25 +239,18 @@ def extractExtraHeaders(self, headerLines):
if len(headerLines) > 1:
for i in range(1, numLines):
lastLine = (i == numLines - 1)
if not(readingPOSTBody):
(header_name, header_value, readingPOSTBody) = self.getHeaderNameAndValueFromLine(headerLines[i])
if header_name is not None:
if header_name == self.HTTP_PROXY_HEADER:
(proxyURL, proxyPort) = self.getProxyURLandPort(header_value)
elif header_name == self.HTTPS_SSL_CLIENT_CERT:
clientSSLCertificateFile = header_value
elif header_name == self.HTTPS_SSL_CLIENT_KEY:
clientSSLKeyFile = header_value
else:
extra_headers[header_name] = header_value
else: # read all following lines as HTTP POST body
lineBreak = ""
if not(lastLine):
lineBreak = "\n"

requestPOSTBody = requestPOSTBody + headerLines[i] + lineBreak

return (extra_headers, requestPOSTBody, proxyURL, proxyPort, clientSSLCertificateFile, clientSSLKeyFile)
(header_name, header_value) = self.getHeaderNameAndValueFromLine(headerLines[i])
if header_name is not None:
if header_name == self.HTTP_PROXY_HEADER:
(proxyURL, proxyPort) = self.getProxyURLandPort(header_value)
elif header_name == self.HTTPS_SSL_CLIENT_CERT:
clientSSLCertificateFile = header_value
elif header_name == self.HTTPS_SSL_CLIENT_KEY:
clientSSLKeyFile = header_value
else:
extra_headers[header_name] = header_value

return (extra_headers, proxyURL, proxyPort, clientSSLCertificateFile, clientSSLKeyFile)

def getProxyURLandPort(self, proxyAddress):
proxyURL = ""
Expand Down