svn commit: r1862597 - in /xmlgraphics/fop/trunk/fop-core/src: main/java/org/apache/fop/pdf/ test/java/org/apache/fop/pdf/

Author: ssteiner
Date: Fri Jul  5 08:55:44 2019
New Revision: 1862597

URL: http://svn.apache.org/viewvc?rev=1862597&view=rev
Log:
FOP-2869: basic-link to embedded file broken with encryption

Added:
    xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java   (with props)
Modified:
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFAction.java
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java
    xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFUri.java

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFAction.java?rev=1862597&r1=1862596&r2=1862597&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFAction.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFAction.java Fri Jul  5 08:55:44 2019
@@ -35,5 +35,14 @@ public abstract class PDFAction extends
      */
     public abstract String getAction();
 
+    protected String encodeScript(String text) {
+        if (getDocument() != null && getDocumentSafely().isEncryptionActive()) {
+            final byte[] buf = PDFText.encode(text);
+            byte[] enc = getDocument().getEncryption().encrypt(buf, this);
+            return PDFText.toHex(enc, true);
+        } else {
+            return "(" + text + ")";
+        }
+    }
 
 }

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java?rev=1862597&r1=1862596&r2=1862597&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFJavaScriptLaunchAction.java Fri Jul  5 08:55:44 2019
@@ -43,12 +43,11 @@ public class PDFJavaScriptLaunchAction e
     /** {@inheritDoc} */
     public String toPDFString() {
         StringBuffer sb = new StringBuffer(64);
-        sb.append("<<\n/S /JavaScript\n/JS (");
-        sb.append(this.script);
-        sb.append(")\n>>");
+        sb.append("<<\n/S /JavaScript\n/JS ");
+        sb.append(encodeScript(this.script));
+        sb.append("\n>>");
         return sb.toString();
     }
-
     /** {@inheritDoc} */
     protected boolean contentEquals(PDFObject obj) {
         if (this == obj) {

Modified: xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFUri.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFUri.java?rev=1862597&r1=1862596&r2=1862597&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFUri.java (original)
+++ xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/pdf/PDFUri.java Fri Jul  5 08:55:44 2019
@@ -49,7 +49,7 @@ public class PDFUri extends PDFAction {
     }
 
     private String getDictString() {
-        return "<< /URI " + encodeURI(uri) + "\n/S /URI >>";
+        return "<< /URI " + encodeScript(uri) + "\n/S /URI >>";
     }
 
     /** {@inheritDoc} */
@@ -57,14 +57,4 @@ public class PDFUri extends PDFAction {
         //TODO Convert this class into a dictionary
         return getDictString();
     }
-
-    private String encodeURI(String text) {
-        if (getDocument() != null && getDocumentSafely().isEncryptionActive()) {
-            final byte[] buf = PDFText.encode(text);
-            byte[] enc = getDocument().getEncryption().encrypt(buf, this);
-            return PDFText.toHex(enc, true);
-        } else {
-            return "(" + text + ")";
-        }
-    }
 }

Added: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java?rev=1862597&view=auto
==============================================================================
--- xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java (added)
+++ xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java Fri Jul  5 08:55:44 2019
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.fop.pdf;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class PDFJavaScriptLaunchActionTestCase {
+
+    @Test
+    public void testToPDFStringShouldEncrypt() {
+        String jsScript = "this.exportDataObject({cName:\"some.pdf\", nLaunch:2});";
+        PDFJavaScriptLaunchAction action = new PDFJavaScriptLaunchAction(jsScript);
+        PDFDocument document = new PDFDocument("<test />");
+        document.setEncryption(new PDFEncryptionParams(null, null, false,
+                true, false, true, true));
+        action.setDocument(document);
+        action.setObjectNumber(1);
+
+        String pdfString = action.toPDFString();
+
+        assertTrue(pdfString.startsWith("<<\n/S /JavaScript\n/JS <"));
+        assertFalse(pdfString.contains(jsScript));
+        assertTrue(pdfString.endsWith(">\n>>"));
+    }
+}

Propchange: xmlgraphics/fop/trunk/fop-core/src/test/java/org/apache/fop/pdf/PDFJavaScriptLaunchActionTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native