Merge branch 'develop' into devsecops

Author: aleks-ivanov

itext.tests/itext.sign.tests/itext/signatures/validation/CertificateChainValidatorTest.cs

@@ -137,7 +137,7 @@ public virtual void ChainWithAiaTest() {
             IX509Certificate[] certificateChain = PemFileHelper.ReadFirstChain(chainName);
             IX509Certificate signingCert = (IX509Certificate)certificateChain[0];
             IX509Certificate rootCert = (IX509Certificate)certificateChain[2];
-            IssuingCertificateRetriever customRetriever = new _IssuingCertificateRetriever_190();
+            IssuingCertificateRetriever customRetriever = new _IssuingCertificateRetriever_191();
             ValidatorChainBuilder validatorChainBuilder = SetUpValidatorChain(certificateRetriever, properties, mockRevocationDataValidator
                 );
             validatorChainBuilder.WithIssuingCertificateRetrieverFactory(() => customRetriever);
@@ -150,8 +150,8 @@ public virtual void ChainWithAiaTest() {
             AssertValidationReport.AssertThat(report, (a) => a.HasStatus(ValidationReport.ValidationResult.VALID));
         }
 
-        private sealed class _IssuingCertificateRetriever_190 : IssuingCertificateRetriever {
-            public _IssuingCertificateRetriever_190() {
+        private sealed class _IssuingCertificateRetriever_191 : IssuingCertificateRetriever {
+            public _IssuingCertificateRetriever_191() {
             }
 
             protected internal override Stream GetIssuerCertByURI(String uri) {
@@ -170,7 +170,7 @@ public virtual void ChainWithAiaWhichPointsToRandomCertTest() {
             IX509Certificate signingCert = (IX509Certificate)certificateChain[0];
             IX509Certificate intermediateCert = (IX509Certificate)certificateChain[1];
             IX509Certificate rootCert = (IX509Certificate)certificateChain[2];
-            IssuingCertificateRetriever customRetriever = new _IssuingCertificateRetriever_218();
+            IssuingCertificateRetriever customRetriever = new _IssuingCertificateRetriever_219();
             ValidatorChainBuilder validatorChainBuilder = SetUpValidatorChain(certificateRetriever, properties, mockRevocationDataValidator
                 );
             validatorChainBuilder.WithIssuingCertificateRetrieverFactory(() => customRetriever);
@@ -185,8 +185,8 @@ public virtual void ChainWithAiaWhichPointsToRandomCertTest() {
             AssertValidationReport.AssertThat(report, (a) => a.HasStatus(ValidationReport.ValidationResult.VALID));
         }
 
-        private sealed class _IssuingCertificateRetriever_218 : IssuingCertificateRetriever {
-            public _IssuingCertificateRetriever_218() {
+        private sealed class _IssuingCertificateRetriever_219 : IssuingCertificateRetriever {
+            public _IssuingCertificateRetriever_219() {
             }
 
             protected internal override Stream GetIssuerCertByURI(String uri) {
@@ -801,5 +801,25 @@ private String BuildKeyUsageWrongMessagePart(KeyUsage expectedKeyUsage, params K
                 .EXPECTED_VALUE, expectedKeyUsage) + MessageFormatUtil.Format(KeyUsageExtension.ACTUAL_VALUE, stringBuilder
                 .ToString()));
         }
+
+        [NUnit.Framework.Test]
+        public virtual void ValidityPeriodCheckTrustedCertificateTest() {
+            MockRevocationDataValidator mockRevocationDataValidator = new MockRevocationDataValidator();
+            IssuingCertificateRetriever certificateRetriever = new IssuingCertificateRetriever();
+            SignatureValidationProperties properties = new SignatureValidationProperties();
+            String chainName = CERTS_SRC + "chain.pem";
+            //certificate expiration date year 2400
+            IX509Certificate rootCert = (IX509Certificate)PemFileHelper.ReadFirstChain(chainName)[0];
+            ValidatorChainBuilder validatorChainBuilder = SetUpValidatorChain(certificateRetriever, properties, mockRevocationDataValidator
+                );
+            CertificateChainValidator validator = validatorChainBuilder.BuildCertificateChainValidator();
+            certificateRetriever.SetTrustedCertificates(JavaCollectionsUtil.SingletonList<IX509Certificate>(rootCert));
+            //validation year 2405
+            DateTime validationDate = new DateTime(13750537642000L);
+            ValidationReport report = validator.ValidateCertificate(baseContext, rootCert, validationDate);
+            AssertValidationReport.AssertThat(report, (a) => a.HasStatus(ValidationReport.ValidationResult.VALID).HasNumberOfFailures
+                (0).HasNumberOfLogs(1).HasLogItem((l) => l.WithCheckName("Certificate check.").WithMessage(CertificateChainValidator
+                .CERTIFICATE_TRUSTED, (i) => rootCert.GetSubjectDN()).WithCertificate(rootCert)));
+        }
     }
 }

itext/itext.kernel/itext/kernel/geom/AffineTransform.cs

@@ -31,6 +31,16 @@ namespace iText.Kernel.Geom {
     /// which is a combination of linear transformations such as translation,
     /// scaling, rotation, and shearing which allows preservation of the straightness of lines.
     /// </summary>
+    /// <remarks>
+    /// The
+    /// <see cref="AffineTransform"/>
+    /// class represents an affine transformation,
+    /// which is a combination of linear transformations such as translation,
+    /// scaling, rotation, and shearing which allows preservation of the straightness of lines.
+    /// <para />
+    /// Note: this class is a special case of a 3 by 3
+    /// <see cref="Matrix"/>.
+    /// </remarks>
     public class AffineTransform {
         /// <summary>The type of affine transformation.</summary>
         /// <remarks>
@@ -190,6 +200,9 @@ public AffineTransform(iText.Kernel.Geom.AffineTransform t) {
         /// instance with the values provided.
         /// The default type is for the transformation is
         /// <c>TYPE_UNKNOWN</c>
+        /// Detailed explanation of parameters can be found in
+        /// <see cref="Matrix"/>
+        /// documentation.
         /// </remarks>
         /// <param name="m00">The value of the first row and first column of the matrix.</param>
         /// <param name="m10">The value of the second row and first column of the matrix.</param>
@@ -218,6 +231,9 @@ public AffineTransform(double m00, double m10, double m01, double m11, double m0
         /// instance with the values provided.
         /// The default type is for the transformation is
         /// <c>TYPE_UNKNOWN</c>
+        /// Detailed explanation of parameters can be found in
+        /// <see cref="Matrix"/>
+        /// documentation.
         /// </remarks>
         /// <param name="matrix">The array of values to be used for the transformation matrix.</param>
         public AffineTransform(float[] matrix) {
@@ -243,6 +259,9 @@ public AffineTransform(float[] matrix) {
         /// instance with the values provided.
         /// The default type is for the transformation is
         /// <c>TYPE_UNKNOWN</c>
+        /// Detailed explanation of parameters can be found in
+        /// <see cref="Matrix"/>
+        /// documentation.
         /// </remarks>
         /// <param name="matrix">The array of values to be used for the transformation matrix.</param>
         public AffineTransform(double[] matrix) {

itext/itext.kernel/itext/kernel/geom/Matrix.cs

@@ -24,50 +24,109 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Commons.Utils;
 
 namespace iText.Kernel.Geom {
-    /// <summary>
-    /// Keeps all the values of a 3 by 3 matrix and allows you to
-    /// do some math with matrices.
-    /// </summary>
+    /// <summary>Keeps all the values of a 3 by 3 matrix and allows you to do some math with matrices.</summary>
+    /// <remarks>
+    /// Keeps all the values of a 3 by 3 matrix and allows you to do some math with matrices.
+    /// <para />
+    /// Transformation matrix in PDF is a special case of a 3 by 3 matrix
+    /// <br />
+    /// <c>[a b 0]</c>
+    /// <br />
+    /// <c>[c d 0]</c>
+    /// <br />
+    /// <c>[e f 1]</c>
+    /// <para />
+    /// In its most general form, this matrix is specified by six numbers, usually in the form of an array containing six
+    /// elements
+    /// <c>[a b c d e f]</c>
+    /// . It can represent any linear transformation from one coordinate system to
+    /// another. Here the most common transformations:
+    /// <list type="bullet">
+    /// <item><description>Translations shall be specified as
+    /// <c>[1 0 0 1 Tx Ty]</c>
+    /// , where
+    /// <c>Tx</c>
+    /// and
+    /// <c>Ty</c>
+    /// shall be the
+    /// distances to translate the origin of the coordinate system in the horizontal and vertical dimensions, respectively.
+    /// </description></item>
+    /// <item><description>Scaling shall be obtained by
+    /// <c>[Sx 0 0 Sy 0 0]</c>
+    /// . This scales the coordinates so that 1 unit in the
+    /// horizontal and vertical dimensions of the new coordinate system is the same size as
+    /// <c>Sx</c>
+    /// and
+    /// <c>Sy</c>
+    /// units,
+    /// respectively, in the previous coordinate system.
+    /// </description></item>
+    /// <item><description>Rotations shall be produced by
+    /// <c>[Rc Rs -Rs Rc 0 0]</c>
+    /// , where
+    /// <c>Rc = cos(q)</c>
+    /// and
+    /// <c>Rs = sin(q)</c>
+    /// which has the effect of rotating the coordinate system axes by an angle
+    /// <c>q</c>
+    /// counterclockwise.
+    /// </description></item>
+    /// <item><description>Skew shall be specified by
+    /// <c>[1 Wx Wy 1 0 0]</c>
+    /// , where
+    /// <c>Wx = tan(a)</c>
+    /// and
+    /// <c>Wy = tan(b)</c>
+    /// which
+    /// skews the x-axis by an angle
+    /// <c>a</c>
+    /// and the y-axis by an angle
+    /// <c>b</c>.
+    /// </description></item>
+    /// </list>
+    /// <para />
+    /// For more information see PDF Specification ISO 32000-1 section 8.3.
+    /// </remarks>
     public class Matrix {
-        /// <summary>the row=1, col=1 position ('a') in the matrix.</summary>
+        /// <summary>The row=1, col=1 position ('a') in the matrix.</summary>
         public const int I11 = 0;
 
-        /// <summary>the row=1, col=2 position ('b') in the matrix.</summary>
+        /// <summary>The row=1, col=2 position ('b') in the matrix.</summary>
         public const int I12 = 1;
 
-        /// <summary>the row=1, col=3 position (always 0 for 2-D) in the matrix.</summary>
+        /// <summary>The row=1, col=3 position (always 0 for 2D) in the matrix.</summary>
         public const int I13 = 2;
 
-        /// <summary>the row=2, col=1 position ('c') in the matrix.</summary>
+        /// <summary>The row=2, col=1 position ('c') in the matrix.</summary>
         public const int I21 = 3;
 
-        /// <summary>the row=2, col=2 position ('d') in the matrix.</summary>
+        /// <summary>The row=2, col=2 position ('d') in the matrix.</summary>
         public const int I22 = 4;
 
-        /// <summary>the row=2, col=3 position (always 0 for 2-D) in the matrix.</summary>
+        /// <summary>The row=2, col=3 position (always 0 for 2D) in the matrix.</summary>
         public const int I23 = 5;
 
-        /// <summary>the row=3, col=1 ('e', or X translation) position in the matrix.</summary>
+        /// <summary>The row=3, col=1 ('e', or X translation) position in the matrix.</summary>
         public const int I31 = 6;
 
-        /// <summary>the row=3, col=2 ('f', or Y translation) position in the matrix.</summary>
+        /// <summary>The row=3, col=2 ('f', or Y translation) position in the matrix.</summary>
         public const int I32 = 7;
 
-        /// <summary>the row=3, col=3 position (always 1 for 2-D) in the matrix.</summary>
+        /// <summary>The row=3, col=3 position (always 1 for 2D) in the matrix.</summary>
         public const int I33 = 8;
 
         /// <summary>The values inside the matrix (the identity matrix by default).</summary>
         /// <remarks>
         /// The values inside the matrix (the identity matrix by default).
         /// <para />
-        /// For reference, the indeces are as follows:
+        /// For reference, the indexes are as follows:
         /// <br />I11 I12 I13
         /// <br />I21 I22 I23
         /// <br />I31 I32 I33
         /// </remarks>
         private readonly float[] vals = new float[] { 1, 0, 0, 0, 1, 0, 0, 0, 1 };
 
-        /// <summary>constructs a new Matrix with identity.</summary>
+        /// <summary>Constructs a new Matrix with identity.</summary>
         public Matrix() {
         }
 
@@ -144,7 +203,7 @@ public virtual float Get(int index) {
         /// <summary>multiplies this matrix by 'b' and returns the result.</summary>
         /// <remarks>
         /// multiplies this matrix by 'b' and returns the result.
-        /// See http://en.wikipedia.org/wiki/Matrix_multiplication
+        /// See <a href="http://en.wikipedia.org/wiki/matrix_multiplication">Matrix_multiplication</a>
         /// </remarks>
         /// <param name="by">The matrix to multiply by</param>
         /// <returns>the resulting matrix</returns>

itext/itext.kernel/itext/kernel/pdf/canvas/CanvasGraphicsState.cs

@@ -157,7 +157,13 @@ public virtual Matrix GetCtm() {
         /// <summary>Updates current transformation matrix.</summary>
         /// <remarks>
         /// Updates current transformation matrix.
-        /// The third column will always be [0 0 1]
+        /// <para />
+        /// Detailed explanation of
+        /// <c>[a b c d e f]</c>
+        /// parameters of transformation
+        /// matrix can be found in
+        /// <see cref="iText.Kernel.Geom.Matrix"/>
+        /// documentation.
         /// </remarks>
         /// <param name="a">element at (1,1) of the transformation matrix</param>
         /// <param name="b">element at (1,2) of the transformation matrix</param>