Merge branch 'init-shared' of https://github.com/fzs/gitblit into prefixes

2 files changed, 286 insertions, 0 deletions

diff --git a/src/test/java/com/gitblit/tests/JGitUtilsTest.java b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
index 375dbd5a..463c0a84 100644
--- a/src/test/java/com/gitblit/tests/JGitUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
@@ -52,6 +52,7 @@ import com.gitblit.models.PathModel.PathChangeModel;
 import com.gitblit.models.RefModel;

 import com.gitblit.utils.CompressionUtils;

 import com.gitblit.utils.JGitUtils;

+import com.gitblit.utils.JnaUtils;

 import com.gitblit.utils.StringUtils;

 

 public class JGitUtilsTest {

@@ -149,6 +150,139 @@ public class JGitUtilsTest {
 	}

 

 	@Test

+	public void testCreateRepositoryShared() throws Exception {

+		String[] repositories = { "NewSharedTestRepository.git" };

+		for (String repositoryName : repositories) {

+			Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES,

+					repositoryName, "group");

+			File folder = FileKey.resolve(new File(GitBlitSuite.REPOSITORIES, repositoryName),

+					FS.DETECTED);

+			assertNotNull(repository);

+			assertFalse(JGitUtils.hasCommits(repository));

+			assertNull(JGitUtils.getFirstCommit(repository, null));

+

+			assertEquals("1", repository.getConfig().getString("core", null, "sharedRepository"));

+

+			assertTrue(folder.exists());

+			if (! JnaUtils.isWindows()) {

+				int mode = JnaUtils.getFilemode(folder);

+				assertEquals(JnaUtils.S_ISGID, mode & JnaUtils.S_ISGID);

+				assertEquals(JnaUtils.S_IRWXG, mode & JnaUtils.S_IRWXG);

+

+				mode = JnaUtils.getFilemode(folder.getAbsolutePath() + "/HEAD");

+				assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP, mode & JnaUtils.S_IRWXG);

+

+				mode = JnaUtils.getFilemode(folder.getAbsolutePath() + "/config");

+				assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP, mode & JnaUtils.S_IRWXG);

+			}

+

+			repository.close();

+			RepositoryCache.close(repository);

+			FileUtils.delete(repository.getDirectory(), FileUtils.RECURSIVE);

+		}

+	}

+

+	@Test

+	public void testCreateRepositorySharedCustom() throws Exception {

+		String[] repositories = { "NewSharedTestRepository.git" };

+		for (String repositoryName : repositories) {

+			Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES,

+					repositoryName, "660");

+			File folder = FileKey.resolve(new File(GitBlitSuite.REPOSITORIES, repositoryName),

+					FS.DETECTED);

+			assertNotNull(repository);

+			assertFalse(JGitUtils.hasCommits(repository));

+			assertNull(JGitUtils.getFirstCommit(repository, null));

+

+			assertEquals("0660", repository.getConfig().getString("core", null, "sharedRepository"));

+

+			assertTrue(folder.exists());

+			if (! JnaUtils.isWindows()) {

+				int mode = JnaUtils.getFilemode(folder);

+				assertEquals(JnaUtils.S_ISGID, mode & JnaUtils.S_ISGID);

+				assertEquals(JnaUtils.S_IRWXG, mode & JnaUtils.S_IRWXG);

+				assertEquals(0, mode & JnaUtils.S_IRWXO);

+

+				mode = JnaUtils.getFilemode(folder.getAbsolutePath() + "/HEAD");

+				assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP, mode & JnaUtils.S_IRWXG);

+				assertEquals(0, mode & JnaUtils.S_IRWXO);

+

+				mode = JnaUtils.getFilemode(folder.getAbsolutePath() + "/config");

+				assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP, mode & JnaUtils.S_IRWXG);

+				assertEquals(0, mode & JnaUtils.S_IRWXO);

+			}

+

+			repository.close();

+			RepositoryCache.close(repository);

+			FileUtils.delete(repository.getDirectory(), FileUtils.RECURSIVE);

+		}

+	}

+

+	@Test

