[java-opensaml COMMIT] in /trunk: opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/Sc...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Jan  1 08:52:34 2016
New Revision: 4415

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4415&view=rev
Log:
IDP-893 avoid using Resource.getFile()

https://issues.shibboleth.net/jira/browse/IDP-893
 
Add a couple of methods to the crypto code which accept 
InputStreams  (whereas previously they just took File or byte[]).  
This allows upper layers to pass the InoutStream of a resource rather than its file.

Change one use of Resource.getFile() to Resource.getInputStream

Modified:
    trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java
    trunk/opensaml-security-api/.settings/org.eclipse.jdt.core.prefs
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java
    trunk/opensaml-security-api/src/main/java/org/opensaml/security/x509/X509Support.java
    trunk/opensaml-security-api/src/test/java/org/opensaml/security/crypto/KeySupportTest.java

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java?rev=4415&r1=4414&r2=4415&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java	(original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java	Fri Jan  1 08:52:34 2016
@@ -18,6 +18,7 @@
 package org.opensaml.saml.metadata.resolver.filter.impl;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Set;
 
 import javax.annotation.Nonnull;
@@ -94,7 +95,7 @@
      * 
      * @param object the custom object
      */
-    @Nullable public void setCustomObject(Object object) {
+    @Nullable public void setCustomObject(final Object object) {
         customObject = object;
     }
 
@@ -106,7 +107,7 @@
         scriptContext.setAttribute("profileContext", context, ScriptContext.ENGINE_SCOPE);
 
         try {
-            Object output = script.eval(scriptContext);
+            final Object output = script.eval(scriptContext);
             return (Set<String>) output;
 
         } catch (final ScriptException e) {
@@ -127,8 +128,10 @@
      */
     @Nonnull static ScriptedTrustedNamesFunction resourceScript(@Nonnull @NotEmpty final String engineName,
             @Nonnull final Resource resource) throws ScriptException, IOException {
-        final EvaluableScript script = new EvaluableScript(engineName, resource.getFile());
-        return new ScriptedTrustedNamesFunction(script, resource.getDescription());
+        try (final InputStream is = resource.getInputStream()) {
+            final EvaluableScript script = new EvaluableScript(engineName, is);
+            return new ScriptedTrustedNamesFunction(script, resource.getDescription());
+        }
     }
 
     /**

Modified: trunk/opensaml-security-api/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-api/.settings/org.eclipse.jdt.core.prefs?rev=4415&r1=4414&r2=4415&view=diff
==============================================================================
--- trunk/opensaml-security-api/.settings/org.eclipse.jdt.core.prefs	(original)
+++ trunk/opensaml-security-api/.settings/org.eclipse.jdt.core.prefs	Fri Jan  1 08:52:34 2016
@@ -10,22 +10,15 @@
 org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

Modified: trunk/opensaml-security-api/src/main/java/org/opensaml/security/crypto/KeySupport.java

[... 574 lines stripped ...]