Merge branch 'release/7.1.0'

Author: pavel-alay

iTextCore.netstandard.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.14
+VisualStudioVersion = 15.0.26430.15
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.io.netstandard", "itext\itext.io\itext.io.netstandard.csproj", "{4C4C74D4-00E2-43A4-9D7A-54352096DE32}"
 EndProject

itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs

@@ -14,9 +14,9 @@
 
 [assembly: Guid("d015a3aa-613c-45d9-b908-7d47c4b613af")]
 
-[assembly: AssemblyVersion("7.0.5.0")]
-[assembly: AssemblyFileVersion("7.0.5.0")]
-[assembly: AssemblyInformationalVersion("7.0.5")]
+[assembly: AssemblyVersion("7.1.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
+[assembly: AssemblyInformationalVersion("7.1.0")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs

@@ -14,9 +14,9 @@
 
 [assembly: Guid("6fe2f714-6b3e-4b20-8c70-28bfce084ed2")]
 
-[assembly: AssemblyVersion("7.0.5.0")]
-[assembly: AssemblyFileVersion("7.0.5.0")]
-[assembly: AssemblyInformationalVersion("7.0.5")]
+[assembly: AssemblyVersion("7.1.0.0")]
+[assembly: AssemblyFileVersion("7.1.0.0")]
+[assembly: AssemblyInformationalVersion("7.1.0")]
 
 #if !NETSTANDARD1_6
 [assembly: NUnit.Framework.Timeout(300000)]

itext.tests/itext.forms.tests/itext/forms/FormFieldsTaggingTest.cs

@@ -44,6 +44,7 @@ source product.
 using iText.Forms.Fields;
 using iText.Kernel.Geom;
 using iText.Kernel.Pdf;
+using iText.Kernel.Pdf.Tagging;
 using iText.Kernel.Pdf.Tagutils;
 using iText.Kernel.Utils;
 using iText.Test;
@@ -189,7 +190,7 @@ public virtual void FormFieldTaggingTest07() {
             PdfButtonFormField pushButton = PdfFormField.CreatePushButton(pdfDoc, new Rectangle(36, 650, 40, 20), "push"
                 , "Capcha");
             TagTreePointer tagPointer = pdfDoc.GetTagStructureContext().GetAutoTaggingPointer();
-            tagPointer.MoveToKid(PdfName.Div);
+            tagPointer.MoveToKid(StandardRoles.DIV);
             acroForm.AddField(pushButton);
             pdfDoc.Close();
             CompareOutput(outFileName, cmpFileName);

itext.tests/itext.forms.tests/itext/forms/PdfEncryptionTest.cs

@@ -41,13 +41,36 @@ source product.
 address: [email protected]
 */
 using System;
+using iText.Forms.Fields;
+using iText.Kernel.Geom;
 using iText.Kernel.Pdf;
+using iText.Kernel.Utils;
+using iText.Test;
 
 namespace iText.Forms {
-    public class PdfEncryptionTest {
+    public class PdfEncryptionTest : ExtendedITextTest {
         public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
             .CurrentContext.TestDirectory) + "/resources/itext/forms/PdfEncryptionTest/";
 
+        public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+             + "/test/itext/forms/PdfEncryptionTest/";
+
+        /// <summary>User password.</summary>
+        public static byte[] USER = "Hello".GetBytes(iText.IO.Util.EncodingUtil.ISO_8859_1);
+
+        /// <summary>Owner password.</summary>
+        public static byte[] OWNER = "World".GetBytes(iText.IO.Util.EncodingUtil.ISO_8859_1);
+
+        [NUnit.Framework.OneTimeSetUp]
+        public static void BeforeClass() {
+            ITextTest.CreateOrClearDestinationFolder(destinationFolder);
+        }
+
+        internal const String customInfoEntryKey = "Custom";
+
+        internal const String customInfoEntryValue = "String";
+
+        // Custom entry in Info dictionary is used because standard entried are gone into metadata in PDF 2.0
         /// <exception cref="System.IO.IOException"/>
         [NUnit.Framework.Test]
         public virtual void EncryptedDocumentWithFormFields() {
@@ -58,5 +81,70 @@ public virtual void EncryptedDocumentWithFormFields() {
             acroForm.GetField("personal.name").GetPdfObject();
             pdfDocument.Close();
         }
+
+        /// <exception cref="System.Exception"/>
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="iText.Kernel.XMP.XMPException"/>
+        [NUnit.Framework.Test]
+        public virtual void EncryptAes256Pdf2PermissionsTest01() {
+            String filename = "encryptAes256Pdf2PermissionsTest01.pdf";
+            int permissions = EncryptionConstants.ALLOW_FILL_IN | EncryptionConstants.ALLOW_SCREENREADERS | EncryptionConstants
+                .ALLOW_DEGRADED_PRINTING;
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(destinationFolder + filename, new WriterProperties().SetPdfVersion
+                (PdfVersion.PDF_2_0).SetStandardEncryption(USER, OWNER, permissions, EncryptionConstants.ENCRYPTION_AES_256
+                )));
+            pdfDoc.GetDocumentInfo().SetMoreInfo(customInfoEntryKey, customInfoEntryValue);
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            PdfTextFormField textField1 = PdfFormField.CreateText(pdfDoc, new Rectangle(100, 600, 200, 30), "Name", "Enter your name"
+                );
+            form.AddField(textField1);
+            PdfTextFormField textField2 = PdfFormField.CreateText(pdfDoc, new Rectangle(100, 550, 200, 30), "Surname", 
+                "Enter your surname");
+            form.AddField(textField2);
+            PdfButtonFormField group = PdfFormField.CreateRadioGroup(pdfDoc, "Sex", "Male");
+            PdfFormField.CreateRadioButton(pdfDoc, new Rectangle(100, 530, 10, 10), group, "Male");
+            PdfFormField.CreateRadioButton(pdfDoc, new Rectangle(120, 530, 10, 10), group, "Female");
+            form.AddField(group);
+            pdfDoc.Close();
+            CompareTool compareTool = new CompareTool();
+            String errorMessage = compareTool.CompareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename
+                , destinationFolder, "diff_", USER, USER);
+            if (errorMessage != null) {
+                NUnit.Framework.Assert.Fail(errorMessage);
+            }
+        }
+
+        /// <exception cref="System.Exception"/>
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="iText.Kernel.XMP.XMPException"/>
+        [NUnit.Framework.Test]
+        public virtual void EncryptAes256Pdf2PermissionsTest02() {
+            String filename = "encryptAes256Pdf2PermissionsTest02.pdf";
+            // This test differs from the previous one (encryptAes256Pdf2PermissionsTest01) only in permissions.
+            // Here we do not allow to fill the form in.
+            int permissions = EncryptionConstants.ALLOW_SCREENREADERS | EncryptionConstants.ALLOW_DEGRADED_PRINTING;
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(destinationFolder + filename, new WriterProperties().SetPdfVersion
+                (PdfVersion.PDF_2_0).SetStandardEncryption(USER, OWNER, permissions, EncryptionConstants.ENCRYPTION_AES_256
+                )));
+            pdfDoc.GetDocumentInfo().SetMoreInfo(customInfoEntryKey, customInfoEntryValue);
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            PdfTextFormField textField1 = PdfFormField.CreateText(pdfDoc, new Rectangle(100, 600, 200, 30), "Name", "Enter your name"
+                );
+            form.AddField(textField1);
+            PdfTextFormField textField2 = PdfFormField.CreateText(pdfDoc, new Rectangle(100, 550, 200, 30), "Surname", 
+                "Enter your surname");
+            form.AddField(textField2);
+            PdfButtonFormField group = PdfFormField.CreateRadioGroup(pdfDoc, "Sex", "Male");
+            PdfFormField.CreateRadioButton(pdfDoc, new Rectangle(100, 530, 10, 10), group, "Male");
+            PdfFormField.CreateRadioButton(pdfDoc, new Rectangle(120, 530, 10, 10), group, "Female");
+            form.AddField(group);
+            pdfDoc.Close();
+            CompareTool compareTool = new CompareTool();
+            String errorMessage = compareTool.CompareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename
+                , destinationFolder, "diff_", USER, USER);
+            if (errorMessage != null) {
+                NUnit.Framework.Assert.Fail(errorMessage);
+            }
+        }
     }
 }

itext.tests/itext.forms.tests/itext/forms/PdfFormFieldTest.cs

@@ -322,5 +322,43 @@ public virtual void AcroFieldDictionaryNoFields() {
                 NUnit.Framework.Assert.Fail(errorMessage);
             }
         }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void RegenerateAppearance() {
+            String input = "regenerateAppearance.pdf";
+            String output = "regenerateAppearance.pdf";
+            PdfDocument document = new PdfDocument(new PdfReader(sourceFolder + input), new PdfWriter(destinationFolder
+                 + output), new StampingProperties().UseAppendMode());
+            PdfAcroForm acro = PdfAcroForm.GetAcroForm(document, false);
+            int i = 1;
+            foreach (KeyValuePair<String, PdfFormField> entry in acro.GetFormFields()) {
+                if (entry.Key.Contains("field")) {
+                    PdfFormField field = entry.Value;
+                    field.SetValue("test" + i++, false);
+                }
+            }
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + output, sourceFolder 
+                + "cmp_" + output, destinationFolder, "diff"));
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void RegenerateAppearance2() {
+            String input = "regenerateAppearance2.pdf";
+            String output = "regenerateAppearance2.pdf";
+            PdfDocument document = new PdfDocument(new PdfReader(sourceFolder + input), new PdfWriter(destinationFolder
+                 + output), new StampingProperties().UseAppendMode());
+            PdfAcroForm acro = PdfAcroForm.GetAcroForm(document, false);
+            acro.SetNeedAppearances(true);
+            PdfFormField field = acro.GetField("number");
+            field.SetValue("20150044DR");
+            document.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + output, sourceFolder 
+                + "cmp_" + output, destinationFolder, "diff"));
+        }
     }
 }

