.forgejo/workflows/build-and-publish.yaml

@@ -1,35 +0,0 @@
-name: Build and publish
-
-on:
-  push:
-    branches:
-      - main
-      - dev
-
-jobs:
-  build-and-push-arch:
-    runs-on: docker
-    container:
-      image: ghcr.io/catthehacker/ubuntu:act-latest
-      options: -v /dind/docker.sock:/var/run/docker.sock
-    steps:
-      - name: Checkout the repo
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Login to the registry
-        uses: docker/login-action@v3
-        with:
-          registry: guardianproject.dev
-          username: irl
-          password: ${{ secrets.PACKAGE_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: src/
-          file: src/Dockerfile
-          push: true
-          tags: guardianproject.dev/${{ github.repository }}:latest

src/default.main

@@ -1,6 +1,4 @@
 env JASIMA_MATOMO_HOST;
 env JASIMA_PROXY_HOST;
-env JASIMA_DEFAULT_ZONE;
-env JASIMA_API_KEY;
 
 worker_processes auto;

src/lua/access.lua

@@ -1,24 +1,17 @@
-local api = require "api"
 local config = require "config"
 local geo = require "geo"
 local psl = require "psl"
 local utils = require "utils"
 
-local headers = ngx.req.get_headers()
+local jasima_host = config.get_jasima_host()
-
+ngx.ctx.jasima_host = jasima_host
-if headers["Jasima-Api-Key"] then
+if not jasima_host then
-    api.handle_api_request(headers["Jasima-Api-Key"])
+    ngx.log(ngx.DEBUG, "no host specified via header or cookie")
-end
-
-local jasima_key = config.get_jasima_key()
-ngx.ctx.jasima_key = jasima_key
-if not jasima_key then
-    ngx.log(ngx.DEBUG, "no key specified via header or cookie")
     return ngx.exit(400)
 end
 
 local err
-ngx.ctx.jasima_config, err = config.load_config(jasima_key)
+ngx.ctx.jasima_config, err = config.load_config(jasima_host)
 if err then
     ngx.status = 500
     ngx.log(ngx.ERR, "could not load config: " .. err)
@@ -31,19 +24,13 @@ if not ngx.ctx.jasima_config then
     ngx.exit(403)
 end
 
-if not ngx.ctx.jasima_config.host_canonical then
-    ngx.log(ngx.DEBUG, "no origin host specified in config")
-    return ngx.exit(400)
-end
-ngx.ctx.jasima_host = ngx.ctx.jasima_config.host_canonical
-
 local country = geo.viewer_country()
 if not ngx.ctx.jasima_config.geo_redirect_disable then
-    ngx.log(ngx.DEBUG, "geo_redirect_disable not configured for site " .. ngx.ctx.jasima_host)
+    ngx.log(ngx.DEBUG, "geo_redirect_disable not configured for site " .. jasima_host)
     if not geo.needs_mirror(country) then
-        ngx.log(ngx.DEBUG, "mirror is not needed for viewer in " .. country .. " for " .. ngx.ctx.jasima_host .. ", redirecting")
+        ngx.log(ngx.DEBUG, "mirror is not needed for viewer in " .. country .. " for " .. jasima_host .. ", redirecting")
         local request_uri = ngx.var.request_uri
-        local new_url = "https://" .. ngx.ctx.jasima_host .. request_uri
+        local new_url = "https://" .. jasima_host .. request_uri
         return ngx.redirect(new_url, ngx.HTTP_MOVED_TEMPORARILY)
     end
 end
@@ -57,6 +44,8 @@ if err then
     return ngx.exit(500)
 end
 
+local headers = ngx.req.get_headers()
+
 -- Remove the headers that should not be proxied to the origin
 for k, v in pairs(headers) do
   if k:lower():match("^jasima%-") then
@@ -71,9 +60,9 @@ if ngx.ctx.jasima_config.headers then
     end
 end
 
-local host_connect = ngx.ctx.jasima_config.host_connect or ngx.ctx.jasima_host
+local host_connect = ngx.ctx.jasima_config.host_connect or jasima_host
-local host_header = ngx.ctx.jasima_config.host_header or ngx.ctx.jasima_host
+local host_header = ngx.ctx.jasima_config.host_header or jasima_host
-local host_ssl = ngx.ctx.jasima_config.host_ssl or ngx.ctx.jasima_host
+local host_ssl = ngx.ctx.jasima_config.host_ssl or jasima_host
 
 -- Handle first party Tealium installations
 if ngx.ctx.jasima_config.first_party_tealium then
@@ -116,7 +105,7 @@ if #ngx.ctx.upstream_ips == 0 then
 end
 
 -- Set the nginx host variables
-ngx.var.jasima_host = ngx.ctx.jasima_host
+ngx.var.jasima_host = jasima_host
 ngx.var.jasima_host_connect = host_connect
 ngx.var.jasima_host_header = host_header
 ngx.var.jasima_host_ssl = host_ssl

src/lua/api.lua

@@ -1,47 +0,0 @@
-local cjson = require "cjson.safe"
-local redis = require "resty.redis"
-
-local _M = {}
-
-function _M.handle_api_request(api_key)
-    if api_key ~= os.getenv("JASIMA_API_KEY") then
-        ngx.exit(401)
-    end
-    if ngx.var.request_uri == "/update" then
-        ngx.req.read_body()
-        local body_data = ngx.req.get_body_data()
-        if not body_data then
-            ngx.status = 400
-            ngx.say("No request body")
-            ngx.exit(400)
-        end
-        local config = cjson.decode(body_data)
-
-        local red = redis:new()
-        red:set_timeout(1000)
-        red:set_keepalive(10000, 100)
-
-        local ok, err = red:connect("redis", 6379)
-        if not ok then return nil, "Redis connect failed: " .. err end
-
-        for jasima_key, rewrite_config in pairs(config.origins) do
-            local key = "jasima:config:" .. jasima_key
-            red:set(key, cjson.encode(rewrite_config))
-        end
-
-        for pool, poolmap in pairs(config.pools) do
-            local key = "jasima:poolmap:" .. pool
-            red:set(key, cjson.encode(poolmap))
-        end
-
-        if not config.pools.public then
-            -- This is a default and things break if we don't have it
-            red:set("jasima:poolmap:public", "{}")
-        end
-
-        ngx.exit(200)
-    end
-    ngx.exit(404)
-end
-
-return _M

src/lua/body_filter.lua

@@ -52,8 +52,7 @@ local function rewrite_body(body)
     return body
 end
 
-if ngx.ctx.jasima_config then
+if ngx.ctx.rewriting then
-    if ngx.ctx.rewriting then
     local chunk = ngx.arg[1]
     local eof = ngx.arg[2]
 
@@ -71,5 +70,4 @@ if ngx.ctx.jasima_config then
     else
         ngx.arg[1] = nil
     end
-    end
 end

src/lua/config.lua

@@ -4,18 +4,10 @@ local redis = require "resty.redis"
 
 local _M = {}
 
-function _M.get_jasima_key()
+function _M.get_jasima_host()
     local headers = ngx.req.get_headers()
-    if headers["Jasima-Key"] then
+    if headers["Jasima-Host"] then
-        return headers["Jasima-Key"]
+        return headers["Jasima-Host"]
-    end
-
-    if headers["Host"] then
-        local host = headers["Host"]
-        local default_zone = os.getenv("JASIMA_DEFAULT_ZONE")
-        if string.sub(host, -string.len(default_zone)) == default_zone then
-            return string.sub(host, 1, string.len(host) - string.len(default_zone) - 1)
-        end
     end
 
     local cookie, err = ck:new()
@@ -24,9 +16,11 @@ function _M.get_jasima_key()
         return nil
     end
 
-    local jasima_cookie, err = cookie:get("jasima_key")
+    local jasima_cookie, err = cookie:get("jasima_host")
     if jasima_cookie then
         return jasima_cookie
+    elseif err then
+        ngx.log(ngx.ERR, "failed to get jasima_host cookie: ", err)
     end
 
     return nil
@@ -77,9 +71,9 @@ function _M.load_pool_mapping(pool_name)
     return cjson.decode(res)
 end
 
-function _M.load_config(jasima_key)
+function _M.load_config(jasima_host)
     local cache = ngx.shared.jasima_cache
-    local cache_key = "config:" .. jasima_key
+    local cache_key = "config:" .. jasima_host
     local cached = cache:get(cache_key)
     if cached then return cjson.decode(cached) end
 
@@ -88,7 +82,7 @@ function _M.load_config(jasima_key)
     local ok, err = red:connect("redis", 6379)
     if not ok then return nil, "Redis connect failed: " .. err end
 
-    local key = "jasima:config:" .. jasima_key
+    local key = "jasima:config:" .. jasima_host
     local res, err = red:get(key)
     if not res or res == ngx.null then return nil, "No config in Redis" end
 

src/lua/geo.lua

@@ -18,6 +18,7 @@ function _M.needs_mirror(country)
 
     local safe_countries = {
         US = true, -- United States
+        GB = true, -- United Kingdom
         IE = true, -- Ireland
         FR = true, -- France
         DE = true, -- Germany

src/lua/header_filter.lua

@@ -1,11 +1,10 @@
 local utils = require "utils"
 
-if ngx.ctx.jasima_config then
+if ngx.ctx.jasima_config.rewrite_disable then
-    if ngx.ctx.jasima_config.rewrite_disable then
     return
-    end
+end
 
-    if ngx.header["Content-Type"] then
+if ngx.header["Content-Type"] then
     local content_type = ngx.header["Content-Type"]:lower()
     if content_type:find("text/html") or
        content_type:find("text/css") or
@@ -20,12 +19,11 @@ if ngx.ctx.jasima_config then
         ngx.ctx.rewriting = true
         ngx.header["Content-Length"] = nil  -- We're rewriting the body so this has the wrong value if set
     end
-    end
+end
 
-    if ngx.header["Location"] then
+if ngx.header["Location"] then
     if ngx.ctx.jasima_pool_map then
         local location = ngx.header["Location"]
         ngx.header["Location"] = location:gsub("//([%a%d%.-]+%.[%a%d-]+)/+", utils.get_mirror)
     end
-    end
 end