boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

fix for sid check

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6673 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 15 years ago
parent ef62d017e5
commit 30c8185139
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File

1
defaults/sessionid.names
Unescape View File

@ -1,3 +1,4 @@
PHPSESSIONID PHPSESSIONID
PHPSESSID
jsessionid jsessionid
sid sid

42
source/net/yacy/kelondro/data/meta/DigestURI.java
Unescape View File

@ -585,13 +585,13 @@ public class DigestURI implements Serializable {
String q = quest; String q = quest;
if (removeSessionID) { if (removeSessionID) {
for (String sid: sessionIDnames) { for (String sid: sessionIDnames) {
if (q.startsWith(sid + "=")) { if (q.toLowerCase().startsWith(sid.toLowerCase() + "=")) {
int p = q.indexOf('&'); int p = q.indexOf('&');
if (p < 0) return (excludeReference || ref == null) ? path : path + "#" + ref; if (p < 0) return (excludeReference || ref == null) ? path : path + "#" + ref;
q = q.substring(p + 1); q = q.substring(p + 1);
continue; continue;
} }
int p = q.indexOf("&" + sid + "="); int p = q.toLowerCase().indexOf("&" + sid.toLowerCase() + "=");
if (p < 0) continue; if (p < 0) continue;
int p1 = q.indexOf('&', p); int p1 = q.indexOf('&', p);
if (p1 < 0) { if (p1 < 0) {
@ -750,25 +750,30 @@ public class DigestURI implements Serializable {
} }
public final boolean isIndividual() { public final boolean isIndividual() {
final String ls = unescape(path.toLowerCase()); final String q = unescape(path.toLowerCase());
for (String sid: sessionIDnames) {
if (q.startsWith(sid.toLowerCase() + "=")) return true;
int p = q.indexOf("&" + sid.toLowerCase() + "=");
if (p >= 0) return true;
}
int pos; int pos;
return return
((pos = ls.indexOf("sid")) > 0 && ((pos = q.indexOf("sid")) > 0 &&
(ls.charAt(--pos) == '?' || ls.charAt(pos) == '&' || ls.charAt(pos) == ';') && (q.charAt(--pos) == '?' || q.charAt(pos) == '&' || q.charAt(pos) == ';') &&
(pos += 5) < ls.length() && (pos += 5) < q.length() &&
(ls.charAt(pos) != '&' && ls.charAt(--pos) == '=') (q.charAt(pos) != '&' && q.charAt(--pos) == '=')
) || ) ||
((pos = ls.indexOf("sessionid")) > 0 && ((pos = q.indexOf("sessionid")) > 0 &&
(pos += 10) < ls.length() && (pos += 10) < q.length() &&
(ls.charAt(pos) != '&' && (q.charAt(pos) != '&' &&
(ls.charAt(--pos) == '=' || ls.charAt(pos) == '/')) (q.charAt(--pos) == '=' || q.charAt(pos) == '/'))
) || ) ||
((pos = ls.indexOf("phpsessid")) > 0 && ((pos = q.indexOf("phpsessid")) > 0 &&
(pos += 10) < ls.length() && (pos += 10) < q.length() &&
(ls.charAt(pos) != '&' && (q.charAt(pos) != '&' &&
(ls.charAt(--pos) == '=' || ls.charAt(pos) == '/'))); (q.charAt(--pos) == '=' || q.charAt(pos) == '/')));
} }
@ -1029,8 +1034,11 @@ public class DigestURI implements Serializable {
new String[]{"http://www.anomic.de","javascipt:temp"}, new String[]{"http://www.anomic.de","javascipt:temp"},
new String[]{null,"http://yacy-websuche.de/wiki/index.php?title=De:IntroInformationFreedom&action=history"}, new String[]{null,"http://yacy-websuche.de/wiki/index.php?title=De:IntroInformationFreedom&action=history"},
new String[]{null, "http://diskusjion.no/index.php?s=5bad5f431a106d9a8355429b81bb0ca5&showuser=23585"}, new String[]{null, "http://diskusjion.no/index.php?s=5bad5f431a106d9a8355429b81bb0ca5&showuser=23585"},
new String[]{null, "http://diskusjion.no/index.php?s=5bad5f431a106d9a8355429b81bb0ca5&amp;showuser=23585"} new String[]{null, "http://diskusjion.no/index.php?s=5bad5f431a106d9a8355429b81bb0ca5&amp;showuser=23585"},
new String[]{null, "http://www.scc.kit.edu/publikationen/80.php?PHPSESSID=5f3624d3e1c33d4c086ab600d4d5f5a1"},
new String[]{null, "http://www.scc.kit.edu/publikationen/80.php"}
}; };
DigestURI.initSessionIDNames(new File("defaults/sessionid.names"));
String environment, url; String environment, url;
DigestURI aURL, aURL1; DigestURI aURL, aURL1;
java.net.URL jURL; java.net.URL jURL;
@ -1038,7 +1046,7 @@ public class DigestURI implements Serializable {
environment = test[i][0]; environment = test[i][0];
url = test[i][1]; url = test[i][1];
try {aURL = DigestURI.newURL(environment, url);} catch (final MalformedURLException e) {Log.logException(e); aURL = null;} try {aURL = DigestURI.newURL(environment, url);} catch (final MalformedURLException e) {Log.logException(e); aURL = null;}
if (aURL != null) System.out.println("normalized: " + aURL.toNormalform(true, true)); if (aURL != null) System.out.println("normalized: " + aURL.toNormalform(true, true, true) + " - hash=" + aURL.hash());
if (environment == null) { if (environment == null) {
try {jURL = new java.net.URL(url);} catch (final MalformedURLException e) {jURL = null;} try {jURL = new java.net.URL(url);} catch (final MalformedURLException e) {jURL = null;}
} else { } else {

Write Preview
Loading…
Cancel
Save