MIME-Version: 1.0
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Thu, 11 Feb 2021 16:15:34 +0530
Message-ID: 
 <CAM9w-_=BJfbcWJ0TZ0TLzbe4KxDEY2YN=o4NO4DFOqFaZhRArg@mail.gmail.com>
Subject: [pgAdmin][RM6197] Incomplete ERD image downloaded.
To: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="0000000000004fdc9905bb0d3ab8"
Precedence: bulk

--0000000000004fdc9905bb0d3ab8
Content-Type: multipart/alternative; boundary="0000000000004fdc9805bb0d3ab6"

--0000000000004fdc9805bb0d3ab6
Content-Type: text/plain; charset="UTF-8"

Hi Hackers,

Attached patch will improve and fix things except, the links are partially
rendered in case of SVG overflow. That needs to be fixed in html2canvas
library. Ref - https://github.com/niklasvh/html2canvas/issues/1486. In
addition, safari seems to be distorting the link paths.
Considering the majority of users are on Chrome and Firefox, the fix will
help most users until issues for Safari are fixed.

Please review.

-- 
Thanks,
Aditya Toshniwal
pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com*
<http://edbpostgres.com>
"Don't Complain about Heat, Plant a TREE"

--0000000000004fdc9805bb0d3ab6
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_default" style=3D"font-family:verdana,=
sans-serif">Hi Hackers,</div><div class=3D"gmail_default" style=3D"font-fam=
ily:verdana,sans-serif"><br></div><div class=3D"gmail_default" style=3D"fon=
t-family:verdana,sans-serif">Attached patch will improve and fix things exc=
ept, the links are partially rendered in case of SVG overflow. That needs t=
o be fixed in html2canvas library. Ref - <a href=3D"https://github.com/nikl=
asvh/html2canvas/issues/1486">https://github.com/niklasvh/html2canvas/issue=
s/1486</a>. In addition, safari seems to be distorting the link paths.</div=
><div class=3D"gmail_default" style=3D"font-family:verdana,sans-serif">Cons=
idering the majority of users are on Chrome and Firefox, the fix will help =
most users until issues for Safari are=C2=A0fixed.</div><div class=3D"gmail=
_default" style=3D"font-family:verdana,sans-serif"><br></div><div class=3D"=
gmail_default" style=3D"font-family:verdana,sans-serif">Please review.</div=
><div><br></div>-- <br><div dir=3D"ltr" data-smartmail=3D"gmail_signature">=
<div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div dir=3D"ltr"><div di=
r=3D"ltr"><div><font size=3D"2" color=3D"#000000" face=3D"arial, sans-serif=
">Thanks,</font><div><span style=3D"color:rgb(34,34,34)"><span style=3D"col=
or:rgb(18,22,70)"><font face=3D"arial, sans-serif">Aditya Toshniwal</font><=
/span></span><font size=3D"2" color=3D"#000000" face=3D"verdana, sans-serif=
"><br></font></div><div><span style=3D"color:rgb(18,22,70);font-family:Aria=
l,sans-serif">pgAdmin hacker</span><font size=3D"2" color=3D"#000000" style=
=3D"font-family:verdana,sans-serif">=C2=A0| </font><font size=3D"2" color=
=3D"#000000" face=3D"arial, sans-serif">Sr. Software Engineer</font><font s=
ize=3D"2" color=3D"#000000"><font face=3D"verdana, sans-serif"> | </font><a=
 href=3D"http://edbpostgres.com" target=3D"_blank"><font face=3D"arial, san=
s-serif" color=3D"#000000"><b>edbpostgres.com</b></font></a></font></div><d=
iv><font color=3D"#38761d" size=3D"1"><font face=3D"arial, sans-serif">&quo=
t;Don&#39;t Complain about Heat, Plant a TREE&quot;</font></font></div></di=
v></div></div></div></div></div></div></div>

--0000000000004fdc9805bb0d3ab6--

--0000000000004fdc9905bb0d3ab8
Content-Type: application/octet-stream; name="RM6197.patch"
Content-Disposition: attachment; filename="RM6197.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kl0qkcgy0>
X-Attachment-Id: f_kl0qkcgy0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0aWMvanMvZXJkX3Rvb2wvRVJE
Q29yZS5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0aWMvanMvZXJkX3Rvb2wvRVJEQ29y
ZS5qcwppbmRleCAzOTM1YWYzNjAuLjIzYjU5MjE0OSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v
dG9vbHMvZXJkL3N0YXRpYy9qcy9lcmRfdG9vbC9FUkRDb3JlLmpzCisrKyBiL3dlYi9wZ2FkbWlu
L3Rvb2xzL2VyZC9zdGF0aWMvanMvZXJkX3Rvb2wvRVJEQ29yZS5qcwpAQCAtNTMsNiArNTMsOCBA
QCBleHBvcnQgZGVmYXVsdCBjbGFzcyBFUkRDb3JlIHsKICAgICBsZXQgbW9kZWwgPSBuZXcgRVJE
TW9kZWwoKTsKICAgICBpZihkYXRhKSB7CiAgICAgICBtb2RlbC5kZXNlcmlhbGl6ZU1vZGVsKGRh
dGEsIHRoaXMuZW5naW5lKTsKKyAgICAgIHRoaXMuZmlyZUV2ZW50KG1vZGVsLmdldE9wdGlvbnMo
KSwgJ29mZnNldFVwZGF0ZWQnLCB0cnVlKTsKKyAgICAgIHRoaXMuZmlyZUV2ZW50KG1vZGVsLmdl
dE9wdGlvbnMoKSwgJ3pvb21VcGRhdGVkJywgdHJ1ZSk7CiAgICAgfQogCiAgICAgY29uc3QgcmVn
aXN0ZXJOb2RlRXZlbnRzID0gKG5vZGUpID0+IHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rv
b2xzL2VyZC9zdGF0aWMvanMvZXJkX3Rvb2wvdWlfY29tcG9uZW50cy9Cb2R5V2lkZ2V0LmpzeCBi
L3dlYi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0aWMvanMvZXJkX3Rvb2wvdWlfY29tcG9uZW50cy9C
b2R5V2lkZ2V0LmpzeAppbmRleCA1NDUxZTg2OGYuLmZmOGE5Yzc5OCAxMDA2NDQKLS0tIGEvd2Vi
L3BnYWRtaW4vdG9vbHMvZXJkL3N0YXRpYy9qcy9lcmRfdG9vbC91aV9jb21wb25lbnRzL0JvZHlX
aWRnZXQuanN4CisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0aWMvanMvZXJkX3Rvb2wv
dWlfY29tcG9uZW50cy9Cb2R5V2lkZ2V0LmpzeApAQCAtODcsMjIgKzg3LDEyIEBAIGV4cG9ydCBk
ZWZhdWx0IGNsYXNzIEJvZHlXaWRnZXQgZXh0ZW5kcyBSZWFjdC5Db21wb25lbnQgewogICAgIHRo
aXMubm90ZU5vZGUgPSBudWxsOwogICAgIHRoaXMua2V5Ym9hcmRBY3Rpb25PYmogPSBudWxsOwog
Ci0gICAgdGhpcy5vbkxvYWREaWFncmFtID0gdGhpcy5vbkxvYWREaWFncmFtLmJpbmQodGhpcyk7
Ci0gICAgdGhpcy5vblNhdmVEaWFncmFtID0gdGhpcy5vblNhdmVEaWFncmFtLmJpbmQodGhpcyk7
Ci0gICAgdGhpcy5vblNhdmVBc0RpYWdyYW0gPSB0aGlzLm9uU2F2ZUFzRGlhZ3JhbS5iaW5kKHRo
aXMpOwotICAgIHRoaXMub25TUUxDbGljayA9IHRoaXMub25TUUxDbGljay5iaW5kKHRoaXMpOwot
ICAgIHRoaXMub25JbWFnZUNsaWNrID0gdGhpcy5vbkltYWdlQ2xpY2suYmluZCh0aGlzKTsKLSAg
ICB0aGlzLm9uQWRkTmV3Tm9kZSA9IHRoaXMub25BZGROZXdOb2RlLmJpbmQodGhpcyk7Ci0gICAg
dGhpcy5vbkVkaXROb2RlID0gdGhpcy5vbkVkaXROb2RlLmJpbmQodGhpcyk7Ci0gICAgdGhpcy5v
bkNsb25lTm9kZSA9IHRoaXMub25DbG9uZU5vZGUuYmluZCh0aGlzKTsKLSAgICB0aGlzLm9uRGVs
ZXRlTm9kZSA9IHRoaXMub25EZWxldGVOb2RlLmJpbmQodGhpcyk7Ci0gICAgdGhpcy5vbk5vdGVD
bGljayA9IHRoaXMub25Ob3RlQ2xpY2suYmluZCh0aGlzKTsKLSAgICB0aGlzLm9uTm90ZUNsb3Nl
ID0gdGhpcy5vbk5vdGVDbG9zZS5iaW5kKHRoaXMpOwotICAgIHRoaXMub25PbmVUb01hbnlDbGlj
ayA9IHRoaXMub25PbmVUb01hbnlDbGljay5iaW5kKHRoaXMpOwotICAgIHRoaXMub25NYW55VG9N
YW55Q2xpY2sgPSB0aGlzLm9uTWFueVRvTWFueUNsaWNrLmJpbmQodGhpcyk7Ci0gICAgdGhpcy5v
bkF1dG9EaXN0cmlidXRlID0gdGhpcy5vbkF1dG9EaXN0cmlidXRlLmJpbmQodGhpcyk7Ci0gICAg
dGhpcy5vbkRldGFpbHNUb2dnbGUgPSB0aGlzLm9uRGV0YWlsc1RvZ2dsZS5iaW5kKHRoaXMpOwot
ICAgIHRoaXMub25IZWxwQ2xpY2sgPSB0aGlzLm9uSGVscENsaWNrLmJpbmQodGhpcyk7CisgICAg
Xy5iaW5kQWxsKHRoaXMsIFsnb25Mb2FkRGlhZ3JhbScsICdvblNhdmVEaWFncmFtJywgJ29uU2F2
ZUFzRGlhZ3JhbScsICdvblNRTENsaWNrJywKKyAgICAgICdvbkltYWdlQ2xpY2snLCAnb25BZGRO
ZXdOb2RlJywgJ29uRWRpdE5vZGUnLCAnb25DbG9uZU5vZGUnLCAnb25EZWxldGVOb2RlJywgJ29u
Tm90ZUNsaWNrJywKKyAgICAgICdvbk5vdGVDbG9zZScsICdvbk9uZVRvTWFueUNsaWNrJywgJ29u
TWFueVRvTWFueUNsaWNrJywgJ29uQXV0b0Rpc3RyaWJ1dGUnLCAnb25EZXRhaWxzVG9nZ2xlJywK
KyAgICAgICdvbkRldGFpbHNUb2dnbGUnLCAnb25IZWxwQ2xpY2snCisgICAgXSk7CisKICAgICB0
aGlzLmRpYWdyYW0uem9vbVRvRml0ID0gdGhpcy5kaWFncmFtLnpvb21Ub0ZpdC5iaW5kKHRoaXMu
ZGlhZ3JhbSk7CiAgICAgdGhpcy5kaWFncmFtLnpvb21JbiA9IHRoaXMuZGlhZ3JhbS56b29tSW4u
YmluZCh0aGlzLmRpYWdyYW0pOwogICAgIHRoaXMuZGlhZ3JhbS56b29tT3V0ID0gdGhpcy5kaWFn
cmFtLnpvb21PdXQuYmluZCh0aGlzLmRpYWdyYW0pOwpAQCAtNTUyLDYgKzU0MiwzMCBAQCBleHBv
cnQgZGVmYXVsdCBjbGFzcyBCb2R5V2lkZ2V0IGV4dGVuZHMgUmVhY3QuQ29tcG9uZW50IHsKICAg
b25JbWFnZUNsaWNrKCkgewogICAgIHRoaXMuc2V0TG9hZGluZyhnZXR0ZXh0KCdQcmVwYXJpbmcg
dGhlIGltYWdlLi4uJykpOwogCisgICAgLyogTW92ZSB0aGUgZGlhZ3JhbSB0ZW1wb3JhcmlseSB0
byBhbGlnbiBpdCB0byB0b3AtbGVmdCBvZiB0aGUgY2FudmFzIHNvIHRoYXQgd2hlbgorICAgICAq
IHRha2luZyB0aGUgc25hcHNob3QgYWxsIHRoZSBub2RlcyBhcmUgY292ZXJlZC4gT25jZSB0aGUg
aW1hZ2UgaXMgdGFrZW4sIHJlcGFpbnQKKyAgICAgKiB0aGUgY2FudmFzIGJhY2sgdG8gb3JpZ2lu
YWwgc3RhdGUuCisgICAgICogQ29kZSByZWZlcnJlZCBmcm9tIC0gem9vbVRvRml0Tm9kZXMgZnVu
Y3Rpb24uCisgICAgICovCisgICAgbGV0IG5vZGVzUmVjdCA9IHRoaXMuZGlhZ3JhbS5nZXRFbmdp
bmUoKS5nZXRCb3VuZGluZ05vZGVzUmVjdCh0aGlzLmRpYWdyYW0uZ2V0TW9kZWwoKS5nZXROb2Rl
cygpLCAxMCk7CisgICAgbGV0IGNhbnZhc1JlY3QgPSB0aGlzLmNhbnZhc0VsZS5nZXRCb3VuZGlu
Z0NsaWVudFJlY3QoKTsKKyAgICBsZXQgY2FudmFzVG9wTGVmdFBvaW50ID0geworICAgICAgICB4
OiBjYW52YXNSZWN0LmxlZnQsCisgICAgICAgIHk6IGNhbnZhc1JlY3QudG9wCisgICAgfTsKKyAg
ICBsZXQgbm9kZUxheWVyVG9wTGVmdFBvaW50ID0geworICAgICAgICB4OiBjYW52YXNUb3BMZWZ0
UG9pbnQueCArIHRoaXMuZGlhZ3JhbS5nZXRNb2RlbCgpLmdldE9mZnNldFgoKSwKKyAgICAgICAg
eTogY2FudmFzVG9wTGVmdFBvaW50LnkgKyB0aGlzLmRpYWdyYW0uZ2V0TW9kZWwoKS5nZXRPZmZz
ZXRZKCkKKyAgICB9OworICAgIGxldCBub2Rlc1JlY3RUb3BMZWZ0UG9pbnQgPSB7CisgICAgICAg
IHg6IG5vZGVMYXllclRvcExlZnRQb2ludC54ICsgbm9kZXNSZWN0LmdldFRvcExlZnQoKS54LAor
ICAgICAgICB5OiBub2RlTGF5ZXJUb3BMZWZ0UG9pbnQueSArIG5vZGVzUmVjdC5nZXRUb3BMZWZ0
KCkueQorICAgIH07CisgICAgbGV0IHByZXZUcmFuc2Zvcm0gPSB0aGlzLmNhbnZhc0VsZS5xdWVy
eVNlbGVjdG9yKCdkaXYnKS5zdHlsZS50cmFuc2Zvcm07CisgICAgdGhpcy5jYW52YXNFbGUuY2hp
bGROb2Rlcy5mb3JFYWNoKChlbGUpPT57CisgICAgICBlbGUuc3R5bGUudHJhbnNmb3JtID0gYHRy
YW5zbGF0ZSgke25vZGVMYXllclRvcExlZnRQb2ludC54IC0gbm9kZXNSZWN0VG9wTGVmdFBvaW50
Lnh9cHgsICR7bm9kZUxheWVyVG9wTGVmdFBvaW50LnkgLSBub2Rlc1JlY3RUb3BMZWZ0UG9pbnQu
eX1weCkgc2NhbGUoMS4wKWA7CisgICAgfSk7CisKICAgICAvKiBDaGFuZ2UgdGhlIHN0eWxlcyBm
b3Igc3VpdGluZyBodG1sMmNhbnZhcyAqLwogICAgIHRoaXMuY2FudmFzRWxlLmNsYXNzTGlzdC5h
ZGQoJ2h0bWwyY2FudmFzLXJlc2V0Jyk7CiAgICAgdGhpcy5jYW52YXNFbGUuc3R5bGUud2lkdGgg
PSB0aGlzLmNhbnZhc0VsZS5zY3JvbGxXaWR0aCArICdweCc7CkBAIC01NjcsMTAgKzU4MSwxNiBA
QCBleHBvcnQgZGVmYXVsdCBjbGFzcyBCb2R5V2lkZ2V0IGV4dGVuZHMgUmVhY3QuQ29tcG9uZW50
IHsKICAgICAgICAgICAnZm9udCcKICAgICAgIF07CiAgICAgICBsZXQgc3ZnRWxlbXMgPSBBcnJh
eS5mcm9tKHRhcmdldEVsZW0uZ2V0RWxlbWVudHNCeVRhZ05hbWUoInN2ZyIpKTsKLSAgICAgIGZv
ciAobGV0IHN2Z0VsZW1lbnQgb2Ygc3ZnRWxlbXMpIHsKLSAgICAgICAgICBzdmdFbGVtZW50LnNl
dEF0dHJpYnV0ZSgnd2lkdGgnLCBzdmdFbGVtZW50LmNsaWVudFdpZHRoKTsKLSAgICAgICAgICBz
dmdFbGVtZW50LnNldEF0dHJpYnV0ZSgnaGVpZ2h0Jywgc3ZnRWxlbWVudC5jbGllbnRIZWlnaHQp
OwotICAgICAgICAgIHJlY3Vyc2VFbGVtZW50Q2hpbGRyZW4oc3ZnRWxlbWVudCk7CisgICAgICBm
b3IgKGxldCBzdmdFbGUgb2Ygc3ZnRWxlbXMpIHsKKyAgICAgICAgICBzdmdFbGUuc2V0QXR0cmli
dXRlKCd3aWR0aCcsIHN2Z0VsZS5jbGllbnRXaWR0aCk7CisgICAgICAgICAgc3ZnRWxlLnNldEF0
dHJpYnV0ZSgnaGVpZ2h0Jywgc3ZnRWxlLmNsaWVudEhlaWdodCk7CisgICAgICAgICAgLyogV3Jh
cCB0aGUgU1ZHIGluIGEgZGl2IHRhZyBzbyB0aGF0IHRyYW5zZm9ybXMgYXJlIGNvbnNpc3RlbnQg
d2l0aCBodG1sICovCisgICAgICAgICAgbGV0IHdyYXAgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50
KCdkaXYnKTsKKyAgICAgICAgICB3cmFwLnNldEF0dHJpYnV0ZSgnc3R5bGUnLCBzdmdFbGUuZ2V0
QXR0cmlidXRlKCdzdHlsZScpKTsKKyAgICAgICAgICBzdmdFbGUuc2V0QXR0cmlidXRlKCdzdHls
ZScsIG51bGwpOworICAgICAgICAgIHN2Z0VsZS5wYXJlbnROb2RlLmFwcGVuZENoaWxkKHdyYXAp
OworICAgICAgICAgIHdyYXAuYXBwZW5kQ2hpbGQoc3ZnRWxlKTsKKyAgICAgICAgICByZWN1cnNl
RWxlbWVudENoaWxkcmVuKHN2Z0VsZSk7CiAgICAgICB9CiAgICAgICBmdW5jdGlvbiByZWN1cnNl
RWxlbWVudENoaWxkcmVuKG5vZGUpIHsKICAgICAgICAgICBpZiAoIW5vZGUuc3R5bGUpCkBAIC01
ODYsNDAgKzYwNiw0NSBAQCBleHBvcnQgZGVmYXVsdCBjbGFzcyBCb2R5V2lkZ2V0IGV4dGVuZHMg
UmVhY3QuQ29tcG9uZW50IHsKICAgICAgIH0KICAgICB9CiAKLSAgICBodG1sMmNhbnZhcyh0aGlz
LmNhbnZhc0VsZSwgewotICAgICAgd2lkdGg6IHRoaXMuY2FudmFzRWxlLnNjcm9sbFdpZHRoICsg
MTAsCi0gICAgICBoZWlnaHQ6IHRoaXMuY2FudmFzRWxlLnNjcm9sbEhlaWdodCArIDEwLAotICAg
ICAgc2Nyb2xsWDogMCwKLSAgICAgIHNjcm9sbFk6IDAsCi0gICAgICB1c2VDT1JTOiB0cnVlLAot
ICAgICAgYWxsb3dUYWludDogdHJ1ZSwKLSAgICAgIGJhY2tncm91bmRDb2xvcjogd2luZG93Lmdl
dENvbXB1dGVkU3R5bGUodGhpcy5jYW52YXNFbGUpLmJhY2tncm91bmRDb2xvciwKLSAgICAgIG9u
Y2xvbmU6IChjbG9uZWRFbGUpPT57Ci0gICAgICAgIHNldFN2Z0lubGluZVN0eWxlcyhjbG9uZWRF
bGUpOwotICAgICAgICByZXR1cm4gY2xvbmVkRWxlOwotICAgICAgfSwKLSAgICB9KS50aGVuKChj
YW52YXMpPT57Ci0gICAgICBsZXQgbGluayA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ2EnKTsK
LSAgICAgIGxpbmsuc2V0QXR0cmlidXRlKCdocmVmJywgY2FudmFzLnRvRGF0YVVSTCgnaW1hZ2Uv
cG5nJykpOwotICAgICAgbGluay5zZXRBdHRyaWJ1dGUoJ2Rvd25sb2FkJywgdGhpcy5nZXRDdXJy
ZW50UHJvamVjdE5hbWUoKSArICcucG5nJyk7Ci0gICAgICBsaW5rLmNsaWNrKCk7Ci0gICAgICBs
aW5rLnJlbW92ZSgpOwotICAgIH0pLmNhdGNoKChlcnIpPT57Ci0gICAgICBjb25zb2xlLmVycm9y
KGVycik7Ci0gICAgICBsZXQgbXNnID0gZ2V0dGV4dCgnVW5rbm93biBlcnJvci4gQ2hlY2sgY29u
c29sZSBsb2dzJyk7Ci0gICAgICBpZihlcnIubmFtZSkgewotICAgICAgICBtc2cgPSBgJHtlcnIu
bmFtZX06ICR7ZXJyLm1lc3NhZ2V9YDsKLSAgICAgIH0KLSAgICAgIHRoaXMucHJvcHMuYWxlcnRp
ZnkuYWxlcnQoKQotICAgICAgICAuc2V0KCd0aXRsZScsIGdldHRleHQoJ0Vycm9yJykpCi0gICAg
ICAgIC5zZXQoJ21lc3NhZ2UnLCBtc2cpLnNob3coKTsKLSAgICB9KS50aGVuKCgpPT57Ci0gICAg
ICAvKiBSZXZlcnQgYmFjayB0byB0aGUgb3JpZ2luYWwgQ1NTIHN0eWxlcyAqLwotICAgICAgdGhp
cy5jYW52YXNFbGUuY2xhc3NMaXN0LnJlbW92ZSgnaHRtbDJjYW52YXMtcmVzZXQnKTsKLSAgICAg
IHRoaXMuY2FudmFzRWxlLnN0eWxlLndpZHRoID0gJyc7Ci0gICAgICB0aGlzLmNhbnZhc0VsZS5z
dHlsZS5oZWlnaHQgPSAnJzsKLSAgICAgIHRoaXMuc2V0TG9hZGluZyhudWxsKTsKLSAgICB9KTsK
KyAgICBzZXRUaW1lb3V0KCgpPT57CisgICAgICBodG1sMmNhbnZhcyh0aGlzLmNhbnZhc0VsZSwg
eworICAgICAgICB3aWR0aDogdGhpcy5jYW52YXNFbGUuc2Nyb2xsV2lkdGggKyAxMCwKKyAgICAg
ICAgaGVpZ2h0OiB0aGlzLmNhbnZhc0VsZS5zY3JvbGxIZWlnaHQgKyAxMCwKKyAgICAgICAgc2Ny
b2xsWDogMCwKKyAgICAgICAgc2Nyb2xsWTogMCwKKyAgICAgICAgdXNlQ09SUzogdHJ1ZSwKKyAg
ICAgICAgYWxsb3dUYWludDogdHJ1ZSwKKyAgICAgICAgYmFja2dyb3VuZENvbG9yOiB3aW5kb3cu
Z2V0Q29tcHV0ZWRTdHlsZSh0aGlzLmNhbnZhc0VsZSkuYmFja2dyb3VuZENvbG9yLAorICAgICAg
ICBvbmNsb25lOiAoY2xvbmVkRWxlKT0+eworICAgICAgICAgIHNldFN2Z0lubGluZVN0eWxlcyhj
bG9uZWRFbGUpOworICAgICAgICAgIHJldHVybiBjbG9uZWRFbGU7CisgICAgICAgIH0sCisgICAg
ICB9KS50aGVuKChjYW52YXMpPT57CisgICAgICAgIGxldCBsaW5rID0gZG9jdW1lbnQuY3JlYXRl
RWxlbWVudCgnYScpOworICAgICAgICBsaW5rLnNldEF0dHJpYnV0ZSgnaHJlZicsIGNhbnZhcy50
b0RhdGFVUkwoJ2ltYWdlL3BuZycpKTsKKyAgICAgICAgbGluay5zZXRBdHRyaWJ1dGUoJ2Rvd25s
b2FkJywgdGhpcy5nZXRDdXJyZW50UHJvamVjdE5hbWUoKSArICcucG5nJyk7CisgICAgICAgIGxp
bmsuY2xpY2soKTsKKyAgICAgICAgbGluay5yZW1vdmUoKTsKKyAgICAgIH0pLmNhdGNoKChlcnIp
PT57CisgICAgICAgIGNvbnNvbGUuZXJyb3IoZXJyKTsKKyAgICAgICAgbGV0IG1zZyA9IGdldHRl
eHQoJ1Vua25vd24gZXJyb3IuIENoZWNrIGNvbnNvbGUgbG9ncycpOworICAgICAgICBpZihlcnIu
bmFtZSkgeworICAgICAgICAgIG1zZyA9IGAke2Vyci5uYW1lfTogJHtlcnIubWVzc2FnZX1gOwor
ICAgICAgICB9CisgICAgICAgIHRoaXMucHJvcHMuYWxlcnRpZnkuYWxlcnQoKQorICAgICAgICAg
IC5zZXQoJ3RpdGxlJywgZ2V0dGV4dCgnRXJyb3InKSkKKyAgICAgICAgICAuc2V0KCdtZXNzYWdl
JywgbXNnKS5zaG93KCk7CisgICAgICB9KS50aGVuKCgpPT57CisgICAgICAgIC8qIFJldmVydCBi
YWNrIHRvIHRoZSBvcmlnaW5hbCBDU1Mgc3R5bGVzICovCisgICAgICAgIHRoaXMuY2FudmFzRWxl
LmNsYXNzTGlzdC5yZW1vdmUoJ2h0bWwyY2FudmFzLXJlc2V0Jyk7CisgICAgICAgIHRoaXMuY2Fu
dmFzRWxlLnN0eWxlLndpZHRoID0gJyc7CisgICAgICAgIHRoaXMuY2FudmFzRWxlLnN0eWxlLmhl
aWdodCA9ICcnOworICAgICAgICB0aGlzLmNhbnZhc0VsZS5jaGlsZE5vZGVzLmZvckVhY2goKGVs
ZSk9PnsKKyAgICAgICAgICBlbGUuc3R5bGUudHJhbnNmb3JtID0gcHJldlRyYW5zZm9ybTsKKyAg
ICAgICAgfSk7CisgICAgICAgIHRoaXMuc2V0TG9hZGluZyhudWxsKTsKKyAgICAgIH0pOworICAg
IH0sIDEwMDApOwogICB9CiAKICAgb25PbmVUb01hbnlDbGljaygpIHsKZGlmZiAtLWdpdCBhL3dl
Yi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0aWMvc2Nzcy9fZXJkLnNjc3MgYi93ZWIvcGdhZG1pbi90
b29scy9lcmQvc3RhdGljL3Njc3MvX2VyZC5zY3NzCmluZGV4IGE1NGRmMTI4NC4uZjQ4ZDY1YjRj
IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9lcmQvc3RhdGljL3Njc3MvX2VyZC5zY3Nz
CisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2VyZC9zdGF0aWMvc2Nzcy9fZXJkLnNjc3MKQEAgLTc0
LDEwICs3NCw2IEBACiAgIC5odG1sMmNhbnZhcy1yZXNldCB7CiAgICAgYmFja2dyb3VuZC1pbWFn
ZTogbm9uZSAhaW1wb3J0YW50OwogICAgIG92ZXJmbG93OiBhdXRvICFpbXBvcnRhbnQ7Ci0KLSAg
ICAmID4gc3ZnLCAmID4gZGl2IHsKLSAgICAgIHRyYW5zZm9ybTogbm9uZSAhaW1wb3J0YW50Owot
ICAgIH0KICAgfQogCiAgIC5kaWFncmFtLWNhbnZhc3sK
--0000000000004fdc9905bb0d3ab8--