Merge branch 'master' of git.scraperwall.com:scw/apache-lua

docker-compose.yml

@@ -27,9 +27,6 @@ services:
       - ./httpd-lua.conf:/usr/local/apache2/conf/extra/httpd-lua.conf
       - ./htdocs:/usr/local/apache2/htdocs
       - ./lua:/usr/local/apache2/lua
-#      - /docker-filesystem/httpd/apache/httpd-lua.conf:/usr/local/apache2/conf/extra/httpd-lua.conf
-#      - /docker-filesystem/httpd/apache/htdocs:/usr/local/apache2/htdocs
-#      - /docker-filesystem/httpd/apache/lua:/usr/local/apache2/lua
     environment:
       - SCW_IGNORE=(^/assets/|\.(png|jpe?g|svg|gif|js|css)$$)
       - SCW_KEY=DydmRdMMZWcRF91mNj/CWLPzzQQi5Rew0cBP0qiBUZI=

httpd-lua.conf

@@ -1,9 +1,12 @@
 LoadModule lua_module modules/mod_lua.so
+LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
+
+# these modules are not necessary for the ScraperWall-Lua module to work
+# and are only here to setup the test server
 LoadModule info_module modules/mod_info.so
 LoadModule proxy_module modules/mod_proxy.so
 LoadModule proxy_http_module modules/mod_proxy_http.so
 LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
-LoadModule slotmem_shm_module modules/mod_slotmem_shm.so
 LoadModule ssl_module modules/mod_ssl.so
 
 SSLPRoxyEngine on

lua/scw.lua

@@ -13,7 +13,6 @@ local redis_conn = nil
 
 function _decrypt(message_and_iv, key)
   if message_and_iv:len() < 32 then
-    -- io.stderr:write("message too short!\n")
     return ""
   end
 
@@ -25,11 +24,9 @@ function _decrypt(message_and_iv, key)
   c:decrypt(key, iv)
   cleartext, err = c:final(message)
   if err ~= nil then
-    -- io.stderr:write(err .. "\n")
     return ""
   end
 
-  -- io.stderr:write(cleartext .. "\n")
   return cleartext
 end
 
@@ -38,11 +35,7 @@ function scw(r)
   local has_redis = false
   local ignore = os.getenv("SCW_IGNORE")
 
-  -- io.stderr:write("url: " .. r.uri .. "\n")
-  -- io.stderr:write(string.format("now: %d\n", r:clock()/1000/1000))
-
   if ignore ~= nil and regex.match(r.uri, ignore) then
-    -- io.stderr:write(string.format("ignoring %s\n", r.uri))
     return apache2.DECLINED
   end
 
@@ -55,15 +48,12 @@ function scw(r)
   if human_cookie then
     human_cookie = r:base64_decode(r:unescape(human_cookie))
   end
-  -- io.stderr:write("cookie: " .. r:base64_encode(human_cookie) .. "\n")
   local is_human = false
 
   if human_cookie ~= nil and cookie_key:len() == 32 then
     local cookie_data = _decrypt(human_cookie, cookie_key)
-    -- io.stderr:write("cookie: " .. cookie_data.."\n")
 
     is_human = string.gsub(cookie_data, "scw|(.-)|(%d+)$", function (ip, exp)
-      -- io.stderr:write(string.format("ip: %s, exp: %s\n", ip, exp))
       if ip == r.useragent_ip and r:clock() <= tonumber(exp) then
         return true
       end
@@ -71,8 +61,6 @@ function scw(r)
     end)
 
     if is_human then
-      -- io.stderr:write(string.format("c: %.3f ms\n", (r:clock() - start_time) / 1000.0))
-      -- io.stderr:write(string.format("found scw cookie for %s\n", r.useragent_ip))
       return apache2.DECLINED
     end
   end
@@ -83,20 +71,18 @@ function scw(r)
   if pcall(function() redis_conn:ping() end) then
     has_redis = true
   else
-    io.stderr:write("reconnecting to redis\n")
+    -- io.stderr:write("reconnecting to redis\n")
     local redis_host = os.getenv("SCW_REDIS_HOST")
     local redis_port = os.getenv("SCW_REDIS_PORT")
-    io.stderr:write(string.format("redis host: %s\n", redis_host))
     if pcall(function() redis_conn = redis.connect(redis_host, 6379) end) then
       has_redis = true
     end
   end
 
-  if has_redis then
-    -- io.stderr:write(string.format("ip: %s\n", r.useragent_ip))
+  local captcha_url = os.getenv("SCW_CAPTCHA_URL")
+
+  if has_redis and captcha_url ~= "" then
     local v = redis_conn:get("bl:" .. r.useragent_ip)
-    -- local h = redis_conn:get("h:" .. r.useragent_ip)
-    -- io.stderr:write(string.format("bl: %s, h: %s\n", tostring(v), tostring(h)))
     if v ~= nil then -- and h == nil then
       local rprotocol = "http"
       if r.is_https then
@@ -109,18 +95,16 @@ function scw(r)
       end
 
       local referer = string.format("%s://%s%s%s", rprotocol, r.hostname, rport, r.unparsed_uri)
-      r.headers_out["location"] = string.format("http://docker.scw.systems:8003/?src=%s&r=%s", r.useragent_ip, r:escape(referer))
+      r.headers_out["location"] = string.format(captcha_url, r.useragent_ip, r:escape(referer))
 --[[
       r.headers_in["X-SCW-IP"] = v
       r.handler = "proxy-server"
       r.proxyreq = apache2.PROXYREQ_REVERSE
       r.filename = string.format("proxy:http://captcha:8080/?src=%s&r=%s", r.useragent_ip, r.unparsed_uri)
 --]]
-      -- io.stderr:write(string.format("+ %.3f ms\n", (r:clock() - start_time) / 1000.0))
       return apache2.HTTP_MOVED_TEMPORARILY
     end
   end
 
-  -- io.stderr:write(string.format("* %.3f ms\n", (r:clock() - start_time) / 1000.0))
   return apache2.DECLINED
 end

run.sh

@@ -1,9 +0,0 @@
-#!/bin/sh
-
-
-docker run \
-   -d \
-   --name httpd-lua \
-   -v $PWD/httpd-lua.conf:/usr/local/apache2/conf/extra/httpd-lua.conf \
-   -p 8000:80 \
-   httpd:2.4-alpine