You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/08/19 06:30:36 UTC
svn commit: r1880979 - in /pdfbox/trunk:
examples/src/main/java/org/apache/pdfbox/examples/signature/
pdfbox/src/main/java/org/apache/pdfbox/
pdfbox/src/main/java/org/apache/pdfbox/io/
pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitals...
Author: lehmi
Date: Wed Aug 19 06:30:36 2020
New Revision: 1880979
URL: http://svn.apache.org/viewvc?rev=1880979&view=rev
Log:
PDFBOX-4837: rename RandomAccessBufferedFile to RandomAccessReadBufferedFile to be inline with the other classes inplementing RandomAccessRead
Added:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBufferedFile.java
- copied, changed from r1880978, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBufferedFile.java
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBufferedFile.java
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/TestPDFParser.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java?rev=1880979&r1=1880978&r2=1880979&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/signature/ShowSignature.java Wed Aug 19 06:30:36 2020
@@ -55,7 +55,7 @@ import org.apache.pdfbox.cos.COSString;
import org.apache.pdfbox.examples.signature.cert.CertificateVerificationException;
import org.apache.pdfbox.examples.signature.cert.CertificateVerifier;
import org.apache.pdfbox.io.IOUtils;
-import org.apache.pdfbox.io.RandomAccessBufferedFile;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
@@ -135,7 +135,7 @@ public final class ShowSignature
File infile = new File(args[1]);
// use old-style document loading to disable leniency
// see also https://www.pdf-insecurity.org/
- RandomAccessBufferedFile raFile = new RandomAccessBufferedFile(infile);
+ RandomAccessReadBufferedFile raFile = new RandomAccessReadBufferedFile(infile);
// If your files are not too large, you can also download the PDF into a byte array
// with IOUtils.toByteArray() and pass a RandomAccessBuffer() object to the
// PDFParser constructor.
@@ -301,7 +301,7 @@ public final class ShowSignature
// comment by mkl: check whether gap contains a hex value equal
// byte-by-byte to the Content value, to prevent attacker from using a literal string
// to allow extra space
- try (RandomAccessBufferedFile raf = new RandomAccessBufferedFile(file))
+ try (RandomAccessReadBufferedFile raf = new RandomAccessReadBufferedFile(file))
{
raf.seek(byteRange[1]);
int c = raf.read();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java?rev=1880979&r1=1880978&r2=1880979&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/Loader.java Wed Aug 19 06:30:36 2020
@@ -25,7 +25,7 @@ import java.io.InputStream;
import org.apache.pdfbox.io.IOUtils;
import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.io.RandomAccessBufferedFile;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
import org.apache.pdfbox.io.RandomAccessReadBuffer;
import org.apache.pdfbox.io.RandomAccessReadMemoryMappedFile;
import org.apache.pdfbox.io.RandomAccessRead;
@@ -297,7 +297,7 @@ public class Loader
MemoryUsageSetting memUsageSetting) throws IOException
{
@SuppressWarnings({ "squid:S2095" }) // raFile not closed here, may be needed for signing
- RandomAccessBufferedFile raFile = new RandomAccessBufferedFile(file);
+ RandomAccessReadBufferedFile raFile = new RandomAccessReadBufferedFile(file);
try
{
return Loader.loadPDF(raFile, password, keyStore, alias, memUsageSetting);
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBufferedFile.java (from r1880978, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBufferedFile.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBufferedFile.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBufferedFile.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBufferedFile.java&r1=1880978&r2=1880979&rev=1880979&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessBufferedFile.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/RandomAccessReadBufferedFile.java Wed Aug 19 06:30:36 2020
@@ -30,7 +30,7 @@ import java.util.Map;
*
* @author Timo Boehme
*/
-public class RandomAccessBufferedFile implements RandomAccessRead
+public class RandomAccessReadBufferedFile implements RandomAccessRead
{
private int pageSizeShift = 12;
private int pageSize = 1 << pageSizeShift;
@@ -72,7 +72,7 @@ public class RandomAccessBufferedFile im
* @param filename the filename of the file to be read.
* @throws IOException if something went wrong while accessing the given file.
*/
- public RandomAccessBufferedFile( String filename ) throws IOException
+ public RandomAccessReadBufferedFile( String filename ) throws IOException
{
this(new File(filename));
}
@@ -83,7 +83,7 @@ public class RandomAccessBufferedFile im
* @param file the file to be read.
* @throws IOException if something went wrong while accessing the given file.
*/
- public RandomAccessBufferedFile( File file ) throws IOException
+ public RandomAccessReadBufferedFile( File file ) throws IOException
{
raFile = new RandomAccessFile(file, "r");
fileLength = file.length();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java?rev=1880979&r1=1880978&r2=1880979&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/SignatureOptions.java Wed Aug 19 06:30:36 2020
@@ -23,7 +23,7 @@ import java.io.InputStream;
import org.apache.pdfbox.cos.COSDocument;
import org.apache.pdfbox.io.RandomAccessReadBuffer;
-import org.apache.pdfbox.io.RandomAccessBufferedFile;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.pdfbox.pdmodel.interactive.digitalsignature.visible.PDVisibleSigProperties;
@@ -79,7 +79,7 @@ public class SignatureOptions implements
*/
public void setVisualSignature(File file) throws IOException
{
- initFromRandomAccessRead(new RandomAccessBufferedFile(file));
+ initFromRandomAccessRead(new RandomAccessReadBufferedFile(file));
}
/**
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/TestPDFParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/TestPDFParser.java?rev=1880979&r1=1880978&r2=1880979&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/TestPDFParser.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdfparser/TestPDFParser.java Wed Aug 19 06:30:36 2020
@@ -32,7 +32,7 @@ import java.net.URISyntaxException;
import org.apache.pdfbox.Loader;
import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.io.RandomAccessBufferedFile;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
import org.apache.pdfbox.io.RandomAccessRead;
import org.apache.pdfbox.io.ScratchFile;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -92,13 +92,13 @@ public class TestPDFParser
@Test
public void testPDFParserFile() throws IOException
{
- executeParserTest(new RandomAccessBufferedFile(new File(PATH_OF_PDF)), MemoryUsageSetting.setupMainMemoryOnly());
+ executeParserTest(new RandomAccessReadBufferedFile(new File(PATH_OF_PDF)), MemoryUsageSetting.setupMainMemoryOnly());
}
@Test
public void testPDFParserFileScratchFile() throws IOException
{
- executeParserTest(new RandomAccessBufferedFile(new File(PATH_OF_PDF)), MemoryUsageSetting.setupTempFileOnly());
+ executeParserTest(new RandomAccessReadBufferedFile(new File(PATH_OF_PDF)), MemoryUsageSetting.setupTempFileOnly());
}
@Test
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1880979&r1=1880978&r2=1880979&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java Wed Aug 19 06:30:36 2020
@@ -40,7 +40,7 @@ import org.apache.pdfbox.cos.COSObject;
import org.apache.pdfbox.cos.COSObjectKey;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.cos.COSString;
-import org.apache.pdfbox.io.RandomAccessBufferedFile;
+import org.apache.pdfbox.io.RandomAccessReadBufferedFile;
import org.apache.pdfbox.io.ScratchFile;
import org.apache.pdfbox.pdfparser.PDFParser;
import org.apache.pdfbox.pdfparser.XrefTrailerResolver.XRefType;
@@ -100,7 +100,7 @@ public class PreflightParser extends PDF
*/
public PreflightParser(File file) throws IOException
{
- super(new RandomAccessBufferedFile(file));
+ super(new RandomAccessReadBufferedFile(file));
}
/**
@@ -112,7 +112,7 @@ public class PreflightParser extends PDF
*/
public PreflightParser(File file, ScratchFile scratch) throws IOException
{
- super(new RandomAccessBufferedFile(file), scratch);
+ super(new RandomAccessReadBufferedFile(file), scratch);
}
/**