Authenticate the webapp against the same realm as the git servlet.

Right now the implementation is hard-coded to pass the realm into a
singleton.  This won't work for a WAR distribution so I will
need to figure out how to properly authenticate the webapp using form
authentication and the git servlet using basic authentication - host
against the same realm.

1 files changed, 2 insertions, 91 deletions

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java
index 2bd3179d..658ae67a 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.java
+++ b/src/com/gitblit/wicket/GitBlitWebApp.java
@@ -1,36 +1,17 @@
 package com.gitblit.wicket;

 

-import java.io.File;

-import java.util.ArrayList;

-import java.util.Date;

-import java.util.List;

-

-import javax.servlet.http.Cookie;

-import javax.servlet.http.HttpServletRequest;

-

 import org.apache.wicket.Application;

 import org.apache.wicket.Page;

 import org.apache.wicket.Request;

 import org.apache.wicket.Response;

 import org.apache.wicket.Session;

 import org.apache.wicket.protocol.http.WebApplication;

-import org.apache.wicket.protocol.http.WebResponse;

 import org.apache.wicket.protocol.http.request.urlcompressing.UrlCompressingWebRequestProcessor;

-import org.apache.wicket.protocol.http.servlet.ServletWebRequest;

 import org.apache.wicket.request.IRequestCycleProcessor;

 import org.apache.wicket.request.target.coding.MixedParamUrlCodingStrategy;

-import org.eclipse.jgit.errors.RepositoryNotFoundException;

-import org.eclipse.jgit.http.server.resolver.FileResolver;

-import org.eclipse.jgit.http.server.resolver.ServiceNotEnabledException;

-import org.eclipse.jgit.lib.Repository;

-import org.slf4j.Logger;

-import org.slf4j.LoggerFactory;

 

-import com.gitblit.Constants;

-import com.gitblit.GitBlitServer;

+import com.gitblit.GitBlit;

 import com.gitblit.StoredSettings;

-import com.gitblit.utils.JGitUtils;

-import com.gitblit.wicket.models.RepositoryModel;

 import com.gitblit.wicket.pages.BlobDiffPage;

 import com.gitblit.wicket.pages.BlobPage;

 import com.gitblit.wicket.pages.BranchesPage;

@@ -49,14 +30,6 @@ import com.gitblit.wicket.pages.TreePage;
 

 public class GitBlitWebApp extends WebApplication {

 

-	Logger logger = LoggerFactory.getLogger(GitBlitWebApp.class);

-

-	FileResolver repositoryResolver;

-

-	private File repositories;

-

-	private boolean exportAll;

-

 	@Override

 	public void init() {

 		super.init();

@@ -92,10 +65,6 @@ public class GitBlitWebApp extends WebApplication {
 		mount(new MixedParamUrlCodingStrategy("/ticgittkt", TicGitTicketPage.class, new String[] { "r", "h", "f" }));

 

 		mount(new MixedParamUrlCodingStrategy("/login", LoginPage.class, new String[] {}));

-

-		repositories = new File(StoredSettings.getString("repositoriesFolder", "repos"));

-		exportAll = StoredSettings.getBoolean("exportAll", true);

-		repositoryResolver = new FileResolver(repositories, exportAll);

 	}

 

 	@Override

@@ -115,69 +84,11 @@ public class GitBlitWebApp extends WebApplication {
 

 	@Override

 	public final String getConfigurationType() {

-		if (GitBlitServer.isDebugMode())

+		if (GitBlit.self().isDebugMode())

 			return Application.DEVELOPMENT;

 		return Application.DEPLOYMENT;

 	}

 

-	public User authenticate(String username, char [] password) {

-		return new User(username, password);

-	}

-

-	public User authenticate(Cookie[] cookies) {

-		if (cookies != null && cookies.length > 0) {

-			for (Cookie cookie:cookies) {

-				if (cookie.getName().equals(Constants.NAME)) {

-					String value = cookie.getValue();

-				}

-			}

-		}

-		return null;

-	}

-	

-	public void setCookie(WebResponse response, User user) {

-		Cookie userCookie = new Cookie(Constants.NAME, user.getCookie());

-		userCookie.setMaxAge(Integer.MAX_VALUE);

-		userCookie.setPath("/");

-		response.addCookie(userCookie);

-	}

-

-	public List<String> getRepositoryList() {

-		return JGitUtils.getRepositoryList(repositories, exportAll, StoredSettings.getBoolean("nestedRepositories", true));

-	}

-

-	public List<RepositoryModel> getRepositories(Request request) {

-		List<String> list = getRepositoryList();

-		ServletWebRequest servletWebRequest = (ServletWebRequest) request;

-		HttpServletRequest req = servletWebRequest.getHttpServletRequest();

-

-		List<RepositoryModel> repositories = new ArrayList<RepositoryModel>();

-		for (String repo : list) {

-			Repository r = getRepository(req, repo);

-			String description = JGitUtils.getRepositoryDescription(r);

-			String owner = JGitUtils.getRepositoryOwner(r);

-			Date lastchange = JGitUtils.getLastChange(r);

-			r.close();

-			repositories.add(new RepositoryModel(repo, description, owner, lastchange));

-		}

-		return repositories;

-	}

-

-	public Repository getRepository(HttpServletRequest req, String repositoryName) {

-		Repository r = null;

-		try {

-			r = repositoryResolver.open(req, repositoryName);

-		} catch (RepositoryNotFoundException e) {

-			r = null;

-			logger.error("Failed to find repository " + repositoryName);

-			e.printStackTrace();

-		} catch (ServiceNotEnabledException e) {

-			r = null;

-			e.printStackTrace();

-		}

-		return r;

-	}

-

 	public String getCloneUrl(String repositoryName) {

 		return StoredSettings.getString("cloneUrl", "https://localhost/git/") + repositoryName;

 	}