/hg/icedtea-web: internal browser extended for trivial charset s...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Mon Nov 21 13:17:39 UTC 2016
changeset d5801f6cc5b3 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=d5801f6cc5b3
author: Jiri Vanek <jvanek at redhat.com>
date: Mon Nov 21 14:23:11 2016 +0100
internal browser extended for trivial charset selection
* netx/net/sourceforge/jnlp/runtime/html/browser/HtmlBrowserPanel.java: Added combobox with all currently known java standard charsets. (load) if this combobox value is selected, then given encoding is used to read the page. If not, then default is used as before.
* netx/net/sourceforge/jnlp/util/UrlUtils.java: (loadUrlWithInvalidHeader) overloaded with optional charset argument. Default kept on US_ASCII (loadUrl) overloaded with optional charset argument Default kept on UTF_8
* tests/reproducers/simple/Http511/testcases/Http511Test.java: (http511AuthRequired_jnlpOneFirstAuthorisedServerServerResourceAnother511Server) "fixed". by putting more input before final SKIP to cause delay allowing external logging to success.
diffstat:
ChangeLog | 17 ++++
netx/net/sourceforge/jnlp/runtime/html/browser/HtmlBrowserPanel.java | 35 +++++++++-
netx/net/sourceforge/jnlp/util/UrlUtils.java | 11 ++-
tests/reproducers/simple/Http511/testcases/Http511Test.java | 5 +-
4 files changed, 63 insertions(+), 5 deletions(-)
diffs (170 lines):
diff -r a286e1424097 -r d5801f6cc5b3 ChangeLog
--- a/ChangeLog Mon Nov 21 11:31:22 2016 +0100
+++ b/ChangeLog Mon Nov 21 14:23:11 2016 +0100
@@ -1,3 +1,20 @@
+2016-11-21 Jiri Vanek <jvanek at redhat.com>
+
+ internal browser extended for trivial charset selection
+ * netx/net/sourceforge/jnlp/runtime/html/browser/HtmlBrowserPanel.java:
+ Added combobox with all currently known java standard charsets.
+ (load) if this combobox value is selected, then given encoding is used to read
+ the page. If not, then default is used as before.
+ * netx/net/sourceforge/jnlp/util/UrlUtils.java:
+ (loadUrlWithInvalidHeader) overloaded with optional charset argument.
+ Default kept on US_ASCII
+ (loadUrl) overloaded with optional charset argument
+ Default kept on UTF_8
+ * tests/reproducers/simple/Http511/testcases/Http511Test.java:
+ (http511AuthRequired_jnlpOneFirstAuthorisedServerServerResourceAnother511Server)
+ "fixed". by putting more input before final SKIP to cause delay allowing
+ external logging to success.
+
2016-11-21 Jiri Vanek <jvanek at redhat.com>
AbsolutePathsAndQueryStrings reproducer adapted to port in cache path
diff -r a286e1424097 -r d5801f6cc5b3 netx/net/sourceforge/jnlp/runtime/html/browser/HtmlBrowserPanel.java
--- a/netx/net/sourceforge/jnlp/runtime/html/browser/HtmlBrowserPanel.java Mon Nov 21 11:31:22 2016 +0100
+++ b/netx/net/sourceforge/jnlp/runtime/html/browser/HtmlBrowserPanel.java Mon Nov 21 14:23:11 2016 +0100
@@ -46,6 +46,7 @@
import java.util.List;
import javax.swing.JButton;
import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
import javax.swing.JEditorPane;
import javax.swing.JFrame;
import javax.swing.JMenuItem;
@@ -62,6 +63,8 @@
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.util.UrlUtils;
import net.sourceforge.jnlp.util.logging.OutputController;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
/**
* this calss intentioanlly NOT cache any content, but always load data. Its
@@ -231,6 +234,16 @@
private final JButton fwdButton = new JButton(">>>");
private final JToggleButton viewSourceButton = new JToggleButton(Translator.R("BrowserSource"));
private final JCheckBox socketCheckbox = new JCheckBox(Translator.R("BrowserSocket"));
+ private final JComboBox<Charset> encodingBox = new JComboBox<>(new Charset[]{
+ null,
+ Charset.forName("US-ASCII"),
+ Charset.forName("UTF-8"),
+ Charset.forName("ISO-8859-1"),
+ Charset.forName("UTF-16"),
+ Charset.forName("UTF-16BE"),
+ Charset.forName("UTF-16LE")
+
+});
private static final String TEXTPLAIN = "text/plain";
private static final String TEXTHTML = "text/html";
@@ -301,10 +314,21 @@
String[] result;
if (isUseSocket()) {
OutputController.getLogger().log("Using socket connection");
- result = UrlUtils.loadUrlWithInvalidHeader(url);
+ Charset ch = (Charset)(encodingBox.getSelectedItem());
+ if (ch == null) {
+ result = UrlUtils.loadUrlWithInvalidHeader(url);
+ } else {
+ result = UrlUtils.loadUrlWithInvalidHeader(url, ch);
+ }
} else {
OutputController.getLogger().log("Using URLconnection");
- String s = UrlUtils.loadUrl(url);
+ String s;
+ Charset ch = (Charset)(encodingBox.getSelectedItem());
+ if (ch == null) {
+ s = UrlUtils.loadUrl(url);
+ } else {
+ s = UrlUtils.loadUrl(url, ch);
+ }
result = new String[]{s, s, s};
}
OutputController.getLogger().log(result[0]);
@@ -314,8 +338,14 @@
current = new State(url, result[0], result[2]);
if (source) {
currentHtml = new JEditorPane(TEXTPLAIN, current.getSource());
+ if (encodingBox.getSelectedItem()!=null){
+ currentHtml.getDocument().putProperty("IgnoreCharsetDirective", Boolean.TRUE);
+ }
} else {
currentHtml = new JEditorPane(TEXTHTML, current.getHtml());
+ if (encodingBox.getSelectedItem()!=null){
+ currentHtml.getDocument().putProperty("IgnoreCharsetDirective", Boolean.TRUE);
+ }
((HTMLDocument) currentHtml.getDocument()).setBase(current.url);
}
fireDocumentChanged(getCurrentSource());
@@ -351,6 +381,7 @@
socketCheckbox.setToolTipText(Translator.R("BrowserSocketHelp"));
customUrl.add(gotoButton, BorderLayout.WEST);
customUrl.add(goTo);
+ customUrl.add(encodingBox, BorderLayout.EAST);
tools.add(customUrl, BorderLayout.SOUTH);
tools.add(mainButtons, BorderLayout.NORTH);
gotoButton.addActionListener(new ActionListener() {
diff -r a286e1424097 -r d5801f6cc5b3 netx/net/sourceforge/jnlp/util/UrlUtils.java
--- a/netx/net/sourceforge/jnlp/util/UrlUtils.java Mon Nov 21 11:31:22 2016 +0100
+++ b/netx/net/sourceforge/jnlp/util/UrlUtils.java Mon Nov 21 14:23:11 2016 +0100
@@ -55,6 +55,7 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.URLDecoder;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import javax.net.ssl.SSLSocketFactory;
import net.sourceforge.jnlp.JNLPFile;
@@ -425,6 +426,9 @@
}
public static String loadUrl(URL url) throws IOException {
+ return loadUrl(url, StandardCharsets.UTF_8);
+ }
+ public static String loadUrl(URL url, Charset ch) throws IOException {
StringBuilder all = new StringBuilder();
int tries = 0;
InputStream is = null;
@@ -458,7 +462,7 @@
}
}
}
- try (BufferedReader br = new BufferedReader(new InputStreamReader(is, UTF8))) {
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(is, ch))) {
while (true) {
String line = br.readLine();
if (line == null) {
@@ -511,12 +515,15 @@
public static String[] loadUrlWithInvalidHeader(URL url) throws IOException {
+ return loadUrlWithInvalidHeader(url, StandardCharsets.US_ASCII);
+ }
+ public static String[] loadUrlWithInvalidHeader(URL url, Charset ch) throws IOException {
try (Socket s = UrlUtils.createSocketFromUrl(url)) {
writeRequest(s.getOutputStream(), url);
StringBuilder all = new StringBuilder();
StringBuilder head = new StringBuilder();
StringBuilder body = new StringBuilder();
- try (BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), StandardCharsets.US_ASCII))) {
+ try (BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), ch))) {
StringBuilder second = head;
while (true) {
String line = br.readLine();
diff -r a286e1424097 -r d5801f6cc5b3 tests/reproducers/simple/Http511/testcases/Http511Test.java
--- a/tests/reproducers/simple/Http511/testcases/Http511Test.java Mon Nov 21 11:31:22 2016 +0100
+++ b/tests/reproducers/simple/Http511/testcases/Http511Test.java Mon Nov 21 14:23:11 2016 +0100
@@ -562,7 +562,10 @@
nwJnlp,
Arrays.asList(new ContentReaderListener[]{new ExternalLogin(server511_returnsLast), new ExternalLogin(server511_notreturns), AOK}),
Arrays.asList(new ContentReaderListener[]{sbc}), null);
- pw.setWriter("SKIP\n");
+ // although ExternlLoging is launched correctly after app is started and before prompt is requested,
+ // sometimes the skip goes before ExternlLoging completesd
+ // those empty lines seems to be causing enough delay
+ pw.setWriter("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\nSKIP\n");
ProcessResult p = pw.execute();
Assert.assertTrue(p.stdout.contains(CONFIRMATION));
Assert.assertTrue(p.stdout.contains(AOK.getCondition()));
More information about the distro-pkg-dev
mailing list