diff options
| -rw-r--r-- | sql/lite.sql | 3 | ||||
| -rw-r--r-- | sql/mssql.sql | 3 | ||||
| -rw-r--r-- | sql/mysql.sql | 5 | ||||
| -rw-r--r-- | sql/pg.sql | 5 | ||||
| -rw-r--r-- | src/ejabberd_ctl.erl | 2 |
5 files changed, 15 insertions, 3 deletions
diff --git a/sql/lite.sql b/sql/lite.sql index 0cf7ff41..1741ea95 100644 --- a/sql/lite.sql +++ b/sql/lite.sql @@ -19,6 +19,9 @@ CREATE TABLE users ( username text PRIMARY KEY, password text NOT NULL, + serverkey text NOT NULL DEFAULT '', + salt text NOT NULL DEFAULT '', + iterationcount integer NOT NULL DEFAULT 0, created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ); diff --git a/sql/mssql.sql b/sql/mssql.sql index 155ea64a..675542b6 100644 --- a/sql/mssql.sql +++ b/sql/mssql.sql @@ -362,6 +362,9 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW CREATE TABLE [dbo].[users] (
[username] [varchar] (250) NOT NULL,
[password] [text] NOT NULL,
+ [serverkey] [text] NOT NULL,
+ [salt] [text] NOT NULL,
+ [iterationcount] [smallint] NOT NULL DEFAULT 0,
[created_at] [datetime] NOT NULL DEFAULT GETDATE(),
CONSTRAINT [users_PRIMARY] PRIMARY KEY CLUSTERED
(
diff --git a/sql/mysql.sql b/sql/mysql.sql index cc603c1b..f08b3a4b 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -19,10 +19,13 @@ CREATE TABLE users ( username varchar(191) PRIMARY KEY, password text NOT NULL, + serverkey text NOT NULL DEFAULT '', + salt text NOT NULL DEFAULT '', + iterationcount integer NOT NULL DEFAULT 0, created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; --- To support SCRAM auth: +-- Add support for SCRAM auth to a database created before ejabberd 16.03: -- ALTER TABLE users ADD COLUMN serverkey text NOT NULL DEFAULT ''; -- ALTER TABLE users ADD COLUMN salt text NOT NULL DEFAULT ''; -- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0; @@ -19,10 +19,13 @@ CREATE TABLE users ( username text PRIMARY KEY, "password" text NOT NULL, + serverkey text NOT NULL DEFAULT '', + salt text NOT NULL DEFAULT '', + iterationcount integer NOT NULL DEFAULT 0, created_at TIMESTAMP NOT NULL DEFAULT now() ); --- To support SCRAM auth: +-- Add support for SCRAM auth to a database created before ejabberd 16.03: -- ALTER TABLE users ADD COLUMN serverkey text NOT NULL DEFAULT ''; -- ALTER TABLE users ADD COLUMN salt text NOT NULL DEFAULT ''; -- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0; diff --git a/src/ejabberd_ctl.erl b/src/ejabberd_ctl.erl index 7a26644f..bf4e4675 100644 --- a/src/ejabberd_ctl.erl +++ b/src/ejabberd_ctl.erl @@ -214,7 +214,7 @@ process(Args) -> process2(["--auth", User, Server, Pass | Args], AccessCommands) -> process2(Args, {list_to_binary(User), list_to_binary(Server), list_to_binary(Pass), true}, AccessCommands); process2(Args, AccessCommands) -> - process2(Args, admin, AccessCommands). + process2(Args, noauth, AccessCommands). process2(Args, Auth, AccessCommands) -> case try_run_ctp(Args, Auth, AccessCommands) of |