itext.tests/itext.forms.tests/itext/forms/Utf8FormsTest.cs

@@ -0,0 +1,119 @@
+/*
+This file is part of the iText (R) project.
+Copyright (c) 1998-2017 iText Group NV
+Authors: iText Software.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License version 3
+as published by the Free Software Foundation with the addition of the
+following permission added to Section 15 as permitted in Section 7(a):
+FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
+ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
+OF THIRD PARTY RIGHTS
+
+This program 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 Affero General Public License for more details.
+You should have received a copy of the GNU Affero General Public License
+along with this program; if not, see http://www.gnu.org/licenses or write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA, 02110-1301 USA, or download the license from the following URL:
+http://itextpdf.com/terms-of-use/
+
+The interactive user interfaces in modified source and object code versions
+of this program must display Appropriate Legal Notices, as required under
+Section 5 of the GNU Affero General Public License.
+
+In accordance with Section 7(b) of the GNU Affero General Public License,
+a covered work must retain the producer line in every PDF that is created
+or manipulated using iText.
+
+You can be released from the requirements of the license by purchasing
+a commercial license. Buying such a license is mandatory as soon as you
+develop commercial activities involving the iText software without
+disclosing the source code of your own applications.
+These activities include: offering paid services to customers as an ASP,
+serving PDFs on the fly in a web application, shipping iText with a closed
+source product.
+
+For more information, please contact iText Software Corp. at this
+address: [email protected]
+*/
+using System;
+using System.Collections.Generic;
+using iText.Forms.Fields;
+using iText.IO.Font;
+using iText.Kernel.Font;
+using iText.Kernel.Geom;
+using iText.Kernel.Pdf;
+using iText.Kernel.Utils;
+using iText.Test;
+
+namespace iText.Forms {
+    public class Utf8FormsTest {
+        public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/forms/Utf8FormsTest/";
+
+        public static readonly String destinationFolder = NUnit.Framework.TestContext.CurrentContext.TestDirectory
+             + "/test/itext/forms/Utf8FormsTest/";
+
+        public static readonly String FONT = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
+            .CurrentContext.TestDirectory) + "/resources/itext/forms/Utf8FormsTest/NotoSansCJKsc-Regular.otf";
+
+        [NUnit.Framework.SetUp]
+        public virtual void Before() {
+            ITextTest.CreateDestinationFolder(destinationFolder);
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void ReadUtf8FieldName() {
+            String filename = sourceFolder + "utf-8-field-name.pdf";
+            PdfDocument pdfDoc = new PdfDocument(new PdfReader(filename));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            IDictionary<String, PdfFormField> fields = form.GetFormFields();
+            pdfDoc.Close();
+            foreach (String fldName in fields.Keys) {
+                //  لا
+                NUnit.Framework.Assert.AreEqual("\u0644\u0627", fldName);
+            }
+            pdfDoc.Close();
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void ReadUtf8TextAnnot() {
+            String filename = sourceFolder + "utf-8-text-annot.pdf";
+            PdfDocument pdfDoc = new PdfDocument(new PdfReader(filename));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            IDictionary<String, PdfFormField> fields = form.GetFormFields();
+            pdfDoc.Close();
+            foreach (String fldName in fields.Keys) {
+                //  福昕 福昕UTF8
+                NUnit.Framework.Assert.AreEqual("\u798F\u6615 \u798F\u6615UTF8", fields.Get(fldName).GetValueAsString());
+            }
+        }
+
+        /// <exception cref="System.IO.IOException"/>
+        /// <exception cref="System.Exception"/>
+        [NUnit.Framework.Test]
+        public virtual void WriteUtf8FieldNameAndValue() {
+            PdfDocument pdfDoc = new PdfDocument(new PdfWriter(destinationFolder + "writeUtf8FieldNameAndValue.pdf"));
+            PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
+            PdfTextFormField field = PdfTextFormField.CreateText(pdfDoc, new Rectangle(99, 753, 425, 15), "", "");
+            field.SetFont(PdfFontFactory.CreateFont(FONT, PdfEncodings.IDENTITY_H));
+            //  لا
+            field.Put(PdfName.T, new PdfString("\u0644\u0627", PdfEncodings.UTF8));
+            //  福昕 福昕UTF8
+            field.Put(PdfName.V, new PdfString("\u798F\u6615 \u798F\u6615UTF8", PdfEncodings.UTF8));
+            field.RegenerateField();
+            form.AddField(field);
+            pdfDoc.Close();
+            NUnit.Framework.Assert.IsNull(new CompareTool().CompareByContent(destinationFolder + "writeUtf8FieldNameAndValue.pdf"
+                , sourceFolder + "cmp_writeUtf8FieldNameAndValue.pdf", destinationFolder, "diffFieldNameAndValue_"));
+        }
+    }
+}