/hg/icedtea-web: 2 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Dec 23 12:52:58 UTC 2015
changeset f40a28d5e426 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=f40a28d5e426
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Dec 23 13:39:28 2015 +0100
Small properties parser in C (plugin) now unescapes \= \\ \: \t \n and \r correctly
changeset 0527ad4eb2dd in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=0527ad4eb2dd
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Dec 23 13:51:35 2015 +0100
Added base logic and design for rememberable dialogues editor.
diffstat:
ChangeLog | 35 ++
netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/ClassFinder.java | 164 +++++++++
netx/net/sourceforge/jnlp/controlpanel/RemmeberableDialogueEditor.java | 166 ++++++++++
netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java | 2 +-
netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java | 18 +-
netx/net/sourceforge/jnlp/security/dialogs/remember/AppletSecurityActions.java | 8 +
plugin/icedteanp/IcedTeaParseProperties.cc | 1 +
plugin/icedteanp/IcedTeaPluginUtils.cc | 49 ++
plugin/icedteanp/IcedTeaPluginUtils.h | 2 +
tests/cpp-unit-tests/IcedTeaParsePropertiesTest.cc | 5 +
tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc | 23 +
tests/netx/unit/net/sourceforge/jnlp/controlpanel/ClassFinderTest.java | 83 +++++
tests/reproducers/signed/CheckPluginParams/resources/CheckPluginParams.jnlp | 57 +++
tests/reproducers/signed/CheckPluginParams/resources/CheckPluginParams1.html | 46 ++
tests/reproducers/signed/CheckPluginParams/resources/CheckPluginParams2.html | 45 ++
tests/reproducers/signed/CheckPluginParams/srcs/CheckPluginParams.java | 69 ++++
tests/reproducers/signed/CheckPluginParams/testcases/CheckPluginParamsTests.java | 102 ++++++
18 files changed, 874 insertions(+), 3 deletions(-)
diffs (truncated from 1034 to 500 lines):
diff -r e327545ae0c3 -r 0527ad4eb2dd ChangeLog
--- a/ChangeLog Wed Dec 02 09:00:20 2015 +0100
+++ b/ChangeLog Wed Dec 23 13:51:35 2015 +0100
@@ -1,3 +1,38 @@
+2015-12-23 Jiri Vanek <jvanek at redhat.com>
+
+ Added base logic and design for rememberable dialogues editor.
+ * netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java:
+ (windowGainedFocus) added Override annotation
+ * netx/net/sourceforge/jnlp/controlpanel/ClassFinder.java: new class. Responsible
+ for searching of all RememberableDialog implementations on classpath
+ * netx/net/sourceforge/jnlp/controlpanel/RemmeberableDialogueEditor.java:
+ Desaigned, for now nearly no-op dialog to modify state of (not)remembered dialogues
+ * netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java:
+ first column of extended security table made read only again.
+ * netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java:
+ Click on read only columns of extended security table make RemmeberableDialogueEditor
+ pop up.
+ * netx/net/sourceforge/jnlp/security/dialogs/remember/AppletSecurityActions.java:
+ added api to remove keys from main map.
+ * tests/netx/unit/net/sourceforge/jnlp/controlpanel/ClassFinderTest.java:
+ new class, added tests for ClassFinder
+
+
+2015-12-23 Jiri Vanek <jvanek at redhat.com>
+
+ Small properties parser in C (plugin) now unescapes \= \\ \: \t \n and \r correctly
+ * plugin/icedteanp/IcedTeaParseProperties.cc: (get_property_value) now unescape
+ known escape sequences by calling IcedTeaPluginUtilities::unescape
+ * plugin/icedteanp/IcedTeaPluginUtils.cc: implemented (unescape) which unescape
+ known properties escape sequences
+ * plugin/icedteanp/IcedTeaPluginUtils.h: declared (unescape)
+ * tests/cpp-unit-tests/IcedTeaParsePropertiesTest.cc: ((get_property_value))
+ added testcase which verifies unnescape of escaped sequences from get_property_value
+ * tests/cpp-unit-tests/IcedTeaPluginUtilsTest.cc: added family of (unescape) tests
+ * /tests/reproducers/signed/CheckPluginParams: reproducer to verify if params
+ from -D in deployment.plugin.jvm.arguments get correctly unescaped during its
+ way up to users program.
+
2015-12-02 Jiri Vanek <jvanek at redhat.com>
* NEWS: mentioned main-class handling change
diff -r e327545ae0c3 -r 0527ad4eb2dd netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java
--- a/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java Wed Dec 02 09:00:20 2015 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/AdvancedProxySettingsDialog.java Wed Dec 23 13:51:35 2015 +0100
@@ -23,7 +23,6 @@
import java.awt.Frame;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
-import java.awt.Toolkit;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
@@ -81,6 +80,7 @@
WindowAdapter adapter = new WindowAdapter() {
private boolean gotFocus = false;
+ @Override
public void windowGainedFocus(WindowEvent we) {
// Once window gets focus, set initial focus
if (!gotFocus) {
diff -r e327545ae0c3 -r 0527ad4eb2dd netx/net/sourceforge/jnlp/controlpanel/ClassFinder.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/controlpanel/ClassFinder.java Wed Dec 23 13:51:35 2015 +0100
@@ -0,0 +1,164 @@
+/* Copyright (C) 2016 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp.controlpanel;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.jar.JarEntry;
+import java.util.jar.JarInputStream;
+import javax.swing.JDialog;
+import net.sourceforge.jnlp.util.logging.OutputController;
+
+/**
+ * utility class to find any Interface implementing classes in netx/icedtea-web
+ */
+public class ClassFinder extends JDialog {
+
+ public static final String JAVA_CLASS_PATH_PROPERTY = "java.class.path";
+ public static final String CUSTOM_CLASS_PATH_PROPERTY = "custom.class.path";
+ public static final String BOOT_CLASS_PATH_PROPERTY = "sun.boot.class.path";
+
+
+ static public <T> List<Class<? extends T>> findAllMatchingTypes(Class<T> toFind) {
+ List<Class<? extends T>> returnedClasses = new ArrayList<>();
+ Set<Class> foundClasses = walkClassPath(toFind);
+ for (Class<?> clazz : foundClasses) {
+ returnedClasses.add((Class<? extends T>) clazz);
+ }
+ return returnedClasses;
+ }
+
+ static private Set<Class> walkClassPath(Class toFind) {
+ Set<Class> results = new HashSet<>();
+ Set<String> classPathRoots = getClassPathRoots();
+ for (String classpathEntry : classPathRoots) {
+ //need to avoid base jdk jars/modules
+ if (classpathEntry.toLowerCase().contains("icedtea-web")
+ || classpathEntry.toLowerCase().contains("netx")
+ || classpathEntry.toLowerCase().contains("plugin")) {
+ File f = new File(classpathEntry);
+ if (!f.exists()) {
+ continue;
+ }
+ if (f.isDirectory()) {
+ traverse(f.getAbsolutePath(), f, toFind, results);
+ } else {
+ File jar = new File(classpathEntry);
+ try {
+ JarInputStream is = new JarInputStream(new FileInputStream(jar));
+ JarEntry entry;
+ while ((entry = is.getNextJarEntry()) != null) {
+ Class c = determine(entry.getName(), toFind);
+ if (c != null) {
+ results.add(c);
+ }
+ }
+ } catch (IOException ex) {
+ OutputController.getLogger().log(ex);
+ }
+ }
+ }
+ }
+ return results;
+ }
+
+ static private Set<String> getClassPathRoots() {
+ String classapth1 = System.getProperty(CUSTOM_CLASS_PATH_PROPERTY);
+ String classapth2 = System.getProperty(JAVA_CLASS_PATH_PROPERTY);
+ String classapth3 = System.getProperty(BOOT_CLASS_PATH_PROPERTY);
+ String classpath = "";
+ if (classapth1 != null) {
+ classpath = classpath + classapth1 + File.pathSeparator;
+ }
+ if (classapth2 != null) {
+ classpath = classpath + classapth2 + File.pathSeparator;
+ }
+ if (classapth3 != null) {
+ classpath = classpath + classapth3 + File.pathSeparator;
+ }
+ String[] pathElements = classpath.split(File.pathSeparator);
+ Set<String> s = new HashSet<>(Arrays.asList(pathElements));
+ return s;
+ }
+
+ static private Class determine(String name, Class toFind) {
+ if (name.contains("$")) {
+ return null;
+ }
+ try {
+ if (name.endsWith(".class")) {
+ name = name.replace(".class", "");
+ name = name.replace("/", ".");
+ name = name.replace("\\", ".");
+ Class clazz = Class.forName(name);
+ if (toFind.isAssignableFrom(clazz)) {
+ return clazz;
+ }
+ }
+ } catch (Throwable ex) {
+ //blacklisted classes
+ //System.out.println(name);
+ }
+ return null;
+ }
+
+ static private void traverse(String root, File current, Class toFind, Set<Class> result) {
+ File[] fs = current.listFiles();
+ for (File f : fs) {
+ if (f.isDirectory()) {
+ traverse(root, f, toFind, result);
+ } else {
+ String ff = f.getAbsolutePath();
+ String name = ff.substring(root.length());
+ while (name.startsWith(File.separator)) {
+ name = name.substring(1);
+ }
+ Class c = determine(name, toFind);
+ if (c != null) {
+ result.add(c);
+ }
+ }
+
+ }
+ }
+
+}
diff -r e327545ae0c3 -r 0527ad4eb2dd netx/net/sourceforge/jnlp/controlpanel/RemmeberableDialogueEditor.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/controlpanel/RemmeberableDialogueEditor.java Wed Dec 23 13:51:35 2015 +0100
@@ -0,0 +1,166 @@
+/* Copyright (C) 2016 Red Hat, Inc.
+
+ This file is part of IcedTea.
+
+ IcedTea is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, version 2.
+
+ IcedTea is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with IcedTea; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301 USA.
+
+ Linking this library statically or dynamically with other modules is
+ making a combined work based on this library. Thus, the terms and
+ conditions of the GNU General Public License cover the whole
+ combination.
+
+ As a special exception, the copyright holders of this library give you
+ permission to link this library with independent modules to produce an
+ executable, regardless of the license terms of these independent
+ modules, and to copy and distribute the resulting executable under
+ terms of your choice, provided that you also meet, for each linked
+ independent module, the terms and conditions of the license of that
+ module. An independent module is a module which is not derived from
+ or based on this library. If you modify this library, you may extend
+ this exception to your version of the library, but you are not
+ obligated to do so. If you do not wish to do so, delete this
+ exception statement from your version.
+ */
+package net.sourceforge.jnlp.controlpanel;
+
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import javax.swing.ComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.event.ListDataListener;
+import net.sourceforge.jnlp.security.dialogs.remember.AppletSecurityActions;
+import net.sourceforge.jnlp.security.dialogs.remember.ExecuteAppletAction;
+import net.sourceforge.jnlp.security.dialogs.remember.RememberableDialog;
+import net.sourceforge.jnlp.security.dialogs.remember.SavedRememberAction;
+
+/**
+ * This dialog provides way to manage rememberable dialogues
+ *
+ *
+ */
+public class RemmeberableDialogueEditor extends JDialog {
+
+ private final List<Class<? extends RememberableDialog>> allClasses;
+ private final AppletSecurityActions actions;
+
+ RemmeberableDialogueEditor(JFrame jFrame, boolean modal, Object dialogs) {
+ super(jFrame, modal);
+ actions = (AppletSecurityActions) dialogs;
+ allClasses = ClassFinder.findAllMatchingTypes(RememberableDialog.class);
+ recreateGui();
+ }
+
+ private void recreateGui() {
+ final Collection<Map.Entry<String, SavedRememberAction>> entries = actions.getEntries();
+ final JDialog d = this;
+ getContentPane().removeAll();
+ d.setLayout(new GridLayout(0, 4));
+
+
+ final List<Class<? extends RememberableDialog>> addedBleClasses = new ArrayList<>(allClasses);
+ for (Map.Entry<String, SavedRememberAction> entry : entries) {
+ String dialog = entry.getKey();
+ for (int i = 0; i < addedBleClasses.size(); i++) {
+ final Class<? extends RememberableDialog> get = addedBleClasses.get(i);
+ String s = get.getSimpleName();
+ if (s.equals(dialog)) {
+ JButton bb = new JButton("-");
+ bb.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ actions.removeAction(get);
+ recreateGui();
+ }
+ });
+ d.add(bb);
+ d.add(new JLabel(entry.getKey()));
+ JComboBox cbb = new JComboBox(ExecuteAppletAction.values());
+ cbb.setSelectedItem(entry.getValue().getAction());
+ d.add(cbb);
+ d.add(new JButton("Expert edit"));
+ addedBleClasses.remove(i);
+ i--;
+ }
+ }
+
+ }
+
+ ComboBoxModel<String> model = new ComboBoxModel<String>() {
+
+ Object selected = null;
+
+ @Override
+ public void setSelectedItem(Object anItem) {
+ for (int i = 0; i < addedBleClasses.size(); i++) {
+ Class<? extends RememberableDialog> get = addedBleClasses.get(i);
+ if (get.getSimpleName().equals(anItem)) {
+ selected = get.getSimpleName();
+ }
+
+ }
+ }
+
+ @Override
+ public Object getSelectedItem() {
+ return selected;
+ }
+
+ @Override
+ public int getSize() {
+ return addedBleClasses.size();
+ }
+
+ @Override
+ public String getElementAt(int index) {
+ return addedBleClasses.get(index).getSimpleName();
+ }
+
+ @Override
+ public void addListDataListener(ListDataListener l) {
+
+ }
+
+ @Override
+ public void removeListDataListener(ListDataListener l) {
+
+ }
+ };
+ final JComboBox<String> cb = new JComboBox<>(model);
+ JButton b = new JButton("+");
+ b.addActionListener(new ActionListener() {
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ actions.setAction(addedBleClasses.get(cb.getSelectedIndex()), new SavedRememberAction(ExecuteAppletAction.NEVER, ExecuteAppletAction.NEVER.toChar()));
+ recreateGui();
+ }
+ });
+ d.add(b);
+ d.add(cb);
+ d.pack();
+
+ }
+
+}
diff -r e327545ae0c3 -r 0527ad4eb2dd netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java Wed Dec 02 09:00:20 2015 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java Wed Dec 23 13:51:35 2015 +0100
@@ -103,7 +103,7 @@
}
//FIXME add editor
if (columnIndex == 0) {
- return true;
+ return false;
}
if (getValueAt(rowIndex, columnIndex - 1) == null || getValueAt(rowIndex, columnIndex - 1).toString().trim().isEmpty()) {
return false;
diff -r e327545ae0c3 -r 0527ad4eb2dd netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java
--- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Wed Dec 02 09:00:20 2015 +0100
+++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Wed Dec 23 13:51:35 2015 +0100
@@ -41,6 +41,8 @@
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
@@ -69,6 +71,7 @@
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
+import javax.swing.JTextArea;
import javax.swing.JTextField;
import javax.swing.LayoutStyle;
import javax.swing.ListCellRenderer;
@@ -726,7 +729,7 @@
}
private JTable createTable(final TableModel model) {
- JTable jt = new JTable() {
+ final JTable jt = new JTable() {
@Override
public TableCellEditor getCellEditor(int row, int column) {
int columnx = convertColumnIndexToModel(column);
@@ -774,6 +777,19 @@
};
jt.setRowHeight(jt.getRowHeight() + jt.getRowHeight() / 2);
jt.setModel(model);
+
+ jt.addMouseListener(new MouseAdapter() {
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (e.getClickCount()>1 & jt.getSelectedRowCount() == 1){
+ JDialog d = new RemmeberableDialogueEditor((JFrame)null, true, jt.getModel().getValueAt(jt.getSelectedRow(), 0));
+
+ d.setVisible(true);
+ }
+ }
+
+});
return jt;
}
diff -r e327545ae0c3 -r 0527ad4eb2dd netx/net/sourceforge/jnlp/security/dialogs/remember/AppletSecurityActions.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/remember/AppletSecurityActions.java Wed Dec 02 09:00:20 2015 +0100
+++ b/netx/net/sourceforge/jnlp/security/dialogs/remember/AppletSecurityActions.java Wed Dec 23 13:51:35 2015 +0100
@@ -195,6 +195,14 @@
public void setAction(String i, SavedRememberAction a) {
actions.put(i, a);
}
+
+ public void removeAction(Class clazz) {
+ removeAction(classToKey(clazz));
+ }
+
+ public void removeAction(String i) {
+ actions.remove(i);
+ }
@Override
public String toString() {
diff -r e327545ae0c3 -r 0527ad4eb2dd plugin/icedteanp/IcedTeaParseProperties.cc
--- a/plugin/icedteanp/IcedTeaParseProperties.cc Wed Dec 02 09:00:20 2015 +0100
+++ b/plugin/icedteanp/IcedTeaParseProperties.cc Wed Dec 23 13:51:35 2015 +0100
@@ -95,6 +95,7 @@
int l = c.length();
dest = c.substr(i+1, l-i);
IcedTeaPluginUtilities::trim(dest);
+ IcedTeaPluginUtilities::unescape(dest);
return true;
}
diff -r e327545ae0c3 -r 0527ad4eb2dd plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Dec 02 09:00:20 2015 +0100
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc Wed Dec 23 13:51:35 2015 +0100
@@ -1148,6 +1148,55 @@
str = str.substr(start, end - start + 1);
}
+/*Unescape various escaped chars like \\ -> \ or \= -> = or \: -> , \t -> TAB , \n -> NwLine\*/
+
+/* examples
+ * \\= -> \=
More information about the distro-pkg-dev
mailing list