imp: Dockerfile + tests

Author: Tardo

Dockerfile

@@ -34,18 +34,17 @@ RUN set -eux; \
         zlib-dev \
         pcre2-dev \
         $PRIVOXY_BUILD_EXTRA; \
-    mkdir -p /usr/local/src/privoxy-${PRIVOXY_VERSION}-stable; \
     wget -qO /var/lib/privoxy/privoxy-src.tar.gz https://sourceforge.net/projects/ijbswa/files/Sources/${PRIVOXY_VERSION}%20%28stable%29/privoxy-${PRIVOXY_VERSION}-stable-src.tar.gz/download; \
     echo "${PRIVOXY_SRC_SHA1SUM} /var/lib/privoxy/privoxy-src.tar.gz" | sha1sum -c; \
-    tar -zxvf /var/lib/privoxy/privoxy-src.tar.gz -C /usr/local/src/; \
-    cd /usr/local/src/privoxy-${PRIVOXY_VERSION}-stable; \
+    tar -zxvf /var/lib/privoxy/privoxy-src.tar.gz -C /var/lib/privoxy/; \
+    cd /var/lib/privoxy/privoxy-${PRIVOXY_VERSION}-stable; \
     autoheader; \
     autoconf; \
     ./configure $PRIVOXY_CONFIG_OPTIONS; \
     make; \
     make -s install USER=privoxy GROUP=privoxy; \
     chown -R privoxy:privoxy /usr/local/etc/privoxy/; \
-    rm -rf /var/lib/privoxy/privoxy-src.tar.gz /usr/local/src/privoxy-${PRIVOXY_VERSION}-stable; \
+    rm -rf /var/lib/privoxy/privoxy-src.tar.gz /var/lib/privoxy/privoxy-${PRIVOXY_VERSION}-stable; \
     apk del build-tools build-deps;
 
 # Add system tools
@@ -68,35 +67,33 @@ COPY data/rules/ /usr/local/etc/privoxy/privman-rules/
 COPY data/config /usr/local/etc/privoxy/
 COPY data/privoxy-blocklist.conf /var/lib/privoxy/
 RUN set -eux; \
+    # Remove CRLF (dos2unix) and ensure LF-only
     sed -i 's/\r$//' /var/lib/privoxy/privoxy-blocklist.conf
 COPY bin/privman.py /var/lib/privoxy/privman.py
+RUN set -ex; \
+    sed -i 's/\r$//' /var/lib/privoxy/privman.py; \
+    head -1 /var/lib/privoxy/privman.py | grep -q '^#!' || \
+        sed -i '1i #!/usr/bin/env python3' /var/lib/privoxy/privman.py; \
+    chmod +x /var/lib/privoxy/privman.py; \
+    ln -sf /var/lib/privoxy/privman.py /usr/local/sbin/privman;
 COPY bin/privoxy-blocklist.sh /var/lib/privoxy/privoxy-blocklist.sh
 RUN set -eux; \
-    # Remove CRLF (dos2unix) and ensure LF-only
     sed -i 's/\r$//' /var/lib/privoxy/privoxy-blocklist.sh; \
-    # Make executable
     chmod +x /var/lib/privoxy/privoxy-blocklist.sh; \
-    # (Re)create the symlink
-    ln -sf /var/lib/privoxy/privoxy-blocklist.sh /usr/local/bin/privoxy-blocklist
-COPY docker-entrypoint.sh /usr/local/bin/
-RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh \
- && chmod +x /usr/local/bin/docker-entrypoint.sh
+    ln -sf /var/lib/privoxy/privoxy-blocklist.sh /usr/local/sbin/privoxy-blocklist;
+COPY docker-entrypoint.sh /usr/local/sbin/
+RUN sed -i 's/\r$//' /usr/local/sbin/docker-entrypoint.sh && \
+        chmod +x /usr/local/sbin/docker-entrypoint.sh;
 
 # Set the correct permissions
 RUN set -ex; \
-    sed -i 's/\r$//' /var/lib/privoxy/privman.py /var/lib/privoxy/privoxy-blocklist.sh; \
-    head -1 /var/lib/privoxy/privman.py | grep -q '^#!' || \
-      sed -i '1i #!/usr/bin/env python3' /var/lib/privoxy/privman.py; \
     mkdir -p /var/log/privoxy /usr/local/etc/privoxy/CA /usr/local/etc/privoxy/certs /usr/local/etc/privoxy/privman-rules; \
-    chown -R privoxy:privoxy /var/log/privoxy/ /usr/local/etc/privoxy/config /usr/local/etc/privoxy/CA /usr/local/etc/privoxy/certs /usr/local/etc/privoxy/privman-rules /var/lib/privoxy/privoxy-blocklist.conf; \
-    chmod +x /var/lib/privoxy/privman.py; \
-    ln -sf /var/lib/privoxy/privman.py /usr/local/sbin/privman; \
-    ln -sf /var/lib/privoxy/privoxy-blocklist.sh /usr/local/sbin/privoxy-blocklist;
+    chown -R privoxy:privoxy /var/log/privoxy/ /usr/local/etc/privoxy/config /usr/local/etc/privoxy/CA /usr/local/etc/privoxy/certs /usr/local/etc/privoxy/privman-rules /var/lib/privoxy/privoxy-blocklist.conf;
 
 ENV ADBLOCK_URLS="" \
     ADBLOCK_FILTERS=""
 
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
+ENTRYPOINT ["/usr/local/sbin/docker-entrypoint.sh"]
 
 RUN cp -a /usr/local/etc/privoxy /opt/privoxy-default
 

tests/conftest.py

@@ -8,6 +8,7 @@
 import platform
 
 PRIVOXY_PORT = "8118"
+IMAGE_TAG_NAME = "test:docker-privoxy-https"
 
 
 def pytest_addoption(parser):
@@ -25,7 +26,7 @@ def docker_build(pytestconfig):
         build_args={
             "PRIVOXY_VERSION": privoxy_ver,
         },
-        tags="test:docker-privoxy-https",
+        tags=IMAGE_TAG_NAME,
         cache=not no_cache,
     )
     return docker
@@ -36,7 +37,7 @@ def docker_privoxy(docker_build):
     container = None
     try:
         container = docker_build.container.run(
-            "test:docker-privoxy-https",
+            IMAGE_TAG_NAME,
             volumes=[
                 ("pytest-privoxy", "/usr/local/etc/privoxy"),
             ],

tests/test_privoxy.py

@@ -32,12 +32,18 @@ def test_blocklist(self, docker_privoxy, make_request, exec_privman):
         time.sleep(3)
         resp = make_request("http://google.com", docker_privoxy)
         assert self._is_blocked_by_privoxy(resp) == True
+        resp = make_request("https://google.com", docker_privoxy)
+        assert self._is_blocked_by_privoxy(resp) == True
         resp = exec_privman(docker_privoxy, "--remove-blocklist", ".google.")
         assert "successfully" in resp
         time.sleep(3)
+        resp = make_request("http://google.com", docker_privoxy)
+        assert resp.status_code == 200
         resp = make_request("https://google.com", docker_privoxy)
         assert resp.status_code == 200
 
     def test_adblock_filters(self, docker_privoxy, make_request):
         resp = make_request("http://google.com/www/ad/test", docker_privoxy)
         assert self._is_blocked_by_privoxy(resp) == True
+        resp = make_request("https://google.com/www/ad/test", docker_privoxy)
+        assert self._is_blocked_by_privoxy(resp) == True