openship 0.2.0 → 0.2.2

package/dist/server/lua/rules_guard.lua

@@ -13,6 +13,12 @@
 local rules = ngx.shared.rules
 if not rules then return end
 
+-- Rate-limit counters live in their OWN dict so a high-cardinality flood (a new
+-- rl: key per source IP per second) can't LRU-evict the rulesets and silently
+-- disable enforcement. Fall back to `rules` on a box whose config predates the
+-- separate dict (still works, just shares the zone until the next reload).
+local counters = ngx.shared.rl_counters or rules
+
 local host = ngx.var.host
 if not host then return end
 
@@ -78,7 +84,15 @@ if ban then
     end
     if ban.countries then
         local cc = country_of()
-        if cc and ban.countries[cc] then return ngx.exit(deny_status) end
+        -- Fail CLOSED (matches the allow-list above): if geo is unavailable we
+        -- cannot prove the client is NOT from a banned country, so block rather
+        -- than silently letting banned traffic through. A blocked host is a loud
+        -- signal to fix geo; fail-open would be a silent security hole.
+        if not cc then
+            ngx.log(ngx.WARN, "rules_guard: country ban active but geo unavailable — blocking (fail-closed)")
+            return ngx.exit(deny_status)
+        end
+        if ban.countries[cc] then return ngx.exit(deny_status) end
     end
     if ban.emptyUA or ban.uas then
         local ua = ngx.var.http_user_agent
@@ -110,7 +124,7 @@ local rl = spec.rl
 if rl then
     local key = "rl:" .. host .. ":" .. (chosen.pathPrefix or "/") .. ":" .. ips
         .. ":" .. math.floor(ngx.now())
-    local c = rules:incr(key, 1, 0, 2)  -- init 0, 2s TTL → self-expiring buckets
+    local c = counters:incr(key, 1, 0, 2)  -- init 0, 2s TTL → self-expiring buckets
     if c and c > rl.limit then
         ngx.header["Retry-After"] = "1"
         return ngx.exit(rl.status)

package/dist/server/migrations/0050_add_service_deployment_image_digest.sql

@@ -0,0 +1 @@
+ALTER TABLE "service_deployment" ADD COLUMN "image_digest" text;

package/dist/server/migrations/0051_add_update_status.sql

@@ -0,0 +1,19 @@
+CREATE TABLE "update_status" (
+	"id" text PRIMARY KEY NOT NULL,
+	"organization_id" text NOT NULL,
+	"project_id" text NOT NULL,
+	"kind" text NOT NULL,
+	"behind" boolean DEFAULT false NOT NULL,
+	"latest_in_progress" boolean DEFAULT false NOT NULL,
+	"current_label" text,
+	"latest_label" text,
+	"detail" jsonb,
+	"checked_at" timestamp DEFAULT now() NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "update_status" ADD CONSTRAINT "update_status_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "update_status" ADD CONSTRAINT "update_status_project_id_project_id_fk" FOREIGN KEY ("project_id") REFERENCES "public"."project"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_update_status_project" ON "update_status" USING btree ("project_id");--> statement-breakpoint
+CREATE INDEX "idx_update_status_org_behind" ON "update_status" USING btree ("organization_id","behind");

package/dist/server/migrations/0052_add_notice_target.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "system_notice" ADD COLUMN "target_type" text;--> statement-breakpoint
+ALTER TABLE "system_notice" ADD COLUMN "target_id" text;

package/dist/server/migrations/0053_colossal_sandman.sql

@@ -0,0 +1,14 @@
+CREATE TABLE "billing_usage_snapshot" (
+	"organization_id" text PRIMARY KEY NOT NULL,
+	"balance" double precision,
+	"credits_used" double precision,
+	"cpu_time_minutes" double precision,
+	"memory_gb_minutes" double precision,
+	"disk_io_gb" double precision,
+	"network_gb" double precision,
+	"period_start" timestamp,
+	"period_end" timestamp,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "billing_usage_snapshot" ADD CONSTRAINT "billing_usage_snapshot_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;

package/dist/server/migrations/0054_add_instance_smtp.sql

@@ -0,0 +1,5 @@
+ALTER TABLE "instance_settings" ADD COLUMN "smtp_host" text;--> statement-breakpoint
+ALTER TABLE "instance_settings" ADD COLUMN "smtp_port" integer;--> statement-breakpoint
+ALTER TABLE "instance_settings" ADD COLUMN "smtp_user" text;--> statement-breakpoint
+ALTER TABLE "instance_settings" ADD COLUMN "smtp_password_encrypted" text;--> statement-breakpoint
+ALTER TABLE "instance_settings" ADD COLUMN "smtp_from" text;

package/dist/server/migrations/0055_rainy_klaw.sql

@@ -0,0 +1,22 @@
+CREATE TABLE "server_module_status" (
+	"id" text PRIMARY KEY NOT NULL,
+	"organization_id" text,
+	"server_id" text NOT NULL,
+	"module_name" text NOT NULL,
+	"installed_version" text,
+	"migration_version" text,
+	"available_version" text,
+	"behind" boolean DEFAULT false NOT NULL,
+	"latest_in_progress" boolean DEFAULT false NOT NULL,
+	"current_label" text,
+	"latest_label" text,
+	"detail" jsonb,
+	"checked_at" timestamp DEFAULT now() NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"updated_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "server_module_status" ADD CONSTRAINT "server_module_status_organization_id_organization_id_fk" FOREIGN KEY ("organization_id") REFERENCES "public"."organization"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "server_module_status" ADD CONSTRAINT "server_module_status_server_id_servers_id_fk" FOREIGN KEY ("server_id") REFERENCES "public"."servers"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_server_module_status" ON "server_module_status" USING btree ("server_id","module_name");--> statement-breakpoint
+CREATE INDEX "idx_server_module_status_org_behind" ON "server_module_status" USING btree ("organization_id","behind");