py_tasks_melange: comparison thirdparty/google_appengine/google/appengine/tools/dev

equal deleted inserted replaced

-:c61d96e72e6f
+:d0b7dac5325c
 from google.appengine.tools import os_compat
 import __builtin__
 import BaseHTTPServer
 import Cookie
+import base64
 import cStringIO
 import cgi
 import cgitb
 try:
 from google.appengine.api import mail_stub
 from google.appengine.api import urlfetch_stub
 from google.appengine.api import user_service_stub
 from google.appengine.api import yaml_errors
 from google.appengine.api.capabilities import capability_stub
+from google.appengine.api.labs.taskqueue import taskqueue_stub
 from google.appengine.api.memcache import memcache_stub
 from google.appengine import dist
 from google.appengine.tools import dev_appserver_index
 MAX_RUNTIME_RESPONSE_SIZE = 10 << 20
 MAX_REQUEST_SIZE = 10 * 1024 * 1024
 API_VERSION = '1'
+SITE_PACKAGES = os.path.normcase(os.path.join(os.path.dirname(os.__file__),
+'site-packages'))
 class Error(Exception):
 """Base-class for exceptions in this module."""
 _IGNORE_REQUEST_HEADERS = frozenset(['content-type', 'content-length',
 'accept-encoding', 'transfer-encoding'])
 def SetupEnvironment(cgi_path,
 relative_url,
 headers,
+infile,
 split_url=SplitURL,
 get_user_info=dev_appserver_login.GetUserInfo):
 """Sets up environment variables for a CGI.
 Args:
 cgi_path: Full file-system path to the CGI being executed.
 relative_url: Relative URL used to access the CGI.
 headers: Instance of mimetools.Message containing request headers.
+infile: File-like object with input data from the request.
 split_url, get_user_info: Used for dependency injection.
 Returns:
 Dictionary containing CGI environment variables.
 """
 if key in _IGNORE_REQUEST_HEADERS:
 continue
 adjusted_name = key.replace('-', '_').upper()
 env['HTTP_' + adjusted_name] = ', '.join(headers.getheaders(key))
+PAYLOAD_HEADER = 'HTTP_X_APPENGINE_DEVELOPMENT_PAYLOAD'
+if PAYLOAD_HEADER in env:
+del env[PAYLOAD_HEADER]
+new_data = base64.standard_b64decode(infile.getvalue())
+infile.seek(0)
+infile.truncate()
+infile.write(new_data)
+infile.seek(0)
+env['CONTENT_LENGTH'] = str(len(new_data))
 return env
 def NotImplementedFake(*args, **kwargs):
 """Fake for methods/functions that are not implemented in the production
 NOT_ALLOWED_DIRS = set([
-os.path.normcase(os.path.join(os.path.dirname(os.__file__),
+SITE_PACKAGES,
-'site-packages'))
 ])
 ALLOWED_SITE_PACKAGE_DIRS = set(
-os.path.normcase(os.path.abspath(os.path.join(
+os.path.normcase(os.path.abspath(os.path.join(SITE_PACKAGES, path)))
-os.path.dirname(os.__file__), 'site-packages', path)))
 for path in [
 ])
 ALLOWED_SITE_PACKAGE_FILES = set(
 """
 FakeFile._allow_skipped_files = allow_skipped_files
 FakeFile._availability_cache = {}
 @staticmethod
