From kfm-devel Thu Nov 30 21:35:13 2000 From: Waldo Bastian Date: Thu, 30 Nov 2000 21:35:13 +0000 To: kfm-devel Subject: Problem with cookies without domain. X-MARC-Message: https://marc.info/?l=kfm-devel&m=97562005109167 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--------------Boundary-00=_PAXU4BEN718BSF06N2QT" --------------Boundary-00=_PAXU4BEN718BSF06N2QT Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Hiya, It seems that we do not correctly handle cookies which have no domain specified. The following patch fixes that. Can people check that this doesn't break any other cookie sites? Cheers, Waldo --------------Boundary-00=_PAXU4BEN718BSF06N2QT Content-Type: text/x-c++; name="kcookiejar.diff" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="kcookiejar.diff" PyBrY29va2llamFyLmFubgpJbmRleDoga2Nvb2tpZWphci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmls ZTogL2hvbWUva2RlL2tkZWxpYnMva2lvL2h0dHAva2Nvb2tpZWphci9rY29va2llamFyLmNwcCx2 CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNgpkaWZmIC11IC1yMS4zNiBrY29va2llamFyLmNwcAot LS0ga2Nvb2tpZWphci5jcHAJMjAwMC8xMS8yMiAwMTo0OTowMgkxLjM2CisrKyBrY29va2llamFy LmNwcAkyMDAwLzExLzMwIDIxOjE0OjA0CkBAIC0xNTIsMTEgKzE1MiwxNyBAQAogCiAvLwogLy8g UmV0dXJucyB3aGV0aGVyIHRoaXMgY29va2llIHNob3VsZCBiZSBzZW5kIHRvIHRoaXMgbG9jYXRp b24uCi1ib29sIEtIdHRwQ29va2llOjptYXRjaChjb25zdCBRU3RyaW5nTGlzdCAmZG9tYWlucywg Y29uc3QgUVN0cmluZyAmcGF0aCkKK2Jvb2wgS0h0dHBDb29raWU6Om1hdGNoKGNvbnN0IFFTdHJp bmcgJmZxZG4sIGNvbnN0IFFTdHJpbmdMaXN0ICZkb21haW5zLCBjb25zdCBRU3RyaW5nICZwYXRo KQogewogICAgIC8vIENvb2tpZSBkb21haW4gbWF0Y2ggY2hlY2sKLSAgICBpZiAoIWRvbWFpbnMu Y29udGFpbnMobURvbWFpbikpCisgICAgaWYgKG1Eb21haW4uaXNFbXB0eSgpKQogICAgIHsKKyAg ICAgICAgLy8gTm8gZG9tYWluIHNldCwgY2hlY2sgaG9zdG5hbWUuCisgICAgICAgIGlmIChmcWRu ICE9IG1Ib3N0KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICBlbHNlIGlm ICghZG9tYWlucy5jb250YWlucyhtRG9tYWluKSkKKyAgICB7CiAgICAgICAgIGlmIChtRG9tYWlu WzBdID09ICcuJykKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIApAQCAtMjQ3LDcgKzI1Myw3 IEBACiAKICAgICAgICBmb3IgKCBjb29raWU9Y29va2llTGlzdC0+Zmlyc3QoKTsgY29va2llICE9 IDA7IGNvb2tpZT1jb29raWVMaXN0LT5uZXh0KCkgKQogICAgICAgIHsKLSAgICAgICAgICBpZiAo IWNvb2tpZS0+bWF0Y2goIGRvbWFpbnMsIHBhdGgpKQorICAgICAgICAgIGlmICghY29va2llLT5t YXRjaCggZnFkbiwgZG9tYWlucywgcGF0aCkpCiAgICAgICAgICAgICAgY29udGludWU7CiAKICAg ICAgICAgICBpZiggY29va2llLT5pc1NlY3VyZSgpICYmICFzZWN1cmVSZXF1ZXN0ICkKQEAgLTYw NiwxOCArNjEyLDYgQEAKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGxhc3RDb29raWUtPm1Q YXRoID0gZGlyOwogICAgICAgICAgICAga2REZWJ1Zyg3MTA0KSA8PCAiTm8gXCJQYXRoPVwiIGVu dHJ5IGZvdW5kIGluIFNldC1Db29raWUuICBTZXR0aW5nIHBhdGggdG86ICIgPDwgZGlyIDw8IGVu ZGw7Ci0gICAgICAgIH0KLSAgICAgICAgLy8gTmVlZCB0byBkbyB0aGUgc2FtZSB0aGluZyBmb3Ig dGhlIGRvbWFpbi4gIEFnYWluIHRoaXMgaXMKLSAgICAgICAgLy8gYWNjb3JkaW5nIHRvIGJvdGgg UkZDIDIxMDkgYW5kIE5ldHNjYXBlJ3Mgc3BlYy4gIFdoeSBkbyBpdAotICAgICAgICAvLyBoZXJl IGFuZCBub3QgaW4gOjpjb29raWVBZHZpY2U/ICBCZWNhdXNlIEtDb29raWVTZXJ2ZXIgaW52b2tl cwotICAgICAgICAvLyA6Om1hdGNoKC4uLikgbWV0aG9kIHdoZW4gaXQgaGFzIHBlbmRpbmcgY29v a2llcy4KLSAgICAgICAgaWYoIGxhc3RDb29raWUgJiYgbGFzdENvb2tpZS0+bURvbWFpbi5pc0Vt cHR5KCkgKQotICAgICAgICB7Ci0gICAgICAgICAgICBRU3RyaW5nIGRvbWFpbjsKLSAgICAgICAg ICAgIHN0cmlwRG9tYWluKCBmcWRuLCBkb21haW4gKTsKLSAgICAgICAgICAgIGlmKCAhZG9tYWlu LmlzRW1wdHkoKSApCi0gICAgICAgICAgICAgICAgbGFzdENvb2tpZS0+bURvbWFpbiA9IGRvbWFp bjsKLSAgICAgICAgICAgIGtkRGVidWcoNzEwNCkgPDwgIk5vIFwiRG9tYWluPVwiIGVudHJ5IGZv dW5kIGluIFNldC1Db29raWUuICBTZXR0aW5nIGRvbWFpbiB0bzogIiA8PCBkb21haW4gPDwgZW5k bDsKICAgICAgICAgfQogCiAgICAgICAgIGlmICgqY29va2llU3RyID09ICdcMCcpCkluZGV4OiBr Y29va2llamFyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZWxpYnMva2lvL2h0 dHAva2Nvb2tpZWphci9rY29va2llamFyLmgsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTYKZGlm ZiAtdSAtcjEuMTYga2Nvb2tpZWphci5oCi0tLSBrY29va2llamFyLmgJMjAwMC8xMS8yMiAwMTo0 OTowMgkxLjE2CisrKyBrY29va2llamFyLmgJMjAwMC8xMS8zMCAyMToxNDowNwpAQCAtODUsNyAr ODUsNyBAQAogICAgIGludCAgICAgcHJvdG9jb2xWZXJzaW9uKHZvaWQpIHsgcmV0dXJuIG1Qcm90 b2NvbFZlcnNpb247IH0KICAgICBib29sICAgIGlzU2VjdXJlKHZvaWQpIHsgcmV0dXJuIG1TZWN1 cmU7IH0KICAgICBib29sICAgIGlzRXhwaXJlZCh0aW1lX3QgY3VycmVudERhdGUpOwotICAgIGJv b2wgICAgbWF0Y2goY29uc3QgUVN0cmluZ0xpc3QgJmRvbWFpbkxpc3QsIGNvbnN0IFFTdHJpbmcg JnBhdGgpOworICAgIGJvb2wgICAgbWF0Y2goY29uc3QgUVN0cmluZyAmZnFkbiwgY29uc3QgUVN0 cmluZ0xpc3QgJmRvbWFpbkxpc3QsIGNvbnN0IFFTdHJpbmcgJnBhdGgpOwogCiAgICAgS0h0dHBD b29raWVQdHIgbmV4dCgpIHsgcmV0dXJuIG5leHRDb29raWU7IH0KIH07CkluZGV4OiBrY29va2ll c2VydmVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlbGlicy9raW8vaHR0 cC9rY29va2llamFyL2tjb29raWVzZXJ2ZXIuY3BwLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjI0 CmRpZmYgLXUgLXIxLjI0IGtjb29raWVzZXJ2ZXIuY3BwCi0tLSBrY29va2llc2VydmVyLmNwcAky MDAwLzExLzIyIDEwOjMwOjQ4CTEuMjQKKysrIGtjb29raWVzZXJ2ZXIuY3BwCTIwMDAvMTEvMzAg MjE6MTQ6MTAKQEAgLTI4OCw3ICsyODgsNyBAQAogICAgICAgIGNvb2tpZTsKICAgICAgICBjb29r aWUgPSBtUGVuZGluZ0Nvb2tpZXMtPm5leHQoKSkKICAgewotICAgICAgIGlmIChjb29raWUtPm1h dGNoKCBkb21haW5zLCBwYXRoKSkKKyAgICAgICBpZiAoY29va2llLT5tYXRjaCggZnFkbiwgZG9t YWlucywgcGF0aCkpCiAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgIH0KICAgcmV0dXJuIGZhbHNl Owo= --------------Boundary-00=_PAXU4BEN718BSF06N2QT--