Do not count hashes for non regular files

Signed-off-by: Radovan Sroka <rsroka@redhat.com>

Author: radosroka

src/cli/file-cli.c

@@ -67,19 +67,11 @@ static int ftw_add_list_append(const char *fpath,
  */
 static int add_list_load_path(const char *path)
 {
-	int fd = open(path, O_RDONLY);
-	if (fd < 0) {
-		msg(LOG_ERR, "Cannot open %s", path);
-		return 1;
-	}
-
 	struct stat sb;
-	if (fstat(fd, &sb)) {
+	if (stat(path, &sb)) {
 		msg(LOG_ERR, "Cannot stat %s", path);
-		close(fd);
 		return 1;
 	}
-	close(fd);
 
 	if (S_ISDIR(sb.st_mode))
 		nftw(path, &ftw_add_list_append, FTW_NOPENFD, FTW_FLAGS);

src/library/file.c

@@ -19,6 +19,7 @@
  * Boston, MA 02110-1335, USA.
  *
  * Authors:
+ *   Radovan Sroka <rsroka@redhat.com>
  *   Steve Grubb <sgrubb@redhat.com>
  */
 
@@ -440,17 +441,15 @@ static ssize_t safe_read(int fd, char *buf, size_t size)
  * If a size of 0 is passed, it will return a NULL pointer.
  * If there is an error with mmap, it will also return a NULL pointer.
  */
-static const char *degenerate_hash_sha = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
-static const char *degenerate_hash_md5 = "d41d8cd98f00b204e9800998ecf8427e";
 char *get_hash_from_fd2(int fd, size_t size, const int is_sha)
 {
 	unsigned char *mapped;
 	char *digest = NULL;
 
 	if (size == 0) {
 		if (is_sha)
-			return strdup(degenerate_hash_sha);
-		return strdup(degenerate_hash_md5);
+			return strdup(DEGENERATE_HASH_SHA);
+		return strdup(DEGENERATE_HASH_MD5);
 	}
 
 	mapped = mmap(0, size, PROT_READ, MAP_PRIVATE|MAP_POPULATE, fd, 0);

src/library/file.h

@@ -19,6 +19,7 @@
  * Boston, MA 02110-1335, USA.
  *
  * Authors:
+ *   Radovan Sroka <rsroka@redhat.com>
  *   Steve Grubb <sgrubb@redhat.com>
  */
 
@@ -43,6 +44,9 @@ struct file_info
 #define SHA256_LEN	32
 #define SHA512_LEN	64
 
+#define DEGENERATE_HASH_SHA "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+#define DEGENERATE_HASH_MD5 "d41d8cd98f00b204e9800998ecf8427e"
+
 void file_init(void);
 void file_close(void);
 struct file_info *stat_file_entry(int fd) __attr_dealloc_free;

src/library/trust-file.c

@@ -74,26 +74,34 @@ int _count;
  */
 static char *make_data_string(const char *path)
 {
-	int fd = open(path, O_RDONLY);
-	if (fd < 0) {
-		msg(LOG_ERR, "Cannot open %s", path);
-		return NULL;
-	}
-
 	// Get the size
 	struct stat sb;
-	if (fstat(fd, &sb)) {
+	if (stat(path, &sb)) {
 		msg(LOG_ERR, "Cannot stat %s", path);
-		close(fd);
 		return NULL;
 	}
 
-	// Get the hash
-	char *hash = get_hash_from_fd2(fd, sb.st_size, 1);
-	close(fd);
-	if (!hash) {
-		msg(LOG_ERR, "Cannot hash %s", path);
-		return NULL;
+	char *hash = NULL;
+	if (S_ISREG(sb.st_mode)) {
+		// Get the hash
+
+		int fd = open(path, O_RDONLY);
+		if (fd < 0) {
+			msg(LOG_ERR, "Cannot open %s", path);
+			return NULL;
+		}
+
+		hash = get_hash_from_fd2(fd, sb.st_size, 1);
+
+		close(fd);
+
+		if (!hash) {
+			msg(LOG_ERR, "Cannot hash %s", path);
+			return NULL;
+		}
+
+	} else {
+		hash = strdup(DEGENERATE_HASH_SHA);
 	}
 
 	char *line;