Received: from malur.postgresql.org ([2a02:16a8:dc51::56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1fWEn6-00076D-Qd for pgadmin-hackers@arkaria.postgresql.org; Fri, 22 Jun 2018 05:39:25 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1fWEn5-0004Ve-83 for pgadmin-hackers@arkaria.postgresql.org; Fri, 22 Jun 2018 05:39:23 +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 1fWEn4-0004VX-TE for pgadmin-hackers@lists.postgresql.org; Fri, 22 Jun 2018 05:39:23 +0000 Received: from mail-pg0-x22e.google.com ([2607:f8b0:400e:c05::22e]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1fWEmz-000693-8V for pgadmin-hackers@postgresql.org; Fri, 22 Jun 2018 05:39:22 +0000 Received: by mail-pg0-x22e.google.com with SMTP id q4-v6so2465724pgr.1 for ; Thu, 21 Jun 2018 22:39:16 -0700 (PDT) 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=pl4vX0CmLz9qjJ7iVMXrT/MHKwFBQtC+WUR8T733uGQ=; b=2Ln3FP8zyGF1lAhFHRxDf5ckU+j2NbqyVssBJlxoJKMioJTRgvgsc3F2mFQHRS5i6x LDn1areQtslfFiE97rCipleIIhb8y++7tGXdd0m3oLWJj/RPGK1fEteUF2OxlBUKe4x4 ITiDEWsr2bfBEa2irnaXLQCd0IhK4c8BpneMBufF2YnfQLMMicF8NymwA6d2Ir6yYpei CNgdvPz5X4ffKKuVU+YiQed0tMRQ3IC9gkyuAvLa/fa8L+1ovXf8FiZkTbLkAwQcdHR/ 6PkG9NnZF4cB6T3kLnbiqMYzKGBaJQAN4TeZrqBCH1FSfDfHmnLe47sx2xl+rC8ootRo 2gyQ== 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=pl4vX0CmLz9qjJ7iVMXrT/MHKwFBQtC+WUR8T733uGQ=; b=ALjQQfCVSmYpzDqujV5BC9Y32HHP1bP0iCyJhxMUsW3ktoIDUM3dUAv7J9eOT+84lT BMcJRPgq/zItuAigTalJHYV5GRlGRCbxx/72xYEJisGeHONkn9oLiD47O/wSDNDkg395 OPoeuoyJvETI+0OSQVIssWlkmQ/stxhv6KQH7S1gvQDz2EnucmYXbivZBqYD7n0VuoCs VcAx/j0Eec0dKc2q+Z4JwsiPEADNf7JeY+oGWrhVfBze8cARkufOtKWsZEvWr0EHnGSk 1JjQ8fBHNlryTSfaOcRekOhzB72fs+hF8IDolv37tfZCicDCHvq6H4GJQat00Su0Yo2B XraA== X-Gm-Message-State: APt69E3ovgGxTh/ZnCPDe3LbLGpHOEZtAVCqokU8K5v+0H5wnufAVH5V SJf7DUEoA1GAEpFku9l36BkemhW0lI4jo5Jrwh0s+Q== X-Google-Smtp-Source: ADUXVKLgZBU/A4bxvGIaJyW7SPim2dGXAjiQ+c2a9sDjU23rCmDBANKRKw+SSmQqf/lSY+W5uznCtn7l+ln+zjd0ulY= X-Received: by 2002:a62:a38d:: with SMTP id q13-v6mr221104pfl.49.1529645954370; Thu, 21 Jun 2018 22:39:14 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:90a:8c86:0:0:0:0 with HTTP; Thu, 21 Jun 2018 22:39:13 -0700 (PDT) In-Reply-To: References: From: Akshay Joshi Date: Fri, 22 Jun 2018 11:09:13 +0530 Message-ID: Subject: Re: [pgadmin4][Patch]: Feature #3273 Add ability to sort in the Select File window when opening a saved query To: Dave Page Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000be44a3056f347339" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000be44a3056f347339 Content-Type: multipart/alternative; boundary="000000000000be449f056f347337" --000000000000be449f056f347337 Content-Type: text/plain; charset="UTF-8" On Thu, Jun 21, 2018 at 11:57 PM, Dave Page wrote: > Hi > > On Thu, Jun 21, 2018 at 6:27 AM, Akshay Joshi < > akshay.joshi@enterprisedb.com> wrote: > >> >> >> On Thu, Jun 21, 2018 at 6:20 AM, Dave Page wrote: >> >>> Hi >>> >>> On Wed, Jun 20, 2018 at 3:13 PM, Akshay Joshi < >>> akshay.joshi@enterprisedb.com> wrote: >>> >>>> Hi Hackers, >>>> >>>> Attached is the patch for Feature #3273 Add ability to sort in the >>>> Select File window when opening a saved query. >>>> >>>> I haven't seen any refactoring possibility, patch contains feature test >>>> with *time.sleep(0.05). *I have spend lot of time to not introduce >>>> "time.sleep()" and tried couple of different ways of WebDriveWait, but >>>> didn't get success. >>>> >>>> Please review it. >>>> >>> >>> I get the following running the feature tests: >>> >>> invalid syntax (xss_checks_file_manager_test.py, line 60) >>> >>> make: *** [check-feature] Error 1 >>> >>> Fixed. >> >> >>> Also; should that file be renamed now, to reflect that it tests more >>> than just XSS? >>> >> >> Done. Attached is the modified patch. >> > > This seems to work for the most part, however, when sorting on the > Modified column, it is sorting alphabetically, not by date. This doesn't > seem like it's what users would expect. > Attached is the modified patch with the above fix. > > > -- > Dave Page > Blog: http://pgsnake.blogspot.com > Twitter: @pgsnake > > EnterpriseDB UK: http://www.enterprisedb.com > The Enterprise PostgreSQL Company > -- *Akshay Joshi* *Sr. Software Architect * *Phone: +91 20-3058-9517Mobile: +91 976-788-8246* --000000000000be449f056f347337 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Jun 21, 2018 at 11:57 PM, Dave Page <dpage@pgadmin.org> wrote:
Hi

On Thu, Jun 21, 2018 at= 6:27 AM, Akshay Joshi <akshay.joshi@enterprisedb.com= > wrote:

<= div class=3D"gmail_extra">
On Thu, Jun = 21, 2018 at 6:20 AM, Dave Page <dpage@pgadmin.org> wrote:
Hi

On Wed, Jun 20, 2018 at 3:13 PM, Akshay Joshi= <akshay.joshi@enterprisedb.com> wrote:
=
Hi Hackers,

Attached is the patch for Feature #3273 Add ability t= o sort in the Select File window when opening a saved query.

I haven't seen any refactoring possibility, patch contains featur= e test with time.sleep(0.05). I have spend lot of time to not introd= uce "time.sleep()" and tried couple of different ways of WebDriveWait, but didn't get success.=C2= =A0

Please review it.=

I get the following running t= he feature tests:

invalid syntax (xss_checks_file_manager_test.py, = line 60)

make: *** [check-feature] Error 1


=C2=A0 =C2= =A0Fixed.
=C2=A0
=
Also; should that file be renamed now, to reflect that it tests more = than just XSS?=C2=A0

=C2=A0 =C2=A0 Done. Attached is the modified patch.=C2=A0

This seems to work f= or the most part, however, when sorting on the Modified column, it is sorti= ng alphabetically, not by date. This doesn't seem like it's what us= ers would expect.=C2=A0

=
=C2=A0 =C2=A0 Attached is the modified patch with the above fix.=C2=A0=


--
Dave Page
Blog: http://pgsnake.blogspot.com
Twitter: @pgsnake

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



--
Akshay= Joshi
Sr. Software Architect


Phone: +91 20-3058-9517
Mobile: +91 976-788-824= 6
--000000000000be449f056f347337-- --000000000000be44a3056f347339 Content-Type: application/octet-stream; name="RM_3273_v3.patch" Content-Disposition: attachment; filename="RM_3273_v3.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jipjp6ew0 ZGlmZiAtLWdpdCBhL3dlYi9wYWNrYWdlLmpzb24gYi93ZWIvcGFja2FnZS5qc29uCmluZGV4IGI2 NGJiZTEuLmE1NTFhZjEgMTAwNjQ0Ci0tLSBhL3dlYi9wYWNrYWdlLmpzb24KKysrIGIvd2ViL3Bh Y2thZ2UuanNvbgpAQCAtODcsNiArODcsNyBAQAogICAgICJzbmFwc3ZnIjogIl4wLjUuMSIsCiAg ICAgInNwZWN0cnVtLWNvbG9ycGlja2VyIjogIl4xLjguMCIsCiAgICAgInNwcmludGYtanMiOiAi XjEuMS4xIiwKKyAgICAidGFibGVzb3J0ZXIiOiAiXjIuMzAuNiIsCiAgICAgInVuZGVyc2NvcmUi OiAiXjEuOC4zIiwKICAgICAidW5kZXJzY29yZS5zdHJpbmciOiAiXjMuMy40IiwKICAgICAid2F0 Y2hpZnkiOiAifjMuOS4wIiwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2ZlYXR1cmVfdGVzdHMv ZmlsZV9tYW5hZ2VyX3Rlc3QucHkgYi93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL2ZpbGVfbWFu YWdlcl90ZXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjljZGNlNjUK LS0tIC9kZXYvbnVsbAorKysgYi93ZWIvcGdhZG1pbi9mZWF0dXJlX3Rlc3RzL2ZpbGVfbWFuYWdl cl90ZXN0LnB5CkBAIC0wLDAgKzEsMTY0IEBACisjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworIworIyBwZ0Fk bWluIDQgLSBQb3N0Z3JlU1FMIFRvb2xzCisjCisjIENvcHlyaWdodCAoQykgMjAxMyAtIDIwMTgs IFRoZSBwZ0FkbWluIERldmVsb3BtZW50IFRlYW0KKyMgVGhpcyBzb2Z0d2FyZSBpcyByZWxlYXNl ZCB1bmRlciB0aGUgUG9zdGdyZVNRTCBMaWNlbmNlCisjCisjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIworCitm cm9tIF9fZnV0dXJlX18gaW1wb3J0IHByaW50X2Z1bmN0aW9uCitpbXBvcnQgb3MKK2ltcG9ydCB0 aW1lCitpbXBvcnQgc3lzCitmcm9tIHNlbGVuaXVtLndlYmRyaXZlci5jb21tb24ua2V5cyBpbXBv cnQgS2V5cworZnJvbSBzZWxlbml1bS53ZWJkcml2ZXIuc3VwcG9ydC51aSBpbXBvcnQgV2ViRHJp dmVyV2FpdAorZnJvbSBzZWxlbml1bS53ZWJkcml2ZXIuY29tbW9uLmJ5IGltcG9ydCBCeQorZnJv bSBzZWxlbml1bS53ZWJkcml2ZXIuc3VwcG9ydCBpbXBvcnQgZXhwZWN0ZWRfY29uZGl0aW9ucyBh cyBFQworZnJvbSByZWdyZXNzaW9uLnB5dGhvbl90ZXN0X3V0aWxzIGltcG9ydCB0ZXN0X3V0aWxz Citmcm9tIHJlZ3Jlc3Npb24uZmVhdHVyZV91dGlscy5iYXNlX2ZlYXR1cmVfdGVzdCBpbXBvcnQg QmFzZUZlYXR1cmVUZXN0CisKKworY2xhc3MgQ2hlY2tGaWxlTWFuYWdlckZlYXR1cmVUZXN0KEJh c2VGZWF0dXJlVGVzdCk6CisgICAgIiIiVGVzdHMgdG8gY2hlY2sgZmlsZSBtYW5hZ2VyIGZvciBY U1MuIiIiCisKKyAgICBzY2VuYXJpb3MgPSBbCisgICAgICAgICgiRmlsZSBtYW5hZ2VyIGZlYXR1 cmUgdGVzdCIsCisgICAgICAgICBkaWN0KCkpCisgICAgXQorCisgICAgZGVmIGJlZm9yZShzZWxm KToKKyAgICAgICAgY29ubmVjdGlvbiA9IHRlc3RfdXRpbHMuZ2V0X2RiX2Nvbm5lY3Rpb24oCisg ICAgICAgICAgICBzZWxmLnNlcnZlclsnZGInXSwKKyAgICAgICAgICAgIHNlbGYuc2VydmVyWyd1 c2VybmFtZSddLAorICAgICAgICAgICAgc2VsZi5zZXJ2ZXJbJ2RiX3Bhc3N3b3JkJ10sCisgICAg ICAgICAgICBzZWxmLnNlcnZlclsnaG9zdCddLAorICAgICAgICAgICAgc2VsZi5zZXJ2ZXJbJ3Bv cnQnXQorICAgICAgICApCisgICAgICAgIHRlc3RfdXRpbHMuZHJvcF9kYXRhYmFzZShjb25uZWN0 aW9uLCAiYWNjZXB0YW5jZV90ZXN0X2RiIikKKyAgICAgICAgdGVzdF91dGlscy5jcmVhdGVfZGF0 YWJhc2Uoc2VsZi5zZXJ2ZXIsICJhY2NlcHRhbmNlX3Rlc3RfZGIiKQorICAgICAgICBzZWxmLnBh Z2UuYWRkX3NlcnZlcihzZWxmLnNlcnZlcikKKyAgICAgICAgc2VsZi53YWl0ID0gV2ViRHJpdmVy V2FpdChzZWxmLnBhZ2UuZHJpdmVyLCAxMCkKKyAgICAgICAgc2VsZi5YU1NfRklMRSA9ICcvdG1w LzxpbWcgc3JjPXggb25tb3VzZW92ZXI9YWxlcnQoIjEiKT4uc3FsJworICAgICAgICAjIFJlbW92 ZSBhbnkgcHJldmlvdXMgZmlsZQorICAgICAgICBpZiBvcy5wYXRoLmlzZmlsZShzZWxmLlhTU19G SUxFKToKKyAgICAgICAgICAgIG9zLnJlbW92ZShzZWxmLlhTU19GSUxFKQorCisgICAgZGVmIGFm dGVyKHNlbGYpOgorICAgICAgICBzZWxmLnBhZ2UuY2xvc2VfcXVlcnlfdG9vbCgnc3FsJywgRmFs c2UpCisgICAgICAgIHNlbGYucGFnZS5yZW1vdmVfc2VydmVyKHNlbGYuc2VydmVyKQorICAgICAg ICBjb25uZWN0aW9uID0gdGVzdF91dGlscy5nZXRfZGJfY29ubmVjdGlvbigKKyAgICAgICAgICAg IHNlbGYuc2VydmVyWydkYiddLAorICAgICAgICAgICAgc2VsZi5zZXJ2ZXJbJ3VzZXJuYW1lJ10s CisgICAgICAgICAgICBzZWxmLnNlcnZlclsnZGJfcGFzc3dvcmQnXSwKKyAgICAgICAgICAgIHNl bGYuc2VydmVyWydob3N0J10sCisgICAgICAgICAgICBzZWxmLnNlcnZlclsncG9ydCddCisgICAg ICAgICkKKyAgICAgICAgdGVzdF91dGlscy5kcm9wX2RhdGFiYXNlKGNvbm5lY3Rpb24sICJhY2Nl cHRhbmNlX3Rlc3RfZGIiKQorCisgICAgZGVmIHJ1blRlc3Qoc2VsZik6CisgICAgICAgIHByaW50 KCJUZXN0cyB0byBjaGVjayBpZiBGaWxlIG1hbmFnZXIgaXMgdnVsbmVyYWJsZSB0byBYU1MuLi4g IiwKKyAgICAgICAgICAgICAgZmlsZT1zeXMuc3RkZXJyLCBlbmQ9IiIpCisgICAgICAgIHNlbGYu X25hdmlnYXRlX3RvX3F1ZXJ5X3Rvb2woKQorICAgICAgICBzZWxmLnBhZ2UuZmlsbF9jb2RlbWly cm9yX2FyZWFfd2l0aCgiU0VMRUNUIDE7IikKKyAgICAgICAgc2VsZi5fY3JlYXRlX25ld19maWxl KCkKKyAgICAgICAgc2VsZi5fb3Blbl9maWxlX21hbmFnZXJfYW5kX2NoZWNrX3hzc19maWxlKCkK KyAgICAgICAgcHJpbnQoIk9LLiIsIGZpbGU9c3lzLnN0ZGVycikKKworICAgICAgICBwcmludCgi RmlsZSBtYW5hZ2VyIHNvcnRpbmcgb2YgZGF0YSIsIGZpbGU9c3lzLnN0ZGVycikKKyAgICAgICAg c2VsZi5fY2hlY2tfZmlsZV9zb3J0aW5nKCkKKyAgICAgICAgcHJpbnQoIk9LLiIsIGZpbGU9c3lz LnN0ZGVycikKKworICAgIGRlZiBfbmF2aWdhdGVfdG9fcXVlcnlfdG9vbChzZWxmKToKKyAgICAg ICAgc2VsZi5wYWdlLnRvZ2dsZV9vcGVuX3RyZWVfaXRlbShzZWxmLnNlcnZlclsnbmFtZSddKQor ICAgICAgICBzZWxmLnBhZ2UudG9nZ2xlX29wZW5fdHJlZV9pdGVtKCdEYXRhYmFzZXMnKQorICAg ICAgICBzZWxmLnBhZ2UudG9nZ2xlX29wZW5fdHJlZV9pdGVtKCdhY2NlcHRhbmNlX3Rlc3RfZGIn KQorICAgICAgICBzZWxmLnBhZ2Uub3Blbl9xdWVyeV90b29sKCkKKworICAgIGRlZiBfY3JlYXRl X25ld19maWxlKHNlbGYpOgorICAgICAgICBzZWxmLnBhZ2UuZmluZF9ieV9pZCgiYnRuLXNhdmUi KS5jbGljaygpCisgICAgICAgIHNlbGYucGFnZS53YWl0X2Zvcl9xdWVyeV90b29sX2xvYWRpbmdf aW5kaWNhdG9yX3RvX2Rpc2FwcGVhcigpCisgICAgICAgIHNlbGYud2FpdC51bnRpbChFQy5wcmVz ZW5jZV9vZl9lbGVtZW50X2xvY2F0ZWQoCisgICAgICAgICAgICAoCisgICAgICAgICAgICAgICAg QnkuWFBBVEgsCisgICAgICAgICAgICAgICAgIi8vKltjb250YWlucyhzdHJpbmcoKSwgJ1Nob3cg aGlkZGVuIGZpbGVzIGFuZCBmb2xkZXJzPyAnKV0iCisgICAgICAgICAgICApCisgICAgICAgICkp CisgICAgICAgICMgU2V0IHRoZSBYU1MgdmFsdWUgaW4gaW5wdXQKKyAgICAgICAgc2VsZi5wYWdl LmZpbmRfYnlfaWQoImZpbGUtaW5wdXQtcGF0aCIpLmNsZWFyKCkKKyAgICAgICAgc2VsZi5wYWdl LmZpbmRfYnlfaWQoImZpbGUtaW5wdXQtcGF0aCIpLnNlbmRfa2V5cygKKyAgICAgICAgICAgIHNl bGYuWFNTX0ZJTEUKKyAgICAgICAgKQorICAgICAgICAjIFNhdmUgdGhlIGZpbGUKKyAgICAgICAg c2VsZi5wYWdlLmNsaWNrX21vZGFsKCdTYXZlJykKKyAgICAgICAgc2VsZi5wYWdlLndhaXRfZm9y X3F1ZXJ5X3Rvb2xfbG9hZGluZ19pbmRpY2F0b3JfdG9fZGlzYXBwZWFyKCkKKworICAgIGRlZiBf b3Blbl9maWxlX21hbmFnZXJfYW5kX2NoZWNrX3hzc19maWxlKHNlbGYpOgorICAgICAgICBzZWxm LnBhZ2UuZmluZF9ieV9pZCgiYnRuLWxvYWQtZmlsZSIpLmNsaWNrKCkKKyAgICAgICAgc2VsZi53 YWl0LnVudGlsKEVDLnByZXNlbmNlX29mX2VsZW1lbnRfbG9jYXRlZCgKKyAgICAgICAgICAgICgK KyAgICAgICAgICAgICAgICBCeS5YUEFUSCwKKyAgICAgICAgICAgICAgICAiLy8qW2NvbnRhaW5z KHN0cmluZygpLCAnU2hvdyBoaWRkZW4gZmlsZXMgYW5kIGZvbGRlcnM/ICcpXSIKKyAgICAgICAg ICAgICkKKyAgICAgICAgKSkKKyAgICAgICAgc2VsZi5wYWdlLmZpbmRfYnlfaWQoImZpbGUtaW5w dXQtcGF0aCIpLmNsZWFyKCkKKyAgICAgICAgc2VsZi5wYWdlLmZpbmRfYnlfaWQoImZpbGUtaW5w dXQtcGF0aCIpLnNlbmRfa2V5cygKKyAgICAgICAgICAgICcvdG1wLycKKyAgICAgICAgKQorICAg ICAgICBzZWxmLnBhZ2UuZmluZF9ieV9pZCgiZmlsZS1pbnB1dC1wYXRoIikuc2VuZF9rZXlzKAor ICAgICAgICAgICAgS2V5cy5SRVRVUk4KKyAgICAgICAgKQorCisgICAgICAgIGlmIHNlbGYucGFn ZS5kcml2ZXIuY2FwYWJpbGl0aWVzWydicm93c2VyTmFtZSddID09ICdmaXJlZm94JzoKKyAgICAg ICAgICAgIHRhYmxlID0gc2VsZi5wYWdlLndhaXRfZm9yX2VsZW1lbnRfdG9fcmVsb2FkKAorICAg ICAgICAgICAgICAgIGxhbWJkYSBkcml2ZXI6CisgICAgICAgICAgICAgICAgZHJpdmVyLmZpbmRf ZWxlbWVudF9ieV9jc3Nfc2VsZWN0b3IoInRhYmxlI2NvbnRlbnRzIikKKyAgICAgICAgICAgICkK KyAgICAgICAgZWxzZToKKyAgICAgICAgICAgIHRhYmxlID0gc2VsZi5wYWdlLmRyaXZlciBcCisg ICAgICAgICAgICAgICAgLmZpbmRfZWxlbWVudF9ieV9jc3Nfc2VsZWN0b3IoInRhYmxlI2NvbnRl bnRzIikKKworICAgICAgICBjb250ZW50cyA9IHRhYmxlLmdldF9hdHRyaWJ1dGUoJ2lubmVySFRN TCcpCisKKyAgICAgICAgc2VsZi5wYWdlLmNsaWNrX21vZGFsKCdDYW5jZWwnKQorICAgICAgICBz ZWxmLnBhZ2Uud2FpdF9mb3JfcXVlcnlfdG9vbF9sb2FkaW5nX2luZGljYXRvcl90b19kaXNhcHBl YXIoKQorICAgICAgICBzZWxmLl9jaGVja19lc2NhcGVkX2NoYXJhY3RlcnMoCisgICAgICAgICAg ICBjb250ZW50cywKKyAgICAgICAgICAgICcmbHQ7aW1nIHNyYz14IG9ubW91c2VvdmVyPWFsZXJ0 KCIxIikmZ3Q7LnNxbCcsCisgICAgICAgICAgICAnRmlsZSBtYW5hZ2VyJworICAgICAgICApCisK KyAgICBkZWYgX2NoZWNrX2VzY2FwZWRfY2hhcmFjdGVycyhzZWxmLCBzb3VyY2VfY29kZSwgc3Ry aW5nX3RvX2ZpbmQsIHNvdXJjZSk6CisgICAgICAgICMgRm9yIFhTUyB3ZSBuZWVkIHRvIHNlYXJj aCBhZ2FpbnN0IGVsZW1lbnQncyBodG1sIGNvZGUKKyAgICAgICAgYXNzZXJ0IHNvdXJjZV9jb2Rl LmZpbmQoCisgICAgICAgICAgICBzdHJpbmdfdG9fZmluZAorICAgICAgICApICE9IC0xLCAiezB9 IG1pZ2h0IGJlIHZ1bG5lcmFibGUgdG8gWFNTICIuZm9ybWF0KHNvdXJjZSkKKworICAgIGRlZiBf Y2hlY2tfZmlsZV9zb3J0aW5nKHNlbGYpOgorICAgICAgICBzZWxmLnBhZ2UuZmluZF9ieV9pZCgi YnRuLWxvYWQtZmlsZSIpLmNsaWNrKCkKKyAgICAgICAgc2VsZi53YWl0LnVudGlsKAorICAgICAg ICAgICAgRUMuZWxlbWVudF90b19iZV9jbGlja2FibGUoKAorICAgICAgICAgICAgICAgIEJ5LkNT U19TRUxFQ1RPUiwKKyAgICAgICAgICAgICAgICAiI2NvbnRlbnRzIHRoW2RhdGEtY29sdW1uPScw J10iKQorICAgICAgICAgICAgKQorICAgICAgICApCisKKyAgICAgICAgIyBBZGRlZCB0aW1lLnNs ZWVwIHNvIHRoYXQgdGhlIGVsZW1lbnQgdG8gYmUgY2xpY2tlZC4KKyAgICAgICAgdGltZS5zbGVl cCgwLjA1KQorICAgICAgICBzZWxmLnBhZ2UuZmluZF9ieV9jc3Nfc2VsZWN0b3IoIiNjb250ZW50 cyB0aFtkYXRhLWNvbHVtbj0nMCddIikuY2xpY2soKQorICAgICAgICAjIENoZWNrIGZvciBzb3J0 IEFzY2VuZGluZworICAgICAgICBzZWxmLndhaXQudW50aWwoCisgICAgICAgICAgICBFQy5wcmVz ZW5jZV9vZl9lbGVtZW50X2xvY2F0ZWQoKAorICAgICAgICAgICAgICAgIEJ5LkNTU19TRUxFQ1RP UiwKKyAgICAgICAgICAgICAgICAiI2NvbnRlbnRzIHRoW2RhdGEtY29sdW1uPScwJ10udGFibGVz b3J0ZXItaGVhZGVyQXNjIikKKyAgICAgICAgICAgICkKKyAgICAgICAgKQorCisgICAgICAgICMg Q2xpY2sgYW5kIENoZWNrIGZvciBzb3J0IERlc2NlbmRpbmcKKyAgICAgICAgc2VsZi5wYWdlLmZp bmRfYnlfY3NzX3NlbGVjdG9yKCIjY29udGVudHMgdGhbZGF0YS1jb2x1bW49JzAnXSIpLmNsaWNr KCkKKyAgICAgICAgc2VsZi53YWl0LnVudGlsKAorICAgICAgICAgICAgRUMucHJlc2VuY2Vfb2Zf ZWxlbWVudF9sb2NhdGVkKCgKKyAgICAgICAgICAgICAgICBCeS5DU1NfU0VMRUNUT1IsCisgICAg ICAgICAgICAgICAgIiNjb250ZW50cyB0aFtkYXRhLWNvbHVtbj0nMCddLnRhYmxlc29ydGVyLWhl YWRlckRlc2MiKQorICAgICAgICAgICAgKQorICAgICAgICApCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9mZWF0dXJlX3Rlc3RzL3hzc19jaGVja3NfZmlsZV9tYW5hZ2VyX3Rlc3QucHkgYi93ZWIv cGdhZG1pbi9mZWF0dXJlX3Rlc3RzL3hzc19jaGVja3NfZmlsZV9tYW5hZ2VyX3Rlc3QucHkKZGVs ZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDYwZDdlOTEuLjAwMDAwMDAKLS0tIGEvd2ViL3Bn YWRtaW4vZmVhdHVyZV90ZXN0cy94c3NfY2hlY2tzX2ZpbGVfbWFuYWdlcl90ZXN0LnB5CisrKyAv ZGV2L251bGwKQEAgLTEsMTI2ICswLDAgQEAKLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0jCi0jIHBnQWRt aW4gNCAtIFBvc3RncmVTUUwgVG9vbHMKLSMKLSMgQ29weXJpZ2h0IChDKSAyMDEzIC0gMjAxOCwg VGhlIHBnQWRtaW4gRGV2ZWxvcG1lbnQgVGVhbQotIyBUaGlzIHNvZnR3YXJlIGlzIHJlbGVhc2Vk IHVuZGVyIHRoZSBQb3N0Z3JlU1FMIExpY2VuY2UKLSMKLSMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjCi0KLWlt cG9ydCBvcwotaW1wb3J0IHRpbWUKLWZyb20gc2VsZW5pdW0ud2ViZHJpdmVyLmNvbW1vbi5rZXlz IGltcG9ydCBLZXlzCi1mcm9tIHNlbGVuaXVtLndlYmRyaXZlci5zdXBwb3J0LnVpIGltcG9ydCBX ZWJEcml2ZXJXYWl0Ci1mcm9tIHNlbGVuaXVtLndlYmRyaXZlci5jb21tb24uYnkgaW1wb3J0IEJ5 Ci1mcm9tIHNlbGVuaXVtLndlYmRyaXZlci5zdXBwb3J0IGltcG9ydCBleHBlY3RlZF9jb25kaXRp b25zIGFzIEVDCi1mcm9tIHJlZ3Jlc3Npb24ucHl0aG9uX3Rlc3RfdXRpbHMgaW1wb3J0IHRlc3Rf dXRpbHMKLWZyb20gcmVncmVzc2lvbi5mZWF0dXJlX3V0aWxzLmJhc2VfZmVhdHVyZV90ZXN0IGlt cG9ydCBCYXNlRmVhdHVyZVRlc3QKLQotCi1jbGFzcyBDaGVja0ZpbGVNYW5hZ2VyRmVhdHVyZVRl c3QoQmFzZUZlYXR1cmVUZXN0KToKLSAgICAiIiJUZXN0cyB0byBjaGVjayBmaWxlIG1hbmFnZXIg Zm9yIFhTUy4iIiIKLQotICAgIHNjZW5hcmlvcyA9IFsKLSAgICAgICAgKCJUZXN0cyB0byBjaGVj ayBpZiBGaWxlIG1hbmFnZXIgaXMgdnVsbmVyYWJsZSB0byBYU1MiLAotICAgICAgICAgZGljdCgp KQotICAgIF0KLQotICAgIGRlZiBiZWZvcmUoc2VsZik6Ci0gICAgICAgIGNvbm5lY3Rpb24gPSB0 ZXN0X3V0aWxzLmdldF9kYl9jb25uZWN0aW9uKAotICAgICAgICAgICAgc2VsZi5zZXJ2ZXJbJ2Ri J10sCi0gICAgICAgICAgICBzZWxmLnNlcnZlclsndXNlcm5hbWUnXSwKLSAgICAgICAgICAgIHNl bGYuc2VydmVyWydkYl9wYXNzd29yZCddLAotICAgICAgICAgICAgc2VsZi5zZXJ2ZXJbJ2hvc3Qn XSwKLSAgICAgICAgICAgIHNlbGYuc2VydmVyWydwb3J0J10KLSAgICAgICAgKQotICAgICAgICB0 ZXN0X3V0aWxzLmRyb3BfZGF0YWJhc2UoY29ubmVjdGlvbiwgImFjY2VwdGFuY2VfdGVzdF9kYiIp Ci0gICAgICAgIHRlc3RfdXRpbHMuY3JlYXRlX2RhdGFiYXNlKHNlbGYuc2VydmVyLCAiYWNjZXB0 YW5jZV90ZXN0X2RiIikKLSAgICAgICAgc2VsZi5wYWdlLmFkZF9zZXJ2ZXIoc2VsZi5zZXJ2ZXIp Ci0gICAgICAgIHNlbGYud2FpdCA9IFdlYkRyaXZlcldhaXQoc2VsZi5wYWdlLmRyaXZlciwgMTAp Ci0gICAgICAgIHNlbGYuWFNTX0ZJTEUgPSAnL3RtcC88aW1nIHNyYz14IG9ubW91c2VvdmVyPWFs ZXJ0KCIxIik+LnNxbCcKLSAgICAgICAgIyBSZW1vdmUgYW55IHByZXZpb3VzIGZpbGUKLSAgICAg ICAgaWYgb3MucGF0aC5pc2ZpbGUoc2VsZi5YU1NfRklMRSk6Ci0gICAgICAgICAgICBvcy5yZW1v dmUoc2VsZi5YU1NfRklMRSkKLQotICAgIGRlZiBhZnRlcihzZWxmKToKLSAgICAgICAgc2VsZi5w YWdlLmNsb3NlX3F1ZXJ5X3Rvb2woJ3NxbCcsIEZhbHNlKQotICAgICAgICBzZWxmLnBhZ2UucmVt b3ZlX3NlcnZlcihzZWxmLnNlcnZlcikKLSAgICAgICAgY29ubmVjdGlvbiA9IHRlc3RfdXRpbHMu Z2V0X2RiX2Nvbm5lY3Rpb24oCi0gICAgICAgICAgICBzZWxmLnNlcnZlclsnZGInXSwKLSAgICAg ICAgICAgIHNlbGYuc2VydmVyWyd1c2VybmFtZSddLAotICAgICAgICAgICAgc2VsZi5zZXJ2ZXJb J2RiX3Bhc3N3b3JkJ10sCi0gICAgICAgICAgICBzZWxmLnNlcnZlclsnaG9zdCddLAotICAgICAg ICAgICAgc2VsZi5zZXJ2ZXJbJ3BvcnQnXQotICAgICAgICApCi0gICAgICAgIHRlc3RfdXRpbHMu ZHJvcF9kYXRhYmFzZShjb25uZWN0aW9uLCAiYWNjZXB0YW5jZV90ZXN0X2RiIikKLQotICAgIGRl ZiBydW5UZXN0KHNlbGYpOgotICAgICAgICBzZWxmLl9uYXZpZ2F0ZV90b19xdWVyeV90b29sKCkK LSAgICAgICAgc2VsZi5wYWdlLmZpbGxfY29kZW1pcnJvcl9hcmVhX3dpdGgoIlNFTEVDVCAxOyIp Ci0gICAgICAgIHNlbGYuX2NyZWF0ZV9uZXdfZmlsZSgpCi0gICAgICAgIHNlbGYuX29wZW5fZmls ZV9tYW5hZ2VyX2FuZF9jaGVja194c3NfZmlsZSgpCi0KLSAgICBkZWYgX25hdmlnYXRlX3RvX3F1 ZXJ5X3Rvb2woc2VsZik6Ci0gICAgICAgIHNlbGYucGFnZS50b2dnbGVfb3Blbl90cmVlX2l0ZW0o c2VsZi5zZXJ2ZXJbJ25hbWUnXSkKLSAgICAgICAgc2VsZi5wYWdlLnRvZ2dsZV9vcGVuX3RyZWVf aXRlbSgnRGF0YWJhc2VzJykKLSAgICAgICAgc2VsZi5wYWdlLnRvZ2dsZV9vcGVuX3RyZWVfaXRl bSgnYWNjZXB0YW5jZV90ZXN0X2RiJykKLSAgICAgICAgc2VsZi5wYWdlLm9wZW5fcXVlcnlfdG9v bCgpCi0KLSAgICBkZWYgX2NyZWF0ZV9uZXdfZmlsZShzZWxmKToKLSAgICAgICAgc2VsZi5wYWdl LmZpbmRfYnlfaWQoImJ0bi1zYXZlIikuY2xpY2soKQotICAgICAgICBzZWxmLnBhZ2Uud2FpdF9m b3JfcXVlcnlfdG9vbF9sb2FkaW5nX2luZGljYXRvcl90b19kaXNhcHBlYXIoKQotICAgICAgICBz ZWxmLndhaXQudW50aWwoRUMucHJlc2VuY2Vfb2ZfZWxlbWVudF9sb2NhdGVkKAotICAgICAgICAg ICAgKAotICAgICAgICAgICAgICAgIEJ5LlhQQVRILAotICAgICAgICAgICAgICAgICIvLypbY29u dGFpbnMoc3RyaW5nKCksICdTaG93IGhpZGRlbiBmaWxlcyBhbmQgZm9sZGVycz8gJyldIgotICAg ICAgICAgICAgKQotICAgICAgICApKQotICAgICAgICAjIFNldCB0aGUgWFNTIHZhbHVlIGluIGlu cHV0Ci0gICAgICAgIHNlbGYucGFnZS5maW5kX2J5X2lkKCJmaWxlLWlucHV0LXBhdGgiKS5jbGVh cigpCi0gICAgICAgIHNlbGYucGFnZS5maW5kX2J5X2lkKCJmaWxlLWlucHV0LXBhdGgiKS5zZW5k X2tleXMoCi0gICAgICAgICAgICBzZWxmLlhTU19GSUxFCi0gICAgICAgICkKLSAgICAgICAgIyBT YXZlIHRoZSBmaWxlCi0gICAgICAgIHNlbGYucGFnZS5jbGlja19tb2RhbCgnU2F2ZScpCi0gICAg ICAgIHNlbGYucGFnZS53YWl0X2Zvcl9xdWVyeV90b29sX2xvYWRpbmdfaW5kaWNhdG9yX3RvX2Rp c2FwcGVhcigpCi0KLSAgICBkZWYgX29wZW5fZmlsZV9tYW5hZ2VyX2FuZF9jaGVja194c3NfZmls ZShzZWxmKToKLSAgICAgICAgc2VsZi5wYWdlLmZpbmRfYnlfaWQoImJ0bi1sb2FkLWZpbGUiKS5j bGljaygpCi0gICAgICAgIHNlbGYud2FpdC51bnRpbChFQy5wcmVzZW5jZV9vZl9lbGVtZW50X2xv Y2F0ZWQoCi0gICAgICAgICAgICAoCi0gICAgICAgICAgICAgICAgQnkuWFBBVEgsCi0gICAgICAg ICAgICAgICAgIi8vKltjb250YWlucyhzdHJpbmcoKSwgJ1Nob3cgaGlkZGVuIGZpbGVzIGFuZCBm b2xkZXJzPyAnKV0iCi0gICAgICAgICAgICApCi0gICAgICAgICkpCi0gICAgICAgIHNlbGYucGFn ZS5maW5kX2J5X2lkKCJmaWxlLWlucHV0LXBhdGgiKS5jbGVhcigpCi0gICAgICAgIHNlbGYucGFn ZS5maW5kX2J5X2lkKCJmaWxlLWlucHV0LXBhdGgiKS5zZW5kX2tleXMoCi0gICAgICAgICAgICAn L3RtcC8nCi0gICAgICAgICkKLSAgICAgICAgc2VsZi5wYWdlLmZpbmRfYnlfaWQoImZpbGUtaW5w dXQtcGF0aCIpLnNlbmRfa2V5cygKLSAgICAgICAgICAgIEtleXMuUkVUVVJOCi0gICAgICAgICkK LQotICAgICAgICBpZiBzZWxmLnBhZ2UuZHJpdmVyLmNhcGFiaWxpdGllc1snYnJvd3Nlck5hbWUn XSA9PSAnZmlyZWZveCc6Ci0gICAgICAgICAgICB0YWJsZSA9IHNlbGYucGFnZS53YWl0X2Zvcl9l bGVtZW50X3RvX3JlbG9hZCgKLSAgICAgICAgICAgICAgICBsYW1iZGEgZHJpdmVyOgotICAgICAg ICAgICAgICAgIGRyaXZlci5maW5kX2VsZW1lbnRfYnlfY3NzX3NlbGVjdG9yKCJ0YWJsZSNjb250 ZW50cyIpCi0gICAgICAgICAgICApCi0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICB0YWJsZSA9 IHNlbGYucGFnZS5kcml2ZXIgXAotICAgICAgICAgICAgICAgIC5maW5kX2VsZW1lbnRfYnlfY3Nz X3NlbGVjdG9yKCJ0YWJsZSNjb250ZW50cyIpCi0KLSAgICAgICAgY29udGVudHMgPSB0YWJsZS5n ZXRfYXR0cmlidXRlKCdpbm5lckhUTUwnKQotCi0gICAgICAgIHNlbGYucGFnZS5jbGlja19tb2Rh bCgnQ2FuY2VsJykKLSAgICAgICAgc2VsZi5wYWdlLndhaXRfZm9yX3F1ZXJ5X3Rvb2xfbG9hZGlu Z19pbmRpY2F0b3JfdG9fZGlzYXBwZWFyKCkKLSAgICAgICAgc2VsZi5fY2hlY2tfZXNjYXBlZF9j aGFyYWN0ZXJzKAotICAgICAgICAgICAgY29udGVudHMsCi0gICAgICAgICAgICAnJmx0O2ltZyBz cmM9eCBvbm1vdXNlb3Zlcj1hbGVydCgiMSIpJmd0Oy5zcWwnLAotICAgICAgICAgICAgJ0ZpbGUg bWFuYWdlcicKLSAgICAgICAgKQotCi0gICAgZGVmIF9jaGVja19lc2NhcGVkX2NoYXJhY3RlcnMo c2VsZiwgc291cmNlX2NvZGUsIHN0cmluZ190b19maW5kLCBzb3VyY2UpOgotICAgICAgICAjIEZv ciBYU1Mgd2UgbmVlZCB0byBzZWFyY2ggYWdhaW5zdCBlbGVtZW50J3MgaHRtbCBjb2RlCi0gICAg ICAgIGFzc2VydCBzb3VyY2VfY29kZS5maW5kKAotICAgICAgICAgICAgc3RyaW5nX3RvX2ZpbmQK LSAgICAgICAgKSAhPSAtMSwgInswfSBtaWdodCBiZSB2dWxuZXJhYmxlIHRvIFhTUyAiLmZvcm1h dChzb3VyY2UpCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9zdGF0 aWMvY3NzL2ZpbGVfbWFuYWdlci5jc3MgYi93ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9z dGF0aWMvY3NzL2ZpbGVfbWFuYWdlci5jc3MKaW5kZXggNmU0ZWU5ZS4uNmU3Njc5NSAxMDA2NDQK LS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2Nzcy9maWxlX21hbmFn ZXIuY3NzCisrKyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9jc3MvZmls ZV9tYW5hZ2VyLmNzcwpAQCAtMjMzLDE3ICsyMzMsNiBAQCBkaXYuY2xpcCB7CiAgIGNvbG9yOiAj ZmZmOwogfQogCi0uZmlsZV9saXN0aW5nICNjb250ZW50cy5saXN0IHRoLnRhYmxlc29ydGVyLWhl YWRlckFzYywKLS5maWxlX2xpc3RpbmcgI2NvbnRlbnRzLmxpc3QgdGgudGFibGVzb3J0ZXItaGVh ZGVyRGVzYyB7Ci0gIGJhY2tncm91bmQ6IHJnYigyMTQsMjEyLDIwOSk7IC8qIE9sZCBicm93c2Vy cyAqLwotICBiYWNrZ3JvdW5kOiAtbW96LWxpbmVhci1ncmFkaWVudCh0b3AsIHJnYmEoMjE0LDIx MiwyMDksMSkgMCUsIHJnYmEoMjQ0LDI0MSwyMzcsMSkgMTAwJSk7IC8qIEZGMy42KyAqLwotICBi YWNrZ3JvdW5kOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9t LCBjb2xvci1zdG9wKDAlLHJnYmEoMjE0LDIxMiwyMDksMSkpLCBjb2xvci1zdG9wKDEwMCUscmdi YSgyNDQsMjQxLDIzNywxKSkpOyAvKiBDaHJvbWUsU2FmYXJpNCsgKi8KLSAgYmFja2dyb3VuZDog LXdlYmtpdC1saW5lYXItZ3JhZGllbnQodG9wLCByZ2JhKDIxNCwyMTIsMjA5LDEpIDAlLHJnYmEo MjQ0LDI0MSwyMzcsMSkgMTAwJSk7IC8qIENocm9tZTEwKyxTYWZhcmk1LjErICovCi0gIGJhY2tn cm91bmQ6IC1vLWxpbmVhci1ncmFkaWVudCh0b3AsIHJnYmEoMjE0LDIxMiwyMDksMSkgMCUscmdi YSgyNDQsMjQxLDIzNywxKSAxMDAlKTsgLyogT3BlcmEgMTEuMTArICovCi0gIGJhY2tncm91bmQ6 IC1tcy1saW5lYXItZ3JhZGllbnQodG9wLCByZ2JhKDIxNCwyMTIsMjA5LDEpIDAlLHJnYmEoMjQ0 LDI0MSwyMzcsMSkgMTAwJSk7IC8qIElFMTArICovCi0gIGJhY2tncm91bmQ6IGxpbmVhci1ncmFk aWVudCh0byBib3R0b20sIHJnYmEoMjE0LDIxMiwyMDksMSkgMCUscmdiYSgyNDQsMjQxLDIzNywx KSAxMDAlKTsgLyogVzNDICovCi19Ci0KIC5maWxlX2xpc3RpbmcgI2NvbnRlbnRzLmxpc3QgdGQ6 Zmlyc3QtY2hpbGQgewogICBkaXNwbGF5OiB0YWJsZS1jZWxsOwogICBwYWRkaW5nLWxlZnQ6IDA7 CkBAIC03MjksMyArNzE4LDQzIEBAIGEuZHotcmVtb3ZlIHsKIGRpdi5jaGFuZ2VfZmlsZV90eXBl cyBzcGFuIHsKICAgcGFkZGluZy1sZWZ0OjEwcHg7CiB9CisKKy8qIG92ZXJhbGwgKi8KKy50YWJs ZXNvcnRlciAuaGVhZGVyLAorLnRhYmxlc29ydGVyIC50YWJsZXNvcnRlci1oZWFkZXIgeworCS8q IGJsYWNrICh1bnNvcnRlZCkgZG91YmxlIGFycm93ICovCisJYmFja2dyb3VuZC1pbWFnZTogdXJs KGRhdGE6aW1hZ2UvZ2lmO2Jhc2U2NCxSMGxHT0RsaEZRQUpBSUFBQUNNdE1QLy8veUg1QkFFQUFB RUFMQUFBQUFBVkFBa0FBQUlYakkrQXl3bmFZbmhVTW9xdDNnWlhQbVZnOTR5SlZRQUFPdz09KTsK KwliYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OworCWJhY2tncm91bmQtcG9zaXRpb246IGNl bnRlciByaWdodDsKKwlwYWRkaW5nOiA0cHggMThweCA0cHggNHB4OworCXdoaXRlLXNwYWNlOiBu b3JtYWw7CisJY3Vyc29yOiBwb2ludGVyOworfQorCisudGFibGVzb3J0ZXIgLmhlYWRlclNvcnRV cCwKKy50YWJsZXNvcnRlciAudGFibGVzb3J0ZXItaGVhZGVyU29ydFVwLAorLnRhYmxlc29ydGVy IC50YWJsZXNvcnRlci1oZWFkZXJBc2MgeworCS8qIGJsYWNrIGFzYyBhcnJvdyAqLworCWJhY2tn cm91bmQtaW1hZ2U6IHVybChkYXRhOmltYWdlL2dpZjtiYXNlNjQsUjBsR09EbGhGUUFFQUlBQUFD TXRNUC8vL3lINUJBRUFBQUVBTEFBQUFBQVZBQVFBQUFJTmpJOEJ5YTJ3bklOVU1vcFpBUUE3KTsK K30KKworLnRhYmxlc29ydGVyIC5oZWFkZXJTb3J0RG93biwKKy50YWJsZXNvcnRlciAudGFibGVz b3J0ZXItaGVhZGVyU29ydERvd24sCisudGFibGVzb3J0ZXIgLnRhYmxlc29ydGVyLWhlYWRlckRl c2MgeworCS8qIGJsYWNrIGRlc2MgYXJyb3cgKi8KKwliYWNrZ3JvdW5kLWltYWdlOiB1cmwoZGF0 YTppbWFnZS9naWY7YmFzZTY0LFIwbEdPRGxoRlFBRUFJQUFBQ010TVAvLy95SDVCQUVBQUFFQUxB QUFBQUFWQUFRQUFBSU5qQitnQytqUDJwdG4wV3NrTFFBNyk7Cit9CisKKy50YWJsZXNvcnRlciB0 aGVhZCAuc29ydGVyLWZhbHNlIHsKKwliYWNrZ3JvdW5kLWltYWdlOiBub25lOworCWN1cnNvcjog ZGVmYXVsdDsKKwlwYWRkaW5nOiA0cHg7Cit9CisKKy8qIHRhYmxlIHByb2Nlc3NpbmcgaW5kaWNh dG9yICovCisudGFibGVzb3J0ZXIgLnRhYmxlc29ydGVyLXByb2Nlc3NpbmcgeworCWJhY2tncm91 bmQtcG9zaXRpb246IGNlbnRlciBjZW50ZXIgIWltcG9ydGFudDsKKwliYWNrZ3JvdW5kLXJlcGVh dDogbm8tcmVwZWF0ICFpbXBvcnRhbnQ7CisJYmFja2dyb3VuZC1pbWFnZTogdXJsKCdkYXRhOmlt YWdlL2dpZjtiYXNlNjQsUjBsR09EbGhGQUFVQUtFQUFPN3U3bHBhV2dBQUFBQUFBQ0gvQzA1RlZG TkRRVkJGTWk0d0F3RUFBQUFoK1FRQkNnQUNBQ3dBQUFBQUZBQVVBQUFDUVpSdm9JRHR1MXdMUVVB bHFLVFZ4cXdoWElpQm5EZzZZNGV5eDRsS1c1WEs3d3JMZUszdmJxOEoyVzRUNGUxbk1ocFdyWkNU dDN4S1o4a2dzZ2dkSm1VRkFDSDVCQUVLQUFJQUxBY0FBQUFMQUFjQUFBSVVWQjZpaTdqYWpnQ0F1 VW10b3Z4dFhubWRVQUFBSWZrRUFRb0FBZ0FzRFFBQ0FBY0FDd0FBQWhSVUlwbUh5LzNnVVZRQVFP OU5ldHV1Z0NGV0FBQWgrUVFCQ2dBQ0FDd05BQWNBQndBTEFBQUNFNVFWY1pqS2JWbzZjazJBRjk1 bTUvNkJTd0VBSWZrRUFRb0FBZ0FzQndBTkFBc0FCd0FBQWhPVUgza3I2UWFBY1NyR1dlMVZRbCtt TVVJQkFDSDVCQUVLQUFJQUxBSUFEUUFMQUFjQUFBSVVsSUNtaDduY1RBZ3FpamtydURpdjduMllV QUFBSWZrRUFRb0FBZ0FzQUFBSEFBY0FDd0FBQWhRVUlHbUh5ZWRlaElvcUZYTEtmUE9BYVpkV0FB QWgrUVFGQ2dBQ0FDd0FBQUlBQndBTEFBQUNGSlFGY0ppWGIxNXpMWVJsN2NsYThPdGxHR2dVQURz PScpICFpbXBvcnRhbnQ7Cit9CisKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9t YW5hZ2VyL3N0YXRpYy9qcy91dGlsaXR5LmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFn ZXIvc3RhdGljL2pzL3V0aWxpdHkuanMKaW5kZXggY2UzY2QxNy4uZTVkYWM4NCAxMDA2NDQKLS0t IGEvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3V0aWxpdHkuanMKKysr IGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3V0aWxpdHkuanMKQEAg LTEzLDYgKzEzLDcgQEAgaW1wb3J0IGxvYWRpbmdfaWNvbiBmcm9tICdhY2l0cmVlL2ltYWdlL2xv YWQtcm9vdC5naWYnOwogZGVmaW5lKFsKICAgJ2pxdWVyeScsICd1bmRlcnNjb3JlJywgJ3VuZGVy c2NvcmUuc3RyaW5nJywgJ3BnYWRtaW4uYWxlcnRpZnlqcycsCiAgICdzb3VyY2VzL2dldHRleHQn LCAnc291cmNlcy91cmxfZm9yJywgJ2Ryb3B6b25lJywgJ3NvdXJjZXMvcGdhZG1pbicsCisgICd0 YWJsZXNvcnRlcicsCiBdLCBmdW5jdGlvbigkLCBfLCBTLCBBbGVydGlmeSwgZ2V0dGV4dCwgdXJs X2ZvciwgRHJvcHpvbmUsIHBnQWRtaW4pIHsKIAogICAvKi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpAQCAtNTc0LDggKzU3NSw4IEBAIGRl ZmluZShbCiAKICAgICAgICAgICAgIHJlc3VsdCArPSAnPC91bD4nOwogICAgICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICByZXN1bHQgKz0gJzx0YWJsZSBpZD0iY29udGVudHMiIGNsYXNzPSJs aXN0Ij4nOwotICAgICAgICAgICAgcmVzdWx0ICs9ICc8dGhlYWQ+PHRyPjx0aCBjbGFzcz0iaGVh ZGVyU29ydERvd24iPic7CisgICAgICAgICAgICByZXN1bHQgKz0gJzx0YWJsZSBpZD0iY29udGVu dHMiIGNsYXNzPSJsaXN0IHRhYmxlc29ydGVyIj4nOworICAgICAgICAgICAgcmVzdWx0ICs9ICc8 dGhlYWQ+PHRyPjx0aD4nOwogICAgICAgICAgICAgcmVzdWx0ICs9ICc8c3Bhbj4nICsgbGcubmFt ZSArICc8L3NwYW4+PC90aD4nOwogICAgICAgICAgICAgcmVzdWx0ICs9ICc8dGg+PHNwYW4+JyAr IGxnLnNpemUgKyAnPC9zcGFuPjwvdGg+PHRoPic7CiAgICAgICAgICAgICByZXN1bHQgKz0gJzxz cGFuPicgKyBsZy5tb2RpZmllZCArICc8L3NwYW4+PC90aD48L3RyPjwvdGhlYWQ+JzsKQEAgLTY0 OSw4ICs2NTAsOCBAQCBkZWZpbmUoWwogICAgICAgICAgIGlmICgkKCcuZmlsZWluZm8nKS5kYXRh KCd2aWV3JykgPT0gJ2dyaWQnKSB7CiAgICAgICAgICAgICByZXN1bHQgKz0gJzx1bCBpZD0iY29u dGVudHMiIGNsYXNzPSJncmlkIj48L3VsPic7CiAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIHJlc3VsdCArPSAnPHRhYmxlIGlkPSJjb250ZW50cyIgY2xhc3M9Imxpc3QiPic7Ci0gICAg ICAgICAgICByZXN1bHQgKz0gJzx0aGVhZD48dHI+PHRoIGNsYXNzPSJoZWFkZXJTb3J0RG93biI+ PHNwYW4+JyArCisgICAgICAgICAgICByZXN1bHQgKz0gJzx0YWJsZSBpZD0iY29udGVudHMiIGNs YXNzPSJsaXN0IHRhYmxlc29ydGVyIj4nOworICAgICAgICAgICAgcmVzdWx0ICs9ICc8dGhlYWQ+ PHRyPjx0aD48c3Bhbj4nICsKICAgICAgICAgICAgICAgbGcubmFtZSArICc8L3NwYW4+PC90aD48 dGg+PHNwYW4+JyArIGxnLnNpemUgKwogICAgICAgICAgICAgICAnPC9zcGFuPjwvdGg+PHRoPjxz cGFuPicgKyBsZy5tb2RpZmllZCArCiAgICAgICAgICAgICAgICc8L3NwYW4+PC90aD48L3RyPjwv dGhlYWQ+JzsKQEAgLTY2Nyw2ICs2NjgsMTMgQEAgZGVmaW5lKFsKIAogICAgICAgICAvLyBBZGQg dGhlIG5ldyBtYXJrdXAgdG8gdGhlIERPTS4KICAgICAgICAgJCgnLmZpbGVpbmZvIC5maWxlX2xp c3RpbmcnKS5odG1sKHJlc3VsdCk7CisgICAgICAgICQoJy5maWxlaW5mbyAuZmlsZV9saXN0aW5n ICNjb250ZW50cycpLnRhYmxlc29ydGVyKHsKKyAgICAgICAgICBoZWFkZXJzOiB7CisgICAgICAg ICAgICAyOiB7CisgICAgICAgICAgICAgIHNvcnRlcjogJ3Nob3J0RGF0ZScsCisgICAgICAgICAg ICB9LAorICAgICAgICAgIH0sCisgICAgICAgIH0pOwogCiAgICAgICAgIC8vIHJlbmFtZSBmaWxl L2ZvbGRlcgogICAgICAgICAkKCcuZmlsZV9tYW5hZ2VyIGJ1dHRvbi5yZW5hbWUnKS5vZmYoKS5v bignY2xpY2snLCBmdW5jdGlvbihlKSB7Cg== --000000000000be44a3056f347339--