189058 2018-08-28 14:54:06 -0700 [WPE][GTK] webkit-flatpak intercepts --help for other commands 2018-09-20 09:12:39 -0700 1 1 1 Unclassified WebKit WebKitGTK Other PC Linux RESOLVED FIXED P2 Normal --- 1 mcatanzaro tsaunier aboya bugs-noreply commit-queue mcatanzaro tsaunier oldest_to_newest 1454562 0 mcatanzaro 2018-08-28 14:54:06 -0700 $ run-webkit-tests --help usage: webkit-flatpak [-h] [--verbose] [--debug] [--release] [--platform PLATFORM] [--gtk] [--wpe] [-nf] [-u] [-b] [-ba] [-q] [-t ...] [-c ...] [-y] [--avalaible] [--gdb [GDB]] [-m COREDUMPCTL_MATCHES] [--makeargs MAKEARGS] [--cmakeargs CMAKEARGS] [--clean] optional arguments: -h, --help show this help message and exit General: --verbose Show debug message --debug Compile with Debug configuration, also installs Sdk debug symboles. --release Compile with Release configuration. --platform PLATFORM Platform to use (e.g., "mac-lion") --gtk Alias for --platform=gtk --wpe Alias for --platform=wpe -nf, --no-flatpak-update Do not update flaptak runtime/sdk -u, --update Update the runtime/sdk/app and rebuild the development environment if needed -b, --build-webkit Force rebuilding the app. -ba, --build-all Force rebuilding the app and its dependencies. -q, --quiet Do not print anything -t ..., --tests ... Run LayoutTests -c ..., --command ... The command to run in the sandbox -y, --assumeyes Automatically answer yes for all questions. --avalaible Check if required dependencies are avalaible. --clean Clean previous builds and restart from scratch Debugging: --gdb [GDB] Activate gdb, passing extra args to it if wanted. -m COREDUMPCTL_MATCHES, --coredumpctl-matches COREDUMPCTL_MATCHES Arguments to pass to gdb. Extra build arguments: --makeargs MAKEARGS Optional Makefile flags --cmakeargs CMAKEARGS One or more optional CMake flags (e.g. --cmakeargs="-DFOO=bar -DCMAKE_PREFIX_PATH=/usr/local") Expected behavior: I see the help for run-webkit-tests :) Actual behavior: I see the help for webkit-flatpak :( 1459016 1 aboya 2018-09-12 11:19:55 -0700 This kind of bug usually occurs when someone passes user-provided arguments to a wrapper without a "--" prefix. 1459075 2 aboya 2018-09-12 13:47:15 -0700 run-webkit-tests: flatpakutils.run_in_sandbox_if_available(sys.argv) | v flatpakutils.py: def run_in_sandbox_if_available(args): [...] flatpak_runner = WebkitFlatpak.load_from_args(args) | v flatpakutils.py: @staticmethod def load_from_args(args=None): [...] # creates a webkit-flatpak's ArgumentParser _, self.args = parser.parse_known_args(args=args, namespace=self) What is `args` in run_in_sandbox_if_available() supposed to be? On the first invocation I would assume it is the command to be executed, but it's (also?) being parsed as the flags to webkit-flatpak. That's strange to say the least. It seems like the code is trying to mix flatpak flags with the flags for the wrapped executable (we could call it the «flatpakee»?). This was probably intended to make it easy to set flags for both, but it's quite dangerous and as we are seeing now, can't cope with conflicts. I think run-webkit-tests is doing too much, acting as both the wrapper and the wrapped, and that makes it confusing and creates these conflicts. 1461309 3 350189 tsaunier 2018-09-20 05:33:49 -0700 Created attachment 350189 Patch 1461341 4 350189 mcatanzaro 2018-09-20 08:24:49 -0700 Comment on attachment 350189 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=350189&action=review > Tools/ChangeLog:11 > + 2. exists the app - The solution is to just make sure that `--help` is not used when using exits 1461346 5 350204 tsaunier 2018-09-20 08:34:58 -0700 Created attachment 350204 Patch for landing 1461371 6 350204 commit-queue 2018-09-20 09:12:38 -0700 Comment on attachment 350204 Patch for landing Clearing flags on attachment: 350204 Committed r236261: <https://trac.webkit.org/changeset/236261> 1461372 7 commit-queue 2018-09-20 09:12:39 -0700 All reviewed patches have been landed. Closing bug. 350189 2018-09-20 05:33:49 -0700 2018-09-20 08:34:52 -0700 Patch bug-189058-20180920093347.patch text/plain 2451 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjU2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGYzMWI3NWE2M2Q1OWIyNDVhZjI5NTQzNTgwYzU1MTZh NjAyYjdhNC4uNDE1MDkwMjRlNDllOWQyODExZjViOWJiNjZhY2IzNjdlZGI1ZDdmZSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDE4LTA5LTIwICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4K KworICAgICAgICBbV1BFXVtHVEtdIHdlYmtpdC1mbGF0cGFrIGludGVyY2VwdHMgLS1oZWxwIGZv ciBvdGhlciBjb21tYW5kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg5MDU4CisKKyAgICAgICAgVGhlIGFwcHJvYWNoIG9mIHJ1bl9pbl9zYW5kYm94 X2lmX2F2YWlsYWJsZSBpcyB0aGF0IHdlIGJhc2ljYWxseSBoYXZlIHRoZQorICAgICAgICBzYW1l IHNldCBvZiBhcmd1bWVudHMgdG8gc2V0dXAgdGhlIHNhbmRib3ggKGllLiBwb3J0IG5hbWUsIGJ1 aWxkIHR5cGUsIGV0Yy4uLikKKyAgICAgICAgYW5kIHdlIGNhbiBwYXNzIHRob3NlIGFyZ3MgZmly c3QgdG8gc2V0dXAgdGhlIGZsYXRwYWsgbGF1bmNoZXIgb2JqZWN0CisgICAgICAgIGFuZCB0aGVu IHRvIHRoZSB1bmRlcmx5aW5nIHNjcmlwdC4gVGhhdCBkb2Vzbid0IHdvcmsgd2VsbCB3aXRoIHRo ZSBgLS1oZWxwYCBhcmd1bWVudAorICAgICAgICBhcyBvbmNlIHByb2Nlc3NlZCBpdCAxLiBwcmlu dHMgdGhlIGhlbHAgKHdoaWNoIG1ha2Ugbm8gc2Vuc2UgdG8gdGhlIHVzZXIgb2YgdGhlIGNhbGxp bmcgc2NyaXB0KQorICAgICAgICAyLiBleGlzdHMgdGhlIGFwcCAtIFRoZSBzb2x1dGlvbiBpcyB0 byBqdXN0IG1ha2Ugc3VyZSB0aGF0IGAtLWhlbHBgIGlzIG5vdCB1c2VkIHdoZW4gdXNpbmcKKyAg ICAgICAgZmxhdHBha3V0aWxzIGZyb20gYW55IHNjcmlwdCB0aGF0IGlzIG5vdCBgd2Via2l0LWZs YXRwYWtgIGl0c2VsZi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZsYXRwYWsvZmxhdHBha3V0aWxzLnB5OgorICAgICAgICAoV2Via2l0RmxhdHBh ay5sb2FkX2Zyb21fYXJncyk6CisgICAgICAgIChydW5faW5fc2FuZGJveF9pZl9hdmFpbGFibGUp OgorCiAyMDE4LTA5LTIwICBYYWJpZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxp YS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gQWRkIFczQyBpbXBvcnRlZCB0ZXN0cyB0byB0 aGUgTVNFRU1FIHdhdGNobGlzdC4KZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0 aWxzLnB5IGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKaW5kZXggNTA0MzExMGMzZTMw MGE2Nzg5YmMxNGMwNTNiZGNmMWIzN2JmMjdhYS4uYTUyM2U1YzI2MTdjNjczZWFiMzI5OTdiZWRm MDJiMTYwZDI5OTAyZCAxMDA2NDQKLS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkK KysrIGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKQEAgLTQ2MywxMCArNDYzLDEwIEBA IGRlZiBkaXNhYmxlX3NpZ25hbHMoc2lnbmFscz1bc2lnbmFsLlNJR0lOVF0pOgogY2xhc3MgV2Vi a2l0RmxhdHBhazoKIAogICAgIEBzdGF0aWNtZXRob2QKLSAgICBkZWYgbG9hZF9mcm9tX2FyZ3Mo YXJncz1Ob25lKToKKyAgICBkZWYgbG9hZF9mcm9tX2FyZ3MoYXJncz1Ob25lLCBhZGRfaGVscD1U cnVlKToKICAgICAgICAgc2VsZiA9IFdlYmtpdEZsYXRwYWsoKQogCi0gICAgICAgIHBhcnNlciA9 IGFyZ3BhcnNlLkFyZ3VtZW50UGFyc2VyKHByb2c9IndlYmtpdC1mbGF0cGFrIikKKyAgICAgICAg cGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIocHJvZz0id2Via2l0LWZsYXRwYWsiLCBh ZGRfaGVscD1hZGRfaGVscCkKICAgICAgICAgZ2VuZXJhbCA9IHBhcnNlci5hZGRfYXJndW1lbnRf Z3JvdXAoIkdlbmVyYWwiKQogICAgICAgICBnZW5lcmFsLmFkZF9hcmd1bWVudCgnLS12ZXJib3Nl JywgYWN0aW9uPSdzdG9yZV90cnVlJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaGVs cD0nU2hvdyBkZWJ1ZyBtZXNzYWdlJykKQEAgLTg1Niw3ICs4NTYsNyBAQCBkZWYgcnVuX2luX3Nh bmRib3hfaWZfYXZhaWxhYmxlKGFyZ3MpOgogICAgIGlmIG5vdCBjaGVja19mbGF0cGFrKHZlcmJv c2U9RmFsc2UpOgogICAgICAgICByZXR1cm4gTm9uZQogCi0gICAgZmxhdHBha19ydW5uZXIgPSBX ZWJraXRGbGF0cGFrLmxvYWRfZnJvbV9hcmdzKGFyZ3MpCisgICAgZmxhdHBha19ydW5uZXIgPSBX ZWJraXRGbGF0cGFrLmxvYWRfZnJvbV9hcmdzKGFyZ3MsIGFkZF9oZWxwPUZhbHNlKQogICAgIGlm IG5vdCBmbGF0cGFrX3J1bm5lci5jbGVhbl9hcmdzKCk6CiAgICAgICAgIHJldHVybiBOb25lCiAK 350204 2018-09-20 08:34:58 -0700 2018-09-20 09:12:38 -0700 Patch for landing bug-189058-20180920123457.patch text/plain 2453 tsaunier U3VidmVyc2lvbiBSZXZpc2lvbjogMjM2MjU4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGYzMWI3NWE2M2Q1OWIyNDVhZjI5NTQzNTgwYzU1MTZh NjAyYjdhNC4uMzA0YTkxNWZkZjZkYTYwMjE0YmZmMmZlZDEyMzg3NTY3M2Y4MWFhOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIy IEBACisyMDE4LTA5LTIwICBUaGliYXVsdCBTYXVuaWVyICA8dHNhdW5pZXJAaWdhbGlhLmNvbT4K KworICAgICAgICBbV1BFXVtHVEtdIHdlYmtpdC1mbGF0cGFrIGludGVyY2VwdHMgLS1oZWxwIGZv ciBvdGhlciBjb21tYW5kcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTg5MDU4CisKKyAgICAgICAgVGhlIGFwcHJvYWNoIG9mIHJ1bl9pbl9zYW5kYm94 X2lmX2F2YWlsYWJsZSBpcyB0aGF0IHdlIGJhc2ljYWxseSBoYXZlIHRoZQorICAgICAgICBzYW1l IHNldCBvZiBhcmd1bWVudHMgdG8gc2V0dXAgdGhlIHNhbmRib3ggKGllLiBwb3J0IG5hbWUsIGJ1 aWxkIHR5cGUsIGV0Yy4uLikKKyAgICAgICAgYW5kIHdlIGNhbiBwYXNzIHRob3NlIGFyZ3MgZmly c3QgdG8gc2V0dXAgdGhlIGZsYXRwYWsgbGF1bmNoZXIgb2JqZWN0CisgICAgICAgIGFuZCB0aGVu IHRvIHRoZSB1bmRlcmx5aW5nIHNjcmlwdC4gVGhhdCBkb2Vzbid0IHdvcmsgd2VsbCB3aXRoIHRo ZSBgLS1oZWxwYCBhcmd1bWVudAorICAgICAgICBhcyBvbmNlIHByb2Nlc3NlZCBpdCAxLiBwcmlu dHMgdGhlIGhlbHAgKHdoaWNoIG1ha2Ugbm8gc2Vuc2UgdG8gdGhlIHVzZXIgb2YgdGhlIGNhbGxp bmcgc2NyaXB0KQorICAgICAgICAyLiBleGl0cyB0aGUgYXBwIC0gVGhlIHNvbHV0aW9uIGlzIHRv IGp1c3QgbWFrZSBzdXJlIHRoYXQgYC0taGVscGAgaXMgbm90IHVzZWQgd2hlbiB1c2luZworICAg ICAgICBmbGF0cGFrdXRpbHMgZnJvbSBhbnkgc2NyaXB0IHRoYXQgaXMgbm90IGB3ZWJraXQtZmxh dHBha2AgaXRzZWxmLgorCisgICAgICAgIFJldmlld2VkIGJ5IE1pY2hhZWwgQ2F0YW56YXJvLgor CisgICAgICAgICogZmxhdHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChXZWJraXRGbGF0 cGFrLmxvYWRfZnJvbV9hcmdzKToKKyAgICAgICAgKHJ1bl9pbl9zYW5kYm94X2lmX2F2YWlsYWJs ZSk6CisKIDIwMTgtMDktMjAgIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFyICA8Y2FsdmFyaXNAaWdh bGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLiBBZGQgVzNDIGltcG9ydGVkIHRlc3RzIHRv IHRoZSBNU0VFTUUgd2F0Y2hsaXN0LgpkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay9mbGF0cGFr dXRpbHMucHkgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQppbmRleCA1MDQzMTEwYzNl MzAwYTY3ODliYzE0YzA1M2JkY2YxYjM3YmYyN2FhLi5hNTIzZTVjMjYxN2M2NzNlYWIzMjk5N2Jl ZGYwMmIxNjBkMjk5MDJkIDEwMDY0NAotLS0gYS9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5w eQorKysgYi9Ub29scy9mbGF0cGFrL2ZsYXRwYWt1dGlscy5weQpAQCAtNDYzLDEwICs0NjMsMTAg QEAgZGVmIGRpc2FibGVfc2lnbmFscyhzaWduYWxzPVtzaWduYWwuU0lHSU5UXSk6CiBjbGFzcyBX ZWJraXRGbGF0cGFrOgogCiAgICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBsb2FkX2Zyb21fYXJn cyhhcmdzPU5vbmUpOgorICAgIGRlZiBsb2FkX2Zyb21fYXJncyhhcmdzPU5vbmUsIGFkZF9oZWxw PVRydWUpOgogICAgICAgICBzZWxmID0gV2Via2l0RmxhdHBhaygpCiAKLSAgICAgICAgcGFyc2Vy ID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIocHJvZz0id2Via2l0LWZsYXRwYWsiKQorICAgICAg ICBwYXJzZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihwcm9nPSJ3ZWJraXQtZmxhdHBhayIs IGFkZF9oZWxwPWFkZF9oZWxwKQogICAgICAgICBnZW5lcmFsID0gcGFyc2VyLmFkZF9hcmd1bWVu dF9ncm91cCgiR2VuZXJhbCIpCiAgICAgICAgIGdlbmVyYWwuYWRkX2FyZ3VtZW50KCctLXZlcmJv c2UnLCBhY3Rpb249J3N0b3JlX3RydWUnLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBo ZWxwPSdTaG93IGRlYnVnIG1lc3NhZ2UnKQpAQCAtODU2LDcgKzg1Niw3IEBAIGRlZiBydW5faW5f c2FuZGJveF9pZl9hdmFpbGFibGUoYXJncyk6CiAgICAgaWYgbm90IGNoZWNrX2ZsYXRwYWsodmVy Ym9zZT1GYWxzZSk6CiAgICAgICAgIHJldHVybiBOb25lCiAKLSAgICBmbGF0cGFrX3J1bm5lciA9 IFdlYmtpdEZsYXRwYWsubG9hZF9mcm9tX2FyZ3MoYXJncykKKyAgICBmbGF0cGFrX3J1bm5lciA9 IFdlYmtpdEZsYXRwYWsubG9hZF9mcm9tX2FyZ3MoYXJncywgYWRkX2hlbHA9RmFsc2UpCiAgICAg aWYgbm90IGZsYXRwYWtfcnVubmVyLmNsZWFuX2FyZ3MoKToKICAgICAgICAgcmV0dXJuIE5vbmUK IAo=