Fix double HTML escaping in switcher and harden JS edge cases

This commit is contained in:
Laurent Dinclaux
2026-02-10 23:26:27 +11:00
parent dd477c1b83
commit efcca69d43
19 changed files with 15 additions and 319 deletions

View File

@@ -1,5 +0,0 @@
ALTER TABLE
`ident_switch`
MODIFY
`username`
varchar(64);

View File

@@ -1,6 +0,0 @@
ALTER TABLE
`ident_switch`
MODIFY
`username`
varchar(64)
NULL;

View File

@@ -1,29 +0,0 @@
ALTER TABLE
`ident_switch`
CHANGE
`host`
`imap_host` varchar(64);
ALTER TABLE
`ident_switch`
CHANGE
`port`
`imap_port` int;
ALTER TABLE
`ident_switch`
ADD COLUMN
`smtp_host`
varchar(64);
ALTER TABLE
`ident_switch`
ADD COLUMN
`smtp_port`
int
CHECK(`smtp_port` > 0 AND `smtp_port` <= 65535);
ALTER TABLE
`ident_switch`
DROP COLUMN
`delimiter`;

View File

@@ -1,5 +0,0 @@
ALTER TABLE
`ident_switch`
ADD COLUMN
`imap_delimiter`
char(1);

View File

@@ -1,14 +0,0 @@
ALTER TABLE
`ident_switch`
ADD COLUMN
`drafts_mbox`
varchar(64),
ADD COLUMN
`sent_mbox`
varchar(64),
ADD COLUMN
`junk_mbox`
varchar(64),
ADD COLUMN
`trash_mbox`
varchar(64);

View File

@@ -1,7 +0,0 @@
ALTER TABLE
`ident_switch`
ADD COLUMN
`smtp_auth`
smallint
NOT NULL
DEFAULT 1;

View File

@@ -1,11 +0,0 @@
ALTER TABLE
ident_switch
ALTER COLUMN
host
DROP NOT NULL;
ALTER TABLE
ident_switch
ALTER COLUMN
label
DROP NOT NULL;

View File

@@ -1,5 +0,0 @@
ALTER TABLE
ident_switch
ALTER COLUMN
username
DROP NOT NULL;

View File

@@ -1,5 +0,0 @@
ALTER TABLE
ident_switch
ALTER COLUMN
username
DROP NOT NULL;

View File

@@ -1,31 +0,0 @@
ALTER TABLE
ident_switch
RENAME COLUMN
host
TO
imap_host;
ALTER TABLE
ident_switch
RENAME COLUMN
port
TO
imap_port;
ALTER TABLE
ident_switch
ADD COLUMN
smtp_host
varchar(64);
ALTER TABLE
ident_switch
ADD COLUMN
smtp_port
integer
CHECK(smtp_port > 0 AND smtp_port <= 65535);
ALTER TABLE
ident_switch
DROP COLUMN
delimiter;

View File

@@ -1,5 +0,0 @@
ALTER TABLE
ident_switch
ADD COLUMN
imap_delimiter
char(1);

View File

@@ -1,14 +0,0 @@
ALTER TABLE
ident_switch
ADD COLUMN
drafts_mbox
varchar(64),
ADD COLUMN
sent_mbox
varchar(64),
ADD COLUMN
junk_mbox
varchar(64),
ADD COLUMN
trash_mbox
varchar(64);

View File

@@ -1,7 +0,0 @@
ALTER TABLE
ident_switch
ADD COLUMN
smtp_auth
smallint
NOT NULL
DEFAULT(1);

View File

@@ -1,76 +0,0 @@
PRAGMA foreign_keys=off;
BEGIN TRANSACTION;
ALTER TABLE ident_switch RENAME TO ident_switch_old;
CREATE TABLE ident_switch
(
id
integer
PRIMARY KEY,
user_id
integer
NOT NULL
REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
iid
integer
NOT NULL
REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
UNIQUE,
username
varchar(64),
password
varchar(64),
imap_host
varchar(64),
imap_port
integer
CHECK(imap_port > 0 AND imap_port <= 65535),
label
varchar(32),
flags
integer
NOT NULL
DEFAULT(0),
smtp_host
varchar(64),
smtp_port
integer
CHECK(smtp_port > 0 AND smtp_port <= 65535),
UNIQUE (user_id, label)
);
CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
CREATE INDEX IX_ident_switch_iid on ident_switch(iid);
INSERT OR ROLLBACK INTO
ident_switch (
id,
user_id,
iid,
username,
password,
imap_host,
imap_port,
label,
flags,
smtp_host
)
SELECT
id,
user_id,
iid,
username,
password,
host,
port,
label,
flags,
host
FROM
ident_switch_old;
DROP TABLE
ident_switch_old;
COMMIT;
PRAGMA foreign_keys=on;

View File

@@ -1,92 +0,0 @@
PRAGMA foreign_keys=off;
BEGIN TRANSACTION;
ALTER TABLE ident_switch RENAME TO ident_switch_old;
CREATE TABLE ident_switch
(
id
integer
PRIMARY KEY,
user_id
integer
NOT NULL
REFERENCES users(user_id) ON DELETE CASCADE ON UPDATE CASCADE,
iid
integer
NOT NULL
REFERENCES identities(identity_id) ON DELETE CASCADE ON UPDATE CASCADE
UNIQUE,
username
varchar(64),
password
varchar(64),
imap_host
varchar(64),
imap_port
integer
CHECK(imap_port > 0 AND imap_port <= 65535),
imap_delimiter
char(1),
label
varchar(32),
flags
integer
NOT NULL
DEFAULT(0),
smtp_host
varchar(64),
smtp_port
integer
CHECK(smtp_port > 0 AND smtp_port <= 65535),
smtp_auth
smallint
NOT NULL
DEFAULT 1,
drafts_mbox
varchar(64),
sent_mbox
varchar(64),
junk_mbox
varchar(64),
trash_mbox
varchar(64),
UNIQUE (user_id, label)
);
CREATE INDEX IX_ident_switch_user_id ON ident_switch(user_id);
CREATE INDEX IX_ident_switch_iid on ident_switch(iid);
INSERT OR ROLLBACK INTO
ident_switch (
id,
user_id,
iid,
username,
password,
imap_host,
imap_port,
label,
flags,
smtp_host,
smtp_port
)
SELECT
id,
user_id,
iid,
username,
password,
imap_host,
imap_port,
label,
flags,
smtp_host,
smtp_port
FROM
ident_switch_old;
DROP TABLE
ident_switch_old;
COMMIT;
PRAGMA foreign_keys=on;