From jlukens@botch.com Fri Jul 18 03:52:50 2014 Received: (at submit) by bugs.x2go.org; 18 Jul 2014 01:52:51 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50 autolearn=ham version=3.3.2 Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir.das-netzwerkteam.de (Postfix) with ESMTP id 514125DB2C for ; Fri, 18 Jul 2014 03:52:50 +0200 (CEST) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id 717B11AC0CB for ; Thu, 17 Jul 2014 21:52:48 -0400 (EDT) Date: Thu, 17 Jul 2014 21:52:49 -0400 From: Josh Lukens To: submit@bugs.x2go.org Message-ID: Subject: Session resume doesn't take profile's host list into account X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="53c87df1_25e45d32_2b2" --53c87df1_25e45d32_2b2 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: x2gobroker Version: 0.0.3.0 Severity: normal When a broker has multiple profiles with mutually exclusive host lists but a shared database session state is appropriately sent to the client when listing sessions but if a user attempts to select a non-suspended profile the suspended (different) profile will be resumed instead. Draft patch attached which filters both load balancing decisions and resume decisions based on server_list for selected profile. Patch is really only a handful of lines but indentation of other lines bloats diff. --53c87df1_25e45d32_2b2 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="resume.patch" ZGlmZiAtLWdpdCBhL3gyZ29icm9rZXIvYnJva2Vycy9iYXNlX2Jyb2tlci5weSBiL3gyZ29icm9r ZXIvYnJva2Vycy9iYXNlX2Jyb2tlci5weQppbmRleCBlOTJjN2Q4Li43M2QwZTgyIDEwMDY0NAot LS0gYS94MmdvYnJva2VyL2Jyb2tlcnMvYmFzZV9icm9rZXIucHkKKysrIGIveDJnb2Jyb2tlci9i cm9rZXJzL2Jhc2VfYnJva2VyLnB5CkBAIC0xMTA1LDYgKzExMDUsMTAgQEAgY2xhc3MgWDJHb0Jy b2tlcihvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBpZiBzZXJ2ZXIgbm90IGluIGJ1c3lf c2VydmVycy5rZXlzKCk6CiAgICAgICAgICAgICAgICAgICAgICAgICBidXN5X3NlcnZlcnNbc2Vy dmVyXSA9IDAKIAorICAgICAgICAgICAgICAgIGZvciBzZXJ2ZXIgaW4gYnVzeV9zZXJ2ZXJzLmtl eXMoKToKKyAgICAgICAgICAgICAgICAgICAgaWYgc2VydmVyIG5vdCBpbiBzZXJ2ZXJfbGlzdDoK KyAgICAgICAgICAgICAgICAgICAgICAgIGRlbCBidXN5X3NlcnZlcnNbc2VydmVyXQorCiAgICAg ICAgICAgICAgICAgYnVzeV9zZXJ2ZXJfbGlzdCA9IFsgKGxvYWQsIHNlcnZlcikgZm9yIHNlcnZl ciwgbG9hZCBpbiBidXN5X3NlcnZlcnMuaXRlbXMoKSBdCiAgICAgICAgICAgICAgICAgYnVzeV9z ZXJ2ZXJfbGlzdC5zb3J0KCkKIApAQCAtMTE0NywzMiArMTE1MSwzNSBAQCBjbGFzcyBYMkdvQnJv a2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgICAgIHJ1bm5pbmdfc2Vzc2lvbnMgPSBbXQog ICAgICAgICAgICAgICAgICAgICBzdXNwZW5kZWRfc2Vzc2lvbnMgPSBbXQogICAgICAgICAgICAg ICAgICAgICBmb3Igc2Vzc2lvbl9pbmZvIGluIHNlc3Npb25fbGlzdDoKLSAgICAgICAgICAgICAg ICAgICAgICAgIGlmIHNlc3Npb25faW5mby5zcGxpdCgnfCcpWzRdID09ICdSJzoKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICBydW5uaW5nX3Nlc3Npb25zLmFwcGVuZChzZXNzaW9uX2luZm8p Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiBzZXNzaW9uX2luZm8uc3BsaXQoJ3wnKVs0XSA9 PSAnUyc6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgc3VzcGVuZGVkX3Nlc3Npb25zLmFw cGVuZChzZXNzaW9uX2luZm8pCi0KLSAgICAgICAgICAgICAgICAgICAgIyB3ZSBwcmVmZXIgc3Vz cGVuZGVkIHNlc3Npb25zIGZvciByZXN1bWluZyBpZiB3ZSBmaW5kIHNlc3Npb25zIHdpdGggYm90 aCBzdGF0ZXMgb2YgYWN0aXZpdHkKLSAgICAgICAgICAgICAgICAgICAgaWYgc3VzcGVuZGVkX3Nl c3Npb25zOgotICAgICAgICAgICAgICAgICAgICAgICAgc2Vzc2lvbl9pbmZvID0gc3VzcGVuZGVk X3Nlc3Npb25zWzBdCi0gICAgICAgICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAg ICAgICAgICBzZXNzaW9uX2luZm8gPSBydW5uaW5nX3Nlc3Npb25zWzBdCi0gICAgICAgICAgICAg ICAgICAgICAgICB4MmdvYnJva2VyLmFnZW50LnN1c3BlbmRfc2Vzc2lvbih1c2VybmFtZT11c2Vy bmFtZSwgc2Vzc2lvbl9uYW1lPXNlc3Npb25faW5mby5zcGxpdCgnfCcpWzFdLCByZW1vdGVfYWdl bnQ9cmVtb3RlX2FnZW50KQotICAgICAgICAgICAgICAgICAgICAgICAgIyB0aGlzIGlzIHRoZSB0 dXJuLWFyb3VuZCBpbiB4MmdvY2xlYW5zZXNzaW9ucywgc28gd2FpdGluZyBhcyBhbG9uZyBhcyB0 aGUgZGFlbW9uIHRoYXQgd2lsbCBzdXNwZW5kIHRoZSBzZXNzaW9uCi0gICAgICAgICAgICAgICAg ICAgICAgICB0aW1lLnNsZWVwKDIpCi0gICAgICAgICAgICAgICAgICAgICAgICBzZXNzaW9uX2lu Zm8gPSBzZXNzaW9uX2luZm8ucmVwbGFjZSgnfFJ8JywgJ3xTfCcpCi0gICAgICAgICAgICAgICAg ICAgIHNlcnZlcl9uYW1lID0gc2Vzc2lvbl9pbmZvLnNwbGl0KCd8JylbM10KLQotICAgICAgICAg ICAgICAgICAgICAjIGlmIHdlIGhhdmUgYW4gZXhwbGljaXQgSVAgYWRkcmVzcyBmb3Igc2VydmVy X25hbWUsIGxldCdzIHVzZSB0aGF0IGluc3RlYWQuLi4KLSAgICAgICAgICAgICAgICAgICAgdHJ5 OgotICAgICAgICAgICAgICAgICAgICAgICAgc2VydmVyX25hbWUgPSBwcm9maWxlWydob3N0PXto b3N0bmFtZX0nLmZvcm1hdChob3N0bmFtZT1zZXJ2ZXJfbmFtZSldCi0gICAgICAgICAgICAgICAg ICAgIGV4Y2VwdCBLZXlFcnJvcjoKLSAgICAgICAgICAgICAgICAgICAgICAgIHBhc3MKLQotICAg ICAgICAgICAgICAgICAgICBzZWxlY3RlZF9zZXNzaW9uLnVwZGF0ZSh7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAnc2VydmVyJzogc2VydmVyX25hbWUsCi0gICAgICAgICAgICAgICAgICAgICAg ICAnc2Vzc2lvbl9pbmZvJzogc2Vzc2lvbl9pbmZvLAotICAgICAgICAgICAgICAgICAgICB9KQor ICAgICAgICAgICAgICAgICAgICAgICAgbXlob3N0LG15ZG9tYWluID0gc2Vzc2lvbl9pbmZvLnNw bGl0KCd8JylbM10uc3BsaXQoJy4nLCAxKQorICAgICAgICAgICAgICAgICAgICAgICAgaWYgbXlo b3N0IGluIHNlcnZlcl9saXN0OgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIHNlc3Np b25faW5mby5zcGxpdCgnfCcpWzRdID09ICdSJzoKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcnVubmluZ19zZXNzaW9ucy5hcHBlbmQoc2Vzc2lvbl9pbmZvKQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGlmIHNlc3Npb25faW5mby5zcGxpdCgnfCcpWzRdID09ICdTJzoKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3VzcGVuZGVkX3Nlc3Npb25zLmFwcGVuZChz ZXNzaW9uX2luZm8pCisKKyAgICAgICAgICAgICAgICAgICAgaWYgc3VzcGVuZGVkX3Nlc3Npb25z IG9yIHJ1bm5pbmdfc2Vzc2lvbnM6CisgICAgICAgICAgICAgICAgICAgICAgICAjIHdlIHByZWZl ciBzdXNwZW5kZWQgc2Vzc2lvbnMgZm9yIHJlc3VtaW5nIGlmIHdlIGZpbmQgc2Vzc2lvbnMgd2l0 aCBib3RoIHN0YXRlcyBvZiBhY3Rpdml0eQorICAgICAgICAgICAgICAgICAgICAgICAgaWYgc3Vz cGVuZGVkX3Nlc3Npb25zOgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNlc3Npb25faW5m byA9IHN1c3BlbmRlZF9zZXNzaW9uc1swXQorICAgICAgICAgICAgICAgICAgICAgICAgZWxzZToK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBzZXNzaW9uX2luZm8gPSBydW5uaW5nX3Nlc3Np b25zWzBdCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgeDJnb2Jyb2tlci5hZ2VudC5zdXNw ZW5kX3Nlc3Npb24odXNlcm5hbWU9dXNlcm5hbWUsIHNlc3Npb25fbmFtZT1zZXNzaW9uX2luZm8u c3BsaXQoJ3wnKVsxXSwgcmVtb3RlX2FnZW50PXJlbW90ZV9hZ2VudCkKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAjIHRoaXMgaXMgdGhlIHR1cm4tYXJvdW5kIGluIHgyZ29jbGVhbnNlc3Np b25zLCBzbyB3YWl0aW5nIGFzIGFsb25nIGFzIHRoZSBkYWVtb24gdGhhdCB3aWxsIHN1c3BlbmQg dGhlIHNlc3Npb24KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB0aW1lLnNsZWVwKDIpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc2Vzc2lvbl9pbmZvID0gc2Vzc2lvbl9pbmZvLnJl cGxhY2UoJ3xSfCcsICd8U3wnKQorICAgICAgICAgICAgICAgICAgICAgICAgc2VydmVyX25hbWUg PSBzZXNzaW9uX2luZm8uc3BsaXQoJ3wnKVszXQorCisgICAgICAgICAgICAgICAgICAgICAgICAj IGlmIHdlIGhhdmUgYW4gZXhwbGljaXQgSVAgYWRkcmVzcyBmb3Igc2VydmVyX25hbWUsIGxldCdz IHVzZSB0aGF0IGluc3RlYWQuLi4KKyAgICAgICAgICAgICAgICAgICAgICAgIHRyeToKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICBzZXJ2ZXJfbmFtZSA9IHByb2ZpbGVbJ2hvc3Q9e2hvc3Ru YW1lfScuZm9ybWF0KGhvc3RuYW1lPXNlcnZlcl9uYW1lKV0KKyAgICAgICAgICAgICAgICAgICAg ICAgIGV4Y2VwdCBLZXlFcnJvcjoKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYXNzCisK KyAgICAgICAgICAgICAgICAgICAgICAgIHNlbGVjdGVkX3Nlc3Npb24udXBkYXRlKHsKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAnc2VydmVyJzogc2VydmVyX25hbWUsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgJ3Nlc3Npb25faW5mbyc6IHNlc3Npb25faW5mbywKKyAgICAgICAg ICAgICAgICAgICAgICAgIH0pCiAKICAgICAgICAgICAgICAgICBleGNlcHQgSW5kZXhFcnJvcjoK IAo= --53c87df1_25e45d32_2b2--