mirror of
https://github.com/processone/ejabberd.git
synced 2025-01-03 18:02:28 +01:00
Fix commands access check.
Fixes ECS-20
This commit is contained in:
commit
3b2d0fd24a
@ -19,6 +19,9 @@
|
|||||||
CREATE TABLE users (
|
CREATE TABLE users (
|
||||||
username text PRIMARY KEY,
|
username text PRIMARY KEY,
|
||||||
password text NOT NULL,
|
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
|
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -362,6 +362,9 @@ WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW
|
|||||||
CREATE TABLE [dbo].[users] (
|
CREATE TABLE [dbo].[users] (
|
||||||
[username] [varchar] (250) NOT NULL,
|
[username] [varchar] (250) NOT NULL,
|
||||||
[password] [text] 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(),
|
[created_at] [datetime] NOT NULL DEFAULT GETDATE(),
|
||||||
CONSTRAINT [users_PRIMARY] PRIMARY KEY CLUSTERED
|
CONSTRAINT [users_PRIMARY] PRIMARY KEY CLUSTERED
|
||||||
(
|
(
|
||||||
|
@ -19,10 +19,13 @@
|
|||||||
CREATE TABLE users (
|
CREATE TABLE users (
|
||||||
username varchar(191) PRIMARY KEY,
|
username varchar(191) PRIMARY KEY,
|
||||||
password text NOT NULL,
|
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
|
created_at timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
) ENGINE=InnoDB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
|
) 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 serverkey text NOT NULL DEFAULT '';
|
||||||
-- ALTER TABLE users ADD COLUMN salt 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;
|
-- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0;
|
||||||
|
@ -19,10 +19,13 @@
|
|||||||
CREATE TABLE users (
|
CREATE TABLE users (
|
||||||
username text PRIMARY KEY,
|
username text PRIMARY KEY,
|
||||||
"password" text NOT NULL,
|
"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()
|
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 serverkey text NOT NULL DEFAULT '';
|
||||||
-- ALTER TABLE users ADD COLUMN salt 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;
|
-- ALTER TABLE users ADD COLUMN iterationcount integer NOT NULL DEFAULT 0;
|
||||||
|
@ -214,7 +214,7 @@ process(Args) ->
|
|||||||
process2(["--auth", User, Server, Pass | Args], AccessCommands) ->
|
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, {list_to_binary(User), list_to_binary(Server), list_to_binary(Pass), true}, AccessCommands);
|
||||||
process2(Args, AccessCommands) ->
|
process2(Args, AccessCommands) ->
|
||||||
process2(Args, admin, AccessCommands).
|
process2(Args, noauth, AccessCommands).
|
||||||
|
|
||||||
process2(Args, Auth, AccessCommands) ->
|
process2(Args, Auth, AccessCommands) ->
|
||||||
case try_run_ctp(Args, Auth, AccessCommands) of
|
case try_run_ctp(Args, Auth, AccessCommands) of
|
||||||
|
Loading…
Reference in New Issue
Block a user