Fix bugs

Author: ljm625

Dockerfile

@@ -2,7 +2,15 @@ FROM ubuntu:18.10
 MAINTAINER Jiaming Li <ljm625@gmail.com>
 ENV NGINX_VERSION 1.9.11-1~jessie
 RUN apt-get update
-RUN apt-get install -y ca-certificates nginx gettext-base vim supervisor python3.6 python3.6-dev python3-pip libyaml-dev
+RUN apt-get install -y ca-certificates nginx gettext-base vim supervisor python3.6 python3.6-dev python3-pip libyaml-dev build-essential chrpath libssl-dev libxft-dev libfreetype6 libfreetype6-dev libfontconfig1 libfontconfig1-dev
+# Do phantomjs
+RUN apt-get install -y wget
+RUN cd ~
+ENV PHANTOM_JS phantomjs-2.1.1-linux-x86_64
+RUN wget https://github.com/Medium/phantomjs/releases/download/v2.1.1/$PHANTOM_JS.tar.bz2
+RUN tar xvjf $PHANTOM_JS.tar.bz2
+RUN mv $PHANTOM_JS /usr/local/share
+RUN ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin
 # forward request and error logs to docker log collector
 RUN ln -sf /dev/stdout /var/log/nginx/access.log \
 	&& ln -sf /dev/stderr /var/log/nginx/error.log

components/proxy_checker.py

@@ -47,10 +47,10 @@ def yaml_loader(file):
 
     def validate_proxy(self,proxy,check=False):
         def build_proxy():
-            if proxy[2]=='http':
-                return {"http": "socks5://{}:{}".format(proxy[0],proxy[1]),
-                        "https": "socks5://{}:{}".format(proxy[0],proxy[1])}
-            elif proxy[2]=='socks':
+            if proxy[2]=='HTTP' or proxy[2]=="HTTPS":
+                return {"http": "http://{}:{}".format(proxy[0],proxy[1]),
+                        "https": "http://{}:{}".format(proxy[0],proxy[1])}
+            elif proxy[2]=='SOCKS5':
                 return {"http": "socks5://{}:{}".format(proxy[0],proxy[1]),
                         "https": "socks5://{}:{}".format(proxy[0],proxy[1])}
         try:

config.yaml

@@ -80,6 +80,12 @@ upstream_dns : "8.8.8.8"
 # this is useful if u make a public server on the internet and avoid them to use it as a public HTTP Proxy. (Need to use with PAC or DNS)
 disable_proxy : false
 
+# Enable socks proxy
+enable_socks : true
+# Enable http/https proxy
+enable_http : true
+
+
 
 # Auto Generate Infos.