From a1f967c9c64ec800733dcaaeaf144b661f38b3c0 Mon Sep 17 00:00:00 2001 From: Sebastian Nagel Date: Tue, 26 Nov 2024 20:38:41 +0100 Subject: [PATCH 1/7] Downgrade to commons-io 2.8.0 - comment out all usages of BoundedInputStream available only from commons-io 2.16.0 upwards --- pom.xml | 2 +- .../crawlercommons/domains/EffectiveTldFinder.java | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 496d3029..8790a6b7 100644 --- a/pom.xml +++ b/pom.xml @@ -385,7 +385,7 @@ - 2.19.0 + 2.8.0 2.0.17 5.13.3 1.7.33 diff --git a/src/main/java/crawlercommons/domains/EffectiveTldFinder.java b/src/main/java/crawlercommons/domains/EffectiveTldFinder.java index 18259ec1..21f935e5 100644 --- a/src/main/java/crawlercommons/domains/EffectiveTldFinder.java +++ b/src/main/java/crawlercommons/domains/EffectiveTldFinder.java @@ -39,7 +39,7 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import org.apache.commons.io.input.BoundedInputStream; +// import org.apache.commons.io.input.BoundedInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -166,8 +166,9 @@ public boolean initialize(InputStream effectiveTldDataStream) { boolean inPrivateDomainSection = false; try { int linesRead = 0, rulesRead = 0; - BoundedInputStream isCounting = BoundedInputStream.builder().setInputStream(effectiveTldDataStream).get(); - InputStream is = isCounting; + // BoundedInputStream isCounting = BoundedInputStream.builder().setInputStream(effectiveTldDataStream).get(); + // InputStream is = isCounting; + InputStream is = effectiveTldDataStream; List digests = new ArrayList<>(); try { MessageDigest md5 = MessageDigest.getInstance("MD5"); @@ -208,8 +209,9 @@ public boolean initialize(InputStream effectiveTldDataStream) { configured = true; is.close(); - long bytesRead = isCounting.getCount(); - LOGGER.info("Successfully read public suffix list: {} bytes, {} lines, {} rules", bytesRead, linesRead, rulesRead); + // long bytesRead = isCounting.getCount(); + // LOGGER.info("Successfully read public suffix list: {} bytes, {} lines, {} rules", bytesRead, linesRead, rulesRead); + LOGGER.info("Successfully read public suffix list: {} lines, {} rules", linesRead, rulesRead); for (MessageDigest digest : digests) { byte[] d = digest.digest(); BigInteger bi = new BigInteger(1, d); From 935459ba72d6acd7eddddb21d2e9c8c38c988816 Mon Sep 17 00:00:00 2001 From: malteos Date: Mon, 3 Nov 2025 15:39:17 +0100 Subject: [PATCH 2/7] Add workflow_dispatch event to code coverage workflow --- .github/workflows/code_coverage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 0df9e5ef..17372193 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -5,6 +5,8 @@ on: push: branches: - master + workflow_dispatch: + jobs: build: name: Coveralls From 7f2693fab7c75b5ed6e12e5ed49723942da7aff3 Mon Sep 17 00:00:00 2001 From: malteos Date: Mon, 3 Nov 2025 15:40:52 +0100 Subject: [PATCH 3/7] Modify code coverage workflow triggers Updated workflow triggers for code coverage. --- .github/workflows/code_coverage.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 17372193..117ef417 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -1,11 +1,10 @@ name: Code Coverage on: - pull_request: - push: - branches: - - master workflow_dispatch: + pull_request: + fork: + jobs: build: From 9bb4dee786811e0a6c9557859f3d28ca1f7298e5 Mon Sep 17 00:00:00 2001 From: malteos Date: Mon, 3 Nov 2025 15:59:01 +0100 Subject: [PATCH 4/7] Add branches to code coverage workflow trigger --- .github/workflows/code_coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 117ef417..b70e3f16 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -3,6 +3,7 @@ name: Code Coverage on: workflow_dispatch: pull_request: + branches: [main, develop] fork: From 951e9da4ba74e4a34cff624ae686d0b3d8c71bad Mon Sep 17 00:00:00 2001 From: malteos Date: Mon, 3 Nov 2025 16:00:02 +0100 Subject: [PATCH 5/7] Update code_coverage.yml --- .github/workflows/code_coverage.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index b70e3f16..ea1fa1ac 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -1,11 +1,6 @@ name: Code Coverage -on: - workflow_dispatch: - pull_request: - branches: [main, develop] - fork: - +on: workflow_dispatch jobs: build: From fd13458eb4498bf673d9af35c9c9dd68d8ae0c61 Mon Sep 17 00:00:00 2001 From: malteos Date: Mon, 3 Nov 2025 16:02:51 +0100 Subject: [PATCH 6/7] Add pull_request and fork triggers to coverage workflow --- .github/workflows/code_coverage.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index ea1fa1ac..7e643b89 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -1,7 +1,10 @@ name: Code Coverage -on: workflow_dispatch - +on: + workflow_dispatch: + pull_request: + fork: + jobs: build: name: Coveralls From 1e6d1f5635567032b5c06900aec7c3619a676be4 Mon Sep 17 00:00:00 2001 From: malteos Date: Mon, 3 Nov 2025 16:04:46 +0100 Subject: [PATCH 7/7] Add branches to code coverage workflow triggers --- .github/workflows/code_coverage.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml index 7e643b89..f234264e 100644 --- a/.github/workflows/code_coverage.yml +++ b/.github/workflows/code_coverage.yml @@ -3,6 +3,7 @@ name: Code Coverage on: workflow_dispatch: pull_request: + branches: [main, develop, commons-io-downgrade, patch-1] fork: jobs: