You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2018/02/09 10:59:05 UTC
[1/2] httpcomponents-client git commit: Added digest auth support to
test Apache HTTPD docker imsage
Repository: httpcomponents-client
Updated Branches:
refs/heads/master 4f7df3d0a -> a2cc0a511
Added digest auth support to test Apache HTTPD docker imsage
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/1253d7f4
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/1253d7f4
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/1253d7f4
Branch: refs/heads/master
Commit: 1253d7f411b409c44b1a32215a909f9d4c632f33
Parents: 4f7df3d
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Sun Feb 4 12:59:58 2018 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Sun Feb 4 12:59:58 2018 +0100
----------------------------------------------------------------------
httpclient5-testing/docker/apache-httpd/Dockerfile | 4 +++-
httpclient5-testing/docker/apache-httpd/httpd.conf | 10 ++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/1253d7f4/httpclient5-testing/docker/apache-httpd/Dockerfile
----------------------------------------------------------------------
diff --git a/httpclient5-testing/docker/apache-httpd/Dockerfile b/httpclient5-testing/docker/apache-httpd/Dockerfile
index 3d534bc..166e507 100644
--- a/httpclient5-testing/docker/apache-httpd/Dockerfile
+++ b/httpclient5-testing/docker/apache-httpd/Dockerfile
@@ -36,7 +36,9 @@ COPY httpd.conf ${httpd_home}/conf/
COPY httpd-ssl.conf ${httpd_home}/conf/
RUN mkdir -p ${private_dir}
-RUN htpasswd -b -c ${private_dir}/.htpasswd testuser nopassword
+# user: testuser; pwd: nopassword
+RUN echo "testuser:{SHA}0Ybo2sSKJNARW1aNCrLJ6Lguats=" > ${private_dir}/.htpasswd
+RUN echo "testuser:Restricted Files:73deccd22e07066db8c405e5364335f5" > ${private_dir}/.htpasswd_digest
RUN echo "Big Secret" > ${private_dir}/big-secret.txt
EXPOSE 8080
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/1253d7f4/httpclient5-testing/docker/apache-httpd/httpd.conf
----------------------------------------------------------------------
diff --git a/httpclient5-testing/docker/apache-httpd/httpd.conf b/httpclient5-testing/docker/apache-httpd/httpd.conf
index b1ac51d..8564ef1 100644
--- a/httpclient5-testing/docker/apache-httpd/httpd.conf
+++ b/httpclient5-testing/docker/apache-httpd/httpd.conf
@@ -577,3 +577,13 @@ SSLRandomSeed connect builtin
</Directory>
+<Directory "/var/httpd/www/private">
+
+ AuthType Digest
+ AuthName "Restricted Files"
+ AuthDigestDomain /
+ AuthBasicProvider file
+ AuthUserFile "/var/httpd/www/private/.htpasswd_digest"
+ Require valid-user
+
+</Directory>
[2/2] httpcomponents-client git commit: HTTPCLIENT-1904: check cookie
domain for null
Posted by ol...@apache.org.
HTTPCLIENT-1904: check cookie domain for null
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/a2cc0a51
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/a2cc0a51
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/a2cc0a51
Branch: refs/heads/master
Commit: a2cc0a511bb2a38cc37a0f351944d6b19036fa67
Parents: 1253d7f
Author: Hans-Peter Keck <ha...@haufe-lexware.com>
Authored: Fri Feb 9 10:21:59 2018 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Fri Feb 9 11:57:11 2018 +0100
----------------------------------------------------------------------
.../hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/a2cc0a51/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java
----------------------------------------------------------------------
diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java
index 8093f0b..3022f8e 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/cookie/PublicSuffixDomainFilter.java
@@ -90,6 +90,9 @@ public class PublicSuffixDomainFilter implements CommonCookieAttributeHandler {
@Override
public boolean match(final Cookie cookie, final CookieOrigin origin) {
final String host = cookie.getDomain();
+ if (host == null) {
+ return false;
+ }
final int i = host.indexOf('.');
if (i >= 0) {
final String domain = host.substring(i);