diff options
| -rw-r--r-- | debian/netdata-data.links | 6 | ||||
| -rw-r--r-- | debian/netdata.install | 1 | ||||
| -rw-r--r-- | debian/patches/0002-remove-file-serve-ownership-restrictions-for-root.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 43 insertions, 3 deletions
diff --git a/debian/netdata-data.links b/debian/netdata-data.links index 411b620c..fa6aeab1 100644 --- a/debian/netdata-data.links +++ b/debian/netdata-data.links @@ -5,8 +5,8 @@ /usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.ttf usr/share/netdata/web/fonts/glyphicons-halflings-regular.ttf /usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.woff usr/share/netdata/web/fonts/glyphicons-halflings-regular.woff /usr/share/javascript/bootstrap/fonts/glyphicons-halflings-regular.woff2 usr/share/netdata/web/fonts/glyphicons-halflings-regular.woff2 -/usr/share/javascript/bootstrap/css/bootstrap-theme.min.css usr/share/netdata/css/bootstrap-theme.min.css -/usr/share/javascript/bootstrap/css/bootstrap.min.css usr/share/netdata/css/bootstrap.min.css +/usr/share/javascript/bootstrap/css/bootstrap-theme.min.css usr/share/netdata/web/css/bootstrap-theme.min.css +/usr/share/javascript/bootstrap/css/bootstrap.min.css usr/share/netdata/web/css/bootstrap.min.css #libjs-jquery /usr/share/javascript/jquery/jquery.min.js usr/share/netdata/web/lib/jquery-1.12.0.min.js #libjs-d3 @@ -20,4 +20,4 @@ /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.ttf usr/share/netdata/web/fonts/fontawesome-webfont.ttf /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff usr/share/netdata/web/fonts/fontawesome-webfont.woff /usr/share/fonts-font-awesome/fonts/fontawesome-webfont.woff2 usr/share/netdata/web/fonts/fontawesome-webfont.woff2 -/usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/netdata/css/font-awesome.min.css +/usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/netdata/web/css/font-awesome.min.css diff --git a/debian/netdata.install b/debian/netdata.install index 97091ff7..2999224d 100644 --- a/debian/netdata.install +++ b/debian/netdata.install @@ -6,3 +6,4 @@ usr/lib/*/netdata/plugins.d/charts.d.dryrun-helper.sh usr/lib/*/netdata/plugins.d/charts.d.plugin usr/lib/*/netdata/plugins.d/loopsleepms.sh.inc usr/lib/*/netdata/plugins.d/tc-qos-helper.sh +usr/lib/*/netdata/plugins.d/cgroup-name.sh diff --git a/debian/patches/0002-remove-file-serve-ownership-restrictions-for-root.patch b/debian/patches/0002-remove-file-serve-ownership-restrictions-for-root.patch new file mode 100644 index 00000000..41ecfb07 --- /dev/null +++ b/debian/patches/0002-remove-file-serve-ownership-restrictions-for-root.patch @@ -0,0 +1,38 @@ +From: Lennart Weller <lhw@ring0.de> +Date: Wed, 25 May 2016 13:43:32 +0200 +Subject: remove file serve ownership restrictions for root + +--- + src/web_client.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/web_client.c b/src/web_client.c +index 601dda0..1b631bc 100644 +--- a/src/web_client.c ++++ b/src/web_client.c +@@ -339,14 +339,14 @@ int mysendfile(struct web_client *w, char *filename) + } + + // check if the file is owned by expected user +- if(stat.st_uid != web_files_uid()) { ++ if(stat.st_uid != web_files_uid() && stat.st_uid != 0) { + error("%llu: File '%s' is owned by user %d (expected user %d). Access Denied.", w->id, webfilename, stat.st_uid, web_files_uid()); + buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename); + return 403; + } + + // check if the file is owned by expected group +- if(stat.st_gid != web_files_gid()) { ++ if(stat.st_gid != web_files_gid() && stat.st_gid != 0) { + error("%llu: File '%s' is owned by group %d (expected group %d). Access Denied.", w->id, webfilename, stat.st_gid, web_files_gid()); + buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename); + return 403; +@@ -357,7 +357,7 @@ int mysendfile(struct web_client *w, char *filename) + return mysendfile(w, webfilename); + } + +- if((stat.st_mode & S_IFMT) != S_IFREG) { ++ if((stat.st_mode & S_IFMT) != S_IFREG && (stat.st_mode & S_IFMT) != S_IFLNK) { + error("%llu: File '%s' is not a regular file. Access Denied.", w->id, webfilename); + buffer_sprintf(w->response.data, "Access to file '%s' is not permitted.", webfilename); + return 403; diff --git a/debian/patches/series b/debian/patches/series index 0809eba0..3d371172 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-linked-js-css-fonts-removed-from-make.patch +0002-remove-file-serve-ownership-restrictions-for-root.patch |