Merge pull request #3733 from testeaxeax/bug-3530

Fix #3530, support domains up to 253 characters long

server/db-patches/patch-21-22.sql

@@ -0,0 +1,2 @@
+ALTER TABLE data ALTER COLUMN id TYPE character varying(270);
+ALTER TABLE images ALTER COLUMN shotid TYPE character varying(270);

server/schema.sql

@@ -11,7 +11,7 @@ CREATE TABLE accounts (
     email text
 );
 CREATE TABLE data (
-    id character varying(120) NOT NULL,
+    id character varying(270) NOT NULL,
     deviceid character varying(200),
     created timestamp without time zone DEFAULT now(),
     value text NOT NULL,
@@ -35,7 +35,7 @@ CREATE TABLE devices (
 );
 CREATE TABLE images (
     id character varying(200) NOT NULL,
-    shotid character varying(200) NOT NULL,
+    shotid character varying(270) NOT NULL,
     clipid character varying(200) NOT NULL,
     contenttype text NOT NULL,
     url text,

server/src/dbschema.js

@@ -6,7 +6,7 @@ const mozlog = require("./logging").mozlog("dbschema");
 
 // When updating the database, please also run ./bin/dumpschema --record
 // This updates schema.sql with the latest full database schema
-const MAX_DB_LEVEL = exports.MAX_DB_LEVEL = 21;
+const MAX_DB_LEVEL = exports.MAX_DB_LEVEL = 22;
 
 exports.forceDbVersion = function(version) {
   mozlog.info("forcing-db-version", {db: db.constr, version});

server/src/server.js

@@ -290,7 +290,7 @@ app.param("id", function(req, res, next, id) {
 });
 
 app.param("domain", function(req, res, next, domain) {
-  if (/^[^\s/]{1,100}$/.test(domain)) {
+  if (/^[^\s/]{1,252}$/.test(domain)) {
     next();
     return;
   }