pashko/apache-poi
1
0
Fork 0
mirror of https://github.com/apache/poi.git synced 2026-02-27 12:30:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add some more forbidden-apis to prefer core JDK classes over Guava and commons-codec

Browse Source 
Also prevent java logging from being used inadvertently

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894810 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dominik Stadler 2021-11-07 14:59:40 +00:00
parent 4e7b994c25
commit 034c95ec55
10 changed files with 62 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
poi-ooxml/src/test/java/org/apache/poi/ooxml/TestTriggerCoverage.java
View File

@ -56,7 +56,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
/**
* Test to trigger code-execution of various parts so
* that all required elements are inclueded in the ooxml-schema-lite package
* that all required elements are included in the ooxml-schema-lite package
*/
class TestTriggerCoverage {
private static final Set<String> FAILING = new HashSet<>();

4
poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/tests/TestDecryptor.java
View File

@ -27,10 +27,10 @@ import java.io.IOException;
import java.io.InputStream;
import java.security.GeneralSecurityException;
import java.security.MessageDigest;
import java.util.Base64;
import javax.crypto.Cipher;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
@ -166,7 +166,7 @@ class TestDecryptor {
try (InputStream is2 = dec.getDataStream(pfs)) {
md.update(IOUtils.toByteArray(is2));
}
assertEquals("L1vDQq2EuMSfU/FBfVQfM2zfOY5Jx9ZyVgIQhXPPVgs=", Base64.encodeBase64String(md.digest()));
assertEquals("L1vDQq2EuMSfU/FBfVQfM2zfOY5Jx9ZyVgIQhXPPVgs=", Base64.getEncoder().encodeToString(md.digest()));
}
}

4
poi-ooxml/src/test/java/org/apache/poi/ss/tests/usermodel/TestEmbedOLEPackage.java
View File

@ -29,11 +29,11 @@ import java.io.InputStream;
import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hpsf.ClassIDPredefined;
@ -144,7 +144,7 @@ class TestEmbedOLEPackage {
private static String digest(Ole10Native ole10) {
MessageDigest sha = CryptoFunctions.getMessageDigest(HashAlgorithm.sha256);
byte[] digest = sha.digest(ole10.getDataBuffer());
return Base64.encodeBase64String(digest);
return Base64.getEncoder().encodeToString(digest);
}
@Test

4
poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
View File

@ -29,12 +29,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.IOException;
import java.io.InputStream;
import java.security.MessageDigest;
import java.util.Base64;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.apache.commons.codec.binary.Base64;
import org.apache.poi.POIDataSamples;
import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@ -370,6 +370,6 @@ public final class TestXSSFReader {
md.update(IOUtils.toByteArray(is));
}
return Base64.encodeBase64String(md.digest());
return Base64.getEncoder().encodeToString(md.digest());
}
}

5
poi-scratchpad/src/test/java/org/apache/poi/hslf/extractor/TestExtractor.java
View File

@ -29,11 +29,12 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.security.MessageDigest;
import java.util.Base64;
import java.util.BitSet;
import java.util.List;
import com.zaxxer.sparsebits.SparseBitSet;
import org.apache.commons.codec.binary.Base64;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.usermodel.HSLFObjectShape;
import org.apache.poi.hslf.usermodel.HSLFSlideShow;
@ -241,7 +242,7 @@ public final class TestExtractor {
sha2.update(IOUtils.toByteArray(is));
}
String exp = "lIRRfGMin6B4++WR4XvA82usdQ3ijeHBHU85j523sKY=";
String act = Base64.encodeBase64String(sha2.digest());
String act = Base64.getEncoder().encodeToString(sha2.digest());
assertEquals(exp, act);
}
}

4
poi-scratchpad/src/test/java/org/apache/poi/hslf/record/TestDocumentEncryption.java
View File

