* Added cookie identity comparator
* Fixed broken HttpState#addCookie() method * Added an example demonstrating how to perform form-based logon git-svn-id: https://svn.apache.org/repos/asf/jakarta/httpcomponents/httpclient/trunk@554349 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski
parent
6034c35e2e
commit
7784120878
|
|
@ -0,0 +1,106 @@
|
|||
/*
|
||||
* $HeadURL$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
* ====================================================================
|
||||
*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
* contributor license agreements. See the NOTICE file distributed with
|
||||
* this work for additional information regarding copyright ownership.
|
||||
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||
* (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
|
||||
package org.apache.http.examples.client;
|
||||
|
||||
import org.apache.http.HttpEntity;
|
||||
import org.apache.http.HttpResponse;
|
||||
import org.apache.http.NameValuePair;
|
||||
import org.apache.http.client.methods.HttpGet;
|
||||
import org.apache.http.client.methods.HttpPost;
|
||||
import org.apache.http.client.methods.UrlEncodedFormEntity;
|
||||
import org.apache.http.client.params.CookiePolicy;
|
||||
import org.apache.http.client.params.HttpClientParams;
|
||||
import org.apache.http.cookie.Cookie;
|
||||
import org.apache.http.impl.client.DefaultHttpClient;
|
||||
import org.apache.http.message.BasicNameValuePair;
|
||||
import org.apache.http.protocol.HTTP;
|
||||
|
||||
/**
|
||||
* A example that demonstrates how HttpClient APIs can be used to perform
|
||||
* form-based logon.
|
||||
*/
|
||||
public class ClientFormLogin {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
DefaultHttpClient httpclient = new DefaultHttpClient();
|
||||
httpclient.getParams().setParameter(
|
||||
HttpClientParams.COOKIE_POLICY, CookiePolicy.BROWSER_COMPATIBILITY);
|
||||
|
||||
HttpGet httpget = new HttpGet("https://portal.sun.com/portal/dt");
|
||||
|
||||
HttpResponse response = httpclient.execute(httpget);
|
||||
HttpEntity entity = response.getEntity();
|
||||
|
||||
System.out.println("Login form get: " + response.getStatusLine());
|
||||
if (entity != null) {
|
||||
entity.consumeContent();
|
||||
}
|
||||
System.out.println("Initial set of cookies:");
|
||||
Cookie[] cookies = httpclient.getState().getCookies();
|
||||
if (cookies.length == 0) {
|
||||
System.out.println("None");
|
||||
} else {
|
||||
for (int i = 0; i < cookies.length; i++) {
|
||||
System.out.println("- " + cookies[i].toString());
|
||||
}
|
||||
}
|
||||
|
||||
HttpPost httpost = new HttpPost("https://portal.sun.com/amserver/UI/Login?" +
|
||||
"org=self_registered_users&" +
|
||||
"goto=/portal/dt&" +
|
||||
"gotoOnFail=/portal/dt?error=true");
|
||||
|
||||
NameValuePair[] nvps = new NameValuePair[] {
|
||||
new BasicNameValuePair("IDToken1", "username"),
|
||||
new BasicNameValuePair("IDToken2", "password")
|
||||
};
|
||||
|
||||
httpost.setEntity(new UrlEncodedFormEntity(nvps, HTTP.UTF_8));
|
||||
|
||||
response = httpclient.execute(httpost);
|
||||
entity = response.getEntity();
|
||||
|
||||
System.out.println("Login form get: " + response.getStatusLine());
|
||||
if (entity != null) {
|
||||
entity.consumeContent();
|
||||
}
|
||||
|
||||
System.out.println("Post logon cookies:");
|
||||
cookies = httpclient.getState().getCookies();
|
||||
if (cookies.length == 0) {
|
||||
System.out.println("None");
|
||||
} else {
|
||||
for (int i = 0; i < cookies.length; i++) {
|
||||
System.out.println("- " + cookies[i].toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -31,6 +31,7 @@
|
|||
package org.apache.http.client;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Iterator;
|
||||
|
|
@ -38,6 +39,7 @@ import java.util.Iterator;
|
|||
import org.apache.http.auth.AuthScope;
|
||||
import org.apache.http.auth.Credentials;
|
||||
import org.apache.http.cookie.Cookie;
|
||||
import org.apache.http.cookie.CookieIdentityComparator;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
|
|
@ -66,13 +68,15 @@ public class HttpState {
|
|||
* Map of {@link Credentials credentials} by realm that this
|
||||
* HTTP state contains.
|
||||
*/
|
||||
private HashMap credMap = new HashMap();
|
||||
private final HashMap credMap;
|
||||
|
||||
/**
|
||||
* Array of {@link Cookie cookies} that this HTTP state contains.
|
||||
*/
|
||||
private ArrayList cookies = new ArrayList();
|
||||
private final ArrayList cookies;
|
||||
|
||||
private final Comparator cookieComparator;
|
||||
|
||||
// -------------------------------------------------------- Class Variables
|
||||
|
||||
/**
|
||||
|
|
@ -80,6 +84,9 @@ public class HttpState {
|
|||
*/
|
||||
public HttpState() {
|
||||
super();
|
||||
this.credMap = new HashMap();
|
||||
this.cookies = new ArrayList();
|
||||
this.cookieComparator = new CookieIdentityComparator();
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------- Properties
|
||||
|
|
@ -99,7 +106,7 @@ public class HttpState {
|
|||
// first remove any old cookie that is equivalent
|
||||
for (Iterator it = cookies.iterator(); it.hasNext();) {
|
||||
Cookie tmp = (Cookie) it.next();
|
||||
if (cookie.equals(tmp)) {
|
||||
if (cookieComparator.compare(cookie, tmp) == 0) {
|
||||
it.remove();
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,67 @@
|
|||
/*
|
||||
* $HeadURL$
|
||||
* $Revision$
|
||||
* $Date$
|
||||
*
|
||||
* ====================================================================
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
* ====================================================================
|
||||
*
|
||||
* This software consists of voluntary contributions made by many
|
||||
* individuals on behalf of the Apache Software Foundation. For more
|
||||
* information on the Apache Software Foundation, please see
|
||||
* <http://www.apache.org/>.
|
||||
*
|
||||
*/
|
||||
|
||||
package org.apache.http.cookie;
|
||||
|
||||
import java.util.Comparator;
|
||||
|
||||
/**
|
||||
* This cookie comparator can be used to compare identity of cookies.
|
||||
*
|
||||
* <p>
|
||||
* Cookies are considered identical if their names are equal and
|
||||
* their domain attributes match ignoring case.
|
||||
* </p>
|
||||
*
|
||||
* @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
|
||||
*/
|
||||
public class CookieIdentityComparator implements Comparator {
|
||||
|
||||
public int compare(final Object o1, final Object o2) {
|
||||
Cookie c1 = (Cookie) o1;
|
||||
Cookie c2 = (Cookie) o2;
|
||||
int res = c1.getName().compareTo(c2.getName());
|
||||
if (res == 0) {
|
||||
// do not differentiate empty and null domains
|
||||
String d1 = c1.getDomain();
|
||||
if (d1 == null) {
|
||||
d1 = "";
|
||||
}
|
||||
String d2 = c2.getDomain();
|
||||
if (d2 == null) {
|
||||
d2 = "";
|
||||
}
|
||||
res = d1.compareToIgnoreCase(d2);
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue