You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2022/04/25 18:28:58 UTC
[tika] branch main updated (742af7025 -> b8669229f)
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
from 742af7025 fix older, long broken tests on Windows
new 5b90009e7 fix assertion on error msg in two way tls test
new b8669229f TIKA-3719 -- log warning about beta stage of tls configuration
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 3 ++-
.../main/java/org/apache/tika/server/core/TikaServerProcess.java | 2 ++
.../org/apache/tika/server/core/TikaServerIntegrationTest.java | 7 ++-----
3 files changed, 6 insertions(+), 6 deletions(-)
[tika] 01/02: fix assertion on error msg in two way tls test
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 5b90009e72d336b908328ddc51d6f184fe259fa7
Author: tallison <ta...@apache.org>
AuthorDate: Mon Apr 25 14:24:17 2022 -0400
fix assertion on error msg in two way tls test
---
.../org/apache/tika/server/core/TikaServerIntegrationTest.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
index 3bcf40a05..cc8839d27 100644
--- a/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
+++ b/tika-server/tika-server-core/src/test/java/org/apache/tika/server/core/TikaServerIntegrationTest.java
@@ -410,11 +410,8 @@ public class TikaServerIntegrationTest extends IntegrationTestBase {
ClassLoader.getSystemResourceAsStream(TEST_HELLO_WORLD));
fail("bad, bad, bad. this should have failed!");
} catch (Exception e) {
- assertTrue(
- //linux
- e.getMessage().contains("readHandshakeRecord") ||
- //windows
- e.getMessage().contains("SocketException"));
+ //the messages vary too much between operating systems and
+ //java versions to make a reliable assertion
}
}
[tika] 02/02: TIKA-3719 -- log warning about beta stage of tls configuration
Posted by ta...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit b8669229f28ffb71977d573e17d0bffc6578a8ef
Author: tallison <ta...@apache.org>
AuthorDate: Mon Apr 25 14:28:50 2022 -0400
TIKA-3719 -- log warning about beta stage of tls configuration
---
CHANGES.txt | 3 ++-
.../src/main/java/org/apache/tika/server/core/TikaServerProcess.java | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 2e4f1346f..d78cc9351 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,8 @@ Release 2.4.0 - ???
https://github.com/apache/tika/blob/main/tika-parsers/tika-parsers-ml/tika-dl/pom.xml
for the dependencies that must be provided at run-time (TIKA-3676).
- * Add initial TLS encryption option for tika-server (TIKA-3719).
+ * Add initial, BETA-grade TLS encryption option for tika-server;
+ configuration may change in future releases (TIKA-3719).
* Allow specification of fetcherName and fetchKey via query parameters
in request URI in tika-server (TIKA-3714).
diff --git a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
index ea25dda93..a6ba72e81 100644
--- a/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
+++ b/tika-server/tika-server-core/src/main/java/org/apache/tika/server/core/TikaServerProcess.java
@@ -263,6 +263,8 @@ public class TikaServerProcess {
sf.setResourceComparator(new ProduceTypeResourceComparator());
BindingFactoryManager manager = sf.getBus().getExtension(BindingFactoryManager.class);
if (tikaServerConfig.getTlsConfig().isActive()) {
+ LOG.warn("The TLS configuration is in BETA and might change " +
+ "dramatically in future releases.");
TLSServerParameters tlsParams = getTlsParams(tikaServerConfig.getTlsConfig());
JettyHTTPServerEngineFactory factory = new JettyHTTPServerEngineFactory();
factory.setBus(sf.getBus());