From unknown Fri May 01 17:16:26 2026 X-Loop: owner@bugs.x2go.org Subject: Bug#1183: Pass broker creds to RDP client as plaintext Reply-To: Walid MOGHRABI , 1183@bugs.x2go.org Resent-From: Walid MOGHRABI Resent-To: x2go-dev@lists.x2go.org Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Wed, 31 May 2017 14:45:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: report 1183 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: patch Received: via spool by submit@bugs.x2go.org id=B.149624166212950 (code B); Wed, 31 May 2017 14:45:02 +0000 Received: (at submit) by bugs.x2go.org; 31 May 2017 14:41:02 +0000 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-0.5 required=3.0 tests=BAYES_05,RCVD_IN_DNSWL_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.1 Received: from localhost (localhost [127.0.0.1]) by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 683805DAD3 for ; Wed, 31 May 2017 16:41:00 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at ymir.das-netzwerkteam.de Received: from ymir.das-netzwerkteam.de ([127.0.0.1]) by localhost (ymir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T0XKuv2dxFeh for ; Wed, 31 May 2017 16:40:53 +0200 (CEST) Received: from zm-01.servicemagic.eu (zm-01.servicemagic.eu [176.31.236.17]) by ymir.das-netzwerkteam.de (Postfix) with ESMTPS id 92B935DACE for ; Wed, 31 May 2017 16:40:53 +0200 (CEST) Received: from localhost (localhost.localdomain [127.0.0.1]) by zm-01.servicemagic.eu (Postfix) with ESMTP id 39A1380A921FB for ; Wed, 31 May 2017 16:40:50 +0200 (CEST) X-Amavis-Modified: Mail body modified (using disclaimer) - zm-01.servicemagic.eu X-Virus-Scanned: amavisd-new at servicemagic.eu Received: from zm-01.servicemagic.eu ([127.0.0.1]) by localhost (zm-01.servicemagic.eu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4JGhYKAUZMkQ for ; Wed, 31 May 2017 16:40:49 +0200 (CEST) Received: from zm-01.servicemagic.eu (localhost.localdomain [127.0.0.1]) by zm-01.servicemagic.eu (Postfix) with ESMTP id B3E3E807FF98B for ; Wed, 31 May 2017 16:40:49 +0200 (CEST) Date: Wed, 31 May 2017 16:40:49 +0200 (CEST) From: Walid MOGHRABI To: submit@bugs.x2go.org Message-ID: <1693780969.10950067.1496241649670.JavaMail.root@servicemagic.eu> In-Reply-To: <1917592832.211198.1490277173586.JavaMail.root@servicemagic.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_10950065_501909624.1496241649669" X-Originating-IP: [10.33.100.52] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - GC58 (Linux)/7.2.0_GA_2669) ------=_Part_10950065_501909624.1496241649669 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit package: x2goclient priority: wishlist tags: patch This is a proposal patch in order to let the RDP client use the credentials used at broker auth login so that users can enter them only once in broker mode. This patch also add support for --close-disconnect in broker mode + RDP Regards, Walid Moghrabi TRAVAUX.COM BAT I - PARC CEZANNE 2 290 AVENUE GALILEE - CS 80403 13591 AIX EN PROVENCE CEDEX 3 --- DISCLAIMER: This e-mail is private and confidential and may contain proprietary or legally privileged information. It is for the intended recipient only. If you have received this email in error, please notify the author by replying to it and then destroy it. If you are not the intended recipient you must not use, disclose, distribute, copy, print or rely on this e-mail or any attachment. Thank you ------=_Part_10950065_501909624.1496241649669 Content-Type: text/x-patch; name=x2goclient-pass-broker-creds-to-rdp-client.patch Content-Disposition: attachment; filename=x2goclient-pass-broker-creds-to-rdp-client.patch Content-Transfer-Encoding: base64 LS0tIC9ob21lL3dhbGlkL0J1cmVhdS94MmdvY2xpZW50LWN1cnJlbnQvc3JjL2hlbHAuY3BwCisr KyAvaG9tZS93YWxpZC9CdXJlYXUveDJnb2NsaWVudC9zcmMvaGVscC5jcHAKQEAgLTE1OCw2ICsx NTgsNyBAQAogICBBRERfT1BUICgiLS1icm9rZXItc3NoLWtleT08cGF0aCB0byBrZXk+IiwgUVRf VFJBTlNMQVRFX05PT1AgKCJIZWxwIiwgIlNldHMgdGhlIHBhdGggdG8gYW4gU1NIIGtleSB0byB1 c2UgZm9yIGF1dGhlbnRpY2F0aW9uIGFnYWluc3QgYW4gU1NIIHNlc3Npb24gYnJva2VyLiBUaGUg Y2xpZW50J3MgYmVoYXZpb3IgaXMgdW5kZWZpbmVkIGlmIHRoaXMgZmxhZyBpcyB1c2VkIGZvciBu b24tU1NIIHNlc3Npb24gYnJva2Vycy4iKSk7CiAgIEFERF9PUFQgKCItLWJyb2tlci1hdXRvbG9n aW4iLCBRVF9UUkFOU0xBVEVfTk9PUCAoIkhlbHAiLCAiRW5hYmxlcyB0aGUgdXNlIG9mIHRoZSBk ZWZhdWx0IFNTSCBrZXkgb3IgU1NIIGFnZW50IGZvciBhdXRoZW50aWNhdGlvbiBhZ2FpbnN0IGFu IFNTSCBzZXNzaW9uIGJyb2tlci4gVGhlIGNsaWVudCdzIGJlaGF2aW9yIGlzIHVuZGVmaW5lZCBp ZiB0aGlzIGZsYWcgaXMgdXNlZCBmb3Igbm9uLVNTSCBzZXNzaW9uIGJyb2tlcnMuIikpOwogICBB RERfT1BUICgiLS1icm9rZXItbm9hdXRoIiwgUVRfVFJBTlNMQVRFX05PT1AgKCJIZWxwIiwgIkRv ZXMgbm90IGFzayBmb3IgdXNlciBjcmVkZW50aWFscyBkdXJpbmcgc2Vzc2lvbiBicm9rZXIgYXV0 aGVudGljYXRpb24uIFRoaXMgY2FuIGJlIHVzZWZ1bCBpZiB5b3UgYXJlIHVzaW5nIGFuIEhUVFAo Uykgc2Vzc2lvbiBicm9rZXIgd2l0aG91dCBhdXRoZW50aWNhdGlvbi4gSWYgeW91IHJ1biBhbiBI VFRQKFMpIHNlcnZlciB3aXRob3V0IGF1dGhlbnRpY2F0aW9uLCBidXQgd2l0aCB1c2VyLXNwZWNp ZmljIHByb2ZpbGVzLCB0aGVuIHB1dCB0aGUgdXNlciBuYW1lIGludG8gdGhlIGJyb2tlciBVUkwg KHJlZmVyIHRvIC0tYnJva2VyLXVybC4pIFRoZSB1c2VyIG5hbWUgdGhlbiB3aWxsIGJlIGV4dHJh Y3RlZCBmcm9tIHRoZSBicm9rZXIgVVJMIGFuZCBiZSBzZW50IHRvIHRoZSBzZXNzaW9uIGJyb2tl ci4gVGhlIGNsaWVudCdzIGJlaGF2aW9yIGlzIHVuZGVmaW5lZCBpZiB0aGlzIGZsYWcgaXMgdXNl ZCBmb3Igbm9uLUhUVFAoUykgc2Vzc2lvbiBicm9rZXJzLiIpKTsKKyAgQUREX09QVCAoIi0tdXNl LWJyb2tlci1jcmVkcy1mb3ItcmRwLXNlc3Npb24iLCBRVF9UUkFOU0xBVEVfTk9PUCAoIkhlbHAi LCAiUGFzcyBicm9rZXIgY3JlZGVudGlhbHMgYXMgcGxhaW4gdGV4dCB0byBkaXJlY3RSRFAgc2Vz c2lvbnMgd2hlbiB1c2luZyBicm9rZXIgbW9kZSB3aXRoIGJyb2tlciBhdXRoZW50aWNhdGlvbi4i KSk7CiAgIEFERF9PUFQgKCItLWJhY2tncm91bmQ9PHN2Zy1maWxlPiIsIFFUX1RSQU5TTEFURV9O T09QICgiSGVscCIsICJVc2UgYSBjdXN0b20vYnJhbmRlZCBiYWNrZ3JvdW5kIGltYWdlIChTVkcg Zm9ybWF0KSBmb3IgWDJHbyBDbGllbnQncyBtYWluIHdpbmRvdy4iKSk7CiAgIEFERF9PUFQgKCIt LWJyYW5kaW5nPTxzdmctZmlsZT4iLCBRVF9UUkFOU0xBVEVfTk9PUCAoIkhlbHAiLCAiVXNlIGEg Y3VzdG9tIGljb24gKFNWRyBmb3JtYXQpIGZvciBhZGRpdGlvbmFsIGJyYW5kaW5nIHRvIHJlcGxh Y2UgdGhlIGRlZmF1bHQgaW4gdGhlIGxvd2VyIGxlZnQgY29ybmVyIG9mIFgyR28gQ2xpZW50J3Mg bWFpbiB3aW5kb3cuIikpOwogCgoKLS0tIC9ob21lL3dhbGlkL0J1cmVhdS94MmdvY2xpZW50LWN1 cnJlbnQvc3JjL29ubWFpbndpbmRvdy5oCisrKyAvaG9tZS93YWxpZC9CdXJlYXUveDJnb2NsaWVu dC9zcmMvb25tYWlud2luZG93LmgKQEAgLTYwOSw2ICs2MDksNyBAQAogICAgIGJvb2wga2VlcFRy YXlJY29uOwogICAgIGJvb2wgaGlkZUZvbGRlclNoYXJpbmc7CiAgICAgYm9vbCBicm9rZXJOb2F1 dGhXaXRoU2Vzc2lvblVzZXJuYW1lOworICAgIGJvb2wgYnJva2VyQ3JlZHNGb3JSRFBTZXNzaW9u OwogICAgIGJvb2wgZGVmYXVsdFVzZVNvdW5kOwogICAgIGJvb2wgZGVmYXVsdFhpbmVyYW1hOwog ICAgIGJvb2wgY2FyZFN0YXJ0ZWQ7CgoKCi0tLSAvaG9tZS93YWxpZC9CdXJlYXUveDJnb2NsaWVu dC1jdXJyZW50L3NyYy9vbm1haW53aW5kb3cuY3BwCisrKyAvaG9tZS93YWxpZC9CdXJlYXUveDJn b2NsaWVudC9zcmMvb25tYWlud2luZG93LmNwcApAQCAtNzQsNiArNzQsNyBAQAogICAgIGtlZXBU cmF5SWNvbj1mYWxzZTsKICAgICBoaWRlRm9sZGVyU2hhcmluZz1mYWxzZTsKICAgICBicm9rZXJO b2F1dGhXaXRoU2Vzc2lvblVzZXJuYW1lPWZhbHNlOworICAgIGJyb2tlckNyZWRzRm9yUkRQU2Vz c2lvbj1mYWxzZTsKICAgICB0aGluTW9kZT1mYWxzZTsKICAgICBjbG9zZURpc2Nvbm5lY3Q9ZmFs c2U7CiAgICAgc2hvd0hhbHRCdG49ZmFsc2U7CkBAIC0zNDgyLDggKzM0ODMsMTYgQEAKICAgICB9 CiAgICAgZWxzZQogICAgIHsKLSAgICAgICAgdXNlcj1zdC0+c2V0dGluZygpLT52YWx1ZSAoIHNp ZCsiL3VzZXIiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCBRVmFy aWFudCApICIiKS50b1N0cmluZygpOworICAgICAgICBpZiAoYnJva2VyQ3JlZHNGb3JSRFBTZXNz aW9uKQorICAgICAgICB7CisgICAgICAgICAgICB1c2VyPWxvZ2luLT50ZXh0KCk7CisgICAgICAg ICAgICBwYXNzd29yZD1wYXNzLT50ZXh0KCk7CisgICAgICAgIH0KKyAgICAgICAgZWxzZQorICAg ICAgICB7CisgICAgICAgICAgICB1c2VyPXN0LT5zZXR0aW5nKCktPnZhbHVlICggc2lkKyIvdXNl ciIsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKCBRVmFyaWFu dCApICIiKS50b1N0cmluZygpOworICAgICAgICB9CiAgICAgfQogCiAgICAgbnhwcm94eT1uZXcg UVByb2Nlc3M7CkBAIC02MjMwLDYgKzYyMzksMTAgQEAKICNpZmRlZiBRX09TX0xJTlVYCiAgICAg aWYgKGRpcmVjdFJEUCkKICAgICB7CisgICAgICAgIGlmIChjbG9zZURpc2Nvbm5lY3QpCisgICAg ICAgIHsKKyAgICAgICAgICAgIGNsb3NlKCk7CisgICAgICAgIH0KICAgICAgICAgcGFzcy0+c2V0 VGV4dCAoICIiICk7CiAgICAgICAgIFFUaW1lcjo6c2luZ2xlU2hvdCAoIDIwMDAsdGhpcywKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTaG93UGFzc0Zvcm0oKSApICk7 CkBAIC03NDI1LDYgKzc0MzgsMTIgQEAKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogCisg ICAgaWYgKCBwYXJhbT09Ii0tdXNlLWJyb2tlci1jcmVkcy1mb3ItcmRwLXNlc3Npb24iICkKKyAg ICB7CisgICAgICAgIGJyb2tlckNyZWRzRm9yUkRQU2Vzc2lvbj10cnVlOworICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CisKICAgICAvL2ZvcmNlIHRvIHNob3cgdHJheWljb24KICAgICBpZiAo cGFyYW0gPT0gIi0tdHJheS1pY29uIikKICAgICB7Cgo= ------=_Part_10950065_501909624.1496241649669--