Paul Martin
2016-03-27 795ce2765773156da868720303a6b2638d14820b
src/main/java/com/gitblit/wicket/GitBlitWebApp.java
@@ -25,6 +25,7 @@
import org.apache.wicket.Request;
import org.apache.wicket.Response;
import org.apache.wicket.Session;
import org.apache.wicket.application.IClassResolver;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
@@ -36,15 +37,18 @@
import com.gitblit.extensions.GitblitWicketPlugin;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IFilestoreManager;
import com.gitblit.manager.IGitblit;
import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IPluginManager;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IServicesManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.tickets.ITicketService;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.utils.XssFilter;
import com.gitblit.wicket.pages.ActivityPage;
import com.gitblit.wicket.pages.BlamePage;
import com.gitblit.wicket.pages.BlobDiffPage;
@@ -55,10 +59,13 @@
import com.gitblit.wicket.pages.ComparePage;
import com.gitblit.wicket.pages.DocPage;
import com.gitblit.wicket.pages.DocsPage;
import com.gitblit.wicket.pages.EditFilePage;
import com.gitblit.wicket.pages.EditMilestonePage;
import com.gitblit.wicket.pages.EditRepositoryPage;
import com.gitblit.wicket.pages.EditTicketPage;
import com.gitblit.wicket.pages.ExportTicketPage;
import com.gitblit.wicket.pages.FederationRegistrationPage;
import com.gitblit.wicket.pages.FilestorePage;
import com.gitblit.wicket.pages.ForkPage;
import com.gitblit.wicket.pages.ForksPage;
import com.gitblit.wicket.pages.GitSearchPage;
@@ -70,6 +77,7 @@
import com.gitblit.wicket.pages.MyDashboardPage;
import com.gitblit.wicket.pages.MyTicketsPage;
import com.gitblit.wicket.pages.NewMilestonePage;
import com.gitblit.wicket.pages.NewRepositoryPage;
import com.gitblit.wicket.pages.NewTicketPage;
import com.gitblit.wicket.pages.OverviewPage;
import com.gitblit.wicket.pages.PatchPage;
@@ -86,14 +94,26 @@
import com.gitblit.wicket.pages.TreePage;
import com.gitblit.wicket.pages.UserPage;
import com.gitblit.wicket.pages.UsersPage;
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
@Singleton
public class GitBlitWebApp extends WebApplication implements GitblitWicketApp {
   private final Class<? extends WebPage> homePageClass = MyDashboardPage.class;
   private final Class<? extends WebPage> newRepositoryPageClass = NewRepositoryPage.class;
   private final Map<String, CacheControl> cacheablePages = new HashMap<String, CacheControl>();
   private final Provider<IPublicKeyManager> publicKeyManagerProvider;
   private final Provider<ITicketService> ticketServiceProvider;
   private final IStoredSettings settings;
   private final XssFilter xssFilter;
   private final IRuntimeManager runtimeManager;
@@ -105,8 +125,6 @@
   private final IAuthenticationManager authenticationManager;
   private final IPublicKeyManager publicKeyManager;
   private final IRepositoryManager repositoryManager;
   private final IProjectManager projectManager;
@@ -115,30 +133,42 @@
   private final IGitblit gitblit;
   private final IServicesManager services;
   private final IFilestoreManager filestoreManager;
   @Inject
   public GitBlitWebApp(
         Provider<IPublicKeyManager> publicKeyManagerProvider,
         Provider<ITicketService> ticketServiceProvider,
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager,
         IGitblit gitblit) {
         IGitblit gitblit,
         IServicesManager services,
         IFilestoreManager filestoreManager) {
      super();
      this.publicKeyManagerProvider = publicKeyManagerProvider;
      this.ticketServiceProvider = ticketServiceProvider;
      this.settings = runtimeManager.getSettings();
      this.xssFilter = runtimeManager.getXssFilter();
      this.runtimeManager = runtimeManager;
      this.pluginManager = pluginManager;
      this.notificationManager = notificationManager;
      this.userManager = userManager;
      this.authenticationManager = authenticationManager;
      this.publicKeyManager = publicKeyManager;
      this.repositoryManager = repositoryManager;
      this.projectManager = projectManager;
      this.federationManager = federationManager;
      this.gitblit = gitblit;
      this.services = services;
      this.filestoreManager = filestoreManager;
   }
   @Override
@@ -166,9 +196,9 @@
      // setup the standard gitweb-ish urls
      mount("/repositories", RepositoriesPage.class);
      mount("/overview", OverviewPage.class, "r", "h");
      mount("/overview", OverviewPage.class, "r");
      mount("/summary", SummaryPage.class, "r");
      mount("/reflog", ReflogPage.class, "r", "h");
      mount("/reflog", ReflogPage.class, "r");
      mount("/commits", LogPage.class, "r", "h");
      mount("/log", LogPage.class, "r", "h");
      mount("/tags", TagsPage.class, "r");
@@ -199,13 +229,16 @@
      mount("/mytickets", MyTicketsPage.class, "r", "h");
      // setup the markup document urls
      mount("/docs", DocsPage.class, "r");
      mount("/docs", DocsPage.class, "r", "h");
      mount("/doc", DocPage.class, "r", "h", "f");
      mount("/editfile", EditFilePage.class, "r", "h", "f");
      // federation urls
      mount("/proposal", ReviewProposalPage.class, "t");
      mount("/registration", FederationRegistrationPage.class, "u", "n");
      mount("/new", NewRepositoryPage.class);
      mount("/edit", EditRepositoryPage.class, "r");
      mount("/activity", ActivityPage.class, "r", "h");
      mount("/lucene", LuceneSearchPage.class);
      mount("/project", ProjectPage.class, "p");
@@ -213,6 +246,9 @@
      mount("/user", UserPage.class, "user");
      mount("/forks", ForksPage.class, "r");
      mount("/fork", ForkPage.class, "r");
      // filestore URL
      mount("/filestore", FilestorePage.class);
      // allow started Wicket plugins to initialize
      for (PluginWrapper pluginWrapper : pluginManager.getPlugins()) {
@@ -226,7 +262,8 @@
      }
       // customize the Wicket class resolver to load from plugins
        PluginClassResolver classResolver = new PluginClassResolver(pluginManager);
      IClassResolver coreResolver = getApplicationSettings().getClassResolver();
        PluginClassResolver classResolver = new PluginClassResolver(coreResolver, pluginManager);
        getApplicationSettings().setClassResolver(classResolver);
      getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
@@ -243,7 +280,7 @@
      if (!settings.getBoolean(Keys.web.mountParameters, true)) {
         parameters = new String[] {};
      }
      mount(new GitblitParamUrlCodingStrategy(settings, location, clazz, parameters));
      mount(new GitblitParamUrlCodingStrategy(settings, xssFilter, location, clazz, parameters));
      // map the mount point to the cache control definition
      if (clazz.isAnnotationPresent(CacheControl.class)) {
@@ -258,6 +295,10 @@
   @Override
   public Class<? extends WebPage> getHomePage() {
      return homePageClass;
   }
   public Class<? extends WebPage> getNewRepositoryPage() {
      return newRepositoryPageClass;
   }
   /* (non-Javadoc)
@@ -293,6 +334,14 @@
   @Override
   public IStoredSettings settings() {
      return settings;
   }
   /* (non-Javadoc)
    * @see com.gitblit.wicket.Webapp#xssFilter()
    */
   @Override
   public XssFilter xssFilter() {
      return xssFilter;
   }
   /* (non-Javadoc)
@@ -368,7 +417,7 @@
    */
   @Override
   public IPublicKeyManager keys() {
      return publicKeyManager;
      return publicKeyManagerProvider.get();
   }
   /* (non-Javadoc)
@@ -404,11 +453,19 @@
   }
   /* (non-Javadoc)
    * @see com.gitblit.wicket.Webapp#services()
    */
   @Override
   public IServicesManager services() {
      return services;
   }
   /* (non-Javadoc)
    * @see com.gitblit.wicket.Webapp#tickets()
    */
   @Override
   public ITicketService tickets() {
      return gitblit.getTicketService();
      return ticketServiceProvider.get();
   }
   /* (non-Javadoc)
@@ -430,4 +487,9 @@
   public static GitBlitWebApp get() {
      return (GitBlitWebApp) WebApplication.get();
   }
   @Override
   public IFilestoreManager filestore() {
      return filestoreManager;
   }
}