Re: patch 2/2 debuginfod server etc.

[Mark Wielaard <mark@klomp.org>]

[-- Attachment #1: Type: text/plain, Size: 1713 bytes --]

On Thu, 2019-11-21 at 15:16 +0100, Mark Wielaard wrote:
> Hi,
> 
> On Wed, 2019-11-20 at 12:53 +0100, Mark Wielaard wrote:
> > Sure, you could use that if you wanted to share your whole
> > build/source
> > trees and don't mind serving any other files on some local network.
> > I
> > just think it shouldn't be the default. If you go look for odd
> > paths in
> > .debug files you probably will find them. We already know some
> > builds
> > generate and/or build files in /tmp or outside the src/builddir.
> > 
> > I'll look to see what is necessary to make sure none of those leak
> > out
> > by default.
> 
> The attached is what I came up with.
> 
> It simply splits the paths into those scanned for rpms, those scanned
> for files and (optional) paths that are extra trusted prefixes for
> source files. The paths that are scanned for files are trusted source
> prefixes by default. There is a new option to also remove those using
> -N, --no-files-sources). And you can switch back to allowing all
> files
> on the file system with -A, --all-sources.
> 
> I think this provides a way to do what we both want, it just makes
> things a little bit more explicit.
> 
> As a bonus it separates scanning trees for files and rpms, so no
> unnecessary work is done.
> 
> I haven't updated the documentation yet. Let me know what you think
> about the patch and I can update the documentation if we agree on the
> options/defaults.

On irc you mentioned that you didn't like that -R and -F didn't take
wildcards. The attached makes it so that they now do (you do have to
escape them or put them in single quotes, so the shell doesn't expand
them first).

Cheers,

Mark

[-- Attachment #2: debuginfod-glob.patch --]
[-- Type: text/x-patch, Size: 1271 bytes --]

diff --git a/debuginfod/debuginfod.cxx b/debuginfod/debuginfod.cxx
index 5a08b134..e40efa4b 100644
--- a/debuginfod/debuginfod.cxx
+++ b/debuginfod/debuginfod.cxx
@@ -43,6 +43,7 @@ extern "C" {
 #undef __attribute__ /* glibc bug - rhbz 1763325 */
 #endif
 
+#include <glob.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <error.h>
@@ -415,10 +416,32 @@ parse_opt (int key, char *arg,
       if (http_port > 65535) argp_failure(state, 1, EINVAL, "port number");
       break;
     case 'F':
-      files_paths.insert(string(arg));
+      {
+	glob_t gl;
+	int res = glob(arg, GLOB_TILDE_CHECK, NULL, &gl);
+	if (res == 0)
+	  {
+	    for (size_t i=0; i < gl.gl_pathc; i++)
+	      files_paths.insert(string(gl.gl_pathv[i]));
+	  }
+	else
+	  argp_failure(state, 1, EINVAL, "'%s' didn't match anything", arg);
+	globfree(&gl);
+      }
       break;
     case 'R':
-      rpms_paths.insert(string(arg));
+      {
+	glob_t gl;
+	int res = glob(arg, GLOB_TILDE_CHECK, NULL, &gl);
+	if (res == 0)
+	  {
+	    for (size_t i=0; i < gl.gl_pathc; i++)
+	      rpms_paths.insert(string(gl.gl_pathv[i]));
+	  }
+	else
+	  argp_failure(state, 1, EINVAL, "'%s' didn't match anything", arg);
+	globfree(&gl);
+      }
       break;
     case 'L':
       traverse_logical = true;