+def SetAllowedModule(name):
+"""Allow the use of a module based on where it is located.
+Meant to be used by use_library() so that it has a link back into the
+trusted part of the interpreter.
+Args:
+name: Name of the module to allow.
+"""
+stream, pathname, description = imp.find_module(name)
+pathname = os.path.normcase(os.path.abspath(pathname))
+if stream:
+stream.close()
+FakeFile.ALLOWED_FILES.add(pathname)
+FakeFile.ALLOWED_FILES.add(os.path.realpath(pathname))
+else:
+assert description[2] == imp.PKG_DIRECTORY
+if pathname.startswith(SITE_PACKAGES):
+FakeFile.ALLOWED_SITE_PACKAGE_DIRS.add(pathname)
+FakeFile.ALLOWED_SITE_PACKAGE_DIRS.add(os.path.realpath(pathname))
+else:
+FakeFile.ALLOWED_DIRS.add(pathname)
+FakeFile.ALLOWED_DIRS.add(os.path.realpath(pathname))
+@staticmethod
 def SetSkippedFiles(skip_files):
 """Sets which files in the application directory are to be ignored.
 Must be called at least once before any file objects are created in the
 hardened environment.
 if not FakeFile.IsFileAccessible(filename):
 raise IOError(errno.EACCES, 'file not accessible', filename)
 super(FakeFile, self).__init__(filename, mode, bufsize, **kwargs)
+from google.appengine.dist import _library
+_library.SetAllowedModule = FakeFile.SetAllowedModule
 class RestrictedPathFunction(object):
 """Enforces access restrictions for functions that have a file or
 directory path as their first argument."""
 try:
 ClearAllButEncodingsModules(sys.modules)
 sys.modules.update(module_dict)
 sys.argv = [cgi_path]
-sys.stdin = infile
+sys.stdin = cStringIO.StringIO(infile.getvalue())
 sys.stdout = outfile
 os.environ.clear()
 os.environ.update(env)
 before_path = sys.path[:]
 cgi_dir = os.path.normpath(os.path.dirname(cgi_path))
 try:
 env = {}
 if base_env_dict:
 env.update(base_env_dict)
 cgi_path = self._path_adjuster.AdjustPath(path)
-env.update(self._setup_env(cgi_path, relative_url, headers))
+env.update(self._setup_env(cgi_path, relative_url, headers, infile))
 self._exec_cgi(self._root_path,
 path,
 cgi_path,
 env,
 infile,
 [implicit_matcher, explicit_matcher])
 if require_indexes:
 dev_appserver_index.SetupIndexes(config.application, root_path)
-infile = cStringIO.StringIO(self.rfile.read(
+infile = cStringIO.StringIO()
+infile.write(self.rfile.read(
 int(self.headers.get('content-length', 0))))
+infile.seek(0)
 request_size = len(infile.getvalue())
 if request_size > MAX_REQUEST_SIZE:
 msg = ('HTTP request was too large: %d.  The limit is: %d.'
 % (request_size, MAX_REQUEST_SIZE))
 Args:
 app_id: Application ID being served.
 Keywords:
+root_path: Root path to the directory of the application which should
+contain the app.yaml, indexes.yaml, and queues.yaml files.
 login_url: Relative URL which should be used for handling user login/logout.
 datastore_path: Path to the file to store Datastore file stub data in.
 history_path: Path to the file to store Datastore history in.
 clear_datastore: If the datastore and history should be cleared on startup.
 smtp_host: SMTP host used for sending test mail.
 remove: Used for dependency injection.
 trusted: True if this app can access data belonging to other apps.  This
 behavior is different from the real app server and should be left False
 except for advanced uses of dev_appserver.
 """
+root_path = config.get('root_path', None)
 login_url = config['login_url']
 datastore_path = config['datastore_path']
 history_path = config['history_path']
 clear_datastore = config['clear_datastore']
 require_indexes = config.get('require_indexes', False)
 apiproxy_stub_map.apiproxy.RegisterStub(
 'capability_service',
 capability_stub.CapabilityServiceStub())
+apiproxy_stub_map.apiproxy.RegisterStub(
+'taskqueue',
+taskqueue_stub.TaskQueueServiceStub(root_path=root_path))
 try:
 from google.appengine.api.images import images_stub
 apiproxy_stub_map.apiproxy.RegisterStub(
 'images',
 url_matcher.AddURL(login_url,
 login_dispatcher,
 '',
 False,
 False)
 admin_dispatcher = create_cgi_dispatcher(module_dict, root_path,
 path_adjuster)
 url_matcher.AddURL('/_ah/admin(?:/.*)?',
 admin_dispatcher,

changeset 2413	d0b7dac5325c
parent 2309	be1b94099f2d
child 2864	2e0b0af889be