Do not traverse unaccessible subdirectories (issue 51)

lemval

2012-01-31 1c30dad2115fc513791d8a5b292ad0f7d7b85749

 tests/com/gitblit/tests/GitServletTest.java

@@ -25,7 +25,11 @@


public class GitServletTest {



   File folder = new File(GitBlitSuite.REPOSITORIES, "working/ticgit");

   static File ticgitFolder = new File(GitBlitSuite.REPOSITORIES, "working/ticgit");

	
   static File ticgit2Folder = new File(GitBlitSuite.REPOSITORIES, "working/ticgit2");



   static File jgitFolder = new File(GitBlitSuite.REPOSITORIES, "working/jgit");



   String url = GitBlitSuite.url;

   String account = GitBlitSuite.account;

@@ -35,6 +39,7 @@


   @BeforeClass

   public static void startGitblit() throws Exception {

      deleteWorkingFolders();

      started.set(GitBlitSuite.startGitblit());

   }



@@ -43,20 +48,30 @@
      if (started.get()) {

         GitBlitSuite.stopGitblit();

      }

      deleteWorkingFolders();

   }

	
   private static void deleteWorkingFolders() throws Exception {

      if (ticgitFolder.exists()) {

         FileUtils.delete(ticgitFolder, FileUtils.RECURSIVE);

      }

      if (ticgit2Folder.exists()) {

         FileUtils.delete(ticgit2Folder, FileUtils.RECURSIVE);

      }

      if (jgitFolder.exists()) {

         FileUtils.delete(jgitFolder, FileUtils.RECURSIVE);

      }

   }



   @Test

   public void testClone() throws Exception {

      if (folder.exists()) {

         FileUtils.delete(folder, FileUtils.RECURSIVE);

      }

      CloneCommand clone = Git.cloneRepository();

      clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

      clone.setDirectory(folder);

      clone.setDirectory(ticgitFolder);

      clone.setBare(false);

      clone.setCloneAllBranches(true);

      clone.setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password));

      clone.call();

      close(clone.call());		
      assertTrue(true);

   }



@@ -67,23 +82,19 @@
      model.accessRestriction = AccessRestrictionType.CLONE;

      GitBlit.self().updateRepositoryModel(model.name, model, false);



      // delete any existing working folder

      File folder = new File(GitBlitSuite.REPOSITORIES, "working/gitblit");

      if (folder.exists()) {

         FileUtils.delete(folder, FileUtils.RECURSIVE);

      }

      // delete any existing working folder		
      boolean cloned = false;

      try {

         CloneCommand clone = Git.cloneRepository();

         clone.setURI(MessageFormat.format("{0}/git/ticgit.git", url));

         clone.setDirectory(folder);

         clone.setDirectory(ticgit2Folder);

         clone.setBare(false);

         clone.setCloneAllBranches(true);

         clone.setCredentialsProvider(new UsernamePasswordCredentialsProvider("bogus", "bogus"));

         clone.call();

         close(clone.call());

         cloned = true;

      } catch (Exception e) {

         e.printStackTrace();

         // swallow the exception which we expect

      }



      // restore anonymous repository access

@@ -94,9 +105,9 @@
   }



   @Test

   public void testAnonymousCommit() throws Exception {

      Git git = Git.open(folder);

      File file = new File(folder, "TODO");

   public void testAnonymousPush() throws Exception {

      Git git = Git.open(ticgitFolder);

      File file = new File(ticgitFolder, "TODO");

      OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));

      BufferedWriter w = new BufferedWriter(os);

      w.write("// " + new Date().toString() + "\n");

@@ -104,6 +115,37 @@
      git.add().addFilepattern(file.getName()).call();

      git.commit().setMessage("test commit").call();

      git.push().setPushAll().call();

      git.getRepository().close();

      close(git);

   }



   @Test

   public void testSubfolderPush() throws Exception {

      CloneCommand clone = Git.cloneRepository();

      clone.setURI(MessageFormat.format("{0}/git/test/jgit.git", url));

      clone.setDirectory(jgitFolder);

      clone.setBare(false);

      clone.setCloneAllBranches(true);

      clone.setCredentialsProvider(new UsernamePasswordCredentialsProvider(account, password));

      close(clone.call());

      assertTrue(true);



      Git git = Git.open(jgitFolder);

      File file = new File(jgitFolder, "TODO");

      OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file, true));

      BufferedWriter w = new BufferedWriter(os);

      w.write("// " + new Date().toString() + "\n");

      w.close();

      git.add().addFilepattern(file.getName()).call();

      git.commit().setMessage("test commit").call();

      git.push().setPushAll().call();

      close(git);

   }

	
   private void close(Git git) {

      // really close the repository

      // decrement the use counter to 0

      for (int i = 0; i < 2; i++) {

         git.getRepository().close();

      }

   }

}