@ -25,9 +25,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.InputStream;
import java.security.MessageDigest;
import java.util.Base64;
import java.util.List;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hpsf.DocumentSummaryInformation;
@ -167,7 +167,7 @@ public class TestDocumentEncryption {
for (HSLFPictureData p : pd) {
byte[] hash = md.digest(p.getData());
assertEquals(Integer.parseInt(picCmp[i][0]), p.getOffset());
assertEquals(picCmp[i][1], Base64.encodeBase64String(hash));
assertEquals(picCmp[i][1], Base64.getEncoder().encodeToString(hash));
i++;
}

6
poi/src/main/java/org/apache/poi/poifs/crypt/agile/EncryptionDocument.java
View File

@ -18,11 +18,11 @@
package org.apache.poi.poifs.crypt.agile;
import java.util.ArrayList;
import java.util.Base64;
import java.util.List;
import javax.xml.XMLConstants;
import org.apache.commons.codec.binary.Base64;
import org.apache.poi.EncryptedDocumentException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@ -129,7 +129,7 @@ public class EncryptionDocument {
static byte[] getBinAttr(Element el, String name) {
String at = el.getAttribute(name);
return (at.isEmpty()) ? null : Base64.decodeBase64(at);
return (at.isEmpty()) ? null : Base64.getDecoder().decode(at);
}
static void setIntAttr(Element el, String name, Integer val) {
@ -144,7 +144,7 @@ public class EncryptionDocument {
static void setBinAttr(Element el, String name, byte[] val) {
if (val != null) {
setAttr(el, name, Base64.encodeBase64String(val));
setAttr(el, name, Base64.getEncoder().encodeToString(val));
}
}
}

9
poi/src/main/java/org/apache/poi/ss/format/CellFormat.java
View File

@ -23,13 +23,14 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.swing.JLabel;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.ConditionalFormatting;
@ -93,7 +94,7 @@ import org.apache.poi.util.LocaleUtil;
*/
public class CellFormat {
/** The logger to use in the formatting code. */
private static final Logger LOG = Logger.getLogger(CellFormat.class.getName());
private static final Logger LOG = LogManager.getLogger(CellFormat.class);
private static final Pattern ONE_PART = Pattern.compile(
CellFormatPart.FORMAT_PAT.pattern() + "(;|$)",
@ -191,7 +192,7 @@ public class CellFormat {
parts.add(new CellFormatPart(locale, valueDesc));
} catch (RuntimeException e) {
LOG.log(Level.WARNING, "Invalid format: " + CellFormatter.quote(m.group()), e);
LOG.log(Level.WARN, "Invalid format: " + CellFormatter.quote(m.group()), e);
parts.add(null);
}
}

23
poi/src/main/java/org/apache/poi/ss/format/CellFormatPart.java
View File

@ -50,9 +50,8 @@ public class CellFormatPart {
static final Map<String, Color> NAMED_COLORS;
private final Color color;
private CellFormatCondition condition;
private final CellFormatCondition condition;
private final CellFormatter format;
private final CellFormatType type;
@ -410,17 +409,17 @@ public class CellFormatPart {
while (codePoints.hasNext()) {
String ch = codePoints.next();
if ("\'".equals(ch) && type.isSpecial('\'')) {
sb.append('\u0000');
continue;
}
sb.append('\u0000');
continue;
}
boolean special = type.isSpecial(ch.charAt(0));
if (special)
sb.append("\'");
sb.append(ch);
if (special)
sb.append("\'");
}
boolean special = type.isSpecial(ch.charAt(0));
if (special)
sb.append("'");
sb.append(ch);
if (special)
sb.append("'");
}
return sb.toString();
}

33
src/resources/devtools/forbidden-signatures.txt
View File

@ -141,5 +141,34 @@ javax.xml.bind.DatatypeConverter
@defaultMessage don't rely on the threads ContextClassLoader - provide the classloader via load(Class, Classloader)
java.util.ServiceLoader#load(java.lang.Class)
@defaultMessage use java.nio.charset.StandardCharsets instead
org.apache.commons.codec.Charsets
@defaultMessage Use Log4J classes instead
java.util.logging.**
# taken from https://github.com/apache/solr/blob/main/gradle/validation/forbidden-apis/com.google.guava.guava.all.txt
@defaultMessage Use corresponding Java 8 functional/streaming interfaces
com.google.common.base.Function
com.google.common.base.Joiner
com.google.common.base.Predicate
com.google.common.base.Supplier
@defaultMessage Use java.nio.charset.StandardCharsets instead
com.google.common.base.Charsets
@defaultMessage Use methods in java.util.Objects instead
com.google.common.base.Objects#equal(java.lang.Object,java.lang.Object)
com.google.common.base.Objects#hashCode(java.lang.Object[])
com.google.common.base.Preconditions#checkNotNull(java.lang.Object)
com.google.common.base.Preconditions#checkNotNull(java.lang.Object,java.lang.Object)
@defaultMessage Use methods in java.util.Comparator instead
com.google.common.collect.Ordering
# taken from https://github.com/apache/solr/blob/main/gradle/validation/forbidden-apis/commons-codec.commons-codec.all.txt
@defaultMessage Use java.nio.charset.StandardCharsets instead
org.apache.commons.codec.Charsets
@defaultMessage Use java.util.Base64 instead
org.apache.commons.codec.binary.Base64