aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update upload.py to include fix for svg files.

Browse Source 
This pulls r1084 from the chromium on upstream rietveld.

R=jparent@chromium.org, maruel@chromium.org
BUG=247791

Review URL: https://chromiumcodereview.appspot.com/16744006

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@206743 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
iannucci@chromium.org 12 years ago
parent c376171c1b
commit e7e690a951
1 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File

64
third_party/upload.py vendored
Unescape Escape View File

@ -112,12 +112,19 @@ VCS_ABBREVIATIONS = {
LOCALHOST_IP = '127.0.0.1' LOCALHOST_IP = '127.0.0.1'
DEFAULT_OAUTH2_PORT = 8001 DEFAULT_OAUTH2_PORT = 8001
ACCESS_TOKEN_PARAM = 'access_token' ACCESS_TOKEN_PARAM = 'access_token'
ERROR_PARAM = 'error'
OAUTH_DEFAULT_ERROR_MESSAGE = 'OAuth 2.0 error occurred.'
OAUTH_PATH = '/get-access-token' OAUTH_PATH = '/get-access-token'
OAUTH_PATH_PORT_TEMPLATE = OAUTH_PATH + '?port=%(port)d' OAUTH_PATH_PORT_TEMPLATE = OAUTH_PATH + '?port=%(port)d'
AUTH_HANDLER_RESPONSE = """\ AUTH_HANDLER_RESPONSE = """\
<html> <html>
<head> <head>
<title>Authentication Status</title> <title>Authentication Status</title>
<script>
window.onload = function() {
window.close();
}
</script>
</head> </head>
<body> <body>
<p>The authentication flow has completed.</p> <p>The authentication flow has completed.</p>
@ -673,31 +680,37 @@ class ClientRedirectServer(BaseHTTPServer.HTTPServer):
"""A server for redirects back to localhost from the associated server. """A server for redirects back to localhost from the associated server.
Waits for a single request and parses the query parameters for an access token Waits for a single request and parses the query parameters for an access token
and then stops serving. or an error and then stops serving.
""" """
access_token = None access_token = None
error = None
class ClientRedirectHandler(BaseHTTPServer.BaseHTTPRequestHandler): class ClientRedirectHandler(BaseHTTPServer.BaseHTTPRequestHandler):
"""A handler for redirects back to localhost from the associated server. """A handler for redirects back to localhost from the associated server.
Waits for a single request and parses the query parameters into the server's Waits for a single request and parses the query parameters into the server's
access_token and then stops serving. access_token or error and then stops serving.
""" """
def SetAccessToken(self): def SetResponseValue(self):
"""Stores the access token from the request on the server. """Stores the access token or error from the request on the server.
Will only do this if exactly one query parameter was passed in to the Will only do this if exactly one query parameter was passed in to the
request and that query parameter used 'access_token' as the key. request and that query parameter used 'access_token' or 'error' as the key.
""" """
query_string = urlparse.urlparse(self.path).query query_string = urlparse.urlparse(self.path).query
query_params = urlparse.parse_qs(query_string) query_params = urlparse.parse_qs(query_string)
if len(query_params) == 1: if len(query_params) == 1:
access_token_list = query_params.get(ACCESS_TOKEN_PARAM, []) if query_params.has_key(ACCESS_TOKEN_PARAM):
if len(access_token_list) == 1: access_token_list = query_params[ACCESS_TOKEN_PARAM]
self.server.access_token = access_token_list[0] if len(access_token_list) == 1:
self.server.access_token = access_token_list[0]
else:
error_list = query_params.get(ERROR_PARAM, [])
if len(error_list) == 1:
self.server.error = error_list[0]
def do_GET(self): def do_GET(self):
"""Handle a GET request. """Handle a GET request.
@ -710,7 +723,7 @@ class ClientRedirectHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.send_response(200) self.send_response(200)
self.send_header('Content-type', 'text/html') self.send_header('Content-type', 'text/html')
self.end_headers() self.end_headers()
self.SetAccessToken() self.SetResponseValue()
self.wfile.write(AUTH_HANDLER_RESPONSE) self.wfile.write(AUTH_HANDLER_RESPONSE)
def log_message(self, format, *args): def log_message(self, format, *args):
@ -729,11 +742,23 @@ def OpenOAuth2ConsentPage(server=DEFAULT_REVIEW_SERVER,
DEFAULT_REVIEW_SERVER. DEFAULT_REVIEW_SERVER.
port: Integer, the port where the localhost server receiving the redirect port: Integer, the port where the localhost server receiving the redirect
is serving. Defaults to DEFAULT_OAUTH2_PORT. is serving. Defaults to DEFAULT_OAUTH2_PORT.
Returns:
A boolean indicating whether the page opened successfully.
""" """
path = OAUTH_PATH_PORT_TEMPLATE % {'port': port} path = OAUTH_PATH_PORT_TEMPLATE % {'port': port}
page = 'https://%s%s' % (server, path) parsed_url = urlparse.urlparse(server)
webbrowser.open(page, new=1, autoraise=True) scheme = parsed_url[0] or 'https'
print OPEN_LOCAL_MESSAGE_TEMPLATE % (page,) if scheme != 'https':
ErrorExit('Using OAuth requires a review server with SSL enabled.')
# If no scheme was given on command line the server address ends up in
# parsed_url.path otherwise in netloc.
host = parsed_url[1] or parsed_url[2]
page = '%s://%s%s' % (scheme, host, path)
page_opened = webbrowser.open(page, new=1, autoraise=True)
if page_opened:
print OPEN_LOCAL_MESSAGE_TEMPLATE % (page,)
return page_opened
def WaitForAccessToken(port=DEFAULT_OAUTH2_PORT): def WaitForAccessToken(port=DEFAULT_OAUTH2_PORT):
@ -754,6 +779,8 @@ def WaitForAccessToken(port=DEFAULT_OAUTH2_PORT):
# Wait to serve just one request before deferring control back # Wait to serve just one request before deferring control back
# to the caller of wait_for_refresh_token # to the caller of wait_for_refresh_token
httpd.handle_request() httpd.handle_request()
if httpd.access_token is None:
ErrorExit(httpd.error or OAUTH_DEFAULT_ERROR_MESSAGE)
return httpd.access_token return httpd.access_token
@ -776,11 +803,12 @@ def GetAccessToken(server=DEFAULT_REVIEW_SERVER, port=DEFAULT_OAUTH2_PORT,
""" """
access_token = None access_token = None
if open_local_webbrowser: if open_local_webbrowser:
OpenOAuth2ConsentPage(server=server, port=port) page_opened = OpenOAuth2ConsentPage(server=server, port=port)
try: if page_opened:
access_token = WaitForAccessToken(port=port) try:
except socket.error, e: access_token = WaitForAccessToken(port=port)
print 'Can\'t start local webserver. Socket Error: %s\n' % (e.strerror,) except socket.error, e:
print 'Can\'t start local webserver. Socket Error: %s\n' % (e.strerror,)
if access_token is None: if access_token is None:
# TODO(dhermes): Offer to add to clipboard using xsel, xclip, pbcopy, etc. # TODO(dhermes): Offer to add to clipboard using xsel, xclip, pbcopy, etc.
@ -1150,7 +1178,7 @@ class VersionControlSystem(object):
mimetype = mimetypes.guess_type(filename)[0] mimetype = mimetypes.guess_type(filename)[0]
if not mimetype: if not mimetype:
return False return False
return mimetype.startswith("image/") return mimetype.startswith("image/") and not mimetype.startswith("image/svg")
def IsBinaryData(self, data): def IsBinaryData(self, data):
"""Returns true if data contains a null byte.""" """Returns true if data contains a null byte."""

Write Preview
Loading…
Cancel
Save