+	public void testCreateRepositorySharedSgidParent() throws Exception {

+		if (! JnaUtils.isWindows()) {

+			String repositoryAll = "NewTestRepositoryAll.git";

+			String repositoryUmask = "NewTestRepositoryUmask.git";

+			String sgidParent = "sgid";

+			

+			File parent = new File(GitBlitSuite.REPOSITORIES, sgidParent);

+			File folder = null;

+			boolean parentExisted = parent.exists();

+			try {

+				if (!parentExisted) {

+					assertTrue("Could not create SGID parent folder.", parent.mkdir());

+				}

+				int mode = JnaUtils.getFilemode(parent);

+				assertTrue(mode > 0);

+				assertEquals(0, JnaUtils.setFilemode(parent, mode | JnaUtils.S_ISGID | JnaUtils.S_IWGRP));

+

+				Repository repository = JGitUtils.createRepository(parent, repositoryAll, "all");

+				folder = FileKey.resolve(new File(parent, repositoryAll), FS.DETECTED);

+				assertNotNull(repository);

+		

+				assertEquals("2", repository.getConfig().getString("core", null, "sharedRepository"));

+		

+				assertTrue(folder.exists());

+				mode = JnaUtils.getFilemode(folder);

+				assertEquals(JnaUtils.S_ISGID, mode & JnaUtils.S_ISGID);

+	

+				mode = JnaUtils.getFilemode(folder.getAbsolutePath() + "/HEAD");

+				assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP, mode & JnaUtils.S_IRWXG);

+				assertEquals(JnaUtils.S_IROTH, mode & JnaUtils.S_IRWXO);

+	

+				mode = JnaUtils.getFilemode(folder.getAbsolutePath() + "/config");

+				assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP, mode & JnaUtils.S_IRWXG);

+				assertEquals(JnaUtils.S_IROTH, mode & JnaUtils.S_IRWXO);

+	

+				repository.close();

+				RepositoryCache.close(repository);

+

+

+

+				repository = JGitUtils.createRepository(parent, repositoryUmask, "umask");

+				folder = FileKey.resolve(new File(parent, repositoryUmask), FS.DETECTED);

+				assertNotNull(repository);

+		

+				assertEquals(null, repository.getConfig().getString("core", null, "sharedRepository"));

+		

+				assertTrue(folder.exists());

+				mode = JnaUtils.getFilemode(folder);

+				assertEquals(JnaUtils.S_ISGID, mode & JnaUtils.S_ISGID);

+	

+				repository.close();

+				RepositoryCache.close(repository);

+			}

+			finally {

+				FileUtils.delete(new File(parent, repositoryAll), FileUtils.RECURSIVE | FileUtils.IGNORE_ERRORS);

+				FileUtils.delete(new File(parent, repositoryUmask), FileUtils.RECURSIVE | FileUtils.IGNORE_ERRORS);

+				if (!parentExisted) {

+					FileUtils.delete(parent, FileUtils.RECURSIVE | FileUtils.IGNORE_ERRORS);

+				}

+			}

+		}

+	}

+

