return true;
}
+ function get_login_by_ssl_certificate($link) {
+
+ $cert_serial = db_escape_string($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]);
+
+ if ($cert_serial) {
+ $result = db_query($link, "SELECT login FROM ttrss_user_prefs, ttrss_users
+ WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND
+ owner_uid = ttrss_users.id");
+
+ if (db_num_rows($result) != 0) {
+ return db_escape_string(db_fetch_result($result, 0, "login"));
+ }
+ }
+
+ return "";
+ }
+
function get_remote_user() {
- $remote_user = $_SERVER["REMOTE_USER"];
+ $remote_user = "";
- if (!$remote_user)
- $remote_user = $_SERVER["REDIRECT_SSL_CLIENT_S_DN_CN"];
+ if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH) {
+ $remote_user = $_SERVER["REMOTE_USER"];
+ }
return db_escape_string($remote_user);
}
$pwd_hash2 = encrypt_password($password, $login);
$login = db_escape_string($login);
- if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
- && get_remote_user() && $login != "admin") {
+ $remote_user = get_remote_user();
+
+ if (!$remote_user)
+ $remote_user = get_login_by_ssl_certificate($link);
- $login = db_escape_string(get_remote_user());
+ if ($remote_user && $login != "admin") {
+
+ $login = $remote_user;
$query = "SELECT id,login,access_level,pwd_hash
FROM ttrss_users WHERE
}
if (!$_SESSION["uid"] || !validate_session($link)) {
- if (defined('ALLOW_REMOTE_USER_AUTH') && ALLOW_REMOTE_USER_AUTH
- && get_remote_user() && defined('AUTO_LOGIN') && AUTO_LOGIN) {
+ $cert_login = get_login_by_ssl_certificate($link);
+
+ if ($cert_login) {
+ authenticate_user($link, $cert_login, null);
+ $_SESSION["ref_schema_version"] = get_schema_version($link, true);
+ } else if (get_remote_user() && AUTO_LOGIN) {
authenticate_user($link, get_remote_user(), null);
$_SESSION["ref_schema_version"] = get_schema_version($link, true);
} else {
$subop = $_REQUEST["subop"];
$prefs_blacklist = array("HIDE_FEEDLIST", "SYNC_COUNTERS", "ENABLE_LABELS",
- "ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS",
+ "ENABLE_SEARCH_TOOLBAR", "HIDE_READ_FEEDS", "ENABLE_FEED_ICONS",
"ENABLE_OFFLINE_READING", "EXTENDED_FEEDLIST", "FEEDS_SORT_BY_UNREAD",
"OPEN_LINKS_IN_NEW_WINDOW", "USER_STYLESHEET_URL", "ENABLE_FLASH_PLAYER");
- $profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
- "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
+ $profile_blacklist = array("ALLOW_DUPLICATE_POSTS", "PURGE_OLD_DAYS",
+ "PURGE_UNREAD_ARTICLES", "DIGEST_ENABLE", "DIGEST_CATCHUP",
"BLACKLISTED_TAGS", "ENABLE_FEED_ICONS", "ENABLE_API_ACCESS",
"UPDATE_POST_ON_CHECKSUM_CHANGE", "DEFAULT_UPDATE_INTERVAL",
"MARK_UNREAD_ON_UPDATE", "USER_TIMEZONE", "SORT_HEADLINES_BY_FEED_DATE");
$new_pw_hash = encrypt_password($new_pw, $_SESSION["name"]);
$active_uid = $_SESSION["uid"];
-
+
if ($old_pw && $new_pw) {
$login = db_escape_string($_SERVER['PHP_AUTH_USER']);
- $result = db_query($link, "SELECT id FROM ttrss_users WHERE
- id = '$active_uid' AND (pwd_hash = '$old_pw_hash1' OR
+ $result = db_query($link, "SELECT id FROM ttrss_users WHERE
+ id = '$active_uid' AND (pwd_hash = '$old_pw_hash1' OR
pwd_hash = '$old_pw_hash2')");
if (db_num_rows($result) == 1) {
- db_query($link, "UPDATE ttrss_users SET pwd_hash = '$new_pw_hash'
- WHERE id = '$active_uid'");
+ db_query($link, "UPDATE ttrss_users SET pwd_hash = '$new_pw_hash'
+ WHERE id = '$active_uid'");
$_SESSION["pwd_hash"] = $new_pw_hash;
$orig_theme = get_pref($link, "_THEME_ID");
foreach (array_keys($_POST) as $pref_name) {
-
+
$pref_name = db_escape_string($pref_name);
$value = db_escape_string($_POST[$pref_name]);
$active_uid = $_SESSION["uid"];
db_query($link, "UPDATE ttrss_users SET email = '$email',
- full_name = '$full_name' WHERE id = '$active_uid'");
-
+ full_name = '$full_name' WHERE id = '$active_uid'");
+
print __("Your personal data has been saved.");
-
+
return;
} else if ($subop == "reset-config") {
$profile_qpart = "profile IS NULL";
}
- db_query($link, "DELETE FROM ttrss_user_prefs
+ db_query($link, "DELETE FROM ttrss_user_prefs
WHERE $profile_qpart AND owner_uid = ".$_SESSION["uid"]);
initialize_user_prefs($link, $_SESSION["uid"], $_SESSION["profile"]);
new Ajax.Request('backend.php', {
parameters: dojo.objectToQuery(this.getValues()),
- onComplete: function(transport) {
- notify_callback2(transport);
+ onComplete: function(transport) {
+ notify_callback2(transport);
} });
}
$result = db_query($link, "SELECT email,full_name,
access_level FROM ttrss_users
WHERE id = ".$_SESSION["uid"]);
-
+
$email = htmlspecialchars(db_fetch_result($result, 0, "email"));
$full_name = htmlspecialchars(db_fetch_result($result, 0, "full_name"));
print "<tr><td width=\"40%\">".__('Access level')."</td>";
print "<td>" . $access_level_names[$access_level] . "</td></tr>";
}
-
+
print "</table>";
-
+
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-prefs\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"change-email\">";
print "<div dojoType=\"dijit.layout.AccordionPane\" title=\"".__('Authentication')."\">";
$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) {
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: ', ''));
</script>";
print "<table width=\"100%\" class=\"prefPrefsList\">";
-
+
print "<tr><td width=\"40%\">".__("Old password")."</td>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\" name=\"old_password\"></td></tr>";
-
+
print "<tr><td width=\"40%\">".__("New password")."</td>";
-
+
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\"
name=\"new_password\"></td></tr>";
print "<td class=\"prefValue\"><input dojoType=\"dijit.form.ValidationTextBox\" type=\"password\" required=\"1\" name=\"confirm_password\"></td></tr>";
print "</table>";
-
+
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"op\" value=\"pref-prefs\">";
print "<input dojoType=\"dijit.form.TextBox\" style=\"display : none\" name=\"subop\" value=\"change-password\">";
$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
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();
$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;
}
print "<table width=\"100%\" class=\"prefPrefsList\">";
- $active_section = $line["section_name"];
-
+ $active_section = $line["section_name"];
+
print "<tr><td colspan=\"3\"><h3>".__($active_section)."</h3></td></tr>";
if ($line["section_id"] == 2) {
print "<td><select name=\"_THEME_ID\" dojoType=\"dijit.form.Select\">";
print "<option value='Default'>".__('Default')."</option>";
- print "<option value='----------------' disabled=\"1\">--------</option>";
+ print "<option value='----------------' disabled=\"1\">--------</option>";
foreach ($themes as $t) {
$base = $t['base'];
print "<option $selected value='$base'>$name</option>";
}
-
+
print "</select></td></tr>";
}
print "<td width=\"40%\" class=\"prefName\" id=\"$pref_name\">" . __($line["short_desc"]);
if ($help_text) print "<div class=\"prefHelp\">".__($help_text)."</div>";
-
+
print "</td>";
print "<td class=\"prefValue\">";
$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") {
required=\"1\" $regexp
name=\"$pref_name\" value=\"$value\">";
+ } else if ($pref_name == "SSL_CERT_SERIAL") {
+
+ print "<input dojoType=\"dijit.form.ValidationTextBox\"
+ id=\"SSL_CERT_SERIAL\"
+ name=\"$pref_name\" value=\"$value\">";
+
+ $cert_serial = htmlspecialchars($_SERVER["REDIRECT_SSL_CLIENT_M_SERIAL"]);
+
+ if ($cert_serial) {
+ print " <button dojoType=\"dijit.form.Button\"
+ onclick=\"insertSSLserial('$cert_serial')\">" .
+ __('Fill automatically') . "</button>";
+ }
+
} else {
$regexp = ($type_name == 'integer') ? 'regexp="^\d*$"' : '';
$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 {
}
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");
}
projects / tt-rss.git / commitdiff