Mercurial > hg > release > icedtea-web-1.5
changeset 903:61bfad46e9cc
Unsigned applet warning dialog abstracted and generalized
UnsignedAppletTrustWarningPanel logic moved into new abstract parent class
AppTrustWarningPanel for reusability.
* netx/net/sourceforge/jnlp/security/AppTrustWarningDialog.java: new class
* netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java: new class
* netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java:
major refactor into subclass of AppTrustWarningPanel
* netx/net/sourceforge/jnlp/security/SecurityDialogs.java:
(UnsignedWarningAction) references changed to AppSigningWarningAction
* netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java: same
* tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java:
new tests for AppTrustWarningPanel
* netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteUnsignedApplet.java:
renamed, changed all references
* netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java:
(ExecuteUnsignedApplet) renamed to this
* netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java:
(ExecuteAppletAction) changed references
* netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java:
(ExecuteAppletAction) changed references
* netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionEntry.java:
(ExecuteAppletAction) changed references
* netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java:
(ExecuteAppletAction) changed references
* netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageExtendedImpl.java:
(ExecuteAppletAction) changed references
* netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageImpl.java:
(ExecuteAppletAction) changed references
line wrap: on
line diff
--- a/ChangeLog Fri Feb 28 16:45:24 2014 -0500 +++ b/ChangeLog Mon Mar 03 11:36:14 2014 -0500 @@ -1,3 +1,33 @@ +2014-03-03 Andrew Azores <aazores@redhat.com> + + UnsignedAppletTrustWarningPanel logic moved into new abstract parent class + AppTrustWarningPanel for reusability. + * netx/net/sourceforge/jnlp/security/AppTrustWarningDialog.java: new class + * netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java: new class + * netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java: + major refactor into subclass of AppTrustWarningPanel + * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: + (UnsignedWarningAction) references changed to AppSigningWarningAction + * netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java: same + * tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java: + new tests for AppTrustWarningPanel + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteUnsignedApplet.java: + renamed, changed all references + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java: + (ExecuteUnsignedApplet) renamed to this + * netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java: + (ExecuteAppletAction) changed references + * netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java: + (ExecuteAppletAction) changed references + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionEntry.java: + (ExecuteAppletAction) changed references + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java: + (ExecuteAppletAction) changed references + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageExtendedImpl.java: + (ExecuteAppletAction) changed references + * netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageImpl.java: + (ExecuteAppletAction) changed references + 2014-02-28 Andrew Azores <aazores@redhat.com> Added "Sandbox" button to CertWarning dialogs, allowing signed applets
--- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletActionTableModel.java Mon Mar 03 11:36:14 2014 -0500 @@ -39,7 +39,7 @@ import javax.swing.event.TableModelEvent; import javax.swing.table.AbstractTableModel; import net.sourceforge.jnlp.runtime.Translator; -import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletActionEntry; import net.sourceforge.jnlp.security.appletextendedsecurity.UrlRegEx; import net.sourceforge.jnlp.security.appletextendedsecurity.impl.UnsignedAppletActionStorageExtendedImpl; @@ -75,7 +75,7 @@ @Override public Class<?> getColumnClass(int columnIndex) { if (columnIndex == 0) { - return ExecuteUnsignedApplet.class; + return ExecuteAppletAction.class; } if (columnIndex == 1) { return Date.class; @@ -145,7 +145,7 @@ int i = getRowCount()-1; String s = "\\Qhttp://localhost:80/\\E.*"; back.add(new UnsignedAppletActionEntry( - ExecuteUnsignedApplet.NEVER, + ExecuteAppletAction.NEVER, new Date(), new UrlRegEx(s), new UrlRegEx(s), @@ -174,7 +174,7 @@ fireTableRowsDeleted(0, i); } - void removeByBehaviour(ExecuteUnsignedApplet unsignedAppletAction) { + void removeByBehaviour(ExecuteAppletAction unsignedAppletAction) { int i = getRowCount()-1; if (i<0){ return;
--- a/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/controlpanel/UnsignedAppletsTrustingListPanel.java Mon Mar 03 11:36:14 2014 -0500 @@ -75,7 +75,7 @@ import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.Translator; import net.sourceforge.jnlp.security.appletextendedsecurity.AppletSecurityLevel; -import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; import net.sourceforge.jnlp.security.appletextendedsecurity.ExtendedAppletSecurityHelp; import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletActionEntry; import net.sourceforge.jnlp.security.appletextendedsecurity.UrlRegEx; @@ -520,16 +520,16 @@ removeSelectedFromTable(currentTable); } if (deleteTypeComboBox.getSelectedIndex() == 1) { - removeByBehaviour(ExecuteUnsignedApplet.ALWAYS); + removeByBehaviour(ExecuteAppletAction.ALWAYS); } if (deleteTypeComboBox.getSelectedIndex() == 2) { - removeByBehaviour(ExecuteUnsignedApplet.NEVER); + removeByBehaviour(ExecuteAppletAction.NEVER); } if (deleteTypeComboBox.getSelectedIndex() == 3) { - removeByBehaviour(ExecuteUnsignedApplet.YES); + removeByBehaviour(ExecuteAppletAction.YES); } if (deleteTypeComboBox.getSelectedIndex() == 4) { - removeByBehaviour(ExecuteUnsignedApplet.NO); + removeByBehaviour(ExecuteAppletAction.NO); } if (deleteTypeComboBox.getSelectedIndex() == 5) { removeAllItemsFromTable(currentTable, customModel); @@ -701,7 +701,7 @@ public TableCellEditor getCellEditor(int row, int column) { int columnx = convertColumnIndexToModel(column); if (columnx == 0) { - return new DefaultCellEditor(new JComboBox(new ExecuteUnsignedApplet[]{ExecuteUnsignedApplet.ALWAYS, ExecuteUnsignedApplet.NEVER, ExecuteUnsignedApplet.YES, ExecuteUnsignedApplet.NO})); + return new DefaultCellEditor(new JComboBox(new ExecuteAppletAction[]{ExecuteAppletAction.ALWAYS, ExecuteAppletAction.NEVER, ExecuteAppletAction.YES, ExecuteAppletAction.NO})); } if (columnx == 2) { column = convertColumnIndexToModel(column); @@ -758,7 +758,7 @@ } - private void removeByBehaviour(ExecuteUnsignedApplet unsignedAppletAction) { + private void removeByBehaviour(ExecuteAppletAction unsignedAppletAction) { UnsignedAppletActionEntry[] items = currentModel.back.toArray(); if (askBeforeActionCheckBox.isSelected()) { List<UnsignedAppletActionEntry> toBeDeleted = new ArrayList<UnsignedAppletActionEntry>(); @@ -904,16 +904,16 @@ @Override public boolean include(Entry<? extends UnsignedAppletActionTableModel, ? extends Integer> entry) { - ExecuteUnsignedApplet o = (ExecuteUnsignedApplet) entry.getModel().getValueAt(entry.getIdentifier(), 0); - return (o.equals(ExecuteUnsignedApplet.ALWAYS) || o.equals(ExecuteUnsignedApplet.NEVER)); + ExecuteAppletAction o = (ExecuteAppletAction) entry.getModel().getValueAt(entry.getIdentifier(), 0); + return (o.equals(ExecuteAppletAction.ALWAYS) || o.equals(ExecuteAppletAction.NEVER)); } } private static final class ShowPermanentA extends MyCommonSorter { @Override public boolean include(Entry<? extends UnsignedAppletActionTableModel, ? extends Integer> entry) { - ExecuteUnsignedApplet o = (ExecuteUnsignedApplet) entry.getModel().getValueAt(entry.getIdentifier(), 0); - return (o.equals(ExecuteUnsignedApplet.ALWAYS)); + ExecuteAppletAction o = (ExecuteAppletAction) entry.getModel().getValueAt(entry.getIdentifier(), 0); + return (o.equals(ExecuteAppletAction.ALWAYS)); } } @@ -921,8 +921,8 @@ @Override public boolean include(Entry<? extends UnsignedAppletActionTableModel, ? extends Integer> entry) { - ExecuteUnsignedApplet o = (ExecuteUnsignedApplet) entry.getModel().getValueAt(entry.getIdentifier(), 0); - return (o.equals(ExecuteUnsignedApplet.NEVER)); + ExecuteAppletAction o = (ExecuteAppletAction) entry.getModel().getValueAt(entry.getIdentifier(), 0); + return (o.equals(ExecuteAppletAction.NEVER)); } } @@ -930,8 +930,8 @@ @Override public boolean include(Entry<? extends UnsignedAppletActionTableModel, ? extends Integer> entry) { - ExecuteUnsignedApplet o = (ExecuteUnsignedApplet) entry.getModel().getValueAt(entry.getIdentifier(), 0); - return (o.equals(ExecuteUnsignedApplet.YES) || o.equals(ExecuteUnsignedApplet.NO)); + ExecuteAppletAction o = (ExecuteAppletAction) entry.getModel().getValueAt(entry.getIdentifier(), 0); + return (o.equals(ExecuteAppletAction.YES) || o.equals(ExecuteAppletAction.NO)); } } @@ -939,8 +939,8 @@ @Override public boolean include(Entry<? extends UnsignedAppletActionTableModel, ? extends Integer> entry) { - ExecuteUnsignedApplet o = (ExecuteUnsignedApplet) entry.getModel().getValueAt(entry.getIdentifier(), 0); - return (o.equals(ExecuteUnsignedApplet.YES)); + ExecuteAppletAction o = (ExecuteAppletAction) entry.getModel().getValueAt(entry.getIdentifier(), 0); + return (o.equals(ExecuteAppletAction.YES)); } @@ -950,8 +950,8 @@ @Override public boolean include(Entry<? extends UnsignedAppletActionTableModel, ? extends Integer> entry) { - ExecuteUnsignedApplet o = (ExecuteUnsignedApplet) entry.getModel().getValueAt(entry.getIdentifier(), 0); - return (o.equals(ExecuteUnsignedApplet.NO)); + ExecuteAppletAction o = (ExecuteAppletAction) entry.getModel().getValueAt(entry.getIdentifier(), 0); + return (o.equals(ExecuteAppletAction.NO)); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/security/AppTrustWarningDialog.java Mon Mar 03 11:36:14 2014 -0500 @@ -0,0 +1,68 @@ +/* Copyright (C) 2013 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.security; + +import net.sourceforge.jnlp.JNLPFile; +import net.sourceforge.jnlp.security.AppTrustWarningPanel.ActionChoiceListener; +import net.sourceforge.jnlp.security.AppTrustWarningPanel.AppSigningWarningAction; + +/** + * A panel that confirms that the user is OK with unsigned code running. + */ +public class AppTrustWarningDialog extends SecurityDialogPanel { + + private AppTrustWarningDialog(final SecurityDialog dialog) { + super(dialog); + } + + public static AppTrustWarningDialog unsigned(final SecurityDialog dialog, final JNLPFile file) { + final AppTrustWarningDialog warningDialog = new AppTrustWarningDialog(dialog); + warningDialog.add(new UnsignedAppletTrustWarningPanel(file, warningDialog.getActionChoiceListener())); + return warningDialog; + } + + private ActionChoiceListener getActionChoiceListener() { + return new ActionChoiceListener() { + @Override + public void actionChosen(final AppSigningWarningAction action) { + parent.setValue(action); + parent.dispose(); + } + }; + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/security/AppTrustWarningPanel.java Mon Mar 03 11:36:14 2014 -0500 @@ -0,0 +1,321 @@ +/* Copyright (C) 2013 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.security; + +import static net.sourceforge.jnlp.runtime.Translator.R; + +import java.awt.BorderLayout; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.ButtonGroup; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.SwingConstants; + +import net.sourceforge.jnlp.JNLPFile; +import net.sourceforge.jnlp.PluginBridge; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExtendedAppletSecurityHelp; +import net.sourceforge.jnlp.util.ScreenFinder; + +/* + * This class is meant to provide a common layout and functionality for warning dialogs + * that appear when the user needs to confirm the running of applets/applications. + * Subclasses include UnsignedAppletTrustWarningPanel, for unsigned plugin applets, and + * PartiallySignedAppTrustWarningPanel, for partially signed JNLP applications as well as + * plugin applets. New implementations should be added to the unit test at + * unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest + */ +public abstract class AppTrustWarningPanel extends JPanel { + + /* + * Details of decided action. + */ + public static class AppSigningWarningAction { + private ExecuteAppletAction action; + private boolean applyToCodeBase; + + public AppSigningWarningAction(ExecuteAppletAction action, + boolean applyToCodeBase) { + this.action = action; + this.applyToCodeBase = applyToCodeBase; + } + + public ExecuteAppletAction getAction() { + return action; + } + + public boolean rememberForCodeBase() { + return applyToCodeBase; + } + } + + /* + * Callback for when action is decided. + */ + public static interface ActionChoiceListener { + void actionChosen(AppSigningWarningAction action); + } + + protected int PANE_WIDTH = 500; + + protected int TOP_PANEL_HEIGHT = 60; + protected int INFO_PANEL_HEIGHT = 140; + protected int INFO_PANEL_HINT_HEIGHT = 25; + protected int QUESTION_PANEL_HEIGHT = 35; + + private JButton allowButton; + private JButton rejectButton; + private JButton helpButton; + private JCheckBox permanencyCheckBox; + private JRadioButton applyToAppletButton; + private JRadioButton applyToCodeBaseButton; + + protected JNLPFile file; + + private ActionChoiceListener actionChoiceListener; + + /* + * Subclasses should call addComponents() IMMEDIATELY after calling the super() constructor! + */ + public AppTrustWarningPanel(JNLPFile file, ActionChoiceListener actionChoiceListener) { + this.file = file; + this.actionChoiceListener = actionChoiceListener; + } + + /* + * Provides an image to be displayed near the upper left corner of the dialog. + */ + protected abstract ImageIcon getInfoImage(); + + /* + * Provides a short description of why the dialog is appearing. The message is expected to be HTML-formatted. + */ + protected abstract String getTopPanelText(); + + /* + * Provides in-depth information on why the dialog is appearing. The message is expected to be HTML-formatted. + */ + protected abstract String getInfoPanelText(); + + /* + * This provides the text for the final prompt to the user. The message is expected to be HTML formatted. + * The user's action is a direct response to this question. + */ + protected abstract String getQuestionPanelText(); + + public JButton getAllowButton() { + return allowButton; + } + + public JButton getRejectButton() { + return rejectButton; + } + + protected static String htmlWrap(String text) { + return "<html>" + text + "</html>"; + } + + private void setupTopPanel() { + final String topLabelText = getTopPanelText(); + + JLabel topLabel = new JLabel(topLabelText, getInfoImage(), + SwingConstants.LEFT); + topLabel.setFont(new Font(topLabel.getFont().toString(), Font.BOLD, 12)); + + JPanel topPanel = new JPanel(new BorderLayout()); + topPanel.setBackground(Color.WHITE); + topPanel.add(topLabel, BorderLayout.CENTER); + topPanel.setPreferredSize(new Dimension(PANE_WIDTH, TOP_PANEL_HEIGHT)); + topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + + add(topPanel); + } + + private void setupInfoPanel() { + String infoLabelText = getInfoPanelText(); + int panelHeight = INFO_PANEL_HEIGHT + INFO_PANEL_HINT_HEIGHT; + + JLabel infoLabel = new JLabel(infoLabelText); + JPanel infoPanel = new JPanel(new BorderLayout()); + infoPanel.add(infoLabel, BorderLayout.CENTER); + infoPanel.setPreferredSize(new Dimension(PANE_WIDTH, panelHeight)); + infoPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + + add(infoPanel); + } + + private void setupQuestionsPanel() { + JPanel questionPanel = new JPanel(new BorderLayout()); + + final String questionPanelText = getQuestionPanelText(); + questionPanel.add(new JLabel(questionPanelText), BorderLayout.EAST); + + questionPanel.setPreferredSize(new Dimension(PANE_WIDTH, QUESTION_PANEL_HEIGHT)); + questionPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); + + add(questionPanel); + } + + private JPanel createMatchOptionsPanel() { + JPanel matchOptionsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + + ButtonGroup group = new ButtonGroup(); + applyToAppletButton = new JRadioButton(R("SRememberAppletOnly")); + applyToAppletButton.setSelected(true); + applyToAppletButton.setEnabled(false); // Start disabled until 'Remember this option' is selected + + applyToCodeBaseButton = new JRadioButton(htmlWrap(R("SRememberCodebase", file.getCodeBase()))); + applyToCodeBaseButton.setEnabled(false); + + group.add(applyToAppletButton); + group.add(applyToCodeBaseButton); + + matchOptionsPanel.add(applyToAppletButton); + matchOptionsPanel.add(applyToCodeBaseButton); + + return matchOptionsPanel; + } + + private JPanel createCheckBoxPanel() { + JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + + permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption"))); + permanencyCheckBox.addActionListener(permanencyListener()); + checkBoxPanel.add(permanencyCheckBox); + + return checkBoxPanel; + } + + private JPanel createButtonPanel() { + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); + + allowButton = new JButton(R("ButProceed")); + rejectButton = new JButton(R("ButCancel")); + helpButton = new JButton(R("APPEXTSECguiPanelHelpButton")); + + allowButton.addActionListener(chosenActionSetter(true)); + rejectButton.addActionListener(chosenActionSetter(false)); + + helpButton.addActionListener(new ActionListener() { + + public void actionPerformed(ActionEvent e) { + JDialog d = new ExtendedAppletSecurityHelp(null, false, "dialogue"); + ScreenFinder.centerWindowsToCurrentScreen(d); + d.setVisible(true); + } + }); + + buttonPanel.add(allowButton); + buttonPanel.add(rejectButton); + buttonPanel.add(helpButton); + + buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10)); + + return buttonPanel; + } + + // Set up 'Remember Option' checkbox & Proceed/Cancel buttons + private void setupButtonAndCheckBoxPanel() { + JPanel outerPanel = new JPanel(new BorderLayout()); + JPanel rememberPanel = new JPanel(new GridLayout(2 /*rows*/, 1 /*column*/)); + rememberPanel.add(createCheckBoxPanel()); + rememberPanel.add(createMatchOptionsPanel()); + rememberPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); + + outerPanel.add(rememberPanel, BorderLayout.WEST); + outerPanel.add(createButtonPanel(), BorderLayout.EAST); + + add(outerPanel); + } + + /** + * Creates the actual GUI components, and adds it to this panel. This should be called by all subclasses + * IMMEDIATELY after calling the super() constructor! + */ + protected void addComponents() { + setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); + + setupTopPanel(); + setupInfoPanel(); + setupQuestionsPanel(); + setupButtonAndCheckBoxPanel(); + } + + // Toggles whether 'match applet' or 'match codebase' options are greyed out + private ActionListener permanencyListener() { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + applyToAppletButton.setEnabled(permanencyCheckBox.isSelected()); + applyToCodeBaseButton.setEnabled(permanencyCheckBox.isSelected()); + } + }; + } + + // Sets action depending on allowApplet + checkbox state + private ActionListener chosenActionSetter(final boolean allowApplet) { + return new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + ExecuteAppletAction action; + + if (allowApplet) { + action = permanencyCheckBox.isSelected() ? ExecuteAppletAction.ALWAYS : ExecuteAppletAction.YES; + } else { + action = permanencyCheckBox.isSelected() ? ExecuteAppletAction.NEVER : ExecuteAppletAction.NO; + } + + boolean applyToCodeBase = applyToCodeBaseButton.isSelected(); + actionChoiceListener.actionChosen(new AppSigningWarningAction(action, applyToCodeBase)); + } + }; + } +}
--- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java Mon Mar 03 11:36:14 2014 -0500 @@ -308,7 +308,7 @@ else if (dialogType == DialogType.NOTALLSIGNED_WARNING) panel = new NotAllSignedWarningPane(this); else if (dialogType == DialogType.UNSIGNED_WARNING) // Only necessary for applets on 'high security' or above - panel = new UnsignedAppletTrustWarningDialog(this, (PluginBridge)file); + panel = new UnsignedAppletTrustWarningDialog(this, file); else if (dialogType == DialogType.AUTHENTICATION) panel = new PasswordAuthenticationPane(this, extras);
--- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Mon Mar 03 11:36:14 2014 -0500 @@ -37,9 +37,6 @@ package net.sourceforge.jnlp.security; -import net.sourceforge.jnlp.security.UnsignedAppletTrustWarningPanel.UnsignedWarningAction; -import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet; - import java.awt.Dialog.ModalityType; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; @@ -54,6 +51,8 @@ import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.config.DeploymentConfiguration; import net.sourceforge.jnlp.runtime.JNLPRuntime; +import net.sourceforge.jnlp.security.AppTrustWarningPanel.AppSigningWarningAction; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; /** * <p> @@ -186,10 +185,10 @@ * * @return true if permission was granted by the user, false otherwise. */ - public static UnsignedWarningAction showUnsignedWarningDialog(JNLPFile file) { + public static AppSigningWarningAction showUnsignedWarningDialog(JNLPFile file) { if (!shouldPromptUser()) { - return new UnsignedWarningAction(ExecuteUnsignedApplet.NO, false); + return new AppSigningWarningAction(ExecuteAppletAction.NO, false); } final SecurityDialogMessage message = new SecurityDialogMessage(); @@ -197,7 +196,7 @@ message.accessType = AccessType.UNSIGNED; message.file = file; - return (UnsignedWarningAction)getUserResponse(message); + return (AppSigningWarningAction) getUserResponse(message); } /**
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningDialog.java Mon Mar 03 11:36:14 2014 -0500 @@ -36,9 +36,9 @@ package net.sourceforge.jnlp.security; -import net.sourceforge.jnlp.PluginBridge; -import net.sourceforge.jnlp.security.UnsignedAppletTrustWarningPanel.UnsignedWarningAction; -import net.sourceforge.jnlp.security.UnsignedAppletTrustWarningPanel.ActionChoiceListener; +import net.sourceforge.jnlp.JNLPFile; +import net.sourceforge.jnlp.security.AppTrustWarningPanel.ActionChoiceListener; +import net.sourceforge.jnlp.security.AppTrustWarningPanel.AppSigningWarningAction; /** * A panel that confirms that the user is OK with unsigned code running. @@ -46,13 +46,13 @@ */ public class UnsignedAppletTrustWarningDialog extends SecurityDialogPanel { - public UnsignedAppletTrustWarningDialog(SecurityDialog x, PluginBridge file) { + public UnsignedAppletTrustWarningDialog(SecurityDialog x, JNLPFile file) { super(x); add(new UnsignedAppletTrustWarningPanel(file, new ActionChoiceListener() { @Override - public void actionChosen(UnsignedWarningAction action) { + public void actionChosen(AppSigningWarningAction action) { parent.setValue(action); parent.dispose(); }
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java Mon Mar 03 11:36:14 2014 -0500 @@ -1,4 +1,4 @@ -/* Copyright (C) 2013 Red Hat, Inc. +/* Copyright (C) 2014 Red Hat, Inc. This file is part of IcedTea. @@ -32,271 +32,63 @@ 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.security; import static net.sourceforge.jnlp.runtime.Translator.R; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.FlowLayout; -import java.awt.Font; -import java.awt.GridLayout; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; +import javax.swing.ImageIcon; +import net.sourceforge.jnlp.JNLPFile; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; +import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation; -import javax.swing.BorderFactory; -import javax.swing.BoxLayout; -import javax.swing.ButtonGroup; -import javax.swing.ImageIcon; -import javax.swing.JButton; -import javax.swing.JCheckBox; -import javax.swing.JDialog; -import javax.swing.JLabel; -import javax.swing.JPanel; -import javax.swing.JRadioButton; -import javax.swing.SwingConstants; - -import net.sourceforge.jnlp.PluginBridge; -import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet; -import net.sourceforge.jnlp.security.appletextendedsecurity.ExtendedAppletSecurityHelp; -import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation; -import net.sourceforge.jnlp.util.ScreenFinder; -public class UnsignedAppletTrustWarningPanel extends JPanel { - - /* - * Details of decided action. - */ - public static class UnsignedWarningAction { - private ExecuteUnsignedApplet action; - private boolean applyToCodeBase; +public class UnsignedAppletTrustWarningPanel extends AppTrustWarningPanel { - public UnsignedWarningAction(ExecuteUnsignedApplet action, - boolean applyToCodeBase) { - this.action = action; - this.applyToCodeBase = applyToCodeBase; - } - - public ExecuteUnsignedApplet getAction() { - return action; - } - public boolean rememberForCodeBase() { - return applyToCodeBase; - } - } - - /* - * Callback for when action is decided. - */ - public static interface ActionChoiceListener { - void actionChosen(UnsignedWarningAction action); + public UnsignedAppletTrustWarningPanel(final JNLPFile file, final ActionChoiceListener listener) { + super(file, listener); + addComponents(); } - private final int PANE_WIDTH = 500; - - private final int TOP_PANEL_HEIGHT = 60; - private final int INFO_PANEL_HEIGHT = 140; - private final int INFO_PANEL_HINT_HEIGHT = 25; - private final int QUESTION_PANEL_HEIGHT = 35; - - private JButton allowButton; - private JButton rejectButton; - private JButton helpButton; - private JCheckBox permanencyCheckBox; - private JRadioButton applyToAppletButton; - private JRadioButton applyToCodeBaseButton; - - private PluginBridge file; - - private ActionChoiceListener actionChoiceListener; - - public UnsignedAppletTrustWarningPanel(PluginBridge file, ActionChoiceListener actionChoiceListener) { - - this.file = file; - this.actionChoiceListener = actionChoiceListener; - - addComponents(); - } - - public JButton getAllowButton() { - return allowButton; + @Override + protected ImageIcon getInfoImage() { + final String location = "net/sourceforge/jnlp/resources/info-small.png"; + return new ImageIcon(ClassLoader.getSystemClassLoader().getResource(location)); } - public JButton getRejectButton() { - return rejectButton; - } - - private String htmlWrap(String text) { - return "<html>" + text + "</html>"; - } - - private ImageIcon infoImage() { - final String location = "net/sourceforge/jnlp/resources/info-small.png"; - final ClassLoader appLoader = new sun.misc.Launcher().getClassLoader(); - return new ImageIcon(appLoader.getResource(location)); + protected static String getTopPanelTextKey() { + return "SUnsignedSummary"; } - private void setupTopPanel() { - final String topLabelText = R("SUnsignedSummary"); - - JLabel topLabel = new JLabel(htmlWrap(topLabelText), infoImage(), - SwingConstants.LEFT); - topLabel.setFont(new Font(topLabel.getFont().toString(), Font.BOLD, 12)); - - JPanel topPanel = new JPanel(new BorderLayout()); - topPanel.setBackground(Color.WHITE); - topPanel.add(topLabel, BorderLayout.CENTER); - topPanel.setPreferredSize(new Dimension(PANE_WIDTH, TOP_PANEL_HEIGHT)); - topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - - add(topPanel); + protected static String getInfoPanelTextKey() { + return "SUnsignedDetail"; } - private void setupInfoPanel() { - String infoLabelText = R("SUnsignedDetail", file.getCodeBase(), file.getSourceLocation()); - ExecuteUnsignedApplet rememberedAction = UnsignedAppletTrustConfirmation.getStoredAction(file); - int panelHeight = INFO_PANEL_HEIGHT; - if (rememberedAction == ExecuteUnsignedApplet.YES) { - infoLabelText += "<br/>" + R("SUnsignedAllowedBefore"); - panelHeight += INFO_PANEL_HINT_HEIGHT; - } else if (rememberedAction == ExecuteUnsignedApplet.NO) { - infoLabelText += "<br/>" + R("SUnsignedRejectedBefore"); - panelHeight += INFO_PANEL_HINT_HEIGHT; - } - - JLabel infoLabel = new JLabel(htmlWrap(infoLabelText)); - JPanel infoPanel = new JPanel(new BorderLayout()); - infoPanel.add(infoLabel, BorderLayout.CENTER); - infoPanel.setPreferredSize(new Dimension(PANE_WIDTH, panelHeight)); - infoPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - - add(infoPanel); + protected static String getQuestionPanelTextKey() { + return "SUnsignedQuestion"; } - private void setupQuestionsPanel() { - JPanel questionPanel = new JPanel(new BorderLayout()); - - questionPanel.add(new JLabel(htmlWrap(R("SUnsignedQuestion"))), BorderLayout.EAST); - - questionPanel.setPreferredSize(new Dimension(PANE_WIDTH, QUESTION_PANEL_HEIGHT)); - questionPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10)); - - add(questionPanel); - } - - private JPanel createMatchOptionsPanel() { - JPanel matchOptionsPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - - ButtonGroup group = new ButtonGroup(); - applyToAppletButton = new JRadioButton(R("SRememberAppletOnly")); - applyToAppletButton.setSelected(true); - applyToAppletButton.setEnabled(false); // Start disabled until 'Remember this option' is selected - - applyToCodeBaseButton = new JRadioButton(htmlWrap(R("SRememberCodebase", file.getCodeBase()))); - applyToCodeBaseButton.setEnabled(false); - - group.add(applyToAppletButton); - group.add(applyToCodeBaseButton); - - matchOptionsPanel.add(applyToAppletButton); - matchOptionsPanel.add(applyToCodeBaseButton); - - return matchOptionsPanel; - } - - private JPanel createCheckBoxPanel() { - JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); - - permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption"))); - permanencyCheckBox.addActionListener(permanencyListener()); - checkBoxPanel.add(permanencyCheckBox); - - return checkBoxPanel; + @Override + protected String getTopPanelText() { + return htmlWrap(R(getTopPanelTextKey())); } - private JPanel createButtonPanel() { - JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT)); - - allowButton = new JButton(R("ButProceed")); - rejectButton = new JButton(R("ButCancel")); - helpButton = new JButton(R("APPEXTSECguiPanelHelpButton")); - - allowButton.addActionListener(chosenActionSetter(true)); - rejectButton.addActionListener(chosenActionSetter(false)); - - helpButton.addActionListener(new ActionListener() { - - public void actionPerformed(ActionEvent e) { - JDialog d = new ExtendedAppletSecurityHelp(null, false,"dialogue"); - ScreenFinder.centerWindowsToCurrentScreen(d); - d.setVisible(true); - } - }); - - buttonPanel.add(allowButton); - buttonPanel.add(rejectButton); - buttonPanel.add(helpButton); - - buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10)); - - return buttonPanel; - } - - // Set up 'Remember Option' checkbox & Proceed/Cancel buttons - private void setupButtonAndCheckBoxPanel() { - JPanel outerPanel = new JPanel(new BorderLayout()); - JPanel rememberPanel = new JPanel(new GridLayout(2 /*rows*/, 1 /*column*/)); - rememberPanel.add(createCheckBoxPanel()); - rememberPanel.add(createMatchOptionsPanel()); - rememberPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); - - outerPanel.add(rememberPanel, BorderLayout.WEST); - outerPanel.add(createButtonPanel(), BorderLayout.EAST); - - add(outerPanel); + @Override + protected String getInfoPanelText() { + String text = R(getInfoPanelTextKey(), file.getCodeBase(), file.getSourceLocation()); + ExecuteAppletAction rememberedAction = UnsignedAppletTrustConfirmation.getStoredAction(file); + if (rememberedAction == ExecuteAppletAction.YES) { + text += "<br>" + R("SUnsignedAllowedBefore"); + } else if (rememberedAction == ExecuteAppletAction.NO) { + text += "<br>" + R("SUnsignedRejectedBefore"); + } + return htmlWrap(text); } - /** - * Creates the actual GUI components, and adds it to this panel - */ - private void addComponents() { - setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); - - setupTopPanel(); - setupInfoPanel(); - setupQuestionsPanel(); - setupButtonAndCheckBoxPanel(); + @Override + protected String getQuestionPanelText() { + return htmlWrap(R(getQuestionPanelTextKey())); } - // Toggles whether 'match applet' or 'match codebase' options are greyed out - private ActionListener permanencyListener() { - return new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - applyToAppletButton.setEnabled(permanencyCheckBox.isSelected()); - applyToCodeBaseButton.setEnabled(permanencyCheckBox.isSelected()); - } - }; - } - // Sets action depending on allowApplet + checkbox state - private ActionListener chosenActionSetter(final boolean allowApplet) { - return new ActionListener() { - @Override - public void actionPerformed(ActionEvent e) { - ExecuteUnsignedApplet action; - - if (allowApplet) { - action = permanencyCheckBox.isSelected() ? ExecuteUnsignedApplet.ALWAYS : ExecuteUnsignedApplet.YES; - } else { - action = permanencyCheckBox.isSelected() ? ExecuteUnsignedApplet.NEVER : ExecuteUnsignedApplet.NO; - } - - boolean applyToCodeBase = applyToCodeBaseButton.isSelected(); - actionChoiceListener.actionChosen(new UnsignedWarningAction(action, applyToCodeBase)); - } - }; - } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteAppletAction.java Mon Mar 03 11:36:14 2014 -0500 @@ -0,0 +1,90 @@ +/* Copyright (C) 2013 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.security.appletextendedsecurity; + +import net.sourceforge.jnlp.runtime.Translator; + +public enum ExecuteAppletAction { + + ALWAYS, NEVER, YES, NO; + + public String toChar() { + switch (this) { + case ALWAYS: + return "A"; + case NEVER: + return "N"; + case YES: + return "y"; + case NO: + return "n"; + } + throw new RuntimeException("Unknown ExecuteUnsignedApplet"); + } + + public String toExplanation() { + switch (this) { + case ALWAYS: + return Translator.R("APPEXTSECunsignedAppletActionAlways"); + case NEVER: + return Translator.R("APPEXTSECunsignedAppletActionNever"); + case YES: + return Translator.R("APPEXTSECunsignedAppletActionYes"); + case NO: + return Translator.R("APPEXTSECunsignedAppletActionNo"); + } + throw new RuntimeException("Unknown UnsignedAppletAction"); + } + + public static ExecuteAppletAction fromString(String s) { + if (s.startsWith("A")) { + return ExecuteAppletAction.ALWAYS; + } else if (s.startsWith("N")) { + return ExecuteAppletAction.NEVER; + } else if (s.startsWith("y")) { + return ExecuteAppletAction.YES; + } else if (s.startsWith("n")) { + return ExecuteAppletAction.NO; + } else { + throw new RuntimeException("Unknown ExecuteUnsignedApplet for " + s); + } + } + + @Override + public String toString() { + return toChar() + " - " + toExplanation(); + } +}
--- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/ExecuteUnsignedApplet.java Fri Feb 28 16:45:24 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -/* Copyright (C) 2013 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.security.appletextendedsecurity; - -import net.sourceforge.jnlp.runtime.Translator; - -public enum ExecuteUnsignedApplet { - - ALWAYS, NEVER, YES, NO; - - public String toChar() { - switch (this) { - case ALWAYS: - return "A"; - case NEVER: - return "N"; - case YES: - return "y"; - case NO: - return "n"; - } - throw new RuntimeException("Unknown ExecuteUnsignedApplet"); - } - - public String toExplanation() { - switch (this) { - case ALWAYS: - return Translator.R("APPEXTSECunsignedAppletActionAlways"); - case NEVER: - return Translator.R("APPEXTSECunsignedAppletActionNever"); - case YES: - return Translator.R("APPEXTSECunsignedAppletActionYes"); - case NO: - return Translator.R("APPEXTSECunsignedAppletActionNo"); - } - throw new RuntimeException("Unknown UnsignedAppletAction"); - } - - public static ExecuteUnsignedApplet fromString(String s) { - if (s.startsWith("A")) { - return ExecuteUnsignedApplet.ALWAYS; - } else if (s.startsWith("N")) { - return ExecuteUnsignedApplet.NEVER; - } else if (s.startsWith("y")) { - return ExecuteUnsignedApplet.YES; - } else if (s.startsWith("n")) { - return ExecuteUnsignedApplet.NO; - } else { - throw new RuntimeException("Unknown ExecuteUnsignedApplet for " + s); - } - } - - @Override - public String toString() { - return toChar() + " - " + toExplanation(); - } -}
--- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionEntry.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletActionEntry.java Mon Mar 03 11:36:14 2014 -0500 @@ -43,7 +43,7 @@ public class UnsignedAppletActionEntry { - private ExecuteUnsignedApplet unsignedAppletAction; + private ExecuteAppletAction unsignedAppletAction; private Date timeStamp; private UrlRegEx documentBase; private UrlRegEx codeBase; @@ -52,7 +52,7 @@ public static UnsignedAppletActionEntry createFromString(String s) { String[] split = s.split("\\s+"); UnsignedAppletActionEntry nw = new UnsignedAppletActionEntry( - ExecuteUnsignedApplet.fromString(split[0]), + ExecuteAppletAction.fromString(split[0]), new Date(new Long(split[1])), new UrlRegEx(split[2]), null, @@ -66,7 +66,7 @@ return nw; } - public UnsignedAppletActionEntry(ExecuteUnsignedApplet unsignedAppletAction, Date timeStamp, UrlRegEx documentBase, UrlRegEx codeBase, List<String> archives) { + public UnsignedAppletActionEntry(ExecuteAppletAction unsignedAppletAction, Date timeStamp, UrlRegEx documentBase, UrlRegEx codeBase, List<String> archives) { this.unsignedAppletAction = unsignedAppletAction; this.timeStamp = timeStamp; this.documentBase = documentBase; @@ -109,11 +109,11 @@ this.documentBase = documentBase; } - public ExecuteUnsignedApplet getUnsignedAppletAction() { + public ExecuteAppletAction getUnsignedAppletAction() { return unsignedAppletAction; } - public void setUnsignedAppletAction(ExecuteUnsignedApplet unsignedAppletAction) { + public void setUnsignedAppletAction(ExecuteAppletAction unsignedAppletAction) { this.unsignedAppletAction = unsignedAppletAction; }
--- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/UnsignedAppletTrustConfirmation.java Mon Mar 03 11:36:14 2014 -0500 @@ -38,20 +38,20 @@ import static net.sourceforge.jnlp.runtime.Translator.R; -import java.io.IOException; -import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; - -import net.sourceforge.jnlp.util.UrlUtils; +import net.sourceforge.jnlp.JARDesc; +import net.sourceforge.jnlp.JNLPFile; import net.sourceforge.jnlp.LaunchException; import net.sourceforge.jnlp.PluginBridge; -import net.sourceforge.jnlp.cache.ResourceTracker; +import net.sourceforge.jnlp.security.AppTrustWarningPanel.AppSigningWarningAction; +import net.sourceforge.jnlp.security.CertVerifier; import net.sourceforge.jnlp.security.SecurityDialogs; -import net.sourceforge.jnlp.security.UnsignedAppletTrustWarningPanel.UnsignedWarningAction; +import net.sourceforge.jnlp.util.UrlUtils; import net.sourceforge.jnlp.util.logging.OutputController; public class UnsignedAppletTrustConfirmation { @@ -78,30 +78,30 @@ * @param file the plugin file * @return the remembered decision */ - public static ExecuteUnsignedApplet getStoredAction(PluginBridge file) { + public static ExecuteAppletAction getStoredAction(JNLPFile file) { UnsignedAppletActionStorage userActionStorage = securitySettings.getUnsignedAppletActionCustomStorage(); UnsignedAppletActionStorage globalActionStorage = securitySettings.getUnsignedAppletActionGlobalStorage(); UnsignedAppletActionEntry globalEntry = getMatchingItem(globalActionStorage, file); UnsignedAppletActionEntry userEntry = getMatchingItem(userActionStorage, file); - ExecuteUnsignedApplet globalAction = globalEntry == null ? null : globalEntry.getUnsignedAppletAction(); - ExecuteUnsignedApplet userAction = userEntry == null ? null : userEntry.getUnsignedAppletAction(); + ExecuteAppletAction globalAction = globalEntry == null ? null : globalEntry.getUnsignedAppletAction(); + ExecuteAppletAction userAction = userEntry == null ? null : userEntry.getUnsignedAppletAction(); - if (userAction == ExecuteUnsignedApplet.ALWAYS || userAction == ExecuteUnsignedApplet.NEVER) { + if (userAction == ExecuteAppletAction.ALWAYS || userAction == ExecuteAppletAction.NEVER) { return userAction; - } else if (globalAction == ExecuteUnsignedApplet.ALWAYS || globalAction == ExecuteUnsignedApplet.NEVER) { + } else if (globalAction == ExecuteAppletAction.ALWAYS || globalAction == ExecuteAppletAction.NEVER) { return globalAction; } else { return userAction; } } - private static UnsignedAppletActionEntry getMatchingItem(UnsignedAppletActionStorage actionStorage, PluginBridge file) { + private static UnsignedAppletActionEntry getMatchingItem(UnsignedAppletActionStorage actionStorage, JNLPFile file) { return actionStorage.getMatchingItem( UrlUtils.normalizeUrlAndStripParams(file.getSourceLocation(), true /* encode local files */).toString(), UrlUtils.normalizeUrlAndStripParams(file.getCodeBase(), true /* encode local files */).toString(), - toRelativePaths(file.getArchiveJars(), file.getCodeBase().toString())); + toRelativePaths(getJars(file), file.getCodeBase().toString())); } /* Extract the archives as relative paths */ @@ -117,7 +117,7 @@ return fileNames; } - private static void updateAppletAction(PluginBridge file, ExecuteUnsignedApplet behaviour, boolean rememberForCodeBase) { + private static void updateAppletAction(JNLPFile file, ExecuteAppletAction behaviour, boolean rememberForCodeBase) { UnsignedAppletActionStorage userActionStorage = securitySettings.getUnsignedAppletActionCustomStorage(); userActionStorage.lock(); // We should ensure this operation is atomic @@ -142,7 +142,7 @@ if (!rememberForCodeBase) { documentbaseRegex = new UrlRegEx("\\Q" + documentbase + "\\E"); // Match only this applet - archiveMatches = toRelativePaths(file.getArchiveJars(), file.getCodeBase().toString()); // Match only this applet + archiveMatches = toRelativePaths(getJars(file), file.getCodeBase().toString()); // Match only this applet } UnsignedAppletActionEntry entry = new UnsignedAppletActionEntry( @@ -159,7 +159,19 @@ } } - public static void checkUnsignedWithUserIfRequired(PluginBridge file) throws LaunchException { + private static List<String> getJars(JNLPFile file) { + if (file instanceof PluginBridge) + return ((PluginBridge) file).getArchiveJars(); + + List<JARDesc> jars = Arrays.asList(file.getResources().getJARs()); + List<String> result = new ArrayList<String>(); + for (JARDesc jar : jars) { + result.add(jar.getLocation().toString()); + } + return result; + } + + public static void checkUnsignedWithUserIfRequired(JNLPFile file) throws LaunchException { if (unsignedAppletsAreForbidden()) { OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Not running unsigned applet at " + file.getCodeBase() +" because unsigned applets are disallowed by security policy."); @@ -171,21 +183,21 @@ return; } - ExecuteUnsignedApplet storedAction = getStoredAction(file); + ExecuteAppletAction storedAction = getStoredAction(file); OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Stored action for unsigned applet at " + file.getCodeBase() +" was " + storedAction); boolean appletOK; - if (storedAction == ExecuteUnsignedApplet.ALWAYS) { + if (storedAction == ExecuteAppletAction.ALWAYS) { appletOK = true; - } else if (storedAction == ExecuteUnsignedApplet.NEVER) { + } else if (storedAction == ExecuteAppletAction.NEVER) { appletOK = false; } else { // No remembered decision, prompt the user - UnsignedWarningAction warningResponse = SecurityDialogs.showUnsignedWarningDialog(file); - ExecuteUnsignedApplet executeAction = warningResponse.getAction(); + AppSigningWarningAction warningResponse = SecurityDialogs.showUnsignedWarningDialog(file); + ExecuteAppletAction executeAction = warningResponse.getAction(); - appletOK = (executeAction == ExecuteUnsignedApplet.YES || executeAction == ExecuteUnsignedApplet.ALWAYS); + appletOK = (executeAction == ExecuteAppletAction.YES || executeAction == ExecuteAppletAction.ALWAYS); if (executeAction != null) { updateAppletAction(file, executeAction, warningResponse.rememberForCodeBase()); @@ -199,4 +211,5 @@ } } + } \ No newline at end of file
--- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageExtendedImpl.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageExtendedImpl.java Mon Mar 03 11:36:14 2014 -0500 @@ -38,7 +38,7 @@ import java.io.File; import java.io.IOException; import java.util.Date; -import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletActionEntry; import net.sourceforge.jnlp.security.appletextendedsecurity.UrlRegEx; import net.sourceforge.jnlp.util.lockingfile.StorageIoException; @@ -78,7 +78,7 @@ }); } - public void removeByBehaviour(final ExecuteUnsignedApplet unsignedAppletAction) { + public void removeByBehaviour(final ExecuteAppletAction unsignedAppletAction) { doLocked(new Runnable() { public void run() { try { @@ -156,7 +156,7 @@ } if (columnIndex == 0) { - source.setUnsignedAppletAction((ExecuteUnsignedApplet) aValue); + source.setUnsignedAppletAction((ExecuteAppletAction) aValue); } if (columnIndex == 1) { source.setTimeStamp((Date) aValue);
--- a/netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageImpl.java Fri Feb 28 16:45:24 2014 -0500 +++ b/netx/net/sourceforge/jnlp/security/appletextendedsecurity/impl/UnsignedAppletActionStorageImpl.java Mon Mar 03 11:36:14 2014 -0500 @@ -41,7 +41,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteUnsignedApplet; +import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction; import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletActionEntry; import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletActionStorage; import net.sourceforge.jnlp.util.lockingfile.LockingReaderWriter; @@ -140,8 +140,8 @@ // Actions such as 'always accept' or 'always reject' are 'stronger' than // the hints 'was accepted' or 'was rejected'. for (UnsignedAppletActionEntry candidate : results) { - if (candidate.getUnsignedAppletAction() == ExecuteUnsignedApplet.ALWAYS - || candidate.getUnsignedAppletAction() == ExecuteUnsignedApplet.NEVER) { + if (candidate.getUnsignedAppletAction() == ExecuteAppletAction.ALWAYS + || candidate.getUnsignedAppletAction() == ExecuteAppletAction.NEVER) { //return first found strong return candidate; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/netx/unit/net/sourceforge/jnlp/security/AppTrustWarningPanelTest.java Mon Mar 03 11:36:14 2014 -0500 @@ -0,0 +1,130 @@ +package net.sourceforge.jnlp.security; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.swing.JButton; + +import net.sourceforge.jnlp.PluginBridge; +import net.sourceforge.jnlp.PluginParameters; +import net.sourceforge.jnlp.security.SecurityDialogs.AccessType; +import net.sourceforge.jnlp.security.SecurityDialogs.DialogType; +import net.sourceforge.jnlp.tools.JarCertVerifier; + +import org.junit.BeforeClass; +import org.junit.Test; + +public class AppTrustWarningPanelTest { + + private static URL mockCodebase; + private static URL mockDocumentBase; + private static String mockJar; + private static String mockMainClass; + private static int mockWidth; + private static int mockHeight; + private static PluginParameters mockParameters; + + private static PluginBridge mockPluginBridge; + + /* Should contain an instance of each AppTrustWarningPanel subclass */ + private static List<AppTrustWarningPanel> panelList = new ArrayList<AppTrustWarningPanel>(); + + @BeforeClass + public static void setup() throws Exception { + mockCodebase = new URL("http://www.example.com"); + mockDocumentBase = new URL("http://www.example.com"); + mockJar = "ApplicationName.jar"; + mockMainClass = "ApplicationMainClass"; + mockWidth = 100; + mockHeight = 100; + + Map<String, String> fakeMap = new HashMap<String, String>(); + fakeMap.put("code", mockMainClass); + mockParameters = new PluginParameters(fakeMap); + + mockPluginBridge = new PluginBridge(mockCodebase, mockDocumentBase, mockJar, + mockMainClass, mockWidth, mockHeight, mockParameters); + + panelList.add(new UnsignedAppletTrustWarningPanel(mockPluginBridge, null)); + } + + @Test + public void testJNLPFile() throws Exception { + for (AppTrustWarningPanel panel : panelList) { + assertNotNull("JNLPFile for " + panel.getClass() + " should not be null", panel.file); + } + } + + @Test + public void testDimensions() throws Exception { + for (AppTrustWarningPanel panel : panelList) { + assertTrue("Pane width for " + panel.getClass() + " should be positive", panel.PANE_WIDTH > 0); + assertTrue("Top panel height for " + panel.getClass() + " should be positive", panel.TOP_PANEL_HEIGHT > 0); + assertTrue("Info panel height for " + panel.getClass() + " should be positive", panel.INFO_PANEL_HEIGHT > 0); + assertTrue("Info panel hint height for " + panel.getClass() + " should be positive", panel.INFO_PANEL_HINT_HEIGHT > 0); + assertTrue("Question panel height for " + panel.getClass() + " should be positive", panel.QUESTION_PANEL_HEIGHT > 0); + } + } + + @Test + public void testButtons() throws Exception { + for (AppTrustWarningPanel panel : panelList) { + assertTrue("Allow Button for " + panel.getClass() + " should be a JButton", panel.getAllowButton() instanceof JButton); + assertTrue("Reject Button for " + panel.getClass() + " should be a JButton", panel.getRejectButton() instanceof JButton); + } + } + + @Test + public void testInfoImage() throws Exception { + for (AppTrustWarningPanel panel : panelList) { + assertNotNull("infoImage should not be null for " + panel.getClass(), panel.getInfoImage()); + } + } + + @Test + public void testGetTopLabelTextKey() throws Exception { + for (AppTrustWarningPanel panel : panelList) { + assertResultTextValid("top panel", panel.getClass(), panel.getTopPanelText()); + } + } + + @Test + public void testGetInfoLabelTextKey() throws Exception { + for (AppTrustWarningPanel panel : panelList) { + assertResultTextValid("info panel", panel.getClass(), panel.getInfoPanelText()); + } + } + + @Test + public void testGetQuestionPanelKey() throws Exception { + for (AppTrustWarningPanel panel : panelList) { + assertResultTextValid("question panel", panel.getClass(), panel.getQuestionPanelText()); + } + } + + @Test + public void testHtmlWrap() throws Exception { + final String testText = "This is some text"; + final String expectedResult = "<html>This is some text</html>"; + final String actualResult = UnsignedAppletTrustWarningPanel.htmlWrap(testText); + assertEquals("htmlWrap should properly wrap text with HTML tags", expectedResult, actualResult); + } + + private static void assertResultTextValid(String propertyName, Class<? extends AppTrustWarningPanel> panelType, String result) { + assertNotNull(propertyName + " text should not be null for " + panelType, result); + assertFalse(propertyName + " text should not be No Resource for " + panelType, result.contains("RNoResource")); + assertFalse(propertyName + " label text resource should not be missing for " + panelType, result.contains("Missing Resource:")); + assertTrue(propertyName + " text should be html-wrapped for " + panelType, + result.startsWith("<html>") && result.endsWith("</html>")); + assertFalse(propertyName + " should not have empty fields for " + panelType, result.matches(".*\\{\\d+\\}.*")); + } + +}