Fix for #1018 and #1025 browser LFS links

Paul Martin

2016-03-21 77c38a1865564a4ea4544bfb1f52bedf4326d481

 src/main/java/com/gitblit/wicket/pages/CommitPage.java

@@ -15,29 +15,51 @@
 */

package com.gitblit.wicket.pages;



import java.io.OutputStream;

import java.sql.Blob;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.concurrent.Callable;



import org.apache.wicket.PageParameters;

import org.apache.wicket.behavior.SimpleAttributeModifier;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.link.BookmarkablePageLink;

import org.apache.wicket.markup.html.link.DownloadLink;

import org.apache.wicket.markup.html.link.ExternalLink;

import org.apache.wicket.markup.html.link.Link;

import org.apache.wicket.markup.html.link.ResourceLink;

import org.apache.wicket.markup.repeater.Item;

import org.apache.wicket.markup.repeater.data.DataView;

import org.apache.wicket.markup.repeater.data.ListDataProvider;

import org.apache.wicket.model.AbstractReadOnlyModel;

import org.apache.wicket.model.IModel;

import org.apache.wicket.model.StringResourceModel;

import org.apache.wicket.request.target.basic.RedirectRequestTarget;

import org.apache.wicket.request.target.resource.ResourceStreamRequestTarget;

import org.apache.wicket.util.resource.AbstractResourceStream;

import org.apache.wicket.util.resource.AbstractResourceStreamWriter;

import org.apache.wicket.util.resource.IResourceStream;

import org.bouncycastle.jcajce.provider.symmetric.Threefish;

import org.eclipse.jgit.diff.DiffEntry.ChangeType;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.Constants;

import com.gitblit.GitBlit;

import com.gitblit.manager.FilestoreManager;

import com.gitblit.manager.GitblitManager;

import com.gitblit.models.FilestoreModel;

import com.gitblit.models.GitNote;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.PathModel.PathChangeModel;

import com.gitblit.models.SubmoduleModel;

import com.gitblit.models.UserModel;

import com.gitblit.servlet.RawServlet;

import com.gitblit.utils.JGitUtils;

import com.gitblit.wicket.CacheControl;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.CacheControl.LastModified;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.CommitHeaderPanel;

@@ -198,7 +220,31 @@
               }

               

               if (entry.isFilestoreItem()) {

                  item.add(new LinkPanel("pathName", "list", entry.path, filestoreItemUrl));

                  item.add(new LinkPanel("pathName", "list", entry.path, new Link<Object>("link", null) {

							 
                     private static final long serialVersionUID = 1L;



                     @Override

                      public void onClick() {

						 
                          IResourceStream resourceStream = new AbstractResourceStreamWriter() {

						    		 								    	
                           private static final long serialVersionUID = 1L;



                           @Override 
                               public void write(OutputStream output) {

                                   UserModel user =  GitBlitWebSession.get().getUser();

                                user = user == null ? UserModel.ANONYMOUS : user;

									    	
                                 app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output);

                               }

                           };

						    	      
						    	
                         getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path));

                      }}));

						
						
               } else {

                  item.add(new LinkPanel("pathName", "list", displayPath, BlobPage.class,

                     WicketUtils.newPathParameter(repositoryName, entry.commitId, path)));

@@ -232,8 +278,56 @@
               if (entry.isFilestoreItem()) {

                  item.add(new Label("filestore", getString("gb.filestore")).setVisible(true));

                  

                  item.add(new ExternalLink("view", filestoreItemUrl));

                  item.add(new ExternalLink("raw", filestoreItemUrl));

						
						
                  item.add(new Link<Object>("view", null) {

							 
                     private static final long serialVersionUID = 1L;



                     @Override

                      public void onClick() {

						 
                          IResourceStream resourceStream = new AbstractResourceStreamWriter() {

						    		 								    	
                           private static final long serialVersionUID = 1L;



                           @Override 
                               public void write(OutputStream output) {

                                   UserModel user =  GitBlitWebSession.get().getUser();

                                user = user == null ? UserModel.ANONYMOUS : user;

									    	
                                 app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output);

                               }

                           };

						    	      
						    	
                         getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path));

                      }});

						
                  item.add(new Link<Object>("raw", null) {

							 
                     private static final long serialVersionUID = 1L;



                     @Override

                      public void onClick() {

						 
                          IResourceStream resourceStream = new AbstractResourceStreamWriter() {

						    		 								    	
                           private static final long serialVersionUID = 1L;



                           @Override 
                               public void write(OutputStream output) {

                                   UserModel user =  GitBlitWebSession.get().getUser();

                                user = user == null ? UserModel.ANONYMOUS : user;

									    	
                                 app().filestore().downloadBlob(entry.getFilestoreOid(), user, getRepositoryModel(), output);

                               }

                           };

						    	      
						    	
                         getRequestCycle().setRequestTarget(new ResourceStreamRequestTarget(resourceStream, entry.path));

                      }});

						    						
               } else {

                  item.add(new Label("filestore", getString("gb.filestore")).setVisible(false));