eclipse-ipzilla: Make sure login was successful
If the login fails due to an invalid username or password, the only way we can tell this is by looking at the page title and seeing if the error message "Invalid Username or Password" is present. If the user made a typo on their password, we shouldn't plow through and try to run a query. Doing so returns an HTML login page that can't be parsed as a CSV file. Change-Id: Ia6d7f862435a52ae09ebe29c3835bcee3cf73b93 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
6c64148f66
commit
41bc1738a4
|
@ -48,6 +48,7 @@
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.InputStreamReader;
|
import java.io.InputStreamReader;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
import java.io.Reader;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
import java.net.ConnectException;
|
import java.net.ConnectException;
|
||||||
import java.net.CookieHandler;
|
import java.net.CookieHandler;
|
||||||
|
@ -67,6 +68,8 @@
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.TreeSet;
|
import java.util.TreeSet;
|
||||||
|
import java.util.regex.Matcher;
|
||||||
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
import org.eclipse.jgit.util.HttpSupport;
|
import org.eclipse.jgit.util.HttpSupport;
|
||||||
|
|
||||||
|
@ -186,6 +189,41 @@ private void login() throws MalformedURLException,
|
||||||
+ " failed: " + c.getResponseCode() + " "
|
+ " failed: " + c.getResponseCode() + " "
|
||||||
+ c.getResponseMessage());
|
+ c.getResponseMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
String content = readFully(c);
|
||||||
|
Matcher matcher = Pattern.compile("<title>(.*)</title>",
|
||||||
|
Pattern.CASE_INSENSITIVE).matcher(content);
|
||||||
|
if (!matcher.find()) {
|
||||||
|
throw new IOException("Login as " + username + " to " + login
|
||||||
|
+ " failed: Response not HTML as expected");
|
||||||
|
}
|
||||||
|
|
||||||
|
String title = matcher.group(1);
|
||||||
|
if (!"IPZilla Main Page".equals(title)) {
|
||||||
|
throw new IOException("Login as " + username + " to " + login
|
||||||
|
+ " failed; page title was \"" + title + "\"");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private String readFully(HttpURLConnection c) throws IOException {
|
||||||
|
String enc = c.getContentEncoding();
|
||||||
|
Reader reader;
|
||||||
|
if (enc != null) {
|
||||||
|
reader = new InputStreamReader(c.getInputStream(), enc);
|
||||||
|
} else {
|
||||||
|
reader = new InputStreamReader(c.getInputStream(), "ISO-8859-1");
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
StringBuilder b = new StringBuilder();
|
||||||
|
BufferedReader r = new BufferedReader(reader);
|
||||||
|
String line;
|
||||||
|
while ((line = r.readLine()) != null) {
|
||||||
|
b.append(line).append('\n');
|
||||||
|
}
|
||||||
|
return b.toString();
|
||||||
|
} finally {
|
||||||
|
reader.close();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void logout() throws MalformedURLException, ConnectException,
|
private void logout() throws MalformedURLException, ConnectException,
|
||||||
|
|
Loading…
Reference in New Issue