";
$result = db_query($link, "SELECT id FROM ttrss_users
- WHERE id = ".$_SESSION["uid"]." AND pwd_hash
+ WHERE id = ".$_SESSION["uid"]." AND pwd_hash
= 'SHA1:5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8'");
if (db_num_rows($result) != 0) {
@@ -223,7 +223,7 @@
new Ajax.Request('backend.php', {
parameters: dojo.objectToQuery(this.getValues()),
- onComplete: function(transport) {
+ onComplete: function(transport) {
notify('');
if (transport.responseText.indexOf('ERROR: ') == 0) {
notify_error(transport.responseText.replace('ERROR: ', ''));
@@ -238,12 +238,12 @@
";
print "
";
@@ -278,11 +278,11 @@
$profile_qpart = "profile IS NULL";
}
- $result = db_query($link, "SELECT
+ $result = db_query($link, "SELECT
ttrss_user_prefs.pref_name,short_desc,help_text,value,type_name,
section_name,def_value,section_id
FROM ttrss_prefs,ttrss_prefs_types,ttrss_prefs_sections,ttrss_user_prefs
- WHERE type_id = ttrss_prefs_types.id AND
+ WHERE type_id = ttrss_prefs_types.id AND
$profile_qpart AND
section_id = ttrss_prefs_sections.id AND
ttrss_user_prefs.pref_name = ttrss_prefs.pref_name AND
@@ -299,7 +299,7 @@
new Ajax.Request('backend.php', {
parameters: dojo.objectToQuery(this.getValues()),
- onComplete: function(transport) {
+ onComplete: function(transport) {
var msg = transport.responseText;
if (msg.match('PREFS_THEME_CHANGED')) {
window.location.reload();
@@ -313,14 +313,14 @@
$lnum = 0;
$active_section = "";
-
+
while ($line = db_fetch_assoc($result)) {
if (in_array($line["pref_name"], $prefs_blacklist)) {
continue;
}
- if ($_SESSION["profile"] && in_array($line["pref_name"],
+ if ($_SESSION["profile"] && in_array($line["pref_name"],
$profile_blacklist)) {
continue;
}
@@ -333,8 +333,8 @@
print "
";
- $active_section = $line["section_name"];
-
+ $active_section = $line["section_name"];
+
print "".__($active_section)." |
";
if ($line["section_id"] == 2) {
@@ -345,7 +345,7 @@
print " | ";
}
@@ -383,7 +383,7 @@
print "" . __($line["short_desc"]);
if ($help_text) print " ".__($help_text)." ";
-
+
print " | ";
print "";
@@ -402,14 +402,14 @@
$limits = array(15, 30, 45, 60);
- print_select($pref_name, $value, $limits,
+ print_select($pref_name, $value, $limits,
'dojoType="dijit.form.Select"');
} else if ($pref_name == "DEFAULT_UPDATE_INTERVAL") {
global $update_intervals_nodefault;
- print_select_hash($pref_name, $value, $update_intervals_nodefault,
+ print_select_hash($pref_name, $value, $update_intervals_nodefault,
'dojoType="dijit.form.Select"');
} else if ($type_name == "bool") {
@@ -432,6 +432,20 @@
required=\"1\" $regexp
name=\"$pref_name\" value=\"$value\">";
+ } else if ($pref_name == "SSL_CERT_SERIAL") {
+
+ print "";
+
+ $cert_serial = htmlspecialchars($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]);
+
+ if ($cert_serial) {
+ print " ";
+ }
+
} else {
$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
diff --git a/prefs.js b/prefs.js
index 02d65bc41..ae2c9f785 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1693,3 +1693,11 @@ function customizeCSS() {
exception_error("customizeCSS", e);
}
}
+
+function insertSSLserial(value) {
+ try {
+ dijit.byId("SSL_CERT_SERIAL").attr('value', value);
+ } catch (e) {
+ exception_error("insertSSLcerial", e);
+ }
+}
diff --git a/sanity_check.php b/sanity_check.php
index c9d0fe922..96f4e839c 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
require_once "functions.php";
define('EXPECTED_CONFIG_VERSION', 21);
- define('SCHEMA_VERSION', 81);
+ define('SCHEMA_VERSION', 82);
if (!file_exists("config.php")) {
print "Fatal Error: You forgot to copy
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index a7c555cba..a4acf1e48 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -258,7 +258,7 @@ create table ttrss_tags (id integer primary key auto_increment,
create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
-insert into ttrss_version values (81);
+insert into ttrss_version values (82);
create table ttrss_enclosures (id integer primary key auto_increment,
content_url text not null,
@@ -391,6 +391,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SSL_CERT_SERIAL', 2, '', 'Login with an SSL certificate',3, 'You can login automatically with an active client SSL certificate if you fill in its serial number here.');
+
create table ttrss_user_prefs (
owner_uid integer not null,
pref_name varchar(250),
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index d73206411..fbb693cec 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -229,7 +229,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 (81);
+insert into ttrss_version values (82);
create table ttrss_enclosures (id serial not null primary key,
content_url text not null,
@@ -355,6 +355,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SSL_CERT_SERIAL', 2, '', 'Login with an SSL certificate',3, 'You can login automatically with an active client SSL certificate if you fill in its serial number here.');
+
create table ttrss_user_prefs (
owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,
diff --git a/schema/versions/mysql/82.sql b/schema/versions/mysql/82.sql
new file mode 100644
index 000000000..79fe5f49d
--- /dev/null
+++ b/schema/versions/mysql/82.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SSL_CERT_SERIAL', 2, '', 'Login with an SSL certificate',3, 'You can login automatically with an active client SSL certificate if you fill in its serial number here.');
+
+update ttrss_version set schema_version = 82;
+
+commit;
diff --git a/schema/versions/pgsql/82.sql b/schema/versions/pgsql/82.sql
new file mode 100644
index 000000000..79fe5f49d
--- /dev/null
+++ b/schema/versions/pgsql/82.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SSL_CERT_SERIAL', 2, '', 'Login with an SSL certificate',3, 'You can login automatically with an active client SSL certificate if you fill in its serial number here.');
+
+update ttrss_version set schema_version = 82;
+
+commit;
diff --git a/sessions.php b/sessions.php
index 2ad5a57fc..8588f5807 100644
--- a/sessions.php
+++ b/sessions.php
@@ -7,28 +7,33 @@
$session_expire = SESSION_EXPIRE_TIME; //seconds
$session_name = (!defined('TTRSS_SESSION_NAME')) ? "ttrss_sid" : TTRSS_SESSION_NAME;
+ if ($_SERVER['HTTPS'] == "on") {
+ $session_name .= "_ssl";
+ ini_set("session.cookie_secure", true);
+ }
+
ini_set("session.gc_probability", 50);
ini_set("session.name", $session_name);
ini_set("session.use_only_cookies", true);
ini_set("session.gc_maxlifetime", SESSION_EXPIRE_TIME);
function ttrss_open ($s, $n) {
-
+
global $session_connection;
-
+
$session_connection = db_connect(DB_HOST, DB_USER, DB_PASS, DB_NAME);
-
+
return true;
}
function ttrss_read ($id){
-
- global $session_connection,$session_read;
+
+ global $session_connection,$session_read;
$query = "SELECT data FROM ttrss_sessions WHERE id='$id'";
$res = db_query($session_connection, $query);
-
+
if (db_num_rows($res) != 1) {
return "";
} else {
@@ -39,61 +44,61 @@
}
function ttrss_write ($id, $data) {
-
- if (! $data) {
- return false;
+
+ if (! $data) {
+ return false;
}
-
+
global $session_connection, $session_read, $session_expire;
-
+
$expire = time() + $session_expire;
-
+
$data = db_escape_string(base64_encode($data), $session_connection);
-
+
if ($session_read) {
- $query = "UPDATE ttrss_sessions SET data='$data',
- expire='$expire' WHERE id='$id'";
+ $query = "UPDATE ttrss_sessions SET data='$data',
+ expire='$expire' WHERE id='$id'";
} else {
$query = "INSERT INTO ttrss_sessions (id, data, expire)
VALUES ('$id', '$data', '$expire')";
}
-
+
db_query($session_connection, $query);
return true;
}
function ttrss_close () {
-
+
global $session_connection;
-
+
db_close($session_connection);
-
+
return true;
}
function ttrss_destroy ($id) {
-
+
global $session_connection;
$query = "DELETE FROM ttrss_sessions WHERE id = '$id'";
-
+
db_query($session_connection, $query);
-
+
return true;
}
function ttrss_gc ($expire) {
-
+
global $session_connection;
-
+
$query = "DELETE FROM ttrss_sessions WHERE expire < " . time();
-
+
db_query($session_connection, $query);
}
if (DATABASE_BACKED_SESSIONS) {
- session_set_save_handler("ttrss_open",
- "ttrss_close", "ttrss_read", "ttrss_write",
+ session_set_save_handler("ttrss_open",
+ "ttrss_close", "ttrss_read", "ttrss_write",
"ttrss_destroy", "ttrss_gc");
}
|