From 2a81c95e2752657b7496875243e7a53272539d3c Mon Sep 17 00:00:00 2001 From: Medicean Date: Sat, 30 Jul 2016 11:23:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Ubuntu=E9=AB=98=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=AD=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BDssl?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o/openssl/heartbleed_CVE-2014-0160/Dockerfile | 26 ++++++++++--------- o/openssl/heartbleed_CVE-2014-0160/README.md | 7 +++++ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/o/openssl/heartbleed_CVE-2014-0160/Dockerfile b/o/openssl/heartbleed_CVE-2014-0160/Dockerfile index baba41e..f1ba6fc 100644 --- a/o/openssl/heartbleed_CVE-2014-0160/Dockerfile +++ b/o/openssl/heartbleed_CVE-2014-0160/Dockerfile @@ -1,24 +1,26 @@ -FROM ubuntu:latest +FROM ubuntu:14.04.4 MAINTAINER Medici.Yan@Gmail.com WORKDIR /tmp -ENV BASE_URL https://raw.githubusercontent.com/Medicean/VulApps/master/o/openssl/heartbleed_CVE-2014-0160/ - +RUN sed -i 's/archive.ubuntu.com/mirrors.ustc.edu.cn/g' /etc/apt/sources.list RUN apt-get update \ - && apt-get install -y wget apache2 + && apt-get install -y apache2 -RUN wget ${BASE_URL}/openssl_1.0.1c-4ubuntu8_amd64.deb \ - && dpkg --force-all -i openssl_1.0.1c-4ubuntu8_amd64.deb \ - && wget ${BASE_URL}/libssl1.0.0_1.0.1c-4ubuntu8_amd64.deb \ +COPY openssl_1.0.1c-4ubuntu8_amd64.deb /tmp/openssl_1.0.1c-4ubuntu8_amd64.deb +COPY libssl1.0.0_1.0.1c-4ubuntu8_amd64.deb /tmp/libssl1.0.0_1.0.1c-4ubuntu8_amd64.deb + +RUN dpkg --force-all -i openssl_1.0.1c-4ubuntu8_amd64.deb \ && dpkg --force-all -i libssl1.0.0_1.0.1c-4ubuntu8_amd64.deb \ - && rm -f libssl1.0.0_1.0.1c-4ubuntu8_amd64.deb \ - && rm -f openssl_1.0.1c-4ubuntu8_amd64.deb + && rm -f /tmp/libssl1.0.0_1.0.1c-4ubuntu8_amd64.deb \ + && rm -f /tmp/openssl_1.0.1c-4ubuntu8_amd64.deb RUN mkdir /etc/apache2/ssl \ && openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/apache2/ssl/apache.key -out /etc/apache2/ssl/apache.crt -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=localhost" \ - && rm -f /etc/apache2/sites-available/default-ssl.conf \ - && wget -O /etc/apache2/sites-available/default-ssl.conf ${BASE_URL}/default-ssl.conf \ - && a2enmod ssl \ + && rm -f /etc/apache2/sites-available/default-ssl.conf + +COPY default-ssl.conf /etc/apache2/sites-available/default-ssl.conf + +RUN a2enmod ssl \ && a2ensite default-ssl.conf EXPOSE 443 diff --git a/o/openssl/heartbleed_CVE-2014-0160/README.md b/o/openssl/heartbleed_CVE-2014-0160/README.md index 3c42049..62bbe50 100644 --- a/o/openssl/heartbleed_CVE-2014-0160/README.md +++ b/o/openssl/heartbleed_CVE-2014-0160/README.md @@ -54,3 +54,10 @@ $ docker run -d -p 443:443 medicean/vulapps:o_openssl_heartbleed 读取到的信息在当前目录下的 `result.txt` 内。 > 具体使用参数请使用 `python exp.py -h` + +### 改动日志 + +20160731 + + * 修正高版本 Ubuntu 中无法启动的问题 + * 优化速度