+	@Test

 	public void testRefs() throws Exception {

 		Repository repository = GitBlitSuite.getJGitRepository();

 		Map<ObjectId, List<RefModel>> map = JGitUtils.getAllRefs(repository);

diff --git a/src/test/java/com/gitblit/tests/JnaUtilsTest.java b/src/test/java/com/gitblit/tests/JnaUtilsTest.java
new file mode 100644
index 00000000..25d1ccf5
--- /dev/null
+++ b/src/test/java/com/gitblit/tests/JnaUtilsTest.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gitblit.tests;
+
+import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.JnaUtils;
+import java.io.File;
+import java.io.IOException;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.commons.io.FileUtils;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.RepositoryCache;
+import org.eclipse.jgit.lib.RepositoryCache.FileKey;
+import org.eclipse.jgit.util.FS;
+import org.junit.Test;
+
+/**
+ *
+ * @author Florian Zschocke
+ */
+public class JnaUtilsTest {
+
+	@Test
+	public void testGetgid() {
+		if (JnaUtils.isWindows()) {
+			try {
+				JnaUtils.getFilemode(GitBlitSuite.REPOSITORIES);
+			} catch(UnsupportedOperationException e) {}
+		}
+		else {
+			int gid = JnaUtils.getgid();
+			assertTrue(gid >= 0);
+			int egid = JnaUtils.getegid();
+			assertTrue(egid >= 0);
+			assertTrue("Really? You're running unit tests as root?!", gid > 0);
+			System.out.println("gid: " + gid + "  egid: " + egid);
+		}
+	}
+
+
+	@Test
+	public void testGetFilemode() throws IOException {
+		if (JnaUtils.isWindows()) {
+			try {
+				JnaUtils.getFilemode(GitBlitSuite.REPOSITORIES);
+			} catch(UnsupportedOperationException e) {}
+		}
+		else {
+			String repositoryName = "NewJnaTestRepository.git";
+			Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, repositoryName);
+			File folder = FileKey.resolve(new File(GitBlitSuite.REPOSITORIES, repositoryName), FS.DETECTED);
+			assertTrue(folder.exists());
+
+			int mode = JnaUtils.getFilemode(folder);
+			assertTrue(mode > 0);
+			assertEquals(JnaUtils.S_IFDIR, (mode & JnaUtils.S_IFMT)); // directory
+			assertEquals(JnaUtils.S_IRUSR | JnaUtils.S_IWUSR | JnaUtils.S_IXUSR, (mode & JnaUtils.S_IRWXU)); // owner full access
+
+			mode = JnaUtils.getFilemode(folder.getAbsolutePath() + "/config");
+			assertTrue(mode > 0);
+			assertEquals(JnaUtils.S_IFREG, (mode & JnaUtils.S_IFMT)); // directory
+			assertEquals(JnaUtils.S_IRUSR | JnaUtils.S_IWUSR, (mode & JnaUtils.S_IRWXU)); // owner full access
+
+			repository.close();
+			RepositoryCache.close(repository);
+			FileUtils.deleteDirectory(repository.getDirectory());
+			}
+	}
+
+
+	@Test
+	public void testSetFilemode() throws IOException {
+		if (JnaUtils.isWindows()) {
+			try {
+				JnaUtils.getFilemode(GitBlitSuite.REPOSITORIES);
+			} catch(UnsupportedOperationException e) {}
+		}
+		else {
+			String repositoryName = "NewJnaTestRepository.git";
+			Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, repositoryName);
+			File folder = FileKey.resolve(new File(GitBlitSuite.REPOSITORIES, repositoryName), FS.DETECTED);
+			assertTrue(folder.exists());
+
+			File path = new File(folder, "refs");
+			int mode = JnaUtils.getFilemode(path);
+			assertTrue(mode > 0);
+			assertEquals(JnaUtils.S_IFDIR, (mode & JnaUtils.S_IFMT)); // directory
+			assertEquals(JnaUtils.S_IRUSR | JnaUtils.S_IWUSR | JnaUtils.S_IXUSR, (mode & JnaUtils.S_IRWXU)); // owner full access
+
+			mode |= JnaUtils.S_ISGID;
+			mode |= JnaUtils.S_IRWXG;
+			int ret = JnaUtils.setFilemode(path, mode);
+			assertEquals(0, ret);
+			mode = JnaUtils.getFilemode(path);
+			assertTrue(mode > 0);
+			assertEquals(JnaUtils.S_ISGID, (mode & JnaUtils.S_ISGID)); // set-gid-bit set
+			assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP | JnaUtils.S_IXGRP, (mode & JnaUtils.S_IRWXG)); // group full access
+
+			path = new File(folder, "config");
+			mode = JnaUtils.getFilemode(path.getAbsolutePath());
+			assertTrue(mode > 0);
+			assertEquals(JnaUtils.S_IFREG, (mode & JnaUtils.S_IFMT)); // directory
+			assertEquals(JnaUtils.S_IRUSR | JnaUtils.S_IWUSR, (mode & JnaUtils.S_IRWXU)); // owner full access
+
+			mode |= (JnaUtils.S_IRGRP | JnaUtils.S_IWGRP);
+			ret = JnaUtils.setFilemode(path.getAbsolutePath(), mode);
+			assertEquals(0, ret);
+			mode = JnaUtils.getFilemode(path.getAbsolutePath());
+			assertTrue(mode > 0);
+			assertEquals(JnaUtils.S_IRGRP | JnaUtils.S_IWGRP, (mode & JnaUtils.S_IRWXG)); // group full access
+
+			repository.close();
+			RepositoryCache.close(repository);
+			FileUtils.deleteDirectory(repository.getDirectory());
+		}
+	}
+
+
+	@Test
+	public void testGetFilestat() {
+		if (JnaUtils.isWindows()) {
+			try {
+				JnaUtils.getFilemode(GitBlitSuite.REPOSITORIES);
+			} catch(UnsupportedOperationException e) {}
+		}
+		else {
+			JnaUtils.Filestat stat = JnaUtils.getFilestat(GitBlitSuite.REPOSITORIES);
+			assertNotNull(stat);
+			assertTrue(stat.mode > 0);
+			assertTrue(stat.uid > 0);
+			assertTrue(stat.gid > 0);
+		}
+	}
+
+
+}