Improve blame page error checking

releases.moxie

@@ -9,7 +9,7 @@ r17: {
 	- Raw servlet was insecure. If someone knew the exact repository name and path to a file, the raw blob could be retrieved bypassing security constraints. (issue 198)
     fixes:
      - Could not reset settings with $ or { characters through Gitblit Manager because they are not properly escaped
-	 - Added more error checking to blob page
+	 - Added more error checking to blob page and blame page
 	 - Fix NPE when getting user's fork without repository list caching (issue 182)
 	 - Fix internal error on folder history links (issue 192)
 	 - Fixed incorrect icon file name for .doc files (issue 200)

src/main/java/com/gitblit/wicket/pages/BlamePage.html

@@ -17,6 +17,8 @@
 
 	<!-- breadcrumbs -->
 	<div wicket:id="breadcrumbs">[breadcrumbs]</div>
+	
+	<div wicket:id="missingBlob">[missing blob]</div>
 		
 	<!--  blame content -->
 	<table class="annotated" style="margin-bottom:5px;">

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

@@ -32,7 +32,9 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import com.gitblit.GitBlit;
 import com.gitblit.Keys;
 import com.gitblit.models.AnnotatedLine;
+import com.gitblit.models.PathModel;
 import com.gitblit.utils.DiffUtils;
+import com.gitblit.utils.JGitUtils;
 import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.WicketUtils;
 import com.gitblit.wicket.panels.CommitHeaderPanel;
@@ -69,6 +71,24 @@ public class BlamePage extends RepositoryPage {
 				"EEEE, MMMM d, yyyy HH:mm Z");
 		final DateFormat df = new SimpleDateFormat(format);
 		df.setTimeZone(getTimeZone());
+		
+		PathModel pathModel = null;
+		List<PathModel> paths = JGitUtils.getFilesInPath(getRepository(), StringUtils.getRootPath(blobPath), commit);
+		for (PathModel path : paths) {
+			if (path.path.equals(blobPath)) {
+				pathModel = path;
+				break;
+			}
+		}
+		
+		if (pathModel == null) {
+			add(new Label("annotation").setVisible(false));
+			add(new Label("missingBlob", missingBlob(blobPath, commit)).setEscapeModelStrings(false));
+			return;
+		}
+		
+		add(new Label("missingBlob").setVisible(false));
+		
 		List<AnnotatedLine> lines = DiffUtils.blame(getRepository(), blobPath, objectId);
 		ListDataProvider<AnnotatedLine> blameDp = new ListDataProvider<AnnotatedLine>(lines);
 		DataView<AnnotatedLine> blameView = new DataView<AnnotatedLine>("annotation", blameDp) {
@@ -126,4 +146,13 @@ public class BlamePage extends RepositoryPage {
 	protected String getPageName() {
 		return getString("gb.blame");
 	}
+	
+	protected String missingBlob(String blobPath, RevCommit commit) {
+		StringBuilder sb = new StringBuilder();
+		sb.append("<div class=\"alert alert-error\">");
+		String pattern = getString("gb.doesNotExistInTree").replace("{0}", "<b>{0}</b>").replace("{1}", "<b>{1}</b>");
+		sb.append(MessageFormat.format(pattern, blobPath, commit.getTree().getId().getName()));
+		sb.append("</div>");
+		return sb.toString();
+	}
 }