From 399f26ca052c09ed54f812343a33d82560d9ae48 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@helsinki.at>
Date: Wed, 30 Dec 2015 23:44:30 +0100
Subject: improved sanity check for local files


diff --git a/fetcher.go b/fetcher.go
index 81072eb..f1bbb5e 100644
--- a/fetcher.go
+++ b/fetcher.go
@@ -158,7 +158,7 @@ func FetchFileCurl(ctx *ImportContext, res *FetchResult, uri *url.URL) (err erro
 func FetchFileLocal(ctx *ImportContext, res *FetchResult, uri *url.URL) (err error) {
 	rhl.Printf("Local fetcher called for '%s'", ctx.SourceUri)
 	if ctx.ProgressCallBack != nil {
-		if keep := ctx.ProgressCallBack(1, "fetching", 1.0, ctx.ProgressCallBackData); !keep {
+		if keep := ctx.ProgressCallBack(1, "fetching", 0.0, ctx.ProgressCallBackData); !keep {
 			ctx.ProgressCallBack = nil
 		}
 	}
@@ -170,7 +170,23 @@ func FetchFileLocal(ctx *ImportContext, res *FetchResult, uri *url.URL) (err err
 		res.ErrorString = fmt.Sprintf("local-file open(): %s", err)
 		return nil
 	}
+	if info, err := src.Stat(); err != nil {
+		res.ResponseCode = http.StatusBadRequest
+		res.ErrorString = fmt.Sprintf("local-file stat(): %s", err)
+		return nil
+	} else {
+		if info.IsDir() {
+			res.ResponseCode = http.StatusBadRequest
+			res.ErrorString = fmt.Sprintf("'%s' is a directory", ctx.SourceFile)
+			return nil
+		}
+	}
 	src.Close()
+	if ctx.ProgressCallBack != nil {
+		if keep := ctx.ProgressCallBack(1, "fetching", 1.0, ctx.ProgressCallBackData); !keep {
+			ctx.ProgressCallBack = nil
+		}
+	}
 	ctx.DeleteSourceFile = false
 	ctx.DeleteSourceDir = false
 	return
-- 
cgit v0.10.2