/hg/icedtea-web: Base implementation of Application-Library-Allo...
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Fri Mar 14 12:40:34 UTC 2014
changeset aba4c18c4c64 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=aba4c18c4c64
author: Jiri Vanek <jvanek at redhat.com>
date: Fri Mar 14 13:06:03 2014 +0100
Base implementation of Application-Library-Allowable-Codebase. Remember button not yet working.
diffstat:
ChangeLog | 33 ++
netx/net/sourceforge/jnlp/JNLPFile.java | 14 +-
netx/net/sourceforge/jnlp/resources/Messages.properties | 19 +
netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java | 93 +++++
netx/net/sourceforge/jnlp/security/SecurityDialog.java | 6 +
netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 34 +-
netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java | 165 ++++++++++
netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java | 162 +++++++++
netx/net/sourceforge/jnlp/util/ClasspathMatcher.java | 30 +-
netx/net/sourceforge/jnlp/util/UrlUtils.java | 105 ++++++
tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java | 98 +++++
tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java | 107 ++++++
12 files changed, 846 insertions(+), 20 deletions(-)
diffs (truncated from 1090 to 500 lines):
diff -r dfc27d4d55d5 -r aba4c18c4c64 ChangeLog
--- a/ChangeLog Thu Mar 13 13:48:00 2014 -0400
+++ b/ChangeLog Fri Mar 14 13:06:03 2014 +0100
@@ -1,3 +1,36 @@
+2014-03-14 Jiri Vanek <jvanek at redhat.com>
+
+ Base implementation of Application-Library-Allowable-Codebase. Remember
+ button not yet working.
+ * netx/net/sourceforge/jnlp/JNLPFile.java: (ClasspathMatchers)
+ (getApplicationLibraryAllowableCodebase) (getCodebase) (getCodeBaseMatchersAttribute)
+ (getCodeBaseMatchersAttribute) (getCodeBaseMatchersAttribute) changed signature
+ to include/not include path in returned matcher.
+ * netx/net/sourceforge/jnlp/resources/Messages.properties: Added keys
+ (ALACAMissingMainTitle) (ALACAMissingInfo) (ALACAMatchingMainTitle)
+ (ALACAMatchingInfo) for new dialogs.
+ * netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java: Implemented
+ (checkApplicationLibraryAllowableCodebaseAttribute). Used in (init)
+ * netx/net/sourceforge/jnlp/security/SecurityDialog.java: made aware of
+ new constants (MISSING_ALACA) and (MATCHING_ALACA)
+ * netx/net/sourceforge/jnlp/security/SecurityDialogs.java: new constants
+ (MISSING_ALACA) and (MATCHING_ALACA). Implemented (showMissingALACAttributePanel)
+ and (showMatchingALACAttributePanel)
+ * netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java
+ new dialog for Matching attribute
+ * netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java:
+ new dialog for Missing attribute.
+ * netx/net/sourceforge/jnlp/util/ClasspathMatcher.java: allowing user to
+ choose whether to include paths in matching or not.
+ * netx/net/sourceforge/jnlp/util/UrlUtils.java: new util methods (removeFileName)
+ (setOfUrlsToHtmlList) (sanitizeLastSlash) and (equalsIgnoreLastSlash) to
+ strip filename from url, toString for iterable of urls to string, and
+ for operations with URLs independently on last slash
+ * tests/netx/unit/net/sourceforge/jnlp/util/ClasspathMatcherTest.java: added
+ tests for paths
+ * tests/netx/unit/net/sourceforge/jnlp/util/UrlUtilsTest.java: added tests
+ for new methods
+
2014-03-13 Andrew Azores <aazores at redhat.com>
* netx/net/sourceforge/jnlp/security/policyeditor/PolicyEditor.java:
diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/JNLPFile.java
--- a/netx/net/sourceforge/jnlp/JNLPFile.java Thu Mar 13 13:48:00 2014 -0400
+++ b/netx/net/sourceforge/jnlp/JNLPFile.java Fri Mar 14 13:06:03 2014 +0100
@@ -920,21 +920,21 @@
* http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#caller_allowable
*/
public ClasspathMatcher.ClasspathMatchers getCallerAllowableCodebase() {
- return getCodeBaseMatchersAttribute(CALLER_ALLOWABLE);
+ return getCodeBaseMatchersAttribute(CALLER_ALLOWABLE, false);
}
/**
* http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#app_library
*/
public ClasspathMatcher.ClasspathMatchers getApplicationLibraryAllowableCodebase() {
- return getCodeBaseMatchersAttribute(APP_LIBRARY_ALLOWABLE);
+ return getCodeBaseMatchersAttribute(APP_LIBRARY_ALLOWABLE, true);
}
/**
* http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/manifest.html#codebase
*/
public ClasspathMatcher.ClasspathMatchers getCodebase() {
- return getCodeBaseMatchersAttribute(CODEBASE);
+ return getCodeBaseMatchersAttribute(CODEBASE, false);
}
/**
@@ -1004,16 +1004,16 @@
return loader.checkForAttributeInJars(Arrays.asList(getResources().getJARs()), name);
}
- public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(String s) {
- return getCodeBaseMatchersAttribute(new Attributes.Name(s));
+ public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(String s, boolean includePath) {
+ return getCodeBaseMatchersAttribute(new Attributes.Name(s), includePath);
}
- public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(Attributes.Name name) {
+ public ClasspathMatcher.ClasspathMatchers getCodeBaseMatchersAttribute(Attributes.Name name, boolean includePath) {
String s = getAttribute(name);
if (s == null) {
return null;
}
- return ClasspathMatcher.ClasspathMatchers.compile(s);
+ return ClasspathMatcher.ClasspathMatchers.compile(s, includePath);
}
private ManifestBoolean processBooleanAttribute(String id) throws IllegalArgumentException {
diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties Thu Mar 13 13:48:00 2014 -0400
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties Fri Mar 14 13:06:03 2014 +0100
@@ -58,6 +58,25 @@
and<br/> <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> \
http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
+# missing Application-Library-Allowable-Codebase dialogue
+ALACAMissingMainTitle=Application <span color='red'> {0} </span> \
+form codebase <span color='red'> {1} </span> is missing the Application-Library-Allowable-Codebase attribute. \
+This application uses resources from the following remote locations:<br/> {2} Are you sure you want to run this application?
+ALACAMissingInfo=For more information you can visit:<br/>\
+<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> \
+http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library</a> <br/> \
+and<br/> <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> \
+http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
+# matching Application-Library-Allowable-Codebase dialogue
+ALACAMatchingMainTitle=Application <span color='red'> {0} </span> \
+form codebase <span color='red'> {1} </span> is requiring valid resources from different locations:<br/>{2} <br/> \
+Those resources are expected to be loaded. Do you agree to run this application?
+ALACAMatchingInfo=For more information you can visit:<br/>\
+<a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library"> \
+http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library</a> <br/> \
+and<br/> <a href="http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html"> \
+http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/no_redeploy.html</a>
+
# LS - Severity
LSMinor=Minor
LSFatal=Fatal
diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java
--- a/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Thu Mar 13 13:48:00 2014 -0400
+++ b/netx/net/sourceforge/jnlp/runtime/JNLPClassLoader.java Fri Mar 14 13:06:03 2014 +0100
@@ -92,6 +92,7 @@
import net.sourceforge.jnlp.util.ClasspathMatcher.ClasspathMatchers;
import net.sourceforge.jnlp.util.JarFile;
import net.sourceforge.jnlp.util.StreamUtils;
+import net.sourceforge.jnlp.util.UrlUtils;
import net.sourceforge.jnlp.util.logging.OutputController;
import sun.misc.JarIndex;
@@ -292,6 +293,8 @@
checkPermissionsAttribute();
+ checkApplicationLibraryAllowableCodebaseAttribute();
+
installShutdownHooks();
@@ -2324,6 +2327,96 @@
public boolean getRunInSandbox();
}
+ private void checkApplicationLibraryAllowableCodebaseAttribute() throws LaunchException {
+ if (signing == SigningState.NONE){
+ return; /*when app is not signed at all, then skip this check*/
+ }
+ //conditions
+ URL codebase = file.getCodeBase();
+ URL documentBase = null;
+ if (file instanceof PluginBridge) {
+ documentBase = ((PluginBridge) file).getSourceLocation();
+ }
+ if (documentBase == null) {
+ documentBase = file.getCodeBase();
+ }
+
+ //cases
+ Set<URL> usedUrls = new HashSet<URL>();
+ URL sourceLocation = file.getSourceLocation();
+ ResourcesDesc[] resourcesDescs = file.getResourcesDescs();
+ if (sourceLocation != null) {
+ usedUrls.add(UrlUtils.removeFileName(sourceLocation));
+ }
+ for (ResourcesDesc resourcesDesc: resourcesDescs) {
+ ExtensionDesc[] ex = resourcesDesc.getExtensions();
+ if (ex != null) {
+ for ( ExtensionDesc extensionDesc: ex) {
+ if (extensionDesc != null) {
+ usedUrls.add(UrlUtils.removeFileName(extensionDesc.getLocation()));
+ }
+ }
+ }
+ JARDesc[] jars = resourcesDesc.getJARs();
+ if (jars != null) {
+ for (JARDesc jarDesc: jars) {
+ if (jarDesc != null) {
+ usedUrls.add(UrlUtils.removeFileName(jarDesc.getLocation()));
+ }
+ }
+ }
+ JNLPFile jnlp = resourcesDesc.getJNLPFile();
+ if (jnlp != null) {
+ usedUrls.add(UrlUtils.removeFileName(jnlp.getSourceLocation()));
+ }
+
+ }
+ OutputController.getLogger().log("Found alaca URLs to be verified");
+ for (URL url : usedUrls) {
+ OutputController.getLogger().log(" - " + url.toExternalForm());
+ }
+ if (usedUrls.isEmpty()) {
+ //I hope this is the case, when the resources is/are
+ //only codebase classes. Then it should be safe to return.
+ OutputController.getLogger().log("The application is not using any url resources, skipping Application-Library-Allowable-Codebase Attribute check.");
+ return;
+ }
+
+ if (usedUrls.size() == 1) {
+ if (UrlUtils.equalsIgnoreLastSlash(usedUrls.toArray(new URL[0])[0], codebase)
+ && UrlUtils.equalsIgnoreLastSlash(usedUrls.toArray(new URL[0])[0], documentBase)) {
+ //all resoources are from codebase or document base. it is ok to proceeed.
+ OutputController.getLogger().log("All applications resources (" + usedUrls.toArray(new URL[0])[0] + ") are from codebas/documentbase " + codebase + "/" + documentBase + ", skipping Application-Library-Allowable-Codebase Attribute check.");
+ return;
+ }
+ }
+ ClasspathMatchers att = file.getManifestsAttributes().getApplicationLibraryAllowableCodebase();
+
+ if (att == null) {
+ boolean a = SecurityDialogs.showMissingALACAttributePanel(file.getTitle(), documentBase, usedUrls);
+ if (!a) {
+ throw new LaunchException("The application uses non-codebase resources, has no Application-Library-Allowable-Codebase Attribute, and was blocked from running by the user");
+ } else {
+ OutputController.getLogger().log("The application uses non-codebase resources, has no Application-Library-Allowable-Codebase Attribute, and was allowed to run by the user");
+ return;
+ }
+ } else {
+ for (URL foundUrl : usedUrls) {
+ if (!att.matches(foundUrl)) {
+ throw new LaunchException("The resource from " + foundUrl + " does not match the location in Application-Library-Allowable-Codebase Attribute " + att + ". Blocking the application from running.");
+ } else {
+ OutputController.getLogger().log("The resource from " + foundUrl + " does match the location in Application-Library-Allowable-Codebase Attribute " + att + ". Continuing.");
+ }
+ }
+ }
+ boolean a = SecurityDialogs.showMatchingALACAttributePanel(file.getTitle(), documentBase, usedUrls);
+ if (!a) {
+ throw new LaunchException("The application uses non-codebase resources, which do match its Application-Library-Allowable-Codebase Attribute, but was blocked from running by the user." );
+ } else {
+ OutputController.getLogger().log("The application uses non-codebase resources, which do match its Application-Library-Allowable-Codebase Attribute, and was allowed to run by the user." );
+ }
+ }
+
/**
* Handles security decision logic for the JNLPClassLoader, eg which permission level to assign
* to JARs.
diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/SecurityDialog.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialog.java Thu Mar 13 13:48:00 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialog.java Fri Mar 14 13:06:03 2014 +0100
@@ -37,6 +37,8 @@
package net.sourceforge.jnlp.security;
+import net.sourceforge.jnlp.security.dialogs.MissingALACAttributePanel;
+import net.sourceforge.jnlp.security.dialogs.MatchingALACAttributePanel;
import net.sourceforge.jnlp.security.dialogs.MissingPermissionsAttributePanel;
import net.sourceforge.jnlp.security.dialogs.AppletWarningPane;
import net.sourceforge.jnlp.security.dialogs.AccessWarningPane;
@@ -320,6 +322,10 @@
panel = new PasswordAuthenticationPane(this, extras);
else if (dialogType == DialogType.UNSIGNED_EAS_NO_PERMISSIONS_WARNING)
panel = new MissingPermissionsAttributePanel(this, (String) extras[0], (String) extras[1]);
+ else if (dialogType == DialogType.MISSING_ALACA)
+ panel = new MissingALACAttributePanel(this, (String) extras[0], (String) extras[1], (String) extras[2]);
+ else if (dialogType == DialogType.MATCHING_ALACA)
+ panel = new MatchingALACAttributePanel(this, (String) extras[0], (String) extras[1], (String) extras[2]);
add(panel, BorderLayout.CENTER);
}
diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/SecurityDialogs.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Thu Mar 13 13:48:00 2014 -0400
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Fri Mar 14 13:06:03 2014 +0100
@@ -44,6 +44,7 @@
import java.net.URL;
import java.security.AccessController;
import java.security.PrivilegedAction;
+import java.util.Set;
import java.util.concurrent.Semaphore;
import javax.swing.JDialog;
@@ -52,6 +53,7 @@
import net.sourceforge.jnlp.JNLPFile;
import net.sourceforge.jnlp.config.DeploymentConfiguration;
import net.sourceforge.jnlp.runtime.JNLPRuntime;
+import net.sourceforge.jnlp.util.UrlUtils;
import net.sourceforge.jnlp.security.dialogs.apptrustwarningpanel.AppTrustWarningPanel.AppSigningWarningAction;
import net.sourceforge.jnlp.security.appletextendedsecurity.ExecuteAppletAction;
@@ -80,7 +82,9 @@
UNSIGNED_WARNING, /* requires confirmation with 'high-security' setting */
APPLET_WARNING,
AUTHENTICATION,
- UNSIGNED_EAS_NO_PERMISSIONS_WARNING /* when Extended applet security is at High Security and no permission attribute is find, */
+ UNSIGNED_EAS_NO_PERMISSIONS_WARNING, /* when Extended applet security is at High Security and no permission attribute is find, */
+ MISSING_ALACA, /*alaca - Application-Library-Allowable-Codebase Attribute*/
+ MATCHING_ALACA
}
/** The types of access which may need user permission. */
@@ -263,6 +267,32 @@
return (Object[]) response;
}
+ public static boolean showMissingALACAttributePanel(String title, URL codeBase, Set<URL> remoteUrls) {
+
+ if (!shouldPromptUser()) {
+ return false;
+ }
+
+ SecurityDialogMessage message = new SecurityDialogMessage();
+ message.dialogType = DialogType.MISSING_ALACA;
+ message.extras = new Object[]{title, codeBase.toString(), UrlUtils.setOfUrlsToHtmlList(remoteUrls)};
+ Object selectedValue = getUserResponse(message);
+ return getIntegerResponseAsBoolean(selectedValue);
+ }
+
+ public static boolean showMatchingALACAttributePanel(String title, URL codeBase, Set<URL> remoteUrls) {
+
+ if (!shouldPromptUser()) {
+ return false;
+ }
+
+ SecurityDialogMessage message = new SecurityDialogMessage();
+ message.dialogType = DialogType.MATCHING_ALACA;
+ message.extras = new Object[]{title, codeBase.toString(), UrlUtils.setOfUrlsToHtmlList(remoteUrls)};
+ Object selectedValue = getUserResponse(message);
+ return getIntegerResponseAsBoolean(selectedValue);
+ }
+
/**
* FIXME This is unused. Remove it?
* @return (0, 1, 2) => (Yes, No, Cancel)
@@ -417,5 +447,5 @@
}
});
}
-
+
}
diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/security/dialogs/MatchingALACAttributePanel.java Fri Mar 14 13:06:03 2014 +0100
@@ -0,0 +1,165 @@
+/*
+ Copyright (C) 2008 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.dialogs;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Desktop;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.Font;
+import java.awt.Image;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.HashSet;
+import java.util.Set;
+import javax.imageio.ImageIO;
+
+import javax.swing.BorderFactory;
+import javax.swing.BoxLayout;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JEditorPane;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import javax.swing.event.HyperlinkEvent;
+import javax.swing.event.HyperlinkListener;
+import net.sourceforge.jnlp.runtime.Translator;
+import net.sourceforge.jnlp.security.SecurityDialog;
+import net.sourceforge.jnlp.util.UrlUtils;
+import net.sourceforge.jnlp.util.logging.OutputController;
+
+/**
+ * http://docs.oracle.com/javase/7/docs/technotes/guides/jweb/security/manifest.html#app_library
+ */
+public class MatchingALACAttributePanel extends SecurityDialogPanel {
+
+ public MatchingALACAttributePanel(SecurityDialog x, String title, String codebase, String remoteUrls) {
+ super(x);
+ try {
+ addComponents(title, codebase, remoteUrls);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex);
+ }
+ if (x != null) {
+ x.setMinimumSize(new Dimension(600, 400));
+ }
+ }
+
+ protected final void addComponents(String title, String codebase, String remoteUrls) throws IOException {
+
+ URL imgUrl = this.getClass().getResource("/net/sourceforge/jnlp/resources/question.png");
+ ImageIcon icon;
+ Image img = ImageIO.read(imgUrl);
+ icon = new ImageIcon(img);
+ String topLabelText = Translator.R("ALACAMatchingMainTitle", title, codebase, remoteUrls);
+ String bottomLabelText = Translator.R("ALACAMatchingInfo");
+
+ JLabel topLabel = new JLabel(htmlWrap(topLabelText), icon, SwingConstants.CENTER);
+ 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(400, 80));
+ topPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+ JEditorPane bottomLabel = new JEditorPane("text/html", htmlWrap(bottomLabelText));
+ bottomLabel.setEditable(false);
+ bottomLabel.addHyperlinkListener(new HyperlinkListener() {
+ @Override
+ public void hyperlinkUpdate(HyperlinkEvent e) {
+ try {
+ if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) {
+ Desktop.getDesktop().browse(e.getURL().toURI());
+ }
+ } catch (IOException ex) {
+ OutputController.getLogger().log(ex);
+ } catch (URISyntaxException ex) {
+ OutputController.getLogger().log(ex);
+ }
+ }
+ });
+ JPanel infoPanel = new JPanel(new BorderLayout());
+ infoPanel.add(bottomLabel, BorderLayout.CENTER);
+ infoPanel.setPreferredSize(new Dimension(400, 80));
+ infoPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ bottomLabel.setBackground(infoPanel.getBackground());
+
+ //run and cancel buttons
+ JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+
+ JButton yes = new JButton(Translator.R("ButYes"));
+ JButton no = new JButton(Translator.R("ButNo"));
+ JCheckBox remeber = new JCheckBox(htmlWrap(Translator.R("SRememberOption")));
+ int buttonWidth = yes.getMinimumSize().width;
+ int buttonHeight = yes.getMinimumSize().height;
+ Dimension d = new Dimension(buttonWidth, buttonHeight);
+ yes.setPreferredSize(d);
+ no.setPreferredSize(d);
+ yes.addActionListener(createSetValueListener(parent, 0));
+ no.addActionListener(createSetValueListener(parent, 1));
+ initialFocusComponent = no;
+ buttonPanel.add(remeber);
+ buttonPanel.add(yes);
+ buttonPanel.add(no);
+ buttonPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ //all of the above
+ setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
+ add(topPanel);
+ add(infoPanel);
+ add(buttonPanel);
+
+ }
+
+ public static void main(String[] args) throws MalformedURLException {
+ Set<URL> s = new HashSet<URL>();
+ s.add(new URL("http:/blah.com/blah"));
+ s.add(new URL("http:/blah.com/blah/blah"));
+ MatchingALACAttributePanel w = new MatchingALACAttributePanel(null, "HelloWorld", "http://nbblah.url", UrlUtils.setOfUrlsToHtmlList(s));
+ JFrame f = new JFrame();
+ f.setSize(600, 400);
+ f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+ f.add(w, BorderLayout.CENTER);
+ f.setVisible(true);
+ }
+}
diff -r dfc27d4d55d5 -r aba4c18c4c64 netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/netx/net/sourceforge/jnlp/security/dialogs/MissingALACAttributePanel.java Fri Mar 14 13:06:03 2014 +0100
More information about the distro-pkg-dev
mailing list