203426 2019-10-25 11:29:51 -0700 Add SSL support for peformance dashboard database connection. 2019-10-25 15:45:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu dewei_zhu dewei_zhu rniwa oldest_to_newest 1583930 0 dewei_zhu 2019-10-25 11:29:51 -0700 Add SSL support for peformance dashboard database connection. 1583931 1 381948 dewei_zhu 2019-10-25 11:34:04 -0700 Created attachment 381948 Patch 1583993 2 381948 rniwa 2019-10-25 13:38:01 -0700 Comment on attachment 381948 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=381948&action=review > Websites/perf.webkit.org/public/include/db.php:121 > + $connectionString = 'host=' . $databaseConfig['host'] . ' port=' . $databaseConfig['port'] > + . ' dbname=' . $databaseConfig['name'] . ' user=' . $databaseConfig['username'] . ' password=' . $databaseConfig['password']; This string concatenation is hard to read. Can we define local variables and do: "host=$host port=$port dbname=$dbname user=$user password=$password"? > Websites/perf.webkit.org/public/include/db.php:136 > + $sslConfigString .= ' ssl' . $key . '=' . $path; Why not just $sslConfigString .= "ssl $key = $path"? 1584049 3 dewei_zhu 2019-10-25 15:45:16 -0700 Landed in r251607. 381948 2019-10-25 11:34:04 -0700 2019-10-25 13:38:01 -0700 Patch bug-203426-20191025113404.patch text/plain 6012 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjUxNTk3CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBiNTk4YTY0NzQ4ZjY2MTE0ZWE1MWM4YTM2MDg2NzhiOTI4Y2M2ZTZkLi45YTVmZGMwZjdi MTdhM2VlOGE0MzQ5MGQ1ODgyYjMxZmQ4OTJiN2NlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxOS0xMC0yNSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgU1NMIHN1cHBvcnQgZm9yIHBlZm9ybWFuY2UgZGFz aGJvYXJkIGRhdGFiYXNlIGNvbm5lY3Rpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDM0MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBQZXJmb3JtYW5jZSBkYXNoYm9hcmQgc2hvdWxkIGFsbG93IGNv bm5lY3RpbmcgUG9zdGdyZXMgZGF0YWJhc2Ugd2l0aCBTU0wuCisKKyAgICAgICAgKiBwdWJsaWMv aW5jbHVkZS9kYi5waHA6IEFkZCBTU0wgY29uZmlndXJhdGlvbiB0byBjb25uZWN0aW9uIHN0cmlu ZyBpZiBzcGVjaWZpZWQuCisgICAgICAgICogdG9vbHMvanMvZGF0YWJhc2UuanM6IEFkZCBTU0wg Y29uZmlndXJhdGlvbiB0byBjb25uZWN0aW9uIHN0cmluZyBpZiBzcGVjaWZpZWQuCisgICAgICAg IChEYXRhYmFzZS5wcm90b3R5cGUuX3ByZXBhcmVTU0xDb25maWcpOgorICAgICAgICAoRGF0YWJh c2UucHJvdG90eXBlLmNvbm5lY3QpOgorICAgICAgICAqIHVuaXQtdGVzdHMvY2hlY2tjb25maWcu anM6IEFkZGVkIHVuaXQgdGVzdHMgZm9yIG9wdGlvbmFsIHNzbCBmaWVsZHMuCisKIDIwMTktMTAt MjIgIERld2VpIFpodSAgPGRld2VpX3podUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVmYWN0b3Ig ImJ1aWxkcyIgdGFibGUgImJ1aWxkX251bWJlciIgcm93IHRvICJidWlsZF90YWciIHRvIGZpdCBt b3JlIGdlbmVyaWMgdXNlIGNhc2VzLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy9pbmNsdWRlL2RiLnBocCBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvaW5jbHVkZS9kYi5waHAKaW5kZXggOGEyZDU4MmM0NmVjNTliZDYzMDhjNjFlNjgzN2ExMTFk MmQ0ZjViYi4uMGFkZjM5YzZiMmY5NDQzZDViNjMzNjVhZDA5YTIyMjE0YzFlYWUzYSAxMDA2NDQK LS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRlL2RiLnBocAorKysg Yi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvZGIucGhwCkBAIC0xMTYs OCArMTE2LDI5IEBAIGNsYXNzIERhdGFiYXNlCiAKICAgICBmdW5jdGlvbiBjb25uZWN0KCkgewog ICAgICAgICAkZGF0YWJhc2VDb25maWcgPSBjb25maWcoJ2RhdGFiYXNlJyk7Ci0gICAgICAgICR0 aGlzLT5jb25uZWN0aW9uID0gQHBnX2Nvbm5lY3QoJ2hvc3Q9JyAuICRkYXRhYmFzZUNvbmZpZ1sn aG9zdCddIC4gJyBwb3J0PScgLiAkZGF0YWJhc2VDb25maWdbJ3BvcnQnXQotICAgICAgICAgICAg LiAnIGRibmFtZT0nIC4gJGRhdGFiYXNlQ29uZmlnWyduYW1lJ10gLiAnIHVzZXI9JyAuICRkYXRh YmFzZUNvbmZpZ1sndXNlcm5hbWUnXSAuICcgcGFzc3dvcmQ9JyAuICRkYXRhYmFzZUNvbmZpZ1sn cGFzc3dvcmQnXSk7CisKKyAgICAgICAgJGNvbm5lY3Rpb25TdHJpbmcgPSAnaG9zdD0nIC4gJGRh dGFiYXNlQ29uZmlnWydob3N0J10gLiAnIHBvcnQ9JyAuICRkYXRhYmFzZUNvbmZpZ1sncG9ydCdd CisgICAgICAgICAgICAuICcgZGJuYW1lPScgLiAkZGF0YWJhc2VDb25maWdbJ25hbWUnXSAuICcg dXNlcj0nIC4gJGRhdGFiYXNlQ29uZmlnWyd1c2VybmFtZSddIC4gJyBwYXNzd29yZD0nIC4gJGRh dGFiYXNlQ29uZmlnWydwYXNzd29yZCddOworCisgICAgICAgICRzc2xDb25maWdTdHJpbmcgPSAn JzsKKworICAgICAgICBpZiAoYXJyYXlfZ2V0KCRkYXRhYmFzZUNvbmZpZywgJ3NzbCcpKSB7Cisg ICAgICAgICAgICAkc3NsQ29uZmlnID0gJGRhdGFiYXNlQ29uZmlnWydzc2wnXTsKKyAgICAgICAg ICAgICRzc2xDb25maWdTdHJpbmcgLj0gJyBzc2xtb2RlPScgLiBhcnJheV9nZXQoJHNzbENvbmZp ZywgJ21vZGUnLCAncmVxdWlyZScpOworICAgICAgICAgICAgZm9yZWFjaCAoYXJyYXkoJ3Jvb3Rj ZXJ0JywgJ2NlcnQnLCAna2V5JykgYXMgJGtleSkgeworICAgICAgICAgICAgICAgIGlmICghYXJy YXlfZ2V0KCRzc2xDb25maWcsICRrZXkpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsK KworICAgICAgICAgICAgICAgICRwYXRoID0gJHNzbENvbmZpZ1ska2V5XTsKKyAgICAgICAgICAg ICAgICBpZiAoc3RybGVuKCRwYXRoKSAmJiAkcGF0aFswXSAhPT0gJy8nKQorICAgICAgICAgICAg ICAgICAgICAkcGF0aCA9IENPTkZJR19ESVIgLiAnLycgLiAkcGF0aDsKKworICAgICAgICAgICAg ICAgICRzc2xDb25maWdTdHJpbmcgLj0gJyBzc2wnIC4gJGtleSAuICc9JyAuICRwYXRoOworICAg ICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgJGNvbm5lY3Rpb25TdHJpbmcgLj0gJHNz bENvbmZpZ1N0cmluZzsKKyAgICAgICAgJHRoaXMtPmNvbm5lY3Rpb24gPSBAcGdfY29ubmVjdCgk Y29ubmVjdGlvblN0cmluZyk7CiAgICAgICAgIHJldHVybiAkdGhpcy0+Y29ubmVjdGlvbiA/IHRy dWUgOiBmYWxzZTsKICAgICB9CiAKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy90b29scy9qcy9kYXRhYmFzZS5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9q cy9kYXRhYmFzZS5qcwppbmRleCBlZThkNGZmZTY0MzY1MWNmZWNmZDExYmZjNjQ4ODg1ZDhhNDIy ZmE1Li44MzczNDQwNmY3YTE1MjU4ZWY4MzEwMDAwYTc0ZGMxZmJhZjI5NjA2IDEwMDY0NAotLS0g YS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvZGF0YWJhc2UuanMKKysrIGIvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL2RhdGFiYXNlLmpzCkBAIC0xMCw2ICsxMCwy NCBAQCBjbGFzcyBEYXRhYmFzZSB7CiAgICAgICAgIHRoaXMuX2RhdGFiYXNlTmFtZSA9IGRhdGFi YXNlTmFtZSB8fCBjb25maWcudmFsdWUoJ2RhdGFiYXNlLm5hbWUnKTsKICAgICB9CiAKKyAgICBf cHJlcGFyZVNTTENvbmZpZygpCisgICAgeworICAgICAgICBpZiAoIWNvbmZpZy52YWx1ZSgnZGF0 YWJhc2Uuc3NsJykgfHwgY29uZmlnLnZhbHVlKCdkYXRhYmFzZS5zc2wubW9kZScpID09ICdkaXNh YmxlJykKKyAgICAgICAgICAgIHJldHVybiAnJzsKKworICAgICAgICBjb25zdCBjZXJ0aWZpY2F0 ZUNvbmZpZ3MgPSBbJz9zc2w9dHJ1ZSddOworICAgICAgICBmb3IoY29uc3Qga2V5IG9mIFsnY2Vy dCcsICdrZXknLCAncm9vdGNlcnQnXSkgeworICAgICAgICAgICAgY29uc3QgZnVsbEtleSA9IGBk YXRhYmFzZS5zc2wuJHtrZXl9YDsKKyAgICAgICAgICAgIGxldCBwYXRoID0gY29uZmlnLnZhbHVl KGZ1bGxLZXkpOworICAgICAgICAgICAgaWYgKCFwYXRoKQorICAgICAgICAgICAgICAgIGNvbnRp bnVlCisgICAgICAgICAgICBpZiAocGF0aFswXSAhPSAnLycpCisgICAgICAgICAgICAgICAgcGF0 aCA9IGNvbmZpZy5wYXRoKGZ1bGxLZXkpOworICAgICAgICAgICAgY2VydGlmaWNhdGVDb25maWdz LnB1c2goYCR7a2V5fT0ke3BhdGh9YCk7CisgICAgICAgIH0KKyAgICAgICAgcmV0dXJuIGNlcnRp ZmljYXRlQ29uZmlncy5qb2luKCcmJyk7CisgICAgfQorCiAgICAgY29ubmVjdChvcHRpb25zKQog ICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fY2xpZW50ID09PSBudWxsKTsKQEAg LTIwLDcgKzM4LDcgQEAgY2xhc3MgRGF0YWJhc2UgewogICAgICAgICBsZXQgcG9ydCA9IGNvbmZp Zy52YWx1ZSgnZGF0YWJhc2UucG9ydCcpOwogCiAgICAgICAgIC8vIE5vIG5lZWQgdG8gd29ycnkg YWJvdXQgZXNjYXBpbmcgc3RyaW5ncyBzaW5jZSB0aGV5IGFyZSBvbmx5IHNldCBieSBzb21lb25l IHdobyBjYW4gd3JpdGUgdG8gY29uZmlnLmpzb24uCi0gICAgICAgIGxldCBjb25uZWN0aW9uU3Ry aW5nID0gYHRjcDovLyR7dXNlcm5hbWV9OiR7cGFzc3dvcmR9QCR7aG9zdH06JHtwb3J0fS8ke3Ro aXMuX2RhdGFiYXNlTmFtZX1gOworICAgICAgICBsZXQgY29ubmVjdGlvblN0cmluZyA9IGB0Y3A6 Ly8ke3VzZXJuYW1lfToke3Bhc3N3b3JkfUAke2hvc3R9OiR7cG9ydH0vJHt0aGlzLl9kYXRhYmFz ZU5hbWV9JHt0aGlzLl9wcmVwYXJlU1NMQ29uZmlnKCl9YDsKIAogICAgICAgICBsZXQgY2xpZW50 ID0gbmV3IHBnLkNsaWVudChjb25uZWN0aW9uU3RyaW5nKTsKICAgICAgICAgaWYgKCFvcHRpb25z IHx8ICFvcHRpb25zLmtlZXBBbGl2ZSkKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy91bml0LXRlc3RzL2NoZWNrY29uZmlnLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3Jn L3VuaXQtdGVzdHMvY2hlY2tjb25maWcuanMKaW5kZXggNTNjMmFhMjA1MTNiY2EzOTQ5OGQ3MzI1 ZDg4OGE5ZDE4YTAzYWQ3Yi4uZWNmMjhhZDg4OTIxYzE2YjA5ZTM3ZDUyYTZmMzcxZWU3NmY1NmRi NSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvY2hlY2tj b25maWcuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvY2hlY2tj b25maWcuanMKQEAgLTE2Miw1ICsxNjIsMjYgQEAgZGVzY3JpYmUoJ2NvbmZpZy5qc29uJywgKCkg PT4gewogICAgICAgICBpdCgnYHVuaXZlcnNhbFNsYXZlUGFzc3dvcmRgIHNob3VsZCBiZSBgbnVs bGAgb3IgYSBzdHJpbmcnLCAoKSA9PiB7CiAgICAgICAgICAgICBhc3NlcnROdWxsT3JUeXBlKENv bmZpZy52YWx1ZSgndW5pdmVyc2FsU2xhdmVQYXNzd29yZCcpLCAnc3RyaW5nJyk7CiAgICAgICAg IH0pOworCisgICAgICAgIGl0KCdgZGF0YWJhc2Uuc3NsYCBzaG91bGQgYmUgYG51bGxgIG9yIGEg ZGljdGlvbmFyeScsICgpID0+IHsKKyAgICAgICAgICAgIGFzc2VydE51bGxPclR5cGUoQ29uZmln LnZhbHVlKCdkYXRhYmFzZS5zc2wnKSwgJ29iamVjdCcpOworICAgICAgICB9KTsKKworICAgICAg ICBpdCgnYGRhdGFiYXNlLnNzbC5yb290Y2VydGAgc2hvdWxkIGJlIGBudWxsYCBvciBhIHN0cmlu ZycsICgpID0+IHsKKyAgICAgICAgICAgIGFzc2VydE51bGxPclR5cGUoQ29uZmlnLnZhbHVlKCdk YXRhYmFzZS5zc2wucm9vdGNlcnQnKSwgJ3N0cmluZycpOworICAgICAgICB9KTsKKworICAgICAg ICBpdCgnYGRhdGFiYXNlLnNzbC5jZXJ0YCBzaG91bGQgYmUgYG51bGxgIG9yIGEgc3RyaW5nJywg KCkgPT4geworICAgICAgICAgICAgYXNzZXJ0TnVsbE9yVHlwZShDb25maWcudmFsdWUoJ2RhdGFi YXNlLnNzbC5jZXJ0JyksICdzdHJpbmcnKTsKKyAgICAgICAgfSk7CisKKyAgICAgICAgaXQoJ2Bk YXRhYmFzZS5zc2wua2V5YCBzaG91bGQgYmUgYG51bGxgIG9yIGEgc3RyaW5nJywgKCkgPT4gewor ICAgICAgICAgICAgYXNzZXJ0TnVsbE9yVHlwZShDb25maWcudmFsdWUoJ2RhdGFiYXNlLnNzbC5r ZXknKSwgJ3N0cmluZycpOworICAgICAgICB9KTsKKworICAgICAgICBpdCgnYGRhdGFiYXNlLnNz bC5tb2RlYCBzaG91bGQgYmUgYG51bGxgIG9yIGEgc3RyaW5nIGluIDEgb2YgNiBvcHRpb25zJywg KCkgPT4geworICAgICAgICAgICAgYXNzZXJ0TnVsbE9yVHlwZShDb25maWcudmFsdWUoJ2RhdGFi YXNlLnNzbC5tb2RlJyksICdzdHJpbmcnKTsKKyAgICAgICAgICAgIGFzc2VydC5vayhbbnVsbCwg J2Rpc2FibGUnLCAnYWxsb3cnLCAncHJlZmVyJywgJ3JlcXVpcmUnLCAndmVyaWZ5LWNhJywgJ3Zl cmlmeS1mdWxsJ10uaW5jbHVkZXMoQ29uZmlnLnZhbHVlKCdkYXRhYmFzZS5zc2wubW9kZScpKSkK KyAgICAgICAgfSk7CiAgICAgfSk7CiB9KTsK