Add recursion depth control for repository search (issue 103)

James Moger

2012-08-01 65f55eee1c41a9cdfec96dc4310efcc6e57df97f

 src/com/gitblit/GitBlit.java

@@ -58,6 +58,7 @@
import org.eclipse.jgit.lib.StoredConfig;

import org.eclipse.jgit.storage.file.WindowCache;

import org.eclipse.jgit.storage.file.WindowCacheConfig;

import org.eclipse.jgit.transport.ServiceMayNotContinueException;

import org.eclipse.jgit.transport.resolver.FileResolver;

import org.eclipse.jgit.transport.resolver.RepositoryResolver;

import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;

@@ -512,9 +513,15 @@
            userCookie = new Cookie(Constants.NAME, "");

         } else {

            // set cookie for login

            char[] cookie = userService.getCookie(user);

            userCookie = new Cookie(Constants.NAME, new String(cookie));

            userCookie.setMaxAge(Integer.MAX_VALUE);

            String cookie = userService.getCookie(user);

            if (StringUtils.isEmpty(cookie)) {

               // create empty cookie

               userCookie = new Cookie(Constants.NAME, "");

            } else {

               // create real cookie

               userCookie = new Cookie(Constants.NAME, cookie);

               userCookie.setMaxAge(Integer.MAX_VALUE);

            }

         }

         userCookie.setPath("/");

         response.addCookie(userCookie);

@@ -735,7 +742,8 @@
   public List<String> getRepositoryList() {

      return JGitUtils.getRepositoryList(repositoriesFolder, 

            settings.getBoolean(Keys.git.onlyAccessBareRepositories, false),

            settings.getBoolean(Keys.git.searchRepositoriesSubfolders, true));

            settings.getBoolean(Keys.git.searchRepositoriesSubfolders, true),

            settings.getInteger(Keys.git.searchRecursionDepth, -1));

   }



   /**

@@ -772,6 +780,12 @@
                  + new File(repositoriesFolder, repositoryName).getAbsolutePath(), e);

         }

      } catch (ServiceNotEnabledException e) {

         r = null;

         if (logError) {

            logger.error("GitBlit.getRepository(String) failed to find "

                  + new File(repositoriesFolder, repositoryName).getAbsolutePath(), e);

         }

      } catch (ServiceMayNotContinueException e) {

         r = null;

         if (logError) {

            logger.error("GitBlit.getRepository(String) failed to find "

@@ -1081,6 +1095,8 @@
            logger.error("Service not authorized", e);

         } catch (ServiceNotEnabledException e) {

            logger.error("Service not enabled", e);

         } catch (ServiceMayNotContinueException e) {

            logger.error("Service may not continue", e);

         }

      }



@@ -1823,9 +1839,13 @@
      // ensure that the current values are updated in the setting models

      for (String key : settings.getAllKeys(null)) {

         SettingModel setting = settingsModel.get(key);

         if (setting != null) {

            setting.currentValue = settings.getString(key, "");

         if (setting == null) {

            // unreferenced setting, create a setting model

            setting = new SettingModel();

            setting.name = key;

            settingsModel.add(setting);

         }

         setting.currentValue = settings.getString(key, "");			
      }

      settingsModel.pushScripts = getAllScripts();

      return settingsModel;