Plugins: Ignore symlinked folders when verifying plugin signature (#34434) (#35719)

* add check + test * fix test * add manifest * fix linter * add nolint * separate err cond checks * only collect relevant plugin files * skip symlinks * refactor * add missing test files + enable scanning Chromium.app/ * remove test since case already covered * remove unnecessary changes from before * refactor * remove comment (cherry picked from commit 303352a89b) Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
2021-06-15 12:19:24 +02:00
parent eb018c417d
commit c9b8c851fa
16 changed files with 215 additions and 92 deletions
@@ -0,0 +1,31 @@
+
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+{
+  "manifestVersion": "2.0.0",
+  "signatureType": "grafana",
+  "signedByOrg": "grafana",
+  "signedByOrgName": "Grafana Labs",
+  "plugin": "test-app",
+  "version": "1.0.0",
+  "time": 1622547655175,
+  "keyId": "7e4d0c6a708866e7",
+  "files": {
+    "symlink_to_txt": "9f32c171bf78a85d5cb77a48ab44f85578ee2942a1fc9f9ec4fde194ae4ff048",
+    "plugin.json": "c59a51bf6d7ecd7a99608ccb99353390c8b973672a938a0247164324005c0caf",
+    "dashboards/connections.json": "bea86da4be970b98dc4681802ab55cdef3441dc3eb3c654cb207948d17b25303",
+    "dashboards/extra/memory.json": "7c042464941084caa91d0a9a2f188b05315a9796308a652ccdee31ca4fbcbfee",
+    "text.txt": "9f32c171bf78a85d5cb77a48ab44f85578ee2942a1fc9f9ec4fde194ae4ff048"
+  }
+}
+-----BEGIN PGP SIGNATURE-----
+Version: OpenPGP.js v4.10.1
+Comment: https://openpgpjs.org
+
+wqEEARMKAAYFAmC2HMcACgkQfk0ManCIZuddZgIJAVsIWg93v20C9baQhKth
+G9f1PY900AnjVNK/494/qdR7UrBWDH0LWboVIkcALEawo6oLMUzyuMIPknCy
+QW45HwlQAgjRW2Wm1uxcFN6164M5UHAR9+a2mHrpva18bG6ELYliLRFsuEnj
+WG0SOCjmUoSG/qN6iREuLxii5xK4Levu158kCg==
+=Mpyz
+-----END PGP SIGNATURE-----
@@ -0,0 +1,29 @@
+{
+  "__inputs": [
+    {
+      "name": "DS_NAME",
+      "type": "datasource",
+      "pluginId": "graphite"
+    }
+  ],
+
+  "uid": "1MHHlVjzz",
+  "title": "Nginx Connections",
+  "revision": 25,
+  "schemaVersion": 11,
+  "tags": ["tag1", "tag2"],
+  "number_array": [1,2,3,10.33],
+  "boolean_true": true,
+  "boolean_false": false,
+
+  "rows": [
+    {
+      "panels": [
+        {
+          "type": "graph",
+          "datasource": "${DS_NAME}"
+        }
+      ]
+    }
+  ]
+}
@@ -0,0 +1,5 @@
+{
+  "title": "Nginx Memory",
+  "revision": 2,
+  "schemaVersion": 11
+}
@@ -0,0 +1 @@
+dashboards/extra
@@ -0,0 +1,55 @@
+{
+  "type": "app",
+  "name": "Test App",
+  "id": "test-app",
+
+  "staticRoot": ".",
+
+  "pages": [
+    { "name": "Live stream", "component": "StreamPageCtrl", "role": "Editor"},
+    { "name": "Log view", "component": "LogsPageCtrl", "role": "Viewer"}
+  ],
+
+  "css": {
+    "dark":  "css/dark.css",
+    "light":  "css/light.css"
+  },
+
+  "info": {
+    "description": "Official Grafana Test App & Dashboard bundle",
+    "author": {
+      "name": "Test Inc.",
+      "url": "http://test.com"
+    },
+    "keywords": ["test"],
+    "logos": {
+      "small": "img/logo_small.png",
+      "large": "img/logo_large.png"
+    },
+    "screenshots": [
+      {"name": "img1", "path": "img/screenshot1.png"},
+      {"name": "img2", "path": "img/screenshot2.png"}
+    ],
+    "links": [
+      {"name": "Project site", "url": "http://project.com"},
+      {"name": "License & Terms", "url": "http://license.com"}
+    ],
+    "version": "1.0.0",
+    "updated": "2015-02-10"
+  },
+
+  "includes": [
+    {"type": "dashboard", "name": "Nginx Connections", "path": "dashboards/connections.json"},
+    {"type": "dashboard", "name": "Nginx Memory", "path": "dashboards/memory.json"},
+    {"type": "panel", "name": "Nginx Panel"},
+    {"type": "datasource", "name": "Nginx Datasource"}
+  ],
+
+  "dependencies": {
+    "grafanaVersion": "3.x.x",
+    "plugins": [
+      {"type": "datasource", "id": "graphite", "name": "Graphite", "version": "1.0.0"},
+      {"type": "panel", "id": "graph", "name": "Graph", "version": "1.0.0"}
+    ]
+  }
+}
@@ -0,0 +1 @@
+text.txt
@@ -0,0 +1,8 @@
+eafafewfewfwef
+fawfwfwefewfwaef
+fawewfewfewfewfe
+wafewafewfewafewaf
+efewafeawfewafewf
+ewafewafewfeawfawf
+weafweafewfefewafewa
+fewafweafwafeaf
@@ -1,32 +0,0 @@
-
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-{
-  "manifestVersion": "2.0.0",
-  "signatureType": "grafana",
-  "signedByOrg": "grafana",
-  "signedByOrgName": "Grafana Labs",
-  "rootUrls": [
-    "http://localhost:3000/"
-  ],
-  "plugin": "test",
-  "version": "1.0.0",
-  "time": 1623327375936,
-  "keyId": "7e4d0c6a708866e7",
-  "files": {
-    "plugin.json": "2bb467c0bfd6c454551419efe475b8bf8573734e73c7bab52b14842adb62886f",
-    "lib/somelib.so.1": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-    "lib/somelib.so": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-  }
-}
-----BEGIN PGP SIGNATURE-----
-Version: OpenPGP.js v4.10.1
-Comment: https://openpgpjs.org
-
-wqEEARMKAAYFAmDCApAACgkQfk0ManCIZuc+JAIJAVpL9/0Q1vnQyB+0MaOJ
-oklt6Kw7/8OyL0oOj3lG0eW3qkJSOUfdM7Si2VW/BudruyUQovpU3EXr00/A
-oR1SZtoLAgdNyc9KldvPNV95XAsNz8jjBzn12G2Qer4/Vgjzpl5wvn2WvZ1l
-/NFR8rwHVhvMyGe7c1PJ6Gt6KpbQZ5j20j1NMA==
-=GIHH
-----END PGP SIGNATURE-----
@@ -1 +0,0 @@
-somelib.so.1
@@ -1,16 +0,0 @@
-{
-  "type": "datasource",
-  "name": "Test",
-  "id": "test",
-  "backend": true,
-  "executable": "test",
-  "state": "alpha",
-  "info": {
-    "version": "1.0.0",
-    "description": "Test",
-    "author": {
-      "name": "Will Browne",
-      "url": "https://willbrowne.com"
-    }
-  }
-}