mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 23:11:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/9992] Clarify explanations of ip and account limits on login
  [ticket/9992] Add a comma to language for IP_LOGIN_LIMIT_MAX_EXPLAIN
  [ticket/9992] Use sql_fetchfield for single row and single column result
  [ticket/9992] Adding a limit on login attempts per IP.
  [ticket/9992] Make sql_create_table and sql_table_exists available in updater
This commit is contained in:
Andreas Fischer
2011-06-11 19:42:04 +02:00
parent 0cad4ed49f bf2125f0f7
commit fe5d616349
17 changed files with 595 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
phpBB/install/schemas/firebird_schema.sql
View File

@@ -1,5 +1,5 @@
#
# $Id$
# $Id: $
#
@@ -547,6 +547,36 @@ BEGIN
END;;
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
attempt_id INTEGER NOT NULL,
attempt_ip VARCHAR(40) CHARACTER SET NONE DEFAULT '' NOT NULL,
attempt_browser VARCHAR(150) CHARACTER SET NONE DEFAULT '' NOT NULL,
attempt_forwarded_for VARCHAR(255) CHARACTER SET NONE DEFAULT '' NOT NULL,
attempt_time INTEGER DEFAULT 0 NOT NULL,
user_id INTEGER DEFAULT 0 NOT NULL,
username VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE,
username_clean VARCHAR(255) CHARACTER SET UTF8 DEFAULT 0 NOT NULL COLLATE UNICODE
);;
ALTER TABLE phpbb_login_attempts ADD PRIMARY KEY (attempt_id);;
CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts(attempt_ip, attempt_time);;
CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts(attempt_forwarded_for, attempt_time);;
CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts(attempt_time);;
CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts(user_id);;
CREATE GENERATOR phpbb_login_attempts_gen;;
SET GENERATOR phpbb_login_attempts_gen TO 0;;
CREATE TRIGGER t_phpbb_login_attempts FOR phpbb_login_attempts
BEFORE INSERT
AS
BEGIN
NEW.attempt_id = GEN_ID(phpbb_login_attempts_gen, 1);
END;;
# Table: 'phpbb_moderator_cache'
CREATE TABLE phpbb_moderator_cache (
forum_id INTEGER DEFAULT 0 NOT NULL,

38
phpBB/install/schemas/mssql_schema.sql
View File

@@ -1,6 +1,6 @@
/*
$Id$
$Id: $
*/
@@ -653,6 +653,41 @@ CREATE INDEX [user_id] ON [phpbb_log]([user_id]) ON [PRIMARY]
GO
/*
Table: 'phpbb_login_attempts'
*/
CREATE TABLE [phpbb_login_attempts] (
[attempt_id] [int] IDENTITY (1, 1) NOT NULL ,
[attempt_ip] [varchar] (40) DEFAULT ('') NOT NULL ,
[attempt_browser] [varchar] (150) DEFAULT ('') NOT NULL ,
[attempt_forwarded_for] [varchar] (255) DEFAULT ('') NOT NULL ,
[attempt_time] [int] DEFAULT (0) NOT NULL ,
[user_id] [int] DEFAULT (0) NOT NULL ,
[username] [varchar] (255) DEFAULT (0) NOT NULL ,
[username_clean] [varchar] (255) DEFAULT (0) NOT NULL
) ON [PRIMARY]
GO
ALTER TABLE [phpbb_login_attempts] WITH NOCHECK ADD
CONSTRAINT [PK_phpbb_login_attempts] PRIMARY KEY CLUSTERED
(
[attempt_id]
) ON [PRIMARY]
GO
CREATE INDEX [attempt_ip] ON [phpbb_login_attempts]([attempt_ip], [attempt_time]) ON [PRIMARY]
GO
CREATE INDEX [attempt_forwarded_for] ON [phpbb_login_attempts]([attempt_forwarded_for], [attempt_time]) ON [PRIMARY]
GO
CREATE INDEX [attempt_time] ON [phpbb_login_attempts]([attempt_time]) ON [PRIMARY]
GO
CREATE INDEX [user_id] ON [phpbb_login_attempts]([user_id]) ON [PRIMARY]
GO
/*
Table: 'phpbb_moderator_cache'
*/
@@ -1735,3 +1770,4 @@ ALTER TABLE [phpbb_zebra] WITH NOCHECK ADD
) ON [PRIMARY]
GO

20
phpBB/install/schemas/mysql_40_schema.sql
View File

@@ -1,5 +1,5 @@
#
# $Id$
# $Id: $
#
# Table: 'phpbb_attachments'
@@ -371,6 +371,24 @@ CREATE TABLE phpbb_log (
);
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
attempt_ip varbinary(40) DEFAULT '' NOT NULL,
attempt_browser varbinary(150) DEFAULT '' NOT NULL,
attempt_forwarded_for varbinary(255) DEFAULT '' NOT NULL,
attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
username blob NOT NULL,
username_clean blob NOT NULL,
PRIMARY KEY (attempt_id),
KEY attempt_ip (attempt_ip, attempt_time),
KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
KEY attempt_time (attempt_time),
KEY user_id (user_id)
);
# Table: 'phpbb_moderator_cache'
CREATE TABLE phpbb_moderator_cache (
forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,

20
phpBB/install/schemas/mysql_41_schema.sql
View File

@@ -1,5 +1,5 @@
#
# $Id$
# $Id: $
#
# Table: 'phpbb_attachments'
@@ -371,6 +371,24 @@ CREATE TABLE phpbb_log (
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
attempt_id mediumint(8) UNSIGNED NOT NULL auto_increment,
attempt_ip varchar(40) DEFAULT '' NOT NULL,
attempt_browser varchar(150) DEFAULT '' NOT NULL,
attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
attempt_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
username varchar(255) DEFAULT '0' NOT NULL,
username_clean varchar(255) DEFAULT '0' NOT NULL,
PRIMARY KEY (attempt_id),
KEY attempt_ip (attempt_ip, attempt_time),
KEY attempt_forwarded_for (attempt_forwarded_for, attempt_time),
KEY attempt_time (attempt_time),
KEY user_id (user_id)
) CHARACTER SET `utf8` COLLATE `utf8_bin`;
# Table: 'phpbb_moderator_cache'
CREATE TABLE phpbb_moderator_cache (
forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,

43
phpBB/install/schemas/oracle_schema.sql
View File

@@ -1,6 +1,6 @@
/*
$Id$
$Id: $
*/
@@ -743,6 +743,47 @@ END;
/
/*
Table: 'phpbb_login_attempts'
*/
CREATE TABLE phpbb_login_attempts (
attempt_id number(8) NOT NULL,
attempt_ip varchar2(40) DEFAULT '' ,
attempt_browser varchar2(150) DEFAULT '' ,
attempt_forwarded_for varchar2(255) DEFAULT '' ,
attempt_time number(11) DEFAULT '0' NOT NULL,
user_id number(8) DEFAULT '0' NOT NULL,
username varchar2(765) DEFAULT '0' NOT NULL,
username_clean varchar2(255) DEFAULT '0' NOT NULL,
CONSTRAINT pk_phpbb_login_attempts PRIMARY KEY (attempt_id)
)
/
CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time)
/
CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time)
/
CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time)
/
CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id)
/
CREATE SEQUENCE phpbb_login_attempts_seq
/
CREATE OR REPLACE TRIGGER t_phpbb_login_attempts
BEFORE INSERT ON phpbb_login_attempts
FOR EACH ROW WHEN (
new.attempt_id IS NULL OR new.attempt_id = 0
)
BEGIN
SELECT phpbb_login_attempts_seq.nextval
INTO :new.attempt_id
FROM dual;
END;
/
/*
Table: 'phpbb_moderator_cache'
*/

24
phpBB/install/schemas/postgres_schema.sql
View File

@@ -1,6 +1,6 @@
/*
$Id$
$Id: $
*/
@@ -526,6 +526,28 @@ CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
/*
Table: 'phpbb_login_attempts'
*/
CREATE SEQUENCE phpbb_login_attempts_seq;
CREATE TABLE phpbb_login_attempts (
attempt_id INT4 DEFAULT nextval('phpbb_login_attempts_seq'),
attempt_ip varchar(40) DEFAULT '' NOT NULL,
attempt_browser varchar(150) DEFAULT '' NOT NULL,
attempt_forwarded_for varchar(255) DEFAULT '' NOT NULL,
attempt_time INT4 DEFAULT '0' NOT NULL CHECK (attempt_time >= 0),
user_id INT4 DEFAULT '0' NOT NULL CHECK (user_id >= 0),
username varchar(255) DEFAULT '0' NOT NULL,
username_clean varchar_ci DEFAULT '0' NOT NULL,
PRIMARY KEY (attempt_id)
);
CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
/*
Table: 'phpbb_moderator_cache'
*/

3
phpBB/install/schemas/schema_data.sql
View File

@@ -136,6 +136,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_widt
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_min_thumb_filesize', '12000');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_max', '50');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_time', '21600');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_use_forwarded', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', '');

19
phpBB/install/schemas/sqlite_schema.sql
View File

@@ -1,5 +1,5 @@
#
# $Id$
# $Id: $
#
BEGIN TRANSACTION;
@@ -359,6 +359,23 @@ CREATE INDEX phpbb_log_topic_id ON phpbb_log (topic_id);
CREATE INDEX phpbb_log_reportee_id ON phpbb_log (reportee_id);
CREATE INDEX phpbb_log_user_id ON phpbb_log (user_id);
# Table: 'phpbb_login_attempts'
CREATE TABLE phpbb_login_attempts (
attempt_id INTEGER PRIMARY KEY NOT NULL ,
attempt_ip varchar(40) NOT NULL DEFAULT '',
attempt_browser varchar(150) NOT NULL DEFAULT '',
attempt_forwarded_for varchar(255) NOT NULL DEFAULT '',
attempt_time INTEGER UNSIGNED NOT NULL DEFAULT '0',
user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
username varchar(255) NOT NULL DEFAULT '0',
username_clean varchar(255) NOT NULL DEFAULT '0'
);
CREATE INDEX phpbb_login_attempts_attempt_ip ON phpbb_login_attempts (attempt_ip, attempt_time);
CREATE INDEX phpbb_login_attempts_attempt_forwarded_for ON phpbb_login_attempts (attempt_forwarded_for, attempt_time);
CREATE INDEX phpbb_login_attempts_attempt_time ON phpbb_login_attempts (attempt_time);
CREATE INDEX phpbb_login_attempts_user_id ON phpbb_login_attempts (user_id);
# Table: 'phpbb_moderator_cache'
CREATE TABLE phpbb_moderator_cache (
forum_id INTEGER UNSIGNED NOT NULL DEFAULT '0',