/hg/icedtea-web: Fixed PR3198. ITW now tries direct socket conne...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Nov 9 09:28:36 UTC 2016
changeset 10424aa3ebd0 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=10424aa3ebd0
author: Jiri Vanek <jvanek at redhat.com>
date: Tue Nov 08 18:11:19 2016 +0100
Fixed PR3198. ITW now tries direct socket connection when it met invalid http header by java impl.
* netx/net/sourceforge/jnlp/cache/ResourceDownloader.java:(downloadFile) when Invalid Http response exception is encountered, direct socket connection is tried before giving up
* netx/net/sourceforge/jnlp/util/UrlUtils.java: new method of loadUrlWithInvalidHeaderBytes introduced. Based on loadUrlWithInvalidHeader, just slower in reading header, and returns header as string and body as byte[]. New method getRemainingBytes introduced to read remaining byte[] from originally char-processed stream.
* NEWS: mentioned PR3198
diffstat:
ChangeLog | 12 ++
NEWS | 1 +
netx/net/sourceforge/jnlp/cache/ResourceDownloader.java | 21 ++++-
netx/net/sourceforge/jnlp/util/UrlUtils.java | 73 +++++++++++++---
4 files changed, 91 insertions(+), 16 deletions(-)
diffs (187 lines):
diff -r d09eb6e90db7 -r 10424aa3ebd0 ChangeLog
--- a/ChangeLog Tue Nov 08 11:26:13 2016 +0100
+++ b/ChangeLog Tue Nov 08 18:11:19 2016 +0100
@@ -1,3 +1,15 @@
+2016-11-08 Jiri Vanek <jvanek at redhat.com>
+
+ Fixed PR3198. ITW now tries direct socket connection when it met invalid http header by java impl.
+ * netx/net/sourceforge/jnlp/cache/ResourceDownloader.java:
+ (downloadFile) when Invalid Http response exception is encountered,
+ direct socket connection is tried before giving up
+ * netx/net/sourceforge/jnlp/util/UrlUtils.java: new method of loadUrlWithInvalidHeaderBytes
+ introduced. Based on loadUrlWithInvalidHeader, just slower in reading header, and returns
+ header as string and body as byte[]. New method getRemainingBytes introduced
+ to read remaining byte[] from originally char-processed stream.
+ * NEWS: mentioned PR3198
+
2016-11-08 Jiri Vanek <jvanek at redhat.com>
Fixed behavior of JarIndexAccess to better copy original JarIndex usage
diff -r d09eb6e90db7 -r 10424aa3ebd0 NEWS
--- a/NEWS Tue Nov 08 11:26:13 2016 +0100
+++ b/NEWS Tue Nov 08 18:11:19 2016 +0100
@@ -56,6 +56,7 @@
- RH1273691 - Escaped equals signs in deployment.properties not un-escaped when used
- PR2746 - IcedTea-Web Plugin 1.6.1: net.sourceforge.jnlp.LaunchException
- PR2714 - IcedTea-Web plugin sends uninitialized memory garbage across a pipe when NPN_GetValueForURL call fails
+ - PR3198 - Error in webmin (edit)
New in release 1.6 (2015-XX-XX):
* Massively improved offline abilities. Added Xoffline switch to force work without inet connection.
diff -r d09eb6e90db7 -r 10424aa3ebd0 netx/net/sourceforge/jnlp/cache/ResourceDownloader.java
--- a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Tue Nov 08 11:26:13 2016 +0100
+++ b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java Tue Nov 08 18:11:19 2016 +0100
@@ -10,6 +10,7 @@
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -34,6 +35,7 @@
import net.sourceforge.jnlp.security.SecurityDialogs;
import net.sourceforge.jnlp.security.dialogs.InetSecurity511Panel;
import net.sourceforge.jnlp.util.HttpUtils;
+import net.sourceforge.jnlp.util.UrlUtils;
import net.sourceforge.jnlp.util.logging.OutputController;
public class ResourceDownloader implements Runnable {
@@ -380,7 +382,24 @@
CacheEntry downloadEntry = new CacheEntry(downloadLocation, resource.getDownloadVersion());
OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Downloading file: " + downloadLocation + " into: " + downloadEntry.getCacheFile().getCanonicalPath());
if (!downloadEntry.isCurrent(connection.getLastModified())) {
- writeDownloadToFile(resource, downloadLocation, new BufferedInputStream(connection.getInputStream()));
+ try {
+ writeDownloadToFile(resource, downloadLocation, new BufferedInputStream(connection.getInputStream()));
+ } catch (IOException ex) {
+ String IH = "Invalid Http response";
+ if (ex.getMessage().equals(IH)) {
+ OutputController.getLogger().log(ex);
+ OutputController.getLogger().log(OutputController.Level.MESSAGE_ALL, "'" + IH + "' message detected. Attempting direct socket");
+ Object[] result = UrlUtils.loadUrlWithInvalidHeaderBytes(connection.getURL());
+ OutputController.getLogger().log("Header of: " + connection.getURL() + " (" + downloadLocation + ")");
+ String head = (String) result[0];
+ byte[] body = (byte[]) result[1];
+ OutputController.getLogger().log(head);
+ OutputController.getLogger().log("Body is: " + body.length + " bytes long");
+ writeDownloadToFile(resource, downloadLocation, new ByteArrayInputStream(body));
+ } else {
+ throw ex;
+ }
+ }
} else {
resource.setTransferred(CacheUtil.getCacheFile(downloadLocation, resource.getDownloadVersion()).length());
}
diff -r d09eb6e90db7 -r 10424aa3ebd0 netx/net/sourceforge/jnlp/util/UrlUtils.java
--- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Tue Nov 08 11:26:13 2016 +0100
+++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Tue Nov 08 18:11:19 2016 +0100
@@ -37,11 +37,13 @@
package net.sourceforge.jnlp.util;
import java.io.BufferedReader;
+import java.io.ByteArrayOutputStream;
import net.sourceforge.jnlp.util.logging.OutputController;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
@@ -54,7 +56,6 @@
import java.net.URLConnection;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
-import javax.net.ssl.SSLSocket;
import javax.net.ssl.SSLSocketFactory;
import net.sourceforge.jnlp.JNLPFile;
@@ -469,23 +470,49 @@
return all.toString();
}
+
+
+ private static byte[] getRemainingBytes(InputStream is) throws IOException {
+ byte[] buf = new byte[2048];
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ int len;
+ while ((len = is.read(buf)) != -1) {
+ bos.write(buf, 0, len);
+ }
+ bos.close();
+ return bos.toByteArray();
+ }
+ public static Object[] loadUrlWithInvalidHeaderBytes(URL url) throws IOException {
+ try (Socket s = UrlUtils.createSocketFromUrl(url)) {
+ writeRequest(s.getOutputStream(), url);
+ //StringBuilder do not have endsWith method. Check on that are more expensive then recreations
+ String head = new String();
+ byte[] body = new byte[0];
+ //we cant use bufferedreader, otherwise buffer consume also part of body
+ try (InputStream is = s.getInputStream()) {
+ while (true) {
+ int readChar = is.read();
+ if (readChar < 0) {
+ break;
+ }
+ head = head + ((char) readChar);
+ if (head.endsWith("\n\n")
+ || head.endsWith("\r\n\r\n")
+ || head.endsWith("\n\r\n\r")
+ || head.endsWith("\r\r")) {
+ body = getRemainingBytes(is);
+ }
+ }
+ }
+ return new Object[]{head, body};
+ }
+ }
+
+
public static String[] loadUrlWithInvalidHeader(URL url) throws IOException {
try (Socket s = UrlUtils.createSocketFromUrl(url)) {
- Writer w = new OutputStreamWriter(s.getOutputStream(), StandardCharsets.US_ASCII);
- String file = url.getFile();
- if (file.isEmpty()) {
- file = "/";
- }
- w.write("GET " + file + " HTTP/1.0\r\n");
- w.write("Host: " + url.getHost() + "\r\n");
- w.write("User-Agent: javaws (icedtea-web)\r\n");
- w.write("Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n");
- w.write("Referer: " + url.toExternalForm() + "\r\n");
- w.write("\r\n");
-
- w.flush();
-
+ writeRequest(s.getOutputStream(), url);
StringBuilder all = new StringBuilder();
StringBuilder head = new StringBuilder();
StringBuilder body = new StringBuilder();
@@ -508,6 +535,22 @@
}
}
+ private static void writeRequest(final OutputStream s, URL url) throws IOException {
+ Writer w = new OutputStreamWriter(s, StandardCharsets.US_ASCII);
+ String file = url.getFile();
+ if (file.isEmpty()) {
+ file = "/";
+ }
+ w.write("GET " + file + " HTTP/1.0\r\n");
+ w.write("Host: " + url.getHost() + "\r\n");
+ w.write("User-Agent: javaws (icedtea-web)\r\n");
+ w.write("Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n");
+ w.write("Referer: " + url.toExternalForm() + "\r\n");
+ w.write("\r\n");
+
+ w.flush();
+ }
+
private static Socket createSocketFromUrl(URL url) throws IOException {
int p = url.getPort();
if (p < 0) {
More information about the distro-pkg-dev
mailing list