Ticket #3249: default_env.patch

main.py

@@ -225 +225 @@
         environ.setdefault('trac.env_path', options.get('TracEnv'))
         environ.setdefault('trac.env_parent_dir',
                            options.get('TracEnvParentDir'))
+        environ.setdefault('trac.default_env',
+                           options.get('TracDefaultEnv'))
         environ.setdefault('trac.env_index_template',
                            options.get('TracEnvIndexTemplate'))
         environ.setdefault('trac.template_vars',
@@ -246 +248 @@
         environ.setdefault('trac.env_path', os.getenv('TRAC_ENV'))
         environ.setdefault('trac.env_parent_dir',
                            os.getenv('TRAC_ENV_PARENT_DIR'))
+        environ.setdefault('trac.default_env',
+                           os.getenv('TRAC_DEFAULT_ENV'))
         environ.setdefault('trac.env_index_template',
                            os.getenv('TRAC_ENV_INDEX_TEMPLATE'))
         environ.setdefault('trac.template_vars',
@@ -265 +269 @@
     if not env_path:
         env_parent_dir = environ.get('trac.env_parent_dir')
         env_paths = environ.get('trac.env_paths')
+        default_env = environ.get('trac.default_env')
         if env_parent_dir or env_paths:
             # The first component of the path is the base name of the
             # environment
             path_info = environ.get('PATH_INFO', '').lstrip('/').split('/')
             env_name = path_info.pop(0)
+            fake_root = False
 
             if not env_name:
-                # No specific environment requested, so render an environment
-                # index page
-                send_project_index(environ, start_response, env_parent_dir,
-                                   env_paths)
-                return []
+                if default_env:
+                    env_name = default_env
+                    fake_root = True
+                else:
+                    # No specific environment requested, so render an environment
+                    # index page
+                    send_project_index(environ, start_response, env_parent_dir,
+                                       env_paths)
+                    return []
 
             # To make the matching patterns of request handlers work, we append
             # the environment name to the `SCRIPT_NAME` variable, and keep only
-            # the remaining path in the `PATH_INFO` variable.
-            environ['SCRIPT_NAME'] = Href(environ['SCRIPT_NAME'])(env_name)
+            # the remaining path in the `PATH_INFO` variable. Store the originals
+            # In case we need to revert them below
+            original_script_name = environ['SCRIPT_NAME']
+            original_path_info = environ['PATH_INFO']
+            if not fake_root:
+                environ['SCRIPT_NAME'] = Href(environ['SCRIPT_NAME'])(env_name)
             environ['PATH_INFO'] = '/'.join([''] + path_info)
 
             if env_parent_dir:
@@ -290 +304 @@
                 env_path = get_environments(environ).get(env_name)
 
             if not env_path or not os.path.isdir(env_path):
-                start_response('404 Not Found', [])
-                return ['Environment not found']
+                if default_env:
+                    # Reset these variable so we point to the default env
+                    environ['SCRIPT_NAME'] = original_script_name
+                    environ['PATH_INFO'] = original_path_info
+                    env_path = os.path.join(env_parent_dir, default_env)
+                else:
+                    start_response('404 Not Found', [])
+                    return ['Environment not found']
 
     if not env_path:
         raise EnvironmentError('The environment options "TRAC_ENV" or '