Skip to content

Make canonicalizer be able to strip session id params even if they are the first params in the query string. And add session id strip test. #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kngenie merged 2 commits into from
Mar 21, 2016
Merged

Make canonicalizer be able to strip session id params even if they are the first params in the query string. And add session id strip test. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0cc72a1
Make canonicalizer be able to strip session id params even if they ar…
Mar 21, 2016
c7fa50d
Format better
Mar 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions src/main/java/org/archive/url/IAURLCanonicalizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,27 +63,27 @@ public void canonicalize(HandyURL url) {

String query = url.getQuery();
if(query != null) {
if(query.equals("")) {
if(rules.isSet(QUERY_SETTINGS, QUERY_STRIP_EMPTY)) {
query = null;
}
} else {
// we have a query... what to do with it?
// first remove uneeded:
if(rules.isSet(QUERY_SETTINGS, QUERY_STRIP_SESSION_ID)) {
query = URLRegexTransformer.stripQuerySessionID(query);
}
// lower-case:
if(rules.isSet(QUERY_SETTINGS, QUERY_LOWERCASE)) {
query = query.toLowerCase();
}
// re-order?
if(rules.isSet(QUERY_SETTINGS, QUERY_ALPHA_REORDER)) {
query = alphaReorderQuery(query);
}
}
url.setQuery(query);
// we have a query... what to do with it?

// first remove uneeded:
if(rules.isSet(QUERY_SETTINGS, QUERY_STRIP_SESSION_ID)) {
query = URLRegexTransformer.stripQuerySessionID(query);
}
// lower-case:
if(rules.isSet(QUERY_SETTINGS, QUERY_LOWERCASE)) {
query = query.toLowerCase();
}
// re-order?
if(rules.isSet(QUERY_SETTINGS, QUERY_ALPHA_REORDER)) {
query = alphaReorderQuery(query);
}

if(query.equals("")) {
if(rules.isSet(QUERY_SETTINGS, QUERY_STRIP_EMPTY)) {
query = null;
}
}
url.setQuery(query);
}
}

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/org/archive/url/URLRegexTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ public class URLRegexTransformer {

private static final OptimizedPattern QUERY_OPTS[] = {

new OptimizedPattern("(?i)^(.+)(?:jsessionid=[0-9a-zA-Z]{32})(?:&(.*))?$", "jsessionid=", 1, 2),
new OptimizedPattern("(?i)^(.+)(?:phpsessid=[0-9a-zA-Z]{32})(?:&(.*))?$", "phpsessid=", 1, 2),
new OptimizedPattern("(?i)^(.+)(?:sid=[0-9a-zA-Z]{32})(?:&(.*))?$", "sid=", 1, 2),
new OptimizedPattern("(?i)^(.+)(?:ASPSESSIONID[a-zA-Z]{8}=[a-zA-Z]{24})(?:&(.*))?$", "aspsessionid", 1, 2),
new OptimizedPattern("(?i)^(.+)(?:cfid=[^&]+&cftoken=[^&]+)(?:&(.*))?$", "cftoken=", 1, 2),
new OptimizedPattern("(?i)^(.*)(?:jsessionid=[0-9a-zA-Z]{32})(?:&(.*))?$", "jsessionid=", 1, 2),
new OptimizedPattern("(?i)^(.*)(?:phpsessid=[0-9a-zA-Z]{32})(?:&(.*))?$", "phpsessid=", 1, 2),
new OptimizedPattern("(?i)^(.*)(?:sid=[0-9a-zA-Z]{32})(?:&(.*))?$", "sid=", 1, 2),
new OptimizedPattern("(?i)^(.*)(?:ASPSESSIONID[a-zA-Z]{8}=[a-zA-Z]{24})(?:&(.*))?$", "aspsessionid", 1, 2),
new OptimizedPattern("(?i)^(.*)(?:cfid=[^&]+&cftoken=[^&]+)(?:&(.*))?$", "cftoken=", 1, 2),
};


Expand Down
11 changes: 11 additions & 0 deletions src/test/java/org/archive/url/IAURLCanonicalizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,16 @@ public void testGetDefaultPort() {
assertEquals(80,IAURLCanonicalizer.getDefaultPort("http"));
assertEquals(443,IAURLCanonicalizer.getDefaultPort("https"));
}

public void testStripSessionId() throws URISyntaxException {
IAURLCanonicalizer iaC = new IAURLCanonicalizer(new DefaultIACanonicalizerRules());
compCan(iaC,
"http://www.nsf.gov/statistics/sed/2009/SED_2009.zip?CFID=14387305&CFTOKEN=72942008&jsessionid=f030eacc7e49c4ca0b077922347418418766",
"http://nsf.gov/statistics/sed/2009/sed_2009.zip?jsessionid=f030eacc7e49c4ca0b077922347418418766");
compCan(iaC,
"http://www.nsf.gov/statistics/sed/2009/SED_2009.zip?CFID=14387305&CFTOKEN=72942008",
"http://nsf.gov/statistics/sed/2009/sed_2009.zip");

}

}