implement one time passwords using TOTP

4 files changed, 26 insertions, 4 deletions

diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 9a160f2aa..8ac8611c9 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -50,6 +50,7 @@ create table ttrss_users (id integer primary key not null auto_increment,
 	salt varchar(250) not null default '',
 	created datetime default null,
 	twitter_oauth longtext default null,
+	otp_enabled boolean not null default false,
 	index (theme_id)) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
 insert into ttrss_users (login,pwd_hash,access_level) values ('admin',
@@ -268,7 +269,7 @@ create table ttrss_filters2(id integer primary key auto_increment,
 	enabled boolean not null default true,
 	index(owner_uid),
 	foreign key (owner_uid) references ttrss_users(id) ON DELETE CASCADE) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
-	
+
 create table ttrss_filters2_rules(id integer primary key auto_increment,
 	filter_id integer not null references ttrss_filters2(id) on delete cascade,
 	reg_exp varchar(250) not null,
@@ -305,7 +306,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) ENGINE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (96);
+insert into ttrss_version values (97);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 600714e6e..377261dfa 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -46,6 +46,7 @@ create table ttrss_users (id serial not null primary key,
 	last_digest_sent timestamp default null,
 	salt varchar(250) not null default '',
 	twitter_oauth text default null,
+	otp_enabled boolean not null default false,
 	created timestamp default null);
 
 insert into ttrss_users (login,pwd_hash,access_level) values ('admin',
@@ -229,7 +230,7 @@ create table ttrss_filters2(id serial not null primary key,
 	owner_uid integer not null references ttrss_users(id) on delete cascade,
 	match_any_rule boolean not null default false,
 	enabled boolean not null default true);
-	
+
 create table ttrss_filters2_rules(id serial not null primary key,
 	filter_id integer not null references ttrss_filters2(id) on delete cascade,
 	reg_exp varchar(250) not null,
@@ -253,7 +254,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (96);
+insert into ttrss_version values (97);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
diff --git a/schema/versions/mysql/97.sql b/schema/versions/mysql/97.sql
new file mode 100644
index 000000000..c555b86dc
--- /dev/null
+++ b/schema/versions/mysql/97.sql
@@ -0,0 +1,10 @@
+begin;
+
+alter table ttrss_users add column otp_enabled boolean;
+update ttrss_users set otp_enabled = false;
+alter table ttrss_users change otp_enabled otp_enabled boolean not null;
+alter table ttrss_users alter column otp_enabled set default false;
+
+update ttrss_version set schema_version = 97;
+
+commit;
diff --git a/schema/versions/pgsql/97.sql b/schema/versions/pgsql/97.sql
new file mode 100644
index 000000000..f458ee910
--- /dev/null
+++ b/schema/versions/pgsql/97.sql
@@ -0,0 +1,10 @@
+begin;
+
+alter table ttrss_users add column otp_enabled boolean;
+update ttrss_users set otp_enabled = false;
+alter table ttrss_users alter column otp_enabled set not null;
+alter table ttrss_users alter column otp_enabled set default false;
+
+update ttrss_version set schema_version = 97;
+
+commit;