/hg/icedtea-web: 3 new changesets
jvanek at icedtea.classpath.org
jvanek at icedtea.classpath.org
Wed Apr 5 13:53:03 UTC 2017
changeset 2b92785e1299 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=2b92785e1299
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 05 15:06:42 2017 +0200
netx/net/sourceforge/jnlp/security/SecurityDialogs.java (AccessWarningPaneComplexReturn) fixed javadoc warning
changeset 92956304faf4 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=92956304faf4
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 05 15:47:28 2017 +0200
Split ENABLE_PLUGIN to ENABLE_NATIVE_PLUGIN and ENABLE_PLUGINJAR to allow build of plugin.jar and jsobject.jar without native plugin. Doing so, javaws -html may end on plugin-less system.
--disable-plugin replaced by --disable-native_plugin and --disable-plugin.jar
* configure.ac: added check, that native_plugin can not be built without pluginjar
* acinclude.m4: IT_CHECK_PLUGIN and comp. changed to IT_CHECK_NATIVE_PLUGIN and likewise. Added IT_CHECK_PLUGINJAR to allow user enable/disable plugin completely.
* .Makefile: following configure changes, ENABLE_PLUGIN renamed/split to ENABLE_NATIVE_PLUGIN and ENABLE_PLUGINJAR all testsuites keep running with --disable-native_plugin. Not so with disabled plugin completely
changeset b3d9f5bf15f6 in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=b3d9f5bf15f6
author: Jiri Vanek <jvanek at redhat.com>
date: Wed Apr 05 16:00:22 2017 +0200
automerge
diffstat:
ChangeLog | 26 +++++++
Makefile.am | 34 +++++----
acinclude.m4 | 33 ++++++---
configure.ac | 5 +
netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java | 7 ++
netx/net/sourceforge/jnlp/security/SecurityDialogs.java | 1 +
netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java | 34 +++++----
7 files changed, 100 insertions(+), 40 deletions(-)
diffs (299 lines):
diff -r 9a59ac4283f2 -r b3d9f5bf15f6 ChangeLog
--- a/ChangeLog Wed Jan 11 16:20:21 2017 +0100
+++ b/ChangeLog Wed Apr 05 16:00:22 2017 +0200
@@ -1,3 +1,29 @@
+2017-04-05 Jiri Vanek <jvanek at redhat.com>
+
+ Split ENABLE_PLUGIN to ENABLE_NATIVE_PLUGIN and ENABLE_PLUGINJAR to allow build
+ of plugin.jar and jsobject.jar without native plugin. Doing so,
+ javaws -html may end on plugin-less system.
+ --disable-plugin replaced by --disable-native_plugin and --disable-plugin.jar
+ * configure.ac: added check, that native_plugin can not be built without pluginjar
+ * acinclude.m4: IT_CHECK_PLUGIN and comp. changed to IT_CHECK_NATIVE_PLUGIN and likewise.
+ Added IT_CHECK_PLUGINJAR to allow user enable/disable plugin completely.
+ * .Makefile: following configure changes, ENABLE_PLUGIN renamed/split to
+ ENABLE_NATIVE_PLUGIN and ENABLE_PLUGINJAR
+ all testsuites keep running with --disable-native_plugin. Not so with disabled plugin completely
+
+2017-04-05 Jiri Vanek <jvanek at redhat.com>
+
+ * netx/net/sourceforge/jnlp/security/SecurityDialogs.java:
+ (AccessWarningPaneComplexReturn) fixed javadoc warning
+
+2017-01-13 Jiri Vanek <jvanek at redhat.com>
+
+ Basic certificate got command line saving support
+ * netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java: if
+ dialog is CertWarningPane and should be remembered, is.
+ * netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java: extracted
+ saving method, so it can be reused
+
2017-01-11 Jiri Vanek <jvanek at redhat.com>
* icedteaweb-completion.in: improved to suggest also files in relevant cases
diff -r 9a59ac4283f2 -r b3d9f5bf15f6 Makefile.am
--- a/Makefile.am Wed Jan 11 16:20:21 2017 +0100
+++ b/Makefile.am Wed Apr 05 16:00:22 2017 +0200
@@ -112,7 +112,7 @@
# support for javaws -html needs plugin.jar on classpath. rest of javaws works of course without it.
# plugin jar is split into plugin.jar and jsobject.jar so it can run with modular (9+) jdk
-if ENABLE_PLUGIN
+if ENABLE_PLUGINJAR
PLUGIN_JAR=$(datadir)/$(PACKAGE_NAME)/plugin.jar
JSOBJECT_JAR=$(datadir)/$(PACKAGE_NAME)/jsobject.jar
endif
@@ -165,20 +165,25 @@
net.sourceforge.jnlp.tools net.sourceforge.jnlp.util \
sun.applet
-if ENABLE_PLUGIN
-export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
+if ENABLE_PLUGINJAR
+export ICEDTEAPLUGIN_TARGET = stamps/liveconnect-dist.stamp
+export PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
+export PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
export JSOBJECT_DIRS = netscape
export SUN_APPLET_DIRS = sun/applet
+export PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
+export LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
export LIVECONNECT_DIR = $(JSOBJECT_DIRS) $(SUN_APPLET_DIRS)
-export PLUGIN_DIR=$(abs_top_builddir)/plugin/icedteanp
-export PLUGIN_SRCDIR=$(abs_top_srcdir)/plugin/icedteanp
-export LIVECONNECT_SRCS = $(PLUGIN_SRCDIR)/java
+endif
+#overriding ICEDTEAPLUGIN_TARGET
+if ENABLE_NATIVE_PLUGIN
export ICEDTEAPLUGIN_TARGET = $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) stamps/liveconnect-dist.stamp
-export PLUGIN_PKGS = sun.applet netscape.security netscape.javascript
+export ICEDTEAPLUGIN_CLEAN = clean-IcedTeaPlugin
#this is for plugin testcoverage
export COVERABLE_PLUGIN_DIR=$(TESTS_DIR)/icedteanp-build-with-jacoco
endif
+
if CP_SUPPORTS_REFLINK
REFLINK = --reflink=auto
endif
@@ -283,8 +288,10 @@
install-exec-local:
${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/ $(DESTDIR)$(libdir) $(ICONS_DEST_DIR) $(BASH_CMPL_DEST_DIR)
-if ENABLE_PLUGIN
+if ENABLE_NATIVE_PLUGIN
${INSTALL_PROGRAM} $(PLUGIN_DIR)/$(BUILT_PLUGIN_LIBRARY) $(DESTDIR)$(libdir)
+endif
+if ENABLE_PLUGINJAR
${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes-applet.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/plugin.jar
${INSTALL_DATA} $(abs_top_builddir)/liveconnect/lib/classes-jsobject.jar $(DESTDIR)$(datadir)/$(PACKAGE_NAME)/jsobject.jar
endif
@@ -307,7 +314,7 @@
do \
${INSTALL_DATA} -D $${files} $(DESTDIR)$(htmldir)/netx/$${files}; \
done)
-if ENABLE_PLUGIN
+if ENABLE_PLUGINJAR
(cd ${abs_top_builddir}/docs/plugin; \
for files in $$(find . -type f); \
do \
@@ -339,7 +346,7 @@
# Plugin
-if ENABLE_PLUGIN
+if ENABLE_NATIVE_PLUGIN
# IcedTeaPlugin.so.
# Separate compile and link invocations to ensure intermediate object
# is listed before -l options. See:
@@ -495,7 +502,6 @@
# although sun and netscape packages were compiled together, we pack and install them as two jars, to follow java.desktop and jdk.jsobject jdk9 modules
# the all together jar is kept for usage in tests. Feel free to remove and refactor
-
stamps/liveconnect-dist.stamp: stamps/liveconnect.stamp
if test "x${LIVECONNECT_DIR}" != x; then \
(cd $(abs_top_builddir)/liveconnect ; \
@@ -744,7 +750,7 @@
stamps/plugin-docs.stamp:
if ENABLE_DOCS
-if ENABLE_PLUGIN
+if ENABLE_PLUGINJAR
$(SYSTEM_JDK_DIR)/bin/javadoc $(JAVADOC_MEM_OPTS) $(JAVADOC_OPTS) \
-d ${abs_top_builddir}/docs/plugin -sourcepath $(NETX_SRCDIR):$(LIVECONNECT_SRCS) \
-doctitle 'IcedTea-Web: Plugin API Specification' \
@@ -1114,7 +1120,7 @@
#for global-links you must be root, for opera there do not exists user-links
#although this targets will indeed create symbolic links to enable
#icedtea-web plugin inside browser it is intended for testing purposes
-if ENABLE_PLUGIN
+if ENABLE_NATIVE_PLUGIN
stamps/user-links.stamp: stamps/netx-dist.stamp stamps/plugin.stamp \
launcher.build/$(javaws) stamps/netx.stamp $(DESTDIR)$(libdir)/$(BUILT_PLUGIN_LIBRARY)
if [ $(MOZILLA_FAMILY_TEST) ] ; then \
@@ -1567,7 +1573,7 @@
# plugin tests
-if ENABLE_PLUGIN
+if ENABLE_NATIVE_PLUGIN
stamps/plugin-tests.stamp: $(PLUGIN_TEST_SRCS) stamps/plugin.stamp
mkdir -p plugin/tests/LiveConnect
$(SYSTEM_JDK_DIR)/bin/javac $(IT_JAVACFLAGS) \
diff -r 9a59ac4283f2 -r b3d9f5bf15f6 acinclude.m4
--- a/acinclude.m4 Wed Jan 11 16:20:21 2017 +0100
+++ b/acinclude.m4 Wed Apr 05 16:00:22 2017 +0200
@@ -371,22 +371,33 @@
AC_SUBST($2_AVAILABLE)
])
-AC_DEFUN_ONCE([IT_CHECK_PLUGIN],
+AC_DEFUN_ONCE([IT_CHECK_NATIVE_PLUGIN],
[
AC_MSG_CHECKING([whether to build the browser plugin])
-AC_ARG_ENABLE([plugin],
- [AS_HELP_STRING([--disable-plugin],
+AC_ARG_ENABLE([native_plugin],
+ [AS_HELP_STRING([--disable-native-plugin],
[Disable compilation of browser plugin])],
- [enable_plugin="${enableval}"], [enable_plugin="yes"])
-AC_MSG_RESULT(${enable_plugin})
+ [enable_native_plugin="${enableval}"], [enable_native_plugin="yes"])
+AC_MSG_RESULT(${enable_native_plugin})
])
-AC_DEFUN_ONCE([IT_CHECK_PLUGIN_DEPENDENCIES],
+AC_DEFUN_ONCE([IT_CHECK_PLUGINJAR],
+[
+AC_MSG_CHECKING([whether to build plugin jar for javaws -html])
+AC_ARG_ENABLE([pluginjar],
+ [AS_HELP_STRING([--disable-pluginjar],
+ [Disable compilation of plugin.jar for javaws -html])],
+ [enable_pluginjar="${enableval}"], [enable_pluginjar="yes"])
+AC_MSG_RESULT(${enable_pluginjar})
+AM_CONDITIONAL(ENABLE_PLUGINJAR, test "x${enable_pluginjar}" = "xyes")
+])
+
+AC_DEFUN_ONCE([IT_CHECK_NATIVE_PLUGIN_DEPENDENCIES],
[
dnl Check for plugin support headers and libraries.
dnl FIXME: use unstable
-AC_REQUIRE([IT_CHECK_PLUGIN])
-if test "x${enable_plugin}" = "xyes" ; then
+AC_REQUIRE([IT_CHECK_NATIVE_PLUGIN])
+if test "x${enable_native_plugin}" = "xyes" ; then
PKG_CHECK_MODULES(GLIB, glib-2.0)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
@@ -403,13 +414,13 @@
AC_SUBST(MOZILLA_CFLAGS)
AC_SUBST(MOZILLA_LIBS)
fi
-AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
+AM_CONDITIONAL(ENABLE_NATIVE_PLUGIN, test "x${enable_native_plugin}" = "xyes")
])
AC_DEFUN_ONCE([IT_CHECK_XULRUNNER_VERSION],
[
-AC_REQUIRE([IT_CHECK_PLUGIN_DEPENDENCIES])
-if test "x${enable_plugin}" = "xyes"
+AC_REQUIRE([IT_CHECK_NATIVE_PLUGIN_DEPENDENCIES])
+if test "x${enable_native_plugin}" = "xyes"
then
AC_CACHE_CHECK([for xulrunner version], [xulrunner_cv_collapsed_version],[
if pkg-config --modversion libxul >/dev/null 2>&1
diff -r 9a59ac4283f2 -r b3d9f5bf15f6 configure.ac
--- a/configure.ac Wed Jan 11 16:20:21 2017 +0100
+++ b/configure.ac Wed Apr 05 16:00:22 2017 +0200
@@ -54,6 +54,11 @@
IT_SET_VERSION
IT_CHECK_XULRUNNER_VERSION
+IT_CHECK_PLUGINJAR
+
+if test "$enable_native_plugin" = yes -a ! "$enable_pluginjar" = yes ; then
+ AC_MSG_ERROR([$enable_native_plugin/$enable_pluginjar you can not build native_plugin without pluginjar])
+fi
dnl PR46074 (gcc) - Missing java.net cookie code required by IcedTea plugin
dnl IT563 - NetX uses sun.security code
diff -r 9a59ac4283f2 -r b3d9f5bf15f6 netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java Wed Jan 11 16:20:21 2017 +0100
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogMessageHandler.java Wed Apr 05 16:00:22 2017 +0200
@@ -50,6 +50,7 @@
import net.sourceforge.jnlp.runtime.Translator;
import net.sourceforge.jnlp.security.appletextendedsecurity.UnsignedAppletTrustConfirmation;
import net.sourceforge.jnlp.security.dialogresults.BasicDialogValue;
+import net.sourceforge.jnlp.security.dialogs.CertWarningPane;
import net.sourceforge.jnlp.security.dialogs.remember.RememberDialog;
import net.sourceforge.jnlp.security.dialogs.remember.RememberableDialog;
import net.sourceforge.jnlp.security.dialogs.remember.SavedRememberAction;
@@ -208,6 +209,12 @@
if (message.userResponse != null) {
value = message.userResponse.writeValue();
}
+ if (dialog.getSecurityDialogPanel() instanceof CertWarningPane) {
+ CertWarningPane cp = (CertWarningPane) (dialog.getSecurityDialogPanel());
+ if (remember) {
+ cp.saveCert();
+ }
+ }
RememberDialog.getInstance().setOrUpdateRememberedState(dialog, codebase, new SavedRememberAction(RememberDialog.createAction(remember, message.userResponse), value));
} catch (Exception ex) {
OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, ex);
diff -r 9a59ac4283f2 -r b3d9f5bf15f6 netx/net/sourceforge/jnlp/security/SecurityDialogs.java
--- a/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Wed Jan 11 16:20:21 2017 +0100
+++ b/netx/net/sourceforge/jnlp/security/SecurityDialogs.java Wed Apr 05 16:00:22 2017 +0200
@@ -122,6 +122,7 @@
*
* @param accessType the type of system access requested.
* @param file the jnlp file associated with the requesting application.
+ * @param extras array of objects used as extra.toString or similarly later
* @return true if permission was granted by the user, false otherwise.
*/
public static AccessWarningPaneComplexReturn showAccessWarningDialog(final AccessType accessType,
diff -r 9a59ac4283f2 -r b3d9f5bf15f6 netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java
--- a/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Wed Jan 11 16:20:21 2017 +0100
+++ b/netx/net/sourceforge/jnlp/security/dialogs/CertWarningPane.java Wed Apr 05 16:00:22 2017 +0200
@@ -336,22 +336,26 @@
@Override
public void actionPerformed(ActionEvent e) {
if (alwaysTrust != null && alwaysTrust.isSelected()) {
- try {
- KeyStore ks = KeyStores.getKeyStore(Level.USER, Type.CERTS);
- X509Certificate c = (X509Certificate) parent.getCertVerifier().getPublisher(null);
- CertificateUtils.addToKeyStore(c, ks);
- File keyStoreFile = KeyStores.getKeyStoreLocation(Level.USER, Type.CERTS).getFile();
- if (!keyStoreFile.isFile()) {
- FileUtils.createRestrictedFile(keyStoreFile, true);
- }
- SecurityUtil.storeKeyStore(ks, keyStoreFile);
- OutputController.getLogger().log("certificate is now permanently trusted");
- } catch (Exception ex) {
+ saveCert();
+ }
+ }
+ }
+
+ public void saveCert() {
+ try {
+ KeyStore ks = KeyStores.getKeyStore(Level.USER, Type.CERTS);
+ X509Certificate c = (X509Certificate) parent.getCertVerifier().getPublisher(null);
+ CertificateUtils.addToKeyStore(c, ks);
+ File keyStoreFile = KeyStores.getKeyStoreLocation(Level.USER, Type.CERTS).getFile();
+ if (!keyStoreFile.isFile()) {
+ FileUtils.createRestrictedFile(keyStoreFile, true);
+ }
+ SecurityUtil.storeKeyStore(ks, keyStoreFile);
+ OutputController.getLogger().log("certificate is now permanently trusted");
+ } catch (Exception ex) {
// TODO: Let NetX show a dialog here notifying user
- // about being unable to add cert to keystore
- OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex);
- }
- }
+ // about being unable to add cert to keystore
+ OutputController.getLogger().log(OutputController.Level.ERROR_ALL, ex);
}
}
More information about the distro-pkg-dev
mailing list