Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1etapn-0001Ty-E9 for pgadmin-hackers@arkaria.postgresql.org; Wed, 07 Mar 2018 15:18:27 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1etapm-0000VQ-Cl for pgadmin-hackers@arkaria.postgresql.org; Wed, 07 Mar 2018 15:18:26 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1etapm-0000VG-6J for pgadmin-hackers@lists.postgresql.org; Wed, 07 Mar 2018 15:18:26 +0000 Received: from mail-ot0-x242.google.com ([2607:f8b0:4003:c0f::242]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1etaph-0002IN-81 for pgadmin-hackers@postgresql.org; Wed, 07 Mar 2018 15:18:25 +0000 Received: by mail-ot0-x242.google.com with SMTP id 95so2361555ote.5 for ; Wed, 07 Mar 2018 07:18:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=U6Amtg4EZ9y2tBlNEKlVjV2oXoGe/2LGhsB31sotMno=; b=dTzn0+fq04QStxVdxQaGpCxEeI5DSvzQd8J6oRYtwmLpOFZMk0V04NCHX+I5TK/SB+ URH/4m1hvxuw0FCR3J7APjAop8FOZMjyGM14l91TMYe1pq+1U7/nGlRKkc1IPoo2RFSF 1dEISXkYm/X0ky5V9edbYlT2+4eBaQ44L/RJL/txNPGL1bpwYZcVWzprvDOS+8KvR0Bk flCWQOr3pprNyBuYhiHZoLZ/747gKGr39cLE/uhSQZuVOOjTVx0YSIsxNOY+ZkAUD6za 7jEpV5Xfaf8xCwIm4opFgw2MuThShyfPJhzLdRhJzaFQ+Ar2B/V9sBjnjRVUZMgOh2hf VXTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=U6Amtg4EZ9y2tBlNEKlVjV2oXoGe/2LGhsB31sotMno=; b=a7Yq17Z4mvXt1utCSkzZ60oLHpUCnIFfa1fCgM26aOEtkK/oWWBBxvmn67JC3gnJWY qiCR0Yoek6OGwnVfJRDG7I7TUoEJva2Uy+y/Mv3DSk8m0WqVd423lAhkygIs5l6Slovw MtalEZ5JXvOCEnO4NS8fsIG1k2qF2ovLZ5Yzul3zvhOhQkWiQlXxPF2xBTELFk7eQh/z ROAvw3eTKQglUefs2067tyijJTlGojtMG7ZjrTaRYUnG3rH421FUd3ZpCaZl/P9y875i uOcfZkfWz1A/An16wxnr0oBAEK3W7KlO6Z4sy100G+HBJwK9qhiSy+uK/SXmBDX2uXZ3 HvAA== X-Gm-Message-State: APf1xPAl6tjVKyLSBqYLCxkCJLNZljDpoyAtG0drhHLLGaoEYNQ98Z7t JV7KthRkzg7p/Iz9keYhcDdVQp0Nob3gBlMbSlunAA== X-Google-Smtp-Source: AG47ELvhTd9kJrK+HBEEygFNKo7D7Tdy+XJ/G5NEWrFesgSqHLIjOHSEipom9NCiIapFhkaHuOV08Xq8CCHy4Ji3/Ug= X-Received: by 10.157.22.233 with SMTP id s38mr15589237ots.97.1520435899051; Wed, 07 Mar 2018 07:18:19 -0800 (PST) MIME-Version: 1.0 Received: by 10.74.8.150 with HTTP; Wed, 7 Mar 2018 07:17:58 -0800 (PST) In-Reply-To: References: From: Murtuza Zabuawala Date: Wed, 7 Mar 2018 20:47:58 +0530 Message-ID: Subject: Re: [pgAdmin4][RM#3037] Allow user to disable Gravatar image To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="001a114790eaab54370566d41135" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --001a114790eaab54370566d41135 Content-Type: multipart/alternative; boundary="001a114790eaab54320566d41133" --001a114790eaab54320566d41133 Content-Type: text/plain; charset="UTF-8" Hi Dave, PFA updated patch. -- Regards, Murtuza Zabuawala EnterpriseDB: http://www.enterprisedb.com The Enterprise PostgreSQL Company On Wed, Mar 7, 2018 at 7:20 PM, Dave Page wrote: > Hi > > On Mon, Mar 5, 2018 at 8:12 AM, Murtuza Zabuawala enterprisedb.com> wrote: > >> Hi, >> >> PFA patch to disable Gravatar image in Server mode. >> >> Requirments & Issues: >> - For security reasons. >> - For systems which do not have internet access. >> - Hangs pgAdmin4 while loading the page if connection has no internet >> access (as described in the ticket) >> > > If I run with the Gravatar disabled, then I get the following regression > failure: > > ====================================================================== > FAIL: runTest (pgadmin.browser.tests.test_login.LoginTestCase) > Valid_Credentials > ---------------------------------------------------------------------- > Traceback (most recent call last): > File "/Users/dpage/git/pgadmin4/web/pgadmin/browser/tests/test_login.py", > line 93, in runTest > self.assertTrue(self.respdata in response.data.decode('utf8')) > AssertionError: False is not true > > ---------------------------------------------------------------------- > > It's fine when Gravatar is enabled (and the rest of the patch does too). > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > --001a114790eaab54320566d41133 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Dave,

PFA up= dated patch.

<= div class=3D"gmail_signature" data-smartmail=3D"gmail_signature">
=
--
Regards,
Murtuza Zabuawala
Ent= erpriseDB:=C2=A0http://www.enterprisedb.com
The Enterprise Postgr= eSQL Company

<= /div>

On Wed, Mar 7, 2018 at 7:20 PM, Dave Page <= dpage@pgadmin.org> wrote:
<= div dir=3D"ltr">Hi

On Mon, Mar 5, 2018 at 8:12 AM, Murtuza Zabuawala <murtu= za.zabuawala@enterprisedb.com> wrote:
Hi,

PFA patch to disable Gravatar i= mage in Server mode.

Requirments & Issues:
- For security reasons.
- For systems which do not have internet ac= cess.
- Hangs pgAdmin4 while loading the page if connection has no int= ernet access (as described in the ticket)

=
If I run with the Gravatar disabled, then I get the following re= gression failure:

=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
FAIL: runTest (pgadmin.= browser.tests.test_login.LoginTestCase)
Valid_Credentials
----------------------------------------------------------------------
Traceback (most recent call last):
=C2=A0= File "/Users/dpage/git/pgadmin4/web/pgadmin/browser/tests/t= est_login.py", line 93, in runTest
=C2=A0 =C2=A0 self.assert= True(self.respdata in response.data.decode('utf8'))
Asser= tionError: False is not true

---------------------= -------------------------------------------------=C2=A0

It's fine when Gravatar is enabled (and the rest of the= patch does too).
=
--
Dave Page
= Blog: http://pgsn= ake.blogspot.com
Twitter: @pgsnake

EnterpriseDB UK: http://www.enterprisedb.= com
The Enterprise PostgreSQL Company

--001a114790eaab54320566d41133-- --001a114790eaab54370566d41135 Content-Type: application/octet-stream; name="RM_3037_v1.diff" Content-Disposition: attachment; filename="RM_3037_v1.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jeh86ig50 ZGlmZiAtLWdpdCBhL3dlYi9jb25maWcucHkgYi93ZWIvY29uZmlnLnB5CmluZGV4IGE3MjgzMzQu LmQ0ZGRkOWQgMTAwNjQ0Ci0tLSBhL3dlYi9jb25maWcucHkKKysrIGIvd2ViL2NvbmZpZy5weQpA QCAtMzU3LDYgKzM1NywxMSBAQCBTUUxBTENIRU1ZX1RSQUNLX01PRElGSUNBVElPTlMgPSBGYWxz ZQogT05fREVNQU5EX1JFQ09SRF9DT1VOVCA9IDEwMDAKIAogIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKKyMg QWxsb3cgdXNlcnMgdG8gZGlzcGxheSBHcmF2YXRhciBpbWFnZSBmb3IgdGhlaXIgdXNlcm5hbWUg aW4gU2VydmVyIG1vZGUKKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCitTSE9XX0dSQVZBVEFSX0lNQUdFID0g VHJ1ZQorCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIwogIyBMb2NhbCBjb25maWcgc2V0dGluZ3MKICMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjCiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvX19pbml0X18u cHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL19faW5pdF9fLnB5CmluZGV4IDE1ODk2NzcuLmRkMjU0 MmYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvX19pbml0X18ucHkKKysrIGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9fX2luaXRfXy5weQpAQCAtNzMwLDE4ICs3MzAsMTggQEAgY2xhc3Mg QnJvd3NlclBsdWdpbk1vZHVsZShQZ0FkbWluTW9kdWxlKToKIEBsb2dpbl9yZXF1aXJlZAogZGVm IGluZGV4KCk6CiAgICAgIiIiUmVuZGVyIGFuZCBwcm9jZXNzIHRoZSBtYWluIGJyb3dzZXIgd2lu ZG93LiIiIgotICAgICMgR2V0IHRoZSBHcmF2YXRhcgotICAgIEdyYXZhdGFyKAotICAgICAgICBj dXJyZW50X2FwcCwKLSAgICAgICAgc2l6ZT0xMDAsCi0gICAgICAgIHJhdGluZz0nZycsCi0gICAg ICAgIGRlZmF1bHQ9J3JldHJvJywKLSAgICAgICAgZm9yY2VfZGVmYXVsdD1GYWxzZSwKLSAgICAg ICAgdXNlX3NzbD1UcnVlLAotICAgICAgICBiYXNlX3VybD1Ob25lCi0gICAgKQorICAgICMgUmVn aXN0ZXIgR3JhdmF0YXIgbW9kdWxlIHdpdGggdGhlIGFwcCBvbmx5IGlmIHJlcXVpcmVkCisgICAg aWYgY29uZmlnLlNIT1dfR1JBVkFUQVJfSU1BR0U6CisgICAgICAgIEdyYXZhdGFyKAorICAgICAg ICAgICAgY3VycmVudF9hcHAsCisgICAgICAgICAgICBzaXplPTEwMCwKKyAgICAgICAgICAgIHJh dGluZz0nZycsCisgICAgICAgICAgICBkZWZhdWx0PSdyZXRybycsCisgICAgICAgICAgICBmb3Jj ZV9kZWZhdWx0PUZhbHNlLAorICAgICAgICAgICAgdXNlX3NzbD1UcnVlLAorICAgICAgICAgICAg YmFzZV91cmw9Tm9uZQorICAgICAgICApCiAKLSAgICBtc2cgPSBOb25lCiAgICAgIyBHZXQgdGhl IGN1cnJlbnQgdmVyc2lvbiBpbmZvIGZyb20gdGhlIHdlYnNpdGUsIGFuZCBmbGFzaCBhIG1lc3Nh Z2UgaWYKICAgICAjIHRoZSB1c2VyIGlzIG91dCBvZiBkYXRlLCBhbmQgdGhlIGNoZWNrIGlzIGVu YWJsZWQuCiAgICAgaWYgY29uZmlnLlVQR1JBREVfQ0hFQ0tfRU5BQkxFRDoKQEAgLTc2MSw3ICs3 NjEsNyBAQCBkZWYgaW5kZXgoKToKICAgICAgICAgICAgIGlmIHJlc3BvbnNlLmdldGNvZGUoKSA9 PSAyMDA6CiAgICAgICAgICAgICAgICAgZGF0YSA9IGpzb24ubG9hZHMocmVzcG9uc2UucmVhZCgp LmRlY29kZSgndXRmLTgnKSkKICAgICAgICAgICAgICAgICBjdXJyZW50X2FwcC5sb2dnZXIuZGVi dWcoJ1Jlc3BvbnNlIGRhdGE6ICVzJyAlIGRhdGEpCi0gICAgICAgIGV4Y2VwdCBFeGNlcHRpb24g YXMgZToKKyAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbjoKICAgICAgICAgICAgIGN1cnJlbnRfYXBw LmxvZ2dlci5leGNlcHRpb24oJ0V4Y2VwdGlvbiB3aGVuIGNoZWNraW5nIGZvciB1cGRhdGUnKQog CiAgICAgICAgIGlmIGRhdGEgaXMgbm90IE5vbmU6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9i cm93c2VyL3N0YXRpYy9jc3MvYnJvd3Nlci5jc3MgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRp Yy9jc3MvYnJvd3Nlci5jc3MKaW5kZXggMmZmZmQ2NC4uM2JhMzMwZCAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvY3NzL2Jyb3dzZXIuY3NzCisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc3RhdGljL2Nzcy9icm93c2VyLmNzcwpAQCAtNjIsMyArNjIsNyBAQCBzYW1wLAog LnNxbC1lZGl0b3ItZ3JpZC1jb250YWluZXIgewogICBmb250LWZhbWlseTogJ09wZW4gU2Fucycg IWltcG9ydGFudDsKIH0KKworLnBnLWxvZ2luLWljb24geworICBmb250LXNpemU6IDE2cHg7Cit9 CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBsYXRlcy9icm93c2VyL2luZGV4 Lmh0bWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBsYXRlcy9icm93c2VyL2luZGV4Lmh0bWwK aW5kZXggNThmZjQzZi4uNzZjM2U0YyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci90 ZW1wbGF0ZXMvYnJvd3Nlci9pbmRleC5odG1sCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVt cGxhdGVzL2Jyb3dzZXIvaW5kZXguaHRtbApAQCAtMSw1ICsxLDEzIEBACiB7JSBleHRlbmRzICJi YXNlLmh0bWwiICV9CisKK3slIGlmIGNvbmZpZy5TRVJWRVJfTU9ERSBhbmQgY29uZmlnLlNIT1df R1JBVkFUQVJfSU1BR0UgLSV9Cit7JSBpbXBvcnQgJ2Jyb3dzZXIvbWFjcm9zL2dyYXZhdGFyX2lj b24ubWFjcm8nIGFzIElNRyB3aXRoIGNvbnRleHQgJX0KK3slIGVsaWYgY29uZmlnLlNFUlZFUl9N T0RFICV9Cit7JSBpbXBvcnQgJ2Jyb3dzZXIvbWFjcm9zL3N0YXRpY191c2VyX2ljb24ubWFjcm8n IGFzIElNRyB3aXRoIGNvbnRleHQgJX0KK3slIGVuZGlmICV9CisKIHslIGJsb2NrIHRpdGxlICV9 e3sgY29uZmlnLkFQUF9OQU1FIH19eyUgZW5kYmxvY2sgJX0KKwogeyUgYmxvY2sgaW5pdF9zY3Jp cHQgJX0KIHRyeSB7CiByZXF1aXJlKApAQCAtNjYsOSArNzQsMTEgQEAgcmVxdWlyZS5vblJlc291 cmNlTG9hZCA9IGZ1bmN0aW9uIChjb250ZXh0LCBtYXAsIGRlcE1hcHMpIHsKICAgICB9LCA0MDAp CiAgIH0KIH07CisKK3slIGlmIGNvbmZpZy5TRVJWRVJfTU9ERSAlfQogd2luZG93Lm9ubG9hZCA9 IGZ1bmN0aW9uKGUpewogIHNldFRpbWVvdXQoZnVuY3Rpb24oKSB7Ci0gICB2YXIgZ3JhdmF0YXJJ bWcgPSAnPGltZyBzcmM9Int7IHVzZXJuYW1lIHwgZ3JhdmF0YXIgfX0iIHdpZHRoPSIxOCIgaGVp Z2h0PSIxOCIgYWx0PSJHcmF2YXRhciBpbWFnZSBmb3Ige3sgdXNlcm5hbWUgfX0iPiB7eyB1c2Vy bmFtZSB9fSA8c3BhbiBjbGFzcz0iY2FyZXQiPjwvc3Bhbj4nOworICAgdmFyIGdyYXZhdGFySW1n ID0ge3sgSU1HLlBSRVBBUkVfSFRNTCgpfHNhZmUgfX0KICAgIC8vJCgnI25hdmJhci1tZW51IC5u YXZiYXItcmlnaHQgPiBsaSA+IGEnKS5odG1sKGdyYXZhdGFySW1nKTsKICAgIHZhciBuYXZiYXJS aWdodCA9IGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJuYXZiYXItbWVudSIpLmdldEVsZW1lbnRz QnlDbGFzc05hbWUoIm5hdmJhci1yaWdodCIpWzBdOwogICAgaWYgKG5hdmJhclJpZ2h0KSB7CkBA IC03Nyw4ICs4Nyw5IEBAIHdpbmRvdy5vbmxvYWQgPSBmdW5jdGlvbihlKXsKICAgIH0KICB9LCAx MDAwKTsKIH07Ci0KK3slIGVuZGlmICV9CiB7JSBlbmRibG9jayAlfQorCiB7JSBibG9jayBib2R5 ICV9CiA8c3R5bGU+CiAjcGctc3Bpbm5lciB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93 c2VyL3RlbXBsYXRlcy9icm93c2VyL21hY3Jvcy9ncmF2YXRhcl9pY29uLm1hY3JvIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9tYWNyb3MvZ3JhdmF0YXJfaWNvbi5tYWNy bwpuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi43MmVjOTdlCi0tLSAvZGV2L251 bGwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9tYWNyb3MvZ3Jh dmF0YXJfaWNvbi5tYWNybwpAQCAtMCwwICsxLDggQEAKK3sjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworV2Ug d3JvdGUgc2VwYXJhdGUgbWFjcm8gYmVjYXVzZSBpZiB1c2VyIGNob29zZSB0byBkaXNhYmxlIEdy YXZhdGFyIHRoZW4KK3dlIHdpbGwgbm90IGFzc29jaWF0ZSBvdXIgYXBwbGljYXRpb24gd2l0aCBH cmF2YXRhciBtb2R1bGUgd2hpY2ggd2lsbCBtYWtlCisnZ3JhdmF0YXInIGZpbHRlciB1bmF2YWls YWJsZSBpbiBKaW5qYSB0ZW1wbGF0ZXMKKyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjI30KK3slIG1hY3JvIFBS RVBBUkVfSFRNTCgpIC0lfQorJzxpbWcgc3JjID0gInt7IHVzZXJuYW1lIHwgZ3JhdmF0YXIgfX0i IHdpZHRoID0gIjE4IiBoZWlnaHQgPSAiMTgiIGFsdCA9ICJHcmF2YXRhciBpbWFnZSBmb3Ige3sg dXNlcm5hbWUgfX0iID4ge3sgdXNlcm5hbWUgfX0gPHNwYW4gY2xhc3M9ImNhcmV0Ij48L3NwYW4+ JzsKK3slLSBlbmRtYWNybyAlfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1w bGF0ZXMvYnJvd3Nlci9tYWNyb3Mvc3RhdGljX3VzZXJfaWNvbi5tYWNybyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvdGVtcGxhdGVzL2Jyb3dzZXIvbWFjcm9zL3N0YXRpY191c2VyX2ljb24ubWFjcm8K bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNmI3Mjg0NAotLS0gL2Rldi9udWxs CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jyb3dzZXIvbWFjcm9zL3N0YXRp Y191c2VyX2ljb24ubWFjcm8KQEAgLTAsMCArMSwzIEBACit7JSBtYWNybyBQUkVQQVJFX0hUTUwo KSAtJX0KKyc8aSBjbGFzcz0iZmEgZmEtdXNlci1jaXJjbGUgcGctbG9naW4taWNvbiIgYXJpYS1o aWRkZW49InRydWUiPjwvaT4ge3sgdXNlcm5hbWUgfX0gPHNwYW4gY2xhc3M9ImNhcmV0Ij48L3Nw YW4+JzsKK3slLSBlbmRtYWNybyAlfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci90 ZXN0cy90ZXN0X2dyYXZhdGFyX2ltYWdlX2Rpc3BsYXkucHkgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3Rlc3RzL3Rlc3RfZ3JhdmF0YXJfaW1hZ2VfZGlzcGxheS5weQpuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwLi5hNDUyNmM5Ci0tLSAvZGV2L251bGwKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci90ZXN0cy90ZXN0X2dyYXZhdGFyX2ltYWdlX2Rpc3BsYXkucHkKQEAgLTAsMCArMSw2 OCBAQAorIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKKyMKKyMgcGdBZG1pbiA0IC0gUG9zdGdyZVNRTCBUb29s cworIworIyBDb3B5cmlnaHQgKEMpIDIwMTMgLSAyMDE4LCBUaGUgcGdBZG1pbiBEZXZlbG9wbWVu dCBUZWFtCisjIFRoaXMgc29mdHdhcmUgaXMgcmVsZWFzZWQgdW5kZXIgdGhlIFBvc3RncmVTUUwg TGljZW5jZQorIworIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKKworaW1wb3J0IGNvbmZpZworZnJvbSBwZ2Fk bWluLnV0aWxzLnJvdXRlIGltcG9ydCBCYXNlVGVzdEdlbmVyYXRvcgorZnJvbSByZWdyZXNzaW9u LnB5dGhvbl90ZXN0X3V0aWxzIGltcG9ydCB0ZXN0X3V0aWxzIGFzIHV0aWxzCitmcm9tIHJlZ3Jl c3Npb24udGVzdF9zZXR1cCBpbXBvcnQgY29uZmlnX2RhdGEgYXMgdGNvbmZpZworCisKK2NsYXNz IFRlc3RMb2dpblVzZXJJbWFnZShCYXNlVGVzdEdlbmVyYXRvcik6CisgICAgIiIiCisgICAgVGhp cyBjbGFzcyBjaGVja3MgZm9yIHVzZXIgaW1hZ2UgYWZ0ZXIgc3VjY2Vzc2Z1bCBsb2dpbi4KKyAg ICAtIElmIFNIT1dfR1JBVkFUQVJfSU1BR0UgY29uZmlnIG9wdGlvbiBpcyBzZXQgdG8gVHJ1ZSB0 aGVuIHdlIHdpbGwgc2hvdworICAgIEdyYXZhdGFyIG9uIHRoZSBQYWdlLgorICAgIC0gSWYgU0hP V19HUkFWQVRBUl9JTUFHRSBjb25maWcgb3B0aW9uIGlzIHNldCB0byBGYWxzZSB0aGVuIHdlIHdp bGwgc2hvdworICAgIFN0YXRpYyBpbWFnZSBvbiB0aGUgUGFnZS4KKyAgICAiIiIKKworICAgIHNj ZW5hcmlvcyA9IFsKKyAgICAgICAgKAorICAgICAgICAgICAgJ1ZlcmlmeSBncmF2YXRhciBpbWFn ZSBvbiB0aGUgcGFnZScsIGRpY3QoCisgICAgICAgICAgICAgICAgZW1haWw9KAorICAgICAgICAg ICAgICAgICAgICB0Y29uZmlnWydwZ0FkbWluNF9sb2dpbl9jcmVkZW50aWFscyddWydsb2dpbl91 c2VybmFtZSddCisgICAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICAgICBwYXNzd29yZD0o CisgICAgICAgICAgICAgICAgICAgIHRjb25maWdbJ3BnQWRtaW40X2xvZ2luX2NyZWRlbnRpYWxz J11bJ2xvZ2luX3Bhc3N3b3JkJ10KKyAgICAgICAgICAgICAgICApLAorICAgICAgICAgICAgICAg IHJlc3BkYXRhPSdHcmF2YXRhciBpbWFnZSBmb3IgJXMnICUKKyAgICAgICAgICAgICAgICAgICAg ICAgICB0Y29uZmlnWydwZ0FkbWluNF9sb2dpbl9jcmVkZW50aWFscyddCisgICAgICAgICAgICAg ICAgICAgICAgICAgWydsb2dpbl91c2VybmFtZSddLAorICAgICAgICAgICAgKQorICAgICAgICAp CisgICAgXQorCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIHNldFVwQ2xhc3MoY2xzKToKKyAg ICAgICAgIkxvZ291dCBmaXJzdCBpZiBhbHJlYWR5IGxvZ2dlZCBpbiIKKyAgICAgICAgdXRpbHMu bG9nb3V0X3Rlc3Rlcl9hY2NvdW50KGNscy50ZXN0ZXIpCisKKyAgICBkZWYgcnVuVGVzdChzZWxm KToKKyAgICAgICAgIyBMb2dpbiBhbmQgY2hlY2sgdHlwZSBvZiBpbWFnZSBpbiByZXNwb25zZQor ICAgICAgICByZXNwb25zZSA9IHNlbGYudGVzdGVyLnBvc3QoCisgICAgICAgICAgICAnL2xvZ2lu JywgZGF0YT1kaWN0KAorICAgICAgICAgICAgICAgIGVtYWlsPXNlbGYuZW1haWwsCisgICAgICAg ICAgICAgICAgcGFzc3dvcmQ9c2VsZi5wYXNzd29yZAorICAgICAgICAgICAgKSwKKyAgICAgICAg ICAgIGZvbGxvd19yZWRpcmVjdHM9VHJ1ZQorICAgICAgICApCisgICAgICAgICMgU2hvdWxkIGhh dmUgZ3JhdmF0YXIgaW1hZ2UKKyAgICAgICAgaWYgY29uZmlnLlNIT1dfR1JBVkFUQVJfSU1BR0U6 CisgICAgICAgICAgICBzZWxmLmFzc2VydEluKHNlbGYucmVzcGRhdGEsIHJlc3BvbnNlLmRhdGEu ZGVjb2RlKCd1dGY4JykpCisgICAgICAgICMgU2hvdWxkIG5vdCBoYXZlIGdyYXZhdGFyIGltYWdl CisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBzZWxmLmFzc2VydE5vdEluKHNlbGYucmVzcGRh dGEsIHJlc3BvbnNlLmRhdGEuZGVjb2RlKCd1dGY4JykpCisKKyAgICBAY2xhc3NtZXRob2QKKyAg ICBkZWYgdGVhckRvd25DbGFzcyhjbHMpOgorICAgICAgICAiIiIKKyAgICAgICAgV2UgbmVlZCB0 byBhZ2FpbiBsb2dpbiB0aGUgdGVzdCBjbGllbnQgYXMgc29vbiBhcyB0ZXN0IHNjZW5hcmlvcwor ICAgICAgICBmaW5pc2hlcy4KKyAgICAgICAgIiIiCisgICAgICAgIHV0aWxzLmxvZ2luX3Rlc3Rl cl9hY2NvdW50KGNscy50ZXN0ZXIpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3Rl c3RzL3Rlc3RfbG9naW4ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3Rlc3RzL3Rlc3RfbG9naW4u cHkKaW5kZXggMzMzMWI2OC4uMGYwYTMwZSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci90ZXN0cy90ZXN0X2xvZ2luLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVzdHMvdGVz dF9sb2dpbi5weQpAQCAtNjIsMTMgKzYyLDE1IEBAIGNsYXNzIExvZ2luVGVzdENhc2UoQmFzZVRl c3RHZW5lcmF0b3IpOgogICAgICAgICAjIFRoaXMgdGVzdCBjYXNlIHZhbGlkYXRlcyB0aGUgdmFs aWQvY29ycmVjdCBjcmVkZW50aWFscyBhbmQgYWxsb3cgdXNlcgogICAgICAgICAjIHRvIGxvZ2lu IHBnQWRtaW4gNAogICAgICAgICAoJ1ZhbGlkX0NyZWRlbnRpYWxzJywgZGljdCgKLSAgICAgICAg ICAgIGVtYWlsPShjb25maWdfZGF0YVsncGdBZG1pbjRfbG9naW5fY3JlZGVudGlhbHMnXQotICAg ICAgICAgICAgICAgICAgIFsnbG9naW5fdXNlcm5hbWUnXSksCi0gICAgICAgICAgICBwYXNzd29y ZD0oY29uZmlnX2RhdGFbJ3BnQWRtaW40X2xvZ2luX2NyZWRlbnRpYWxzJ10KLSAgICAgICAgICAg ICAgICAgICAgICBbJ2xvZ2luX3Bhc3N3b3JkJ10pLAotICAgICAgICAgICAgcmVzcGRhdGE9J0dy YXZhdGFyIGltYWdlIGZvciAlcycgJQotICAgICAgICAgICAgICAgICAgICAgY29uZmlnX2RhdGFb J3BnQWRtaW40X2xvZ2luX2NyZWRlbnRpYWxzJ10KLSAgICAgICAgICAgICAgICAgICAgIFsnbG9n aW5fdXNlcm5hbWUnXSkpCisgICAgICAgICAgICBlbWFpbD0oY29uZmlnX2RhdGFbCisgICAgICAg ICAgICAgICAgJ3BnQWRtaW40X2xvZ2luX2NyZWRlbnRpYWxzJworICAgICAgICAgICAgXVsnbG9n aW5fdXNlcm5hbWUnXSksCisgICAgICAgICAgICBwYXNzd29yZD0oY29uZmlnX2RhdGFbCisgICAg ICAgICAgICAgICAgJ3BnQWRtaW40X2xvZ2luX2NyZWRlbnRpYWxzJworICAgICAgICAgICAgXVsn bG9naW5fcGFzc3dvcmQnXSksCisgICAgICAgICAgICByZXNwZGF0YT0nJXMnICUgY29uZmlnX2Rh dGFbJ3BnQWRtaW40X2xvZ2luX2NyZWRlbnRpYWxzJ10KKyAgICAgICAgICAgIFsnbG9naW5fdXNl cm5hbWUnXSkKKyAgICAgICAgICkKICAgICBdCiAKICAgICBAY2xhc3NtZXRob2QK --001a114790eaab54370566d41135--