Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
richjohnrambo
@@ -0,0 +1,35 @@
|
||||
name: Deploy Backend (Blue-Green)
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
image_tag:
|
||||
description: '镜像tag，留空则使用commit短哈希'
|
||||
required: false
|
||||
|
||||
jobs:
|
||||
deploy:
|
||||
runs-on: deploy-host
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: 确定镜像tag
|
||||
id: vars
|
||||
run: |
|
||||
TAG="${{ github.event.inputs.image_tag }}"
|
||||
[ -z "$TAG" ] && TAG=$(git rev-parse --short HEAD)
|
||||
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
|
||||
|
||||
- name: 构建镜像(从本仓库源码编译，非下载官方release)
|
||||
run: docker build -t im-server:${{ steps.vars.outputs.tag }} -f docker/tinode/Dockerfile.build .
|
||||
|
||||
- name: 蓝绿部署
|
||||
env:
|
||||
MYSQL_DSN: ${{ secrets.MYSQL_DSN }}
|
||||
REDIS_ADDR: ${{ secrets.REDIS_ADDR }}
|
||||
REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
|
||||
API_KEY_SALT: ${{ secrets.API_KEY_SALT }}
|
||||
AUTH_TOKEN_KEY: ${{ secrets.AUTH_TOKEN_KEY }}
|
||||
UID_ENCRYPTION_KEY: ${{ secrets.UID_ENCRYPTION_KEY }}
|
||||
run: |
|
||||
IMAGE=im-server:${{ steps.vars.outputs.tag }} /opt/apps/im-server/deploy.sh
|
||||
@@ -0,0 +1,83 @@
|
||||
# Builds the Tinode server + tinode-db + tenant-db-migration tools from THIS
|
||||
# repo's local source, instead of downloading a pre-built release from GitHub
|
||||
# (the upstream docker/tinode/Dockerfile does that, so it never picks up the
|
||||
# tenant/workbench/etc. customizations that live only in this repo's source).
|
||||
|
||||
# ---- Stage 1: compile from local source ----
|
||||
FROM golang:1.26-alpine AS build
|
||||
|
||||
RUN apk add --no-cache git
|
||||
WORKDIR /src
|
||||
COPY go.mod go.sum ./
|
||||
RUN go mod download
|
||||
COPY . .
|
||||
RUN CGO_ENABLED=0 go build -tags mysql -o /out/tinode ./server
|
||||
RUN CGO_ENABLED=0 go build -tags mysql -o /out/init-db ./tinode-db
|
||||
# scripts/apply_hotgo_tenant_db.go is `//go:build ignore`-tagged (a standalone
|
||||
# migration script, not part of any package) - build it by exact file path.
|
||||
RUN CGO_ENABLED=0 go build -o /out/apply-hotgo-tenant-db ./scripts/apply_hotgo_tenant_db.go
|
||||
|
||||
# ---- Stage 2: runtime image ----
|
||||
FROM alpine:3.22
|
||||
|
||||
LABEL maintainer="118im"
|
||||
LABEL name="ImServer"
|
||||
|
||||
# Runtime options (same names/semantics as upstream docker/tinode/Dockerfile).
|
||||
ENV WAIT_FOR=
|
||||
ENV RESET_DB=false
|
||||
ENV UPGRADE_DB=false
|
||||
ENV NO_DB_INIT=false
|
||||
# Empty by default: do not load Tinode's canned demo users into a real deployment.
|
||||
# Override explicitly if sample data is ever wanted.
|
||||
ENV SAMPLE_DATA=
|
||||
ENV DEFAULT_COUNTRY_CODE=US
|
||||
|
||||
# DB connection is provided at deploy time via secret-backed env var. No default value.
|
||||
ENV MYSQL_DSN=
|
||||
ENV STORE_USE_ADAPTER=mysql
|
||||
|
||||
# Tenant registry lives in the hotgo database (shared with im_manager); tenant
|
||||
# DB routing resolves to the same tinode DB for the seeded "default" tenant.
|
||||
ENV TENANT_REGISTRY_DB=hotgo
|
||||
|
||||
ENV MEDIA_HANDLER=fs
|
||||
ENV FS_CORS_ORIGINS='["*"]'
|
||||
ENV AWS_CORS_ORIGINS='["*"]'
|
||||
ENV SMTP_HOST_URL='http://localhost:6060'
|
||||
ENV TLS_ENABLED=false
|
||||
ENV FCM_PUSH_ENABLED=false
|
||||
ENV FCM_INCLUDE_ANDROID_NOTIFICATION=true
|
||||
ENV TNPG_PUSH_ENABLED=false
|
||||
ENV WEBRTC_ENABLED=false
|
||||
ENV SERVER_STATUS_PATH=''
|
||||
ENV ACC_GC_ENABLED=false
|
||||
ENV PLUGIN_PYTHON_CHAT_BOT_ENABLED=false
|
||||
|
||||
# Secrets: intentionally NO default values. Must be injected at deploy time.
|
||||
# An empty/missing value fails loudly at startup rather than silently falling
|
||||
# back to Tinode's publicly-known demo keys.
|
||||
ENV API_KEY_SALT=
|
||||
ENV AUTH_TOKEN_KEY=
|
||||
ENV UID_ENCRYPTION_KEY=
|
||||
|
||||
RUN apk add --no-cache ca-certificates bash grep
|
||||
|
||||
WORKDIR /opt/tinode
|
||||
|
||||
COPY docker/tinode/config.template .
|
||||
COPY docker/tinode/entrypoint.sh .
|
||||
COPY tinode-db/credentials.sh .
|
||||
COPY --from=build /out/tinode .
|
||||
COPY --from=build /out/init-db .
|
||||
COPY --from=build /out/apply-hotgo-tenant-db .
|
||||
|
||||
RUN mkdir -p /botdata static \
|
||||
&& chmod +x entrypoint.sh credentials.sh tinode init-db apply-hotgo-tenant-db
|
||||
|
||||
HEALTHCHECK --interval=1m --timeout=3s --start-period=30s \
|
||||
CMD nc -z localhost 6060 || exit 1
|
||||
|
||||
ENTRYPOINT ["./entrypoint.sh"]
|
||||
|
||||
EXPOSE 6060 16060
|
||||
@@ -75,7 +75,13 @@
|
||||
"adapters": {
|
||||
"mysql": {
|
||||
"database": "tinode",
|
||||
"dsn": "$MYSQL_DSN"
|
||||
"dsn": "$MYSQL_DSN",
|
||||
"max_open_conns": 64,
|
||||
"max_idle_conns": 64,
|
||||
"conn_max_lifetime": 60,
|
||||
"sql_timeout": 10,
|
||||
"tenant_registry_db": "$TENANT_REGISTRY_DB",
|
||||
"tenant_db_routing": true
|
||||
},
|
||||
"postgres": {
|
||||
"database": "tinode",
|
||||
|
||||
@@ -127,6 +127,15 @@ if [ $? -ne 0 ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Create/upgrade the hotgo tenant registry and the workbench/org/meetings/
|
||||
# reports/mailbox/etc. tables that init-db above does not manage. Idempotent
|
||||
# (IF NOT EXISTS / ON DUPLICATE KEY UPDATE throughout), safe to run every start.
|
||||
IM_MYSQL_DSN="${MYSQL_DSN}" ./apply-hotgo-tenant-db
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "./apply-hotgo-tenant-db failed. Quitting."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# If sample data was provided, try to find Tino password.
|
||||
if [ ! -z "$SAMPLE_DATA" ] ; then
|
||||
grep "usr;tino;" $init_stdout > /botdata/tino-password
|
||||
|
||||
@@ -57,6 +57,159 @@ func main() {
|
||||
CONSTRAINT fk_im_tenant_config_tenant FOREIGN KEY(tenant_id) REFERENCES hotgo.im_tenant(id) ON DELETE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
"CREATE DATABASE IF NOT EXISTS tinode CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci",
|
||||
// The main server binary only creates tinode.im_tenant/im_tenant_config
|
||||
// (see createTenantRegistry in server/db/mysql/adapter.go) as part of its
|
||||
// version-gated schema upgrade chain. A tinode DB that was already at the
|
||||
// target schema version before this table was introduced never runs that
|
||||
// step, so the ALTERs below would otherwise fail with "table doesn't
|
||||
// exist". Create it here too (schema kept identical to createTenantRegistry).
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_tenant(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
code VARCHAR(64) NOT NULL,
|
||||
name VARCHAR(128) NOT NULL,
|
||||
tenant_desc VARCHAR(256),
|
||||
db_name VARCHAR(128) NOT NULL DEFAULT '',
|
||||
db_dsn VARCHAR(1024) NOT NULL DEFAULT '',
|
||||
state SMALLINT NOT NULL,
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
created_by BIGINT NOT NULL,
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
updated_by BIGINT NOT NULL,
|
||||
PRIMARY KEY(id),
|
||||
UNIQUE INDEX uk_im_tenant_code(code),
|
||||
INDEX idx_im_tenant_db_name(db_name)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_tenant_config(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
tenant_id BIGINT NOT NULL,
|
||||
max_users BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 means unlimited',
|
||||
max_groups BIGINT UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 means unlimited',
|
||||
max_group_members INT UNSIGNED NOT NULL DEFAULT 0 COMMENT '0 means unlimited',
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
created_by BIGINT NOT NULL,
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
updated_by BIGINT NOT NULL,
|
||||
PRIMARY KEY(id),
|
||||
UNIQUE INDEX uk_im_tenant_config_tenant_id(tenant_id),
|
||||
CONSTRAINT fk_im_tenant_config_tenant FOREIGN KEY(tenant_id) REFERENCES tinode.im_tenant(id) ON DELETE CASCADE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`INSERT INTO tinode.im_tenant(id,code,name,tenant_desc,db_name,db_dsn,state,created_by,updated_by)
|
||||
VALUES(1,'default','Default Tenant',NULL,'tinode','',1,0,0)
|
||||
ON DUPLICATE KEY UPDATE db_name=VALUES(db_name), updated_at=CURRENT_TIMESTAMP(3)`,
|
||||
// Same root cause as im_tenant above: createIMSecurityTables, createIMNotificationTables
|
||||
// and createIMRelationTables (server/db/mysql/adapter.go) are only reached from CreateDb's
|
||||
// fresh-install path, which our pre-existing tinode DB never runs. Recreate their tables here.
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_realname_verifications(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
user_id BIGINT NOT NULL,
|
||||
submission_id VARCHAR(64) NOT NULL,
|
||||
status VARCHAR(16) NOT NULL,
|
||||
name_cipher TEXT NOT NULL,
|
||||
id_type VARCHAR(32) NOT NULL,
|
||||
id_number_cipher TEXT NOT NULL,
|
||||
id_number_hash CHAR(64) NOT NULL,
|
||||
masked_name VARCHAR(64) NOT NULL,
|
||||
masked_id_number VARCHAR(64) NOT NULL,
|
||||
review_reason VARCHAR(256),
|
||||
verified_at DATETIME(3),
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
PRIMARY KEY(id),
|
||||
UNIQUE INDEX uk_im_realname_submission(submission_id),
|
||||
INDEX idx_im_realname_user_latest(user_id, created_at),
|
||||
INDEX idx_im_realname_id_hash(id_number_hash)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_action_tokens(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
user_id BIGINT NOT NULL,
|
||||
token_id VARCHAR(64) NOT NULL,
|
||||
action VARCHAR(64) NOT NULL,
|
||||
target VARCHAR(128) NOT NULL DEFAULT '',
|
||||
token_hash CHAR(64) NOT NULL,
|
||||
state SMALLINT NOT NULL,
|
||||
expires_at DATETIME(3) NOT NULL,
|
||||
consumed_at DATETIME(3),
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
PRIMARY KEY(id),
|
||||
UNIQUE INDEX uk_im_action_tokens_token(token_id),
|
||||
INDEX idx_im_action_tokens_user_action(user_id, action, target, state, expires_at)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_system_notifications(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
user_id BIGINT NOT NULL,
|
||||
event_id VARCHAR(64) NOT NULL,
|
||||
event_type VARCHAR(64) NOT NULL,
|
||||
title VARCHAR(128) NOT NULL,
|
||||
summary VARCHAR(512) NOT NULL,
|
||||
action JSON,
|
||||
read_at DATETIME(3),
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
PRIMARY KEY(id),
|
||||
UNIQUE INDEX uk_im_system_notifications_event(user_id, event_id),
|
||||
INDEX idx_im_system_notifications_inbox(user_id, id DESC)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_friend_requests(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
request_id VARCHAR(64) NOT NULL,
|
||||
applicant_id BIGINT NOT NULL,
|
||||
target_id BIGINT NOT NULL,
|
||||
message VARCHAR(200) NOT NULL DEFAULT '',
|
||||
source VARCHAR(32) NOT NULL DEFAULT '',
|
||||
source_topic VARCHAR(64) NOT NULL DEFAULT '',
|
||||
status VARCHAR(16) NOT NULL,
|
||||
idempotency_key VARCHAR(128) NOT NULL DEFAULT '',
|
||||
expires_at DATETIME(3) NOT NULL,
|
||||
handled_at DATETIME(3),
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
PRIMARY KEY(id),
|
||||
UNIQUE INDEX uk_im_friend_requests_request(request_id),
|
||||
UNIQUE INDEX uk_im_friend_requests_idempotency(applicant_id, idempotency_key),
|
||||
INDEX idx_im_friend_requests_pair(applicant_id, target_id, status, created_at),
|
||||
INDEX idx_im_friend_requests_inbox(target_id, status, created_at)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_friendships(
|
||||
user_id BIGINT NOT NULL,
|
||||
peer_id BIGINT NOT NULL,
|
||||
status VARCHAR(16) NOT NULL,
|
||||
remark VARCHAR(64) NOT NULL DEFAULT '',
|
||||
topic CHAR(25) NOT NULL DEFAULT '',
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
PRIMARY KEY(user_id, peer_id),
|
||||
INDEX idx_im_friendships_peer(peer_id, status)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_user_blocks(
|
||||
blocker_id BIGINT NOT NULL,
|
||||
blocked_id BIGINT NOT NULL,
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
PRIMARY KEY(blocker_id, blocked_id),
|
||||
INDEX idx_im_user_blocks_blocked(blocked_id)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_favorites(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
favorite_id VARCHAR(64) NOT NULL,
|
||||
user_id BIGINT NOT NULL,
|
||||
item_type VARCHAR(16) NOT NULL,
|
||||
source_topic CHAR(25) NOT NULL,
|
||||
source_seq INT NOT NULL,
|
||||
snapshot JSON,
|
||||
attachment_refs JSON,
|
||||
availability VARCHAR(16) NOT NULL DEFAULT 'available',
|
||||
idempotency_key VARCHAR(128) NOT NULL DEFAULT '',
|
||||
collected_at DATETIME(3) NOT NULL,
|
||||
created_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3),
|
||||
updated_at DATETIME(3) NOT NULL DEFAULT CURRENT_TIMESTAMP(3) ON UPDATE CURRENT_TIMESTAMP(3),
|
||||
PRIMARY KEY(id),
|
||||
UNIQUE INDEX uk_im_favorites_favorite(favorite_id),
|
||||
UNIQUE INDEX uk_im_favorites_source(user_id, source_topic, source_seq),
|
||||
UNIQUE INDEX uk_im_favorites_idempotency(user_id, ((NULLIF(idempotency_key, '')))),
|
||||
INDEX idx_im_favorites_inbox(user_id, id DESC),
|
||||
INDEX idx_im_favorites_type(user_id, item_type, id DESC)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci`,
|
||||
`CREATE TABLE IF NOT EXISTS tinode.im_call_records(
|
||||
id BIGINT NOT NULL AUTO_INCREMENT,
|
||||
call_id VARCHAR(64) NOT NULL,
|
||||
@@ -413,6 +566,14 @@ func main() {
|
||||
"ALTER TABLE tinode.im_youth_mode_settings ADD COLUMN policy_version INT NOT NULL DEFAULT 1 AFTER enabled",
|
||||
"ALTER TABLE tinode.im_youth_mode_settings ADD COLUMN restrictions JSON AFTER policy_version",
|
||||
"ALTER TABLE tinode.im_youth_mode_settings ADD COLUMN enabled_at DATETIME(3) AFTER restrictions",
|
||||
// auth/credentials: server/db/mysql/adapter.go's CreateDb never defined a
|
||||
// tenant_id column here even on a fresh install, yet every auth/credentials
|
||||
// query unconditionally filters/inserts by tenant_id - a latent bug in the
|
||||
// fresh-schema definition, not something version-skip alone explains. Backfill
|
||||
// existing rows to the default tenant (id=1); adapter.go's CREATE TABLE was
|
||||
// fixed alongside this to include the column on future fresh installs too.
|
||||
"ALTER TABLE tinode.auth ADD COLUMN tenant_id BIGINT NOT NULL DEFAULT 1 AFTER id",
|
||||
"ALTER TABLE tinode.credentials ADD COLUMN tenant_id BIGINT NOT NULL DEFAULT 1 AFTER id",
|
||||
} {
|
||||
if _, err = db.Exec(stmt); err != nil && !strings.Contains(err.Error(), "Duplicate column name") {
|
||||
fatal(fmt.Errorf("exec failed: %s: %w", stmt, err))
|
||||
@@ -520,10 +681,17 @@ func fatal(v any) {
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
// keptTenantIDTables lists tables whose tenant_id column must survive
|
||||
// dropTenantIDColumns: server/db/mysql/adapter.go queries auth and credentials
|
||||
// by tenant_id unconditionally (not gated behind tenant_db_routing), so unlike
|
||||
// the newer per-tenant-DB feature tables, these two are row-tagged by design.
|
||||
var keptTenantIDTables = "'auth','credentials'"
|
||||
|
||||
func dropTenantIDColumns(db *sql.DB, schema string) error {
|
||||
fks, err := queryPairs(db, `SELECT DISTINCT table_name, constraint_name
|
||||
FROM information_schema.KEY_COLUMN_USAGE
|
||||
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND REFERENCED_TABLE_NAME IS NOT NULL`,
|
||||
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND REFERENCED_TABLE_NAME IS NOT NULL
|
||||
AND table_name NOT IN (`+keptTenantIDTables+`)`,
|
||||
schema)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -536,7 +704,8 @@ func dropTenantIDColumns(db *sql.DB, schema string) error {
|
||||
|
||||
indexes, err := queryPairs(db, `SELECT DISTINCT table_name, index_name
|
||||
FROM information_schema.STATISTICS
|
||||
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND INDEX_NAME<>'PRIMARY'`,
|
||||
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id' AND INDEX_NAME<>'PRIMARY'
|
||||
AND table_name NOT IN (`+keptTenantIDTables+`)`,
|
||||
schema)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -549,6 +718,7 @@ func dropTenantIDColumns(db *sql.DB, schema string) error {
|
||||
|
||||
rows, err := db.Query(`SELECT table_name FROM information_schema.COLUMNS
|
||||
WHERE TABLE_SCHEMA=? AND COLUMN_NAME='tenant_id'
|
||||
AND table_name NOT IN (`+keptTenantIDTables+`)
|
||||
ORDER BY table_name`, schema)
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
@@ -657,7 +657,8 @@ func (a *adapter) CreateDb(reset bool) error {
|
||||
// Authentication records for the basic authentication scheme.
|
||||
if _, err = tx.Exec(
|
||||
`CREATE TABLE auth(
|
||||
id INT NOT NULL AUTO_INCREMENT,
|
||||
id INT NOT NULL AUTO_INCREMENT,
|
||||
tenant_id BIGINT NOT NULL,
|
||||
uname VARCHAR(32) NOT NULL,
|
||||
userid BIGINT NOT NULL,
|
||||
scheme VARCHAR(16) NOT NULL,
|
||||
@@ -835,6 +836,7 @@ func (a *adapter) CreateDb(reset bool) error {
|
||||
if _, err = tx.Exec(
|
||||
`CREATE TABLE credentials(
|
||||
id INT NOT NULL AUTO_INCREMENT,
|
||||
tenant_id BIGINT NOT NULL,
|
||||
createdat DATETIME(3) NOT NULL,
|
||||
updatedat DATETIME(3) NOT NULL,
|
||||
deletedat DATETIME(3),
|
||||
|
||||
+8
-2
@@ -801,9 +801,15 @@ func (s *Session) hello(msg *ClientComMessage) {
|
||||
}
|
||||
|
||||
tenantCode := strings.TrimSpace(msg.Hi.Tenant)
|
||||
if tenantCode == "" || len(tenantCode) > 64 {
|
||||
if tenantCode == "" {
|
||||
// Clients that predate the tenant-aware protocol (stock Tinode
|
||||
// webapp/mobile SDKs never send this field) fall back to the
|
||||
// default tenant rather than being rejected. Clients that do
|
||||
// send an explicit code are unaffected.
|
||||
tenantCode = "default"
|
||||
} else if len(tenantCode) > 64 {
|
||||
s.queueOut(ErrMalformed(msg.Id, "", msg.Timestamp))
|
||||
logs.Warn.Println("s.hello: tenant code is missing or invalid", s.sid)
|
||||
logs.Warn.Println("s.hello: tenant code is invalid", s.sid)
|
||||
return
|
||||
}
|
||||
if store.Tenants == nil {
|
||||
|
||||
Reference in New Issue